mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 13:55:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix connection following the update of the QtSingleApplication classes

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mirall/application.cpp
View file

@ -45,6 +45,8 @@
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
class QSocket;
namespace Mirall { namespace Mirall {
namespace { namespace {
@ -103,7 +105,7 @@ Application::Application(int &argc, char **argv) :
setupLogging(); setupLogging();
setupTranslations(); setupTranslations();
connect( this, SIGNAL(messageReceived(QString)), SLOT(slotParseOptions(QString))); connect( this, SIGNAL(messageReceived(QString, QObject*)), SLOT(slotParseOptions(QString, QObject*)));
Account *account = Account::restore(); Account *account = Account::restore();
if (account) { if (account) {
@ -348,7 +350,7 @@ void Application::slotUseMonoIconsChanged(bool)
_gui->slotComputeOverallSyncStatus(); _gui->slotComputeOverallSyncStatus();
} }
void Application::slotParseOptions(const QString &opts) void Application::slotParseOptions(const QString &opts, QObject*)
{ {
QStringList options = opts.split(QLatin1Char('|')); QStringList options = opts.split(QLatin1Char('|'));
parseOptions(options); parseOptions(options);

3
src/mirall/application.h
View file

@ -31,6 +31,7 @@
class QMessageBox; class QMessageBox;
class QSystemTrayIcon; class QSystemTrayIcon;
class QSocket;
namespace Mirall { namespace Mirall {
class Theme; class Theme;
@ -69,7 +70,7 @@ signals:
void folderStateChanged(Folder*); void folderStateChanged(Folder*);
protected slots: protected slots:
void slotParseOptions( const QString& ); void slotParseOptions( const QString&, QObject* );
void slotCheckConnection(); void slotCheckConnection();
void slotConnectionValidatorResult(ConnectionValidator::Status); void slotConnectionValidatorResult(ConnectionValidator::Status);
void slotStartUpdateDetector(); void slotStartUpdateDetector();