Fix connection following the update of the QtSingleApplication classes

This commit is contained in:
Daniel Molkentin 2014-05-21 12:31:44 +02:00
parent 97362cff32
commit 4edbeece49
2 changed files with 6 additions and 3 deletions

View file

@ -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);

View file

@ -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();