From 98ec26bba6d36b6d2268e264fa3dee126ca2f2a8 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Fri, 21 Oct 2016 16:35:19 +0900
Subject: [PATCH] Code cleanup
---
src/core/config.cpp | 16 +++---
src/core/config.h | 4 +-
src/core/network.cpp | 32 ++++++------
src/core/network.h | 6 +--
src/handlers/xdgurl.cpp | 110 ++++++++++++++++++++--------------------
src/handlers/xdgurl.h | 24 ++++-----
src/utility/package.cpp | 12 ++---
src/utility/package.h | 2 +-
8 files changed, 103 insertions(+), 103 deletions(-)
diff --git a/src/core/config.cpp b/src/core/config.cpp
index 49b3b99..9276958 100644
--- a/src/core/config.cpp
+++ b/src/core/config.cpp
@@ -6,31 +6,31 @@
namespace Core {
Config::Config(const QString &configsDir, QObject *parent) :
- QObject(parent), _configsDir(configsDir)
+ QObject(parent), configsDir_(configsDir)
{}
QJsonObject Config::get(const QString &name)
{
- QString configFile = _configsDir + "/" + name + ".json";
+ QString configFile = configsDir_ + "/" + name + ".json";
- if (!_cacheData.contains(name)) {
+ if (!cacheData_.contains(name)) {
QString json = Utility::File::readText(configFile);
if (json.isEmpty()) {
json = "{}"; // Blank JSON data as default
}
- _cacheData[name] = Utility::Json::convertStrToObj(json);
+ cacheData_[name] = Utility::Json::convertStrToObj(json);
}
- return _cacheData[name].toObject();
+ return cacheData_[name].toObject();
}
bool Config::set(const QString &name, const QJsonObject &jsonObj)
{
- QString configFile = _configsDir + "/" + name + ".json";
+ QString configFile = configsDir_ + "/" + name + ".json";
QString json = Utility::Json::convertObjToStr(jsonObj);
- Utility::File::makeDir(_configsDir);
+ Utility::File::makeDir(configsDir_);
if (Utility::File::writeText(configFile, json)) {
- _cacheData[name] = jsonObj;
+ cacheData_[name] = jsonObj;
return true;
}
return false;
diff --git a/src/core/config.h b/src/core/config.h
index 1a4ae9a..16b4dea 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -11,8 +11,8 @@ class Config : public QObject
Q_OBJECT
private:
- QString _configsDir;
- QJsonObject _cacheData;
+ QString configsDir_;
+ QJsonObject cacheData_;
public:
explicit Config(const QString &configsDir, QObject *parent = 0);
diff --git a/src/core/network.cpp b/src/core/network.cpp
index b99c32b..12d7b85 100644
--- a/src/core/network.cpp
+++ b/src/core/network.cpp
@@ -8,42 +8,42 @@
namespace Core {
Network::Network(const bool &async, QObject *parent) :
- QObject(parent), _async(async)
+ QObject(parent), async_(async)
{
- _manager = new QNetworkAccessManager(this);
- connect(_manager, &QNetworkAccessManager::finished,
+ manager_ = new QNetworkAccessManager(this);
+ connect(manager_, &QNetworkAccessManager::finished,
this, &Network::finished);
- if (!_async) {
- _eventLoop = new QEventLoop();
- connect(_manager, &QNetworkAccessManager::finished,
- _eventLoop, &QEventLoop::quit);
+ if (!async_) {
+ eventLoop_ = new QEventLoop();
+ connect(manager_, &QNetworkAccessManager::finished,
+ eventLoop_, &QEventLoop::quit);
}
}
Network::~Network()
{
- _manager->deleteLater();
- if (!_async) {
- delete _eventLoop;
+ manager_->deleteLater();
+ if (!async_) {
+ delete eventLoop_;
}
}
QNetworkReply *Network::head(const QUrl &uri)
{
- QNetworkReply *reply = _manager->head(QNetworkRequest(uri));
- if (!_async) {
- _eventLoop->exec();
+ QNetworkReply *reply = manager_->head(QNetworkRequest(uri));
+ if (!async_) {
+ eventLoop_->exec();
}
return reply;
}
QNetworkReply *Network::get(const QUrl &uri)
{
- QNetworkReply *reply = _manager->get(QNetworkRequest(uri));
+ QNetworkReply *reply = manager_->get(QNetworkRequest(uri));
connect(reply, &QNetworkReply::downloadProgress,
this, &Network::downloadProgress);
- if (!_async) {
- _eventLoop->exec();
+ if (!async_) {
+ eventLoop_->exec();
}
return reply;
}
diff --git a/src/core/network.h b/src/core/network.h
index 3a9eac4..fc96e62 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -14,9 +14,9 @@ class Network : public QObject
Q_OBJECT
private:
- bool _async;
- QNetworkAccessManager *_manager;
- QEventLoop *_eventLoop;
+ bool async_;
+ QNetworkAccessManager *manager_;
+ QEventLoop *eventLoop_;
public:
explicit Network(const bool &async = true, QObject *parent = 0);
diff --git a/src/handlers/xdgurl.cpp b/src/handlers/xdgurl.cpp
index 35ebbb2..f36c5f8 100644
--- a/src/handlers/xdgurl.cpp
+++ b/src/handlers/xdgurl.cpp
@@ -14,69 +14,69 @@
namespace Handlers {
XdgUrl::XdgUrl(const QString &xdgUrl, Core::Config *config, Core::Network *network, QObject *parent) :
- QObject(parent), _xdgUrl(xdgUrl), _config(config), _network(network)
+ QObject(parent), xdgUrl_(xdgUrl), config_(config), network_(network)
{
- _parse();
- _loadDestinations();
+ parse_();
+ loadDestinations_();
- connect(_network, &Core::Network::finished, this, &XdgUrl::_downloaded);
- connect(_network, &Core::Network::downloadProgress, this, &XdgUrl::downloadProgress);
+ connect(network_, &Core::Network::finished, this, &XdgUrl::downloaded_);
+ connect(network_, &Core::Network::downloadProgress, this, &XdgUrl::downloadProgress);
}
-void XdgUrl::_parse()
+void XdgUrl::parse_()
{
- QUrl url(_xdgUrl);
+ QUrl url(xdgUrl_);
QUrlQuery query(url);
- _metadata["scheme"] = QString("xdg");
- _metadata["command"] = QString("download");
- _metadata["url"] = QString("");
- _metadata["type"] = QString("downloads");
- _metadata["filename"] = QString("");
+ metadata_["scheme"] = QString("xdg");
+ metadata_["command"] = QString("download");
+ metadata_["url"] = QString("");
+ metadata_["type"] = QString("downloads");
+ metadata_["filename"] = QString("");
if (!url.scheme().isEmpty()) {
- _metadata["scheme"] = url.scheme();
+ metadata_["scheme"] = url.scheme();
}
if (!url.host().isEmpty()) {
- _metadata["command"] = url.host();
+ metadata_["command"] = url.host();
}
if (query.hasQueryItem("url") && !query.queryItemValue("url").isEmpty()) {
- _metadata["url"] = query.queryItemValue("url", QUrl::FullyDecoded);
+ metadata_["url"] = query.queryItemValue("url", QUrl::FullyDecoded);
}
if (query.hasQueryItem("type") && !query.queryItemValue("type").isEmpty()) {
- _metadata["type"] = query.queryItemValue("type", QUrl::FullyDecoded);
+ metadata_["type"] = query.queryItemValue("type", QUrl::FullyDecoded);
}
if (query.hasQueryItem("filename") && !query.queryItemValue("filename").isEmpty()) {
- _metadata["filename"] = QUrl(query.queryItemValue("filename", QUrl::FullyDecoded)).fileName();
+ metadata_["filename"] = QUrl(query.queryItemValue("filename", QUrl::FullyDecoded)).fileName();
}
- if (!_metadata["url"].toString().isEmpty() && _metadata["filename"].toString().isEmpty()) {
- _metadata["filename"] = QUrl(_metadata["url"].toString()).fileName();
+ if (!metadata_["url"].toString().isEmpty() && metadata_["filename"].toString().isEmpty()) {
+ metadata_["filename"] = QUrl(metadata_["url"].toString()).fileName();
}
}
-void XdgUrl::_loadDestinations()
+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());
+ destinations_[key] = convertPathString_(configDestinations[key].toString());
}
foreach (const QString key, configDestinationsAlias.keys()) {
QString value = configDestinationsAlias[key].toString();
- if (_destinations.contains(value)) {
- _destinations[key] = _destinations.value(value);
+ if (destinations_.contains(value)) {
+ destinations_[key] = destinations_.value(value);
}
}
}
-QString XdgUrl::_convertPathString(const QString &path)
+QString XdgUrl::convertPathString_(const QString &path)
{
QString newPath = path;
@@ -93,7 +93,7 @@ QString XdgUrl::_convertPathString(const QString &path)
return newPath;
}
-void XdgUrl::_saveDownloadedFile(QNetworkReply *reply)
+void XdgUrl::saveDownloadedFile_(QNetworkReply *reply)
{
QJsonObject result;
@@ -106,9 +106,9 @@ void XdgUrl::_saveDownloadedFile(QNetworkReply *reply)
return;
}
- QString type = _metadata["type"].toString();
- QString destination = _destinations[type].toString();
- QString path = destination + "/" + _metadata["filename"].toString();
+ QString type = metadata_["type"].toString();
+ QString destination = destinations_[type].toString();
+ QString path = destination + "/" + metadata_["filename"].toString();
Utility::File::makeDir(destination);
Utility::File::remove(path); // Remove previous downloaded file
@@ -120,14 +120,14 @@ void XdgUrl::_saveDownloadedFile(QNetworkReply *reply)
return;
}
- _destination = destination;
+ destination_ = destination;
result["status"] = QString("success_download");
result["message"] = QString("The file has been stored into " + destination);
emit finished(result);
}
-void XdgUrl::_installDownloadedFile(QNetworkReply *reply)
+void XdgUrl::installDownloadedFile_(QNetworkReply *reply)
{
QJsonObject result;
@@ -140,9 +140,9 @@ void XdgUrl::_installDownloadedFile(QNetworkReply *reply)
return;
}
- QString type = _metadata["type"].toString();
- QString destination = _destinations[type].toString();
- QString path = destination + "/" + _metadata["filename"].toString();
+ QString type = metadata_["type"].toString();
+ QString destination = destinations_[type].toString();
+ QString path = destination + "/" + metadata_["filename"].toString();
Utility::File::makeDir(destination);
Utility::File::remove(path); // Remove previous downloaded file
@@ -188,7 +188,7 @@ void XdgUrl::_installDownloadedFile(QNetworkReply *reply)
return;
}
- _destination = destination;
+ destination_ = destination;
result["status"] = QString("success_install");
emit finished(result);
@@ -208,34 +208,34 @@ void XdgUrl::process()
if (!isValid()) {
QJsonObject result;
result["status"] = QString("error_validation");
- result["message"] = QString("Invalid XDG-URL " + _xdgUrl);
+ result["message"] = QString("Invalid XDG-URL " + xdgUrl_);
emit error(result);
return;
}
- _network->get(QUrl(_metadata["url"].toString()));
+ network_->get(QUrl(metadata_["url"].toString()));
emit started();
}
void XdgUrl::openDestination()
{
- if (!_destination.isEmpty()) {
- QDesktopServices::openUrl(QUrl("file://" + _destination));
+ if (!destination_.isEmpty()) {
+ QDesktopServices::openUrl(QUrl("file://" + destination_));
}
}
bool XdgUrl::isValid()
{
- QString scheme = _metadata["scheme"].toString();
- QString command = _metadata["command"].toString();
- QString url = _metadata["url"].toString();
- QString type = _metadata["type"].toString();
- QString filename = _metadata["filename"].toString();
+ QString scheme = metadata_["scheme"].toString();
+ QString command = metadata_["command"].toString();
+ QString url = metadata_["url"].toString();
+ QString type = metadata_["type"].toString();
+ QString filename = metadata_["filename"].toString();
if ((scheme == "xdg" || scheme == "xdgs")
&& (command == "download" || command == "install")
&& QUrl(url).isValid()
- && _destinations.contains(type)
+ && destinations_.contains(type)
&& !filename.isEmpty()) {
return true;
}
@@ -245,15 +245,15 @@ bool XdgUrl::isValid()
QString XdgUrl::getXdgUrl()
{
- return _xdgUrl;
+ return xdgUrl_;
}
QJsonObject XdgUrl::getMetadata()
{
- return _metadata;
+ return metadata_;
}
-void XdgUrl::_downloaded(QNetworkReply *reply)
+void XdgUrl::downloaded_(QNetworkReply *reply)
{
if (reply->error() != QNetworkReply::NoError) {
QJsonObject result;
@@ -268,7 +268,7 @@ void XdgUrl::_downloaded(QNetworkReply *reply)
if (redirectUrl.startsWith("/")) {
redirectUrl = reply->url().authority() + redirectUrl;
}
- _network->get(QUrl(redirectUrl));
+ network_->get(QUrl(redirectUrl));
return;
}
@@ -277,15 +277,15 @@ void XdgUrl::_downloaded(QNetworkReply *reply)
if (refreshUrl.startsWith("/")) {
refreshUrl = reply->url().authority() + refreshUrl;
}
- _network->get(QUrl(refreshUrl));
+ network_->get(QUrl(refreshUrl));
return;
}
- if (_metadata["command"].toString() == "download") {
- _saveDownloadedFile(reply);
+ if (metadata_["command"].toString() == "download") {
+ saveDownloadedFile_(reply);
}
- else if (_metadata["command"].toString() == "install") {
- _installDownloadedFile(reply);
+ else if (metadata_["command"].toString() == "install") {
+ installDownloadedFile_(reply);
}
}
diff --git a/src/handlers/xdgurl.h b/src/handlers/xdgurl.h
index 4aa1979..7fe233c 100644
--- a/src/handlers/xdgurl.h
+++ b/src/handlers/xdgurl.h
@@ -18,23 +18,23 @@ class XdgUrl : public QObject
Q_OBJECT
private:
- QString _xdgUrl;
- Core::Config *_config;
- Core::Network *_network;
+ QString xdgUrl_;
+ Core::Config *config_;
+ Core::Network *network_;
- QJsonObject _metadata;
- QJsonObject _destinations;
- QString _destination;
+ QJsonObject metadata_;
+ QJsonObject destinations_;
+ QString destination_;
public:
explicit XdgUrl(const QString &xdgUrl, Core::Config *config, Core::Network *network, QObject *parent = 0);
private:
- void _parse();
- void _loadDestinations();
- QString _convertPathString(const QString &path);
- void _saveDownloadedFile(QNetworkReply *reply);
- void _installDownloadedFile(QNetworkReply *reply);
+ void parse_();
+ void loadDestinations_();
+ QString convertPathString_(const QString &path);
+ void saveDownloadedFile_(QNetworkReply *reply);
+ void installDownloadedFile_(QNetworkReply *reply);
public slots:
void process();
@@ -44,7 +44,7 @@ public slots:
QJsonObject getMetadata();
private slots:
- void _downloaded(QNetworkReply *reply);
+ void downloaded_(QNetworkReply *reply);
signals:
void started();
diff --git a/src/utility/package.cpp b/src/utility/package.cpp
index 7cd2668..710b919 100644
--- a/src/utility/package.cpp
+++ b/src/utility/package.cpp
@@ -14,7 +14,7 @@ bool Package::installProgram(const QString &path, const QString &targetPath)
QString program = "install";
QStringList arguments;
arguments << "-m" << "755" << "-p" << path << targetPath;
- return _process(program, arguments);
+ return process_(program, arguments);
}
bool Package::installFile(const QString &path, const QString &targetPath)
@@ -22,7 +22,7 @@ bool Package::installFile(const QString &path, const QString &targetPath)
QString program = "install";
QStringList arguments;
arguments << "-m" << "644" << "-p" << path << targetPath;
- return _process(program, arguments);
+ return process_(program, arguments);
}
bool Package::installPlasmapkg(const QString &path, const QString &type)
@@ -30,7 +30,7 @@ bool Package::installPlasmapkg(const QString &path, const QString &type)
QString program = "plasmapkg2";
QStringList arguments;
arguments << "-t" << type << "-i" << path;
- return _process(program, arguments);
+ return process_(program, arguments);
}
bool Package::uninstallPlasmapkg(const QString &path, const QString &type)
@@ -38,7 +38,7 @@ bool Package::uninstallPlasmapkg(const QString &path, const QString &type)
QString program = "plasmapkg2";
QStringList arguments;
arguments << "-t" << type << "-r" << path;
- return _process(program, arguments);
+ return process_(program, arguments);
}
bool Package::uncompressArchive(const QString &path, const QString &targetDir)
@@ -89,13 +89,13 @@ bool Package::uncompressArchive(const QString &path, const QString &targetDir)
arguments << "e" << path << targetDir;
}
- return _process(program, arguments);
+ return process_(program, arguments);
}
return false;
}
-bool Package::_process(const QString &program, const QStringList &arguments)
+bool Package::process_(const QString &program, const QStringList &arguments)
{
QProcess process;
process.start(program, arguments);
diff --git a/src/utility/package.h b/src/utility/package.h
index 04f8180..3827117 100644
--- a/src/utility/package.h
+++ b/src/utility/package.h
@@ -19,7 +19,7 @@ public:
static bool uncompressArchive(const QString &path, const QString &targetDir);
private:
- static bool _process(const QString &program, const QStringList &arguments);
+ static bool process_(const QString &program, const QStringList &arguments);
};
} // namespace Utility
--
GitLab