[Pkg-owncloud-commits] [owncloud-client] 14/83: Fix connection following the update of the QtSingleApplication classes

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 4edbeece4927ef8580dd18d95faacc4ff66ab148
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed May 21 12:31:44 2014 +0200

    Fix connection following the update of the QtSingleApplication classes
---
 src/mirall/application.cpp | 6 ++++--
 src/mirall/application.h   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index 86b8f85..a88c7ed 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -45,6 +45,8 @@
 #include <QMenu>
 #include <QMessageBox>
 
+class QSocket;
+
 namespace Mirall {
 
 namespace {
@@ -103,7 +105,7 @@ Application::Application(int &argc, char **argv) :
     setupLogging();
     setupTranslations();
 
-    connect( this, SIGNAL(messageReceived(QString)), SLOT(slotParseOptions(QString)));
+    connect( this, SIGNAL(messageReceived(QString, QObject*)), SLOT(slotParseOptions(QString, QObject*)));
 
     Account *account = Account::restore();
     if (account) {
@@ -348,7 +350,7 @@ void Application::slotUseMonoIconsChanged(bool)
     _gui->slotComputeOverallSyncStatus();
 }
 
-void Application::slotParseOptions(const QString &opts)
+void Application::slotParseOptions(const QString &opts, QObject*)
 {
     QStringList options = opts.split(QLatin1Char('|'));
     parseOptions(options);
diff --git a/src/mirall/application.h b/src/mirall/application.h
index 2acffbb..f6c6f96 100644
--- a/src/mirall/application.h
+++ b/src/mirall/application.h
@@ -31,6 +31,7 @@
 
 class QMessageBox;
 class QSystemTrayIcon;
+class QSocket;
 
 namespace Mirall {
 class Theme;
@@ -69,7 +70,7 @@ signals:
     void folderStateChanged(Folder*);
 
 protected slots:
-    void slotParseOptions( const QString& );
+    void slotParseOptions( const QString&, QObject* );
     void slotCheckConnection();
     void slotConnectionValidatorResult(ConnectionValidator::Status);
     void slotStartUpdateDetector();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git