Code cleanup

src/handlers/xdgurl.cpp

@@ -42,13 +42,6 @@ void XdgUrl::process()
     emit started();
 }
 
-void XdgUrl::openDestination()
-{
-    if (!destination_.isEmpty()) {
-        QDesktopServices::openUrl(QUrl("file://" + destination_));
-    }
-}
-
 bool XdgUrl::isValid()
 {
     QString scheme = metadata_["scheme"].toString();
@@ -68,12 +61,19 @@ bool XdgUrl::isValid()
     return false;
 }
 
-QString XdgUrl::getXdgUrl()
+void XdgUrl::openDestination()
+{
+    if (!destination_.isEmpty()) {
+        QDesktopServices::openUrl(QUrl("file://" + destination_));
+    }
+}
+
+QString XdgUrl::xdgUrl() const
 {
     return xdgUrl_;
 }
 
-QJsonObject XdgUrl::getMetadata()
+QJsonObject XdgUrl::metadata() const
 {
     return metadata_;
 }

src/handlers/xdgurl.h

@@ -28,10 +28,10 @@ signals:
 
 public slots:
     void process();
-    void openDestination();
     bool isValid();
-    QString getXdgUrl();
-    QJsonObject getMetadata();
+    void openDestination();
+    QString xdgUrl() const;
+    QJsonObject metadata() const;
 
 private slots:
     void downloaded(QNetworkReply *reply);

src/qml/main.qml

@@ -98,7 +98,7 @@ Window {
     }
 
     Component.onCompleted: {
-        var metadata = xdgUrlHandler.getMetadata();
+        var metadata = xdgUrlHandler.metadata();
         var primaryMessages = {
             'success_download': 'Download successfull',
             'success_install': 'Installation successfull',
@@ -146,7 +146,7 @@ Window {
         }
         else {
             errorDialog.text = 'Validation error';
-            errorDialog.detailedText = 'Invalid XDG-URL ' + xdgUrlHandler.getXdgUrl();
+            errorDialog.detailedText = 'Invalid XDG-URL ' + xdgUrlHandler.xdgUrl();
             errorDialog.open();
         }
     }

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 runProcess(program, arguments);
+    return execute(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 runProcess(program, arguments);
+    return execute(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 runProcess(program, arguments);
+    return execute(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 runProcess(program, arguments);
+    return execute(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 runProcess(program, arguments);
+        return execute(program, arguments);
     }
 
     return false;
 }
 
-bool Package::runProcess(const QString &program, const QStringList &arguments)
+bool Package::execute(const QString &program, const QStringList &arguments)
 {
     QProcess process;
     process.start(program, arguments);

src/utility/package.h

@@ -19,7 +19,7 @@ public:
     static bool uncompressArchive(const QString &path, const QString &targetDir);
 
 private:
-    static bool runProcess(const QString &program, const QStringList &arguments);
+    static bool execute(const QString &program, const QStringList &arguments);
 };
 
 } // namespace utility