Skip to content
Snippets Groups Projects
Commit 83562c4e authored by akiraohgaki's avatar akiraohgaki
Browse files

Config object is not pointer

parent 24367932
No related branches found
No related tags found
No related merge requests found
...@@ -5,14 +5,13 @@ ...@@ -5,14 +5,13 @@
#include "qtlibs/file.h" #include "qtlibs/file.h"
#include "qtlibs/dir.h" #include "qtlibs/dir.h"
#include "qtlibs/config.h"
#include "qtlibs/networkresource.h" #include "qtlibs/networkresource.h"
#include "qtlibs/package.h" #include "qtlibs/package.h"
namespace handlers { namespace handlers {
XdgUrl::XdgUrl(const QString &xdgUrl, qtlibs::Config *config, QObject *parent) : XdgUrl::XdgUrl(const QString &xdgUrl, const qtlibs::Config &config, QObject *parent)
QObject(parent), xdgUrl_(xdgUrl), config_(config) : QObject(parent), xdgUrl_(xdgUrl), config_(config)
{ {
parse(); parse();
loadDestinations(); loadDestinations();
...@@ -132,8 +131,8 @@ void XdgUrl::parse() ...@@ -132,8 +131,8 @@ void XdgUrl::parse()
void XdgUrl::loadDestinations() void XdgUrl::loadDestinations()
{ {
QJsonObject configDestinations = config_->get("destinations"); QJsonObject configDestinations = config_.get("destinations");
QJsonObject configDestinationsAlias = config_->get("destinations_alias"); QJsonObject configDestinationsAlias = config_.get("destinations_alias");
foreach (const QString key, configDestinations.keys()) { foreach (const QString key, configDestinations.keys()) {
destinations_[key] = convertPathString(configDestinations[key].toString()); destinations_[key] = convertPathString(configDestinations[key].toString());
......
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
#include <QObject> #include <QObject>
#include <QJsonObject> #include <QJsonObject>
#include "qtlibs/config.h"
namespace qtlibs { namespace qtlibs {
class Config;
class NetworkResource; class NetworkResource;
} }
...@@ -15,7 +16,7 @@ class XdgUrl : public QObject ...@@ -15,7 +16,7 @@ class XdgUrl : public QObject
Q_OBJECT Q_OBJECT
public: 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: signals:
void started(); void started();
...@@ -42,7 +43,7 @@ private: ...@@ -42,7 +43,7 @@ private:
void installDownloadedFile(qtlibs::NetworkResource *resource); void installDownloadedFile(qtlibs::NetworkResource *resource);
QString xdgUrl_; QString xdgUrl_;
qtlibs::Config *config_; qtlibs::Config config_;
QJsonObject metadata_; QJsonObject metadata_;
QJsonObject destinations_; QJsonObject destinations_;
QString destination_; QString destination_;
......
...@@ -22,8 +22,8 @@ int main(int argc, char *argv[]) ...@@ -22,8 +22,8 @@ int main(int argc, char *argv[])
#endif #endif
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
qtlibs::Config *config = new qtlibs::Config(":/configs"); qtlibs::Config config(":/configs");
QJsonObject configApplication = config->get("application"); QJsonObject configApplication = config.get("application");
app.setApplicationName(configApplication["name"].toString()); app.setApplicationName(configApplication["name"].toString());
app.setApplicationVersion(configApplication["version"].toString()); app.setApplicationVersion(configApplication["version"].toString());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment