More cleanup

To be squashed.

Author: bionade24

main.cpp

@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     {
         if (inst.connectServer())
         {
-            inst.sendMessage(QString(PROGRAM_ARG_OPEN) + parser.positionalArguments().join(','));
+            inst.sendMessage(PROGRAM_ARG_OPEN_W_DEL + parser.positionalArguments().join(','));
             inst.closeSocket();
             return 0;
         }
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
     KokoVP w;
 
     if (parser.positionalArguments().length()>0)
-        w.handleNewMessage(QString(PROGRAM_ARG_OPEN) + parser.positionalArguments().join(','));
+        w.handleNewMessage(PROGRAM_ARG_OPEN_W_DEL + parser.positionalArguments().join(','));
 
     QObject::connect(&inst, &SingleInstance::newMessage, &w, &KokoVP::handleNewMessage);
     w.showNormal();

playercontroller.cpp

@@ -62,20 +62,20 @@ void PlayerController::handleFileEnd()
     }
 }
 
-void PlayerController::open(const QUrl &url)
+void PlayerController::open(const QUrl &file)
 {
     if (haveFile)
     {
-        queuedFile = url;
+        queuedFile = file;
         return stop();
     }
     p_tracks.clear();
 
     // Here we need to scan siblings folder for possible external subtitles and audio
     //, then set it to sub-file-paths and audio-file-paths OPTIONs (not properties)
-    if (url.isLocalFile())
+    if (file.isLocalFile())
     {
-        QDir mediaDir = QFileInfo(url.toLocalFile()).absoluteDir();
+        QDir mediaDir = QFileInfo(file.toLocalFile()).absoluteDir();
 
         if (p_extSubMaxDepth>=0 && p_extSubMode!="no")
         {
@@ -94,7 +94,7 @@ void PlayerController::open(const QUrl &url)
         }
     }
 
-    p->command(QStringList{"loadfile", url.toString()});
+    p->command(QStringList{"loadfile", file.toString()});
 }
 
 void PlayerController::stop()

playercontroller.h

@@ -58,7 +58,7 @@ class PlayerController : public QObject
     void setExtSubOptions(QString mode, int depth) { p_extSubMode = mode; p_extSubMaxDepth = depth; }
     void setExtAudioOptions(QString mode, int depth) { p_extAudioMode = mode; p_extAudioMaxDepth = depth; }
 
-    void open(const QUrl &url);
+    void open(const QUrl &file);
     void stop();
 
     void togglePlayback();

program_arg.h

@@ -2,6 +2,7 @@
 #define PROGRAM_ARG_H
 
 #define PROGRAM_ARG_DELIMITER ":"
-#define PROGRAM_ARG_OPEN "OPEN" PROGRAM_ARG_DELIMITER
+#define PROGRAM_ARG_OPEN "OPEN"
+#define PROGRAM_ARG_OPEN_W_DEL PROGRAM_ARG_OPEN PROGRAM_ARG_DELIMITER
 
 #endif

singleinstance.cpp

@@ -16,14 +16,12 @@
 */
 #include "singleinstance.h"
 
-#include <QDataStream>
 #include <QDebug>
 #include <QIODevice>
 #include <QLocalSocket>
 #include <QLocalServer>
 #include <qflags.h>
 
-#include "program_arg.h"
 
 SingleInstance::SingleInstance(QString appName, QObject *parent)
     : p_appName(appName), QObject{parent}