fixing imports

include/task/task.hpp

@@ -6,6 +6,7 @@ namespace Task {
 class Task {
  public:
   virtual bool isReady() = 0;
+  virtual ~Task() = 0;
 };
 }  // namespace Task
 

include/task/task.hpp.autosave

@@ -1,13 +0,0 @@
-#ifndef __TASK_HPP__
-#define __TASK_HPP__
-
-namespace Task {
-
-class Task {
- public:
-  virtual bool isReady() = 0;
-  virtual ~Task() = 0;
-};
-}  // namespace Task
-
-#endif  // __TASK_HPP__

include/ui/argdialog.h

@@ -1,16 +1,16 @@
 #ifndef ARGDIALOG_H
 #define ARGDIALOG_H
 
+#include <include/ui/kfiledialog.h>
 #include <QDialog>
 #include <QFile>
 #include <QFileDialog>
+#include <QKeyEvent>
 #include <QMessageBox>
 #include <QPushButton>
+#include <headers/util.hpp>
 #include <string_view>
 #include <unordered_map>
-#include <QKeyEvent>
-#include <headers/util.hpp>
-#include <include/kfiledialog.h>
 
 namespace Args {
 const QString HEADER_TYPE = "header";

include/ui/mainwindow.h

@@ -1,8 +1,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <include/argdialog.h>
-#include <include/consoledialog.h>
+#include <include/ui/argdialog.h>
+#include <include/ui/consoledialog.h>
 #include <QList>
 #include <QListView>
 #include <QListWidgetItem>
@@ -13,7 +13,7 @@
 #include <QTableView>
 #include <QTimer>
 #include <headers/kiq_types.hpp>
-#include <include/client.hpp>
+#include <include/client/client.hpp>
 
 namespace ProcessState {
     static constexpr int READY = 1;
@@ -61,16 +61,17 @@ public:
      public:
       void init(MainWindow* window);
       void handleCommands(StringVec commands, QString default_app);
-      void handleMessage(QString message, StringVec v);
-      QString handleEventMessage(QString message, StringVec v);
-      void updateProcessResult(QString id, QString result, bool error);
-      QString parseMessage(const QString& s, StringVec v);
-
-     private:
-      MainWindow* window;
     };
 
-private:
+   private:
+    void handleMessage(QString message, StringVec v);
+    QString handleEventMessage(QString message, StringVec v);
+    void updateProcessResult(QString id, QString result, bool error);
+    QString parseMessage(const QString& s, StringVec v);
+
+   private:
+    MainWindow* window;
+
     /** Process arguments */
     int cli_argc;
     char** cli_argv;

mainwindow.ui

@@ -791,7 +791,7 @@ font-weight: 700;</string>
   <customwidget>
    <class>ConnectionIndicator</class>
    <extends>QLabel</extends>
-   <header>include/connection_indicator.h</header>
+   <header>include/ui/connection_indicator.h</header>
   </customwidget>
  </customwidgets>
  <resources>

src/argdialog.cpp

@@ -1,4 +1,4 @@
-#include <include/argdialog.h>
+#include <include/ui/argdialog.h>
 #include <ui_argdialog.h>
 #include <QCalendarWidget>
 #include <QDateTime>
@@ -120,10 +120,10 @@ ArgDialog::ArgDialog(QWidget *parent)
                              QMessageBox::warning(this, tr("File Error"), tr("Unable to read file"));
                            }
                          }
+
                          if (!k_file_v.empty()) {
                            emit ArgDialog::uploadFiles(k_file_v);
                          }
-
                          emit ArgDialog::taskRequestReady(m_task, true);
                        }
                        clearPost(); // reset m_ig_post to default values

src/client.cpp

@@ -11,7 +11,7 @@
 #include <cstring>
 #include <functional>
 #include <future>
-#include <include/client.hpp>
+#include <include/client/client.hpp>
 #include <iostream>
 #include <vector>
 #define FLATBUFFERS_DEBUG_VERIFICATION_FAILURE

src/consoledialog.cpp

@@ -1,4 +1,4 @@
-#include <include/consoledialog.h>
+#include <include/ui/consoledialog.h>
 #include <QPushButton>
 #include "ui_consoledialog.h"
 

src/kfiledialog.cpp

@@ -1,4 +1,4 @@
-#include <include/kfiledialog.h>
+#include <include/ui/kfiledialog.h>
 
 KFileDialog::KFileDialog()
 {

src/main.cpp

@@ -1,4 +1,4 @@
-#include <include/mainwindow.h>
+#include <include/ui/mainwindow.h>
 #include <QApplication>
 
 int main(int argc, char **argv)

src/mainwindow.cpp

@@ -1,4 +1,4 @@
-#include <include/mainwindow.h>
+#include <include/ui/mainwindow.h>
 
 #include <QDateTime>
 #include <QDebug>