From ac10b481d640c8032f86d0b0e80ca3bc9d485207 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Fri, 25 Nov 2016 07:11:55 +0900
Subject: [PATCH] No namespace
---
src/app/app.pri | 4 +--
.../{xdgurl.cpp => xdgurlhandler.cpp} | 34 ++++++++-----------
.../handlers/{xdgurl.h => xdgurlhandler.h} | 8 ++---
src/app/main.cpp | 4 +--
4 files changed, 21 insertions(+), 29 deletions(-)
rename src/app/handlers/{xdgurl.cpp => xdgurlhandler.cpp} (91%)
rename src/app/handlers/{xdgurl.h => xdgurlhandler.h} (84%)
diff --git a/src/app/app.pri b/src/app/app.pri
index f192467..b37beda 100644
--- a/src/app/app.pri
+++ b/src/app/app.pri
@@ -6,11 +6,11 @@ QT += \
svg
HEADERS += \
- $${PWD}/handlers/xdgurl.h
+ $${PWD}/handlers/xdgurlhandler.h
SOURCES += \
$${PWD}/main.cpp \
- $${PWD}/handlers/xdgurl.cpp
+ $${PWD}/handlers/xdgurlhandler.cpp
RESOURCES += \
$${PWD}/configs/configs.qrc \
diff --git a/src/app/handlers/xdgurl.cpp b/src/app/handlers/xdgurlhandler.cpp
similarity index 91%
rename from src/app/handlers/xdgurl.cpp
rename to src/app/handlers/xdgurlhandler.cpp
index 449c466..f419e6b 100644
--- a/src/app/handlers/xdgurl.cpp
+++ b/src/app/handlers/xdgurlhandler.cpp
@@ -1,4 +1,4 @@
-#include "xdgurl.h"
+#include "xdgurlhandler.h"
#include <QUrlQuery>
#include <QDesktopServices>
@@ -8,26 +8,24 @@
#include "qtlib_networkresource.h"
#include "qtlib_package.h"
-namespace handlers {
-
-XdgUrl::XdgUrl(const QString &xdgUrl, const qtlib::Config &config, QObject *parent)
+XdgUrlHandler::XdgUrlHandler(const QString &xdgUrl, const qtlib::Config &config, QObject *parent)
: QObject(parent), xdgUrl_(xdgUrl), config_(config)
{
parse();
loadDestinations();
}
-QString XdgUrl::xdgUrl() const
+QString XdgUrlHandler::xdgUrl() const
{
return xdgUrl_;
}
-QJsonObject XdgUrl::metadata() const
+QJsonObject XdgUrlHandler::metadata() const
{
return metadata_;
}
-void XdgUrl::process()
+void XdgUrlHandler::process()
{
// xdgs scheme is a reserved name, so the process of xdgs
// is the same process of the xdg scheme currently.
@@ -42,13 +40,13 @@ void XdgUrl::process()
QString url = metadata_["url"].toString();
qtlib::NetworkResource *resource = new qtlib::NetworkResource(url, QUrl(url), true, this);
- connect(resource, &qtlib::NetworkResource::downloadProgress, this, &XdgUrl::downloadProgress);
- connect(resource, &qtlib::NetworkResource::finished, this, &XdgUrl::networkResourceFinished);
+ connect(resource, &qtlib::NetworkResource::downloadProgress, this, &XdgUrlHandler::downloadProgress);
+ connect(resource, &qtlib::NetworkResource::finished, this, &XdgUrlHandler::networkResourceFinished);
resource->get();
emit started();
}
-bool XdgUrl::isValid()
+bool XdgUrlHandler::isValid()
{
QString scheme = metadata_["scheme"].toString();
QString command = metadata_["command"].toString();
@@ -66,14 +64,14 @@ bool XdgUrl::isValid()
return false;
}
-void XdgUrl::openDestination()
+void XdgUrlHandler::openDestination()
{
if (!destination_.isEmpty()) {
QDesktopServices::openUrl(QUrl("file://" + destination_));
}
}
-void XdgUrl::networkResourceFinished(qtlib::NetworkResource *resource)
+void XdgUrlHandler::networkResourceFinished(qtlib::NetworkResource *resource)
{
if (!resource->isFinishedWithNoError()) {
QJsonObject result;
@@ -92,7 +90,7 @@ void XdgUrl::networkResourceFinished(qtlib::NetworkResource *resource)
}
}
-void XdgUrl::parse()
+void XdgUrlHandler::parse()
{
QUrl url(xdgUrl_);
QUrlQuery query(url);
@@ -128,7 +126,7 @@ void XdgUrl::parse()
}
}
-void XdgUrl::loadDestinations()
+void XdgUrlHandler::loadDestinations()
{
QJsonObject configDestinations = config_.get("destinations");
QJsonObject configDestinationsAlias = config_.get("destinations_alias");
@@ -145,7 +143,7 @@ void XdgUrl::loadDestinations()
}
}
-QString XdgUrl::convertPathString(const QString &path)
+QString XdgUrlHandler::convertPathString(const QString &path)
{
QString newPath = path;
@@ -162,7 +160,7 @@ QString XdgUrl::convertPathString(const QString &path)
return newPath;
}
-void XdgUrl::saveDownloadedFile(qtlib::NetworkResource *resource)
+void XdgUrlHandler::saveDownloadedFile(qtlib::NetworkResource *resource)
{
QJsonObject result;
@@ -189,7 +187,7 @@ void XdgUrl::saveDownloadedFile(qtlib::NetworkResource *resource)
emit finishedWithSuccess(result);
}
-void XdgUrl::installDownloadedFile(qtlib::NetworkResource *resource)
+void XdgUrlHandler::installDownloadedFile(qtlib::NetworkResource *resource)
{
QJsonObject result;
@@ -263,5 +261,3 @@ void XdgUrl::installDownloadedFile(qtlib::NetworkResource *resource)
result["status"] = QString("success_install");
emit finishedWithSuccess(result);
}
-
-} // namespace handlers
diff --git a/src/app/handlers/xdgurl.h b/src/app/handlers/xdgurlhandler.h
similarity index 84%
rename from src/app/handlers/xdgurl.h
rename to src/app/handlers/xdgurlhandler.h
index 1ac7baa..e427611 100644
--- a/src/app/handlers/xdgurl.h
+++ b/src/app/handlers/xdgurlhandler.h
@@ -9,14 +9,12 @@ namespace qtlib {
class NetworkResource;
}
-namespace handlers {
-
-class XdgUrl : public QObject
+class XdgUrlHandler : public QObject
{
Q_OBJECT
public:
- explicit XdgUrl(const QString &xdgUrl, const qtlib::Config &config, QObject *parent = 0);
+ explicit XdgUrlHandler(const QString &xdgUrl, const qtlib::Config &config, QObject *parent = 0);
signals:
void started();
@@ -48,5 +46,3 @@ private:
QJsonObject destinations_;
QString destination_;
};
-
-} // namespace handlers
diff --git a/src/app/main.cpp b/src/app/main.cpp
index ea78882..b8c0a6c 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -12,7 +12,7 @@
#include "qtlib_config.h"
-#include "handlers/xdgurl.h"
+#include "handlers/xdgurlhandler.h"
int main(int argc, char *argv[])
{
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
// Setup QML
QQmlApplicationEngine qmlAppEngine;
QQmlContext *qmlContext = qmlAppEngine.rootContext();
- qmlContext->setContextProperty("xdgUrlHandler", new handlers::XdgUrl(xdgUrl, config, &qmlAppEngine));
+ qmlContext->setContextProperty("xdgUrlHandler", new XdgUrlHandler(xdgUrl, config, &qmlAppEngine));
qmlAppEngine.load(QUrl("qrc:/qml/main.qml"));
return app.exec();
--
GitLab