Change file structure

src/handlers/xdgurl.cpp → src/app/handlers/xdgurl.cpp

@@ -6,10 +6,10 @@
 #include <QNetworkReply>
 #include <QDesktopServices>
 
-#include "../utils/config.h"
-#include "../utils/network.h"
-#include "../utils/file.h"
-#include "../utils/package.h"
+#include "../../libs/utils/config.h"
+#include "../../libs/utils/network.h"
+#include "../../libs/utils/file.h"
+#include "../../libs/utils/package.h"
 
 namespace handlers {
 
@@ -19,8 +19,8 @@ XdgUrl::XdgUrl(const QString &xdgUrl, utils::Config *config, utils::Network *net
     parse();
     loadDestinations();
 
-    connect(network_, &utils::Network::finished, this, &XdgUrl::downloaded);
-    connect(network_, &utils::Network::downloadProgress, this, &XdgUrl::downloadProgress);
+    connect(network_, &utils::Network::finished, this, &handlers::XdgUrl::downloaded);
+    connect(network_, &utils::Network::downloadProgress, this, &handlers::XdgUrl::downloadProgress);
 }
 
 void XdgUrl::process()

src/main.cpp → src/app/main.cpp

@@ -10,8 +10,9 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 
-#include "utils/config.h"
-#include "utils/network.h"
+#include "../libs/utils/config.h"
+#include "../libs/utils/network.h"
+
 #include "handlers/xdgurl.h"
 
 int main(int argc, char *argv[])

src/utils/network.cpp → src/libs/utils/network.cpp

@@ -11,7 +11,7 @@ Network::Network(const bool &async, QObject *parent) :
     QObject(parent), async_(async)
 {
     manager_ = new QNetworkAccessManager(this);
-    connect(manager_, &QNetworkAccessManager::finished, this, &Network::finished);
+    connect(manager_, &QNetworkAccessManager::finished, this, &utils::Network::finished);
     if (!async_) {
         eventLoop_ = new QEventLoop();
         connect(manager_, &QNetworkAccessManager::finished, eventLoop_, &QEventLoop::quit);
@@ -38,7 +38,7 @@ QNetworkReply *Network::head(const QUrl &uri)
 QNetworkReply *Network::get(const QUrl &uri)
 {
     QNetworkReply *reply = manager_->get(QNetworkRequest(uri));
-    connect(reply, &QNetworkReply::downloadProgress, this, &Network::downloadProgress);
+    connect(reply, &QNetworkReply::downloadProgress, this, &utils::Network::downloadProgress);
     if (!async_) {
         eventLoop_->exec();
     }