diff --git a/src/handlers/xdgurl.cpp b/src/handlers/xdgurl.cpp index 0cf9c473cd66998de0a0a35f06b51e3c6b00688a..23612734f790df7b4bf9f76f67bcacb022c04c90 100644 --- a/src/handlers/xdgurl.cpp +++ b/src/handlers/xdgurl.cpp @@ -16,10 +16,10 @@ namespace handlers { XdgUrl::XdgUrl(const QString &xdgUrl, core::Config *config, core::Network *network, QObject *parent) : QObject(parent), xdgUrl_(xdgUrl), config_(config), network_(network) { - parse_(); - loadDestinations_(); + parse(); + loadDestinations(); - connect(network_, &core::Network::finished, this, &XdgUrl::downloaded_); + connect(network_, &core::Network::finished, this, &XdgUrl::downloaded); connect(network_, &core::Network::downloadProgress, this, &XdgUrl::downloadProgress); } @@ -78,7 +78,7 @@ QJsonObject XdgUrl::getMetadata() return metadata_; } -void XdgUrl::downloaded_(QNetworkReply *reply) +void XdgUrl::downloaded(QNetworkReply *reply) { if (reply->error() != QNetworkReply::NoError) { QJsonObject result; @@ -107,14 +107,14 @@ void XdgUrl::downloaded_(QNetworkReply *reply) } if (metadata_["command"].toString() == "download") { - saveDownloadedFile_(reply); + saveDownloadedFile(reply); } else if (metadata_["command"].toString() == "install") { - installDownloadedFile_(reply); + installDownloadedFile(reply); } } -void XdgUrl::parse_() +void XdgUrl::parse() { QUrl url(xdgUrl_); QUrlQuery query(url); @@ -150,13 +150,13 @@ void XdgUrl::parse_() } } -void XdgUrl::loadDestinations_() +void XdgUrl::loadDestinations() { 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()) { @@ -167,7 +167,7 @@ void XdgUrl::loadDestinations_() } } -QString XdgUrl::convertPathString_(const QString &path) +QString XdgUrl::convertPathString(const QString &path) { QString newPath = path; @@ -184,7 +184,7 @@ QString XdgUrl::convertPathString_(const QString &path) return newPath; } -void XdgUrl::saveDownloadedFile_(QNetworkReply *reply) +void XdgUrl::saveDownloadedFile(QNetworkReply *reply) { QJsonObject result; @@ -218,7 +218,7 @@ void XdgUrl::saveDownloadedFile_(QNetworkReply *reply) emit finished(result); } -void XdgUrl::installDownloadedFile_(QNetworkReply *reply) +void XdgUrl::installDownloadedFile(QNetworkReply *reply) { QJsonObject result; diff --git a/src/handlers/xdgurl.h b/src/handlers/xdgurl.h index ac9eaeb39df9b7029f0cb2cd0891298866e4483c..0931f9d245590738f9208de86d17d725703df0cf 100644 --- a/src/handlers/xdgurl.h +++ b/src/handlers/xdgurl.h @@ -34,14 +34,14 @@ public slots: QJsonObject getMetadata(); private slots: - void downloaded_(QNetworkReply *reply); + void downloaded(QNetworkReply *reply); 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); QString xdgUrl_; core::Config *config_; diff --git a/src/utility/package.cpp b/src/utility/package.cpp index e22723b302dd26d5a3238205286b2f1713c2c6fb..de883b7eb231ec12abf5b068a150126311880282 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 runProcess(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 runProcess(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 runProcess(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 runProcess(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 runProcess(program, arguments); } return false; } -bool Package::process_(const QString &program, const QStringList &arguments) +bool Package::runProcess(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 d43757c77abc19b69e0797bbfa07151196d2fdbb..a310990bb7bf23365a3d167271ebd397774ef006 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 runProcess(const QString &program, const QStringList &arguments); }; } // namespace utility