From e908d973553011d478e4f81bb6d4c616e0cb6a38 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Sat, 23 Dec 2017 02:55:16 +0100
Subject: Removed SingleApplication::SessionParam

---
 src/singleapplication.cpp | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

(limited to 'src/singleapplication.cpp')

diff --git a/src/singleapplication.cpp b/src/singleapplication.cpp
index e71d1be..0f928df 100644
--- a/src/singleapplication.cpp
+++ b/src/singleapplication.cpp
@@ -10,33 +10,8 @@
 #include <QLocalServer>
 #include <QLocalSocket>
 #include <QDataStream>
-#include <QUrl>
 #include <cstdlib>
 
-QHash<QString, QVariant> paramStructToHash(const SingleApplication::SessionParam &params)
-{
-    QHash<QString, QVariant> hashedParams;
-    hashedParams.insert("profile", params.profile);
-    hashedParams.insert("newWindow", params.newWindow);
-    QList<QVariant> urls;
-    for(const QUrl &url : params.urls) {
-        urls.append(url);
-    }
-    hashedParams.insert("urls", urls);
-    return hashedParams;
-}
-
-SingleApplication::SessionParam paramStructFromHash(const QHash<QString, QVariant> &params)
-{
-    SingleApplication::SessionParam structParams;
-    structParams.profile = params.value("profile").toString();
-    structParams.newWindow = params.value("newWindow").toBool();
-    for(const QVariant &val : params.value("urls").toList()) {
-        structParams.urls.append(val.toUrl());
-    }
-    return structParams;
-}
-
 SingleApplication::SingleApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
 #ifdef Q_OS_UNIX
@@ -100,14 +75,19 @@ QString SingleApplication::serverName() const
     return m_localServer->fullServerName();
 }
 
-int SingleApplication::sendMessage(const SessionParam &params)
+int SingleApplication::sendMessage(const QString &profileName, bool newWindow, const QStringList &urls)
 {
     QLocalSocket socket;
     socket.connectToServer(LOCALSERVER_KEY);
     if(socket.waitForConnected(LOCALSERVER_TIMEOUT)) {
+        QHash<QString, QVariant> hashedParams;
+        hashedParams.insert("profile", profileName);
+        hashedParams.insert("newWindow", newWindow);
+        hashedParams.insert("urls", urls);
+
         QByteArray argumentData;
         QDataStream ds(&argumentData, QIODevice::WriteOnly);
-        ds << paramStructToHash(params);
+        ds << hashedParams;
 
         socket.write(argumentData);
         socket.waitForBytesWritten(LOCALSERVER_TIMEOUT);
@@ -140,5 +120,5 @@ void SingleApplication::parseMessage()
 
     socket->deleteLater();
 
-    emit messageAvailable(paramStructFromHash(params));
+    emit messageAvailable(params["profile"].toString(), params["newWindow"].toBool(), params["urls"].toStringList());
 }
-- 
cgit v1.2.1