From 83562c4ea73b34de6b8a46e621a62dbf85237c5e Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Mon, 14 Nov 2016 08:04:16 +0900
Subject: [PATCH] Config object is not pointer
---
src/app/handlers/xdgurl.cpp | 9 ++++-----
src/app/handlers/xdgurl.h | 7 ++++---
src/app/main.cpp | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/app/handlers/xdgurl.cpp b/src/app/handlers/xdgurl.cpp
index c5709c2..cdb9351 100644
--- a/src/app/handlers/xdgurl.cpp
+++ b/src/app/handlers/xdgurl.cpp
@@ -5,14 +5,13 @@
#include "qtlibs/file.h"
#include "qtlibs/dir.h"
-#include "qtlibs/config.h"
#include "qtlibs/networkresource.h"
#include "qtlibs/package.h"
namespace handlers {
-XdgUrl::XdgUrl(const QString &xdgUrl, qtlibs::Config *config, QObject *parent) :
- QObject(parent), xdgUrl_(xdgUrl), config_(config)
+XdgUrl::XdgUrl(const QString &xdgUrl, const qtlibs::Config &config, QObject *parent)
+ : QObject(parent), xdgUrl_(xdgUrl), config_(config)
{
parse();
loadDestinations();
@@ -132,8 +131,8 @@ void XdgUrl::parse()
void XdgUrl::loadDestinations()
{
- QJsonObject configDestinations = config_->get("destinations");
- QJsonObject configDestinationsAlias = config_->get("destinations_alias");
+ QJsonObject configDestinations = config_.get("destinations");
+ QJsonObject configDestinationsAlias = config_.get("destinations_alias");
foreach (const QString key, configDestinations.keys()) {
destinations_[key] = convertPathString(configDestinations[key].toString());
diff --git a/src/app/handlers/xdgurl.h b/src/app/handlers/xdgurl.h
index 7bd8472..266c504 100644
--- a/src/app/handlers/xdgurl.h
+++ b/src/app/handlers/xdgurl.h
@@ -3,8 +3,9 @@
#include <QObject>
#include <QJsonObject>
+#include "qtlibs/config.h"
+
namespace qtlibs {
-class Config;
class NetworkResource;
}
@@ -15,7 +16,7 @@ class XdgUrl : public QObject
Q_OBJECT
public:
- explicit XdgUrl(const QString &xdgUrl, qtlibs::Config *config, QObject *parent = 0);
+ explicit XdgUrl(const QString &xdgUrl, const qtlibs::Config &config, QObject *parent = 0);
signals:
void started();
@@ -42,7 +43,7 @@ private:
void installDownloadedFile(qtlibs::NetworkResource *resource);
QString xdgUrl_;
- qtlibs::Config *config_;
+ qtlibs::Config config_;
QJsonObject metadata_;
QJsonObject destinations_;
QString destination_;
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 20319b3..839bfc8 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -22,8 +22,8 @@ int main(int argc, char *argv[])
#endif
QGuiApplication app(argc, argv);
- qtlibs::Config *config = new qtlibs::Config(":/configs");
- QJsonObject configApplication = config->get("application");
+ qtlibs::Config config(":/configs");
+ QJsonObject configApplication = config.get("application");
app.setApplicationName(configApplication["name"].toString());
app.setApplicationVersion(configApplication["version"].toString());
--
GitLab