Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2017-09-20 11:14:48 +0300
committerOlivier Goffart <olivier@woboq.com>2017-09-21 15:05:39 +0300
commitff4213b59f223b60e87e70af2db6201986f76df8 (patch)
tree98398cd1a1014b9ef1c47457b9139ccf3a546ace /src/3rdparty
parentc4e51247d833d4f08df7036fe4a7823a6f6e0ff6 (diff)
Use the Qt5 connection syntax (automated with clazy)
This is motivated by the fact that QMetaObject::noralizeSignature takes 7.35% CPU of the LargeSyncBench. (Mostly from ABstractNetworkJob::setupConnections and PropagateUploadFileV1::startNextChunk). It could be fixed by using normalized signature in the connection statement, but i tought it was a good oportunity to modernize the code. This commit only contains calls that were automatically converted with clazy.
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/qtsingleapplication/qtlocalpeer.cpp2
-rw-r--r--src/3rdparty/qtsingleapplication/qtsingleapplication.cpp6
-rw-r--r--src/3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp b/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp
index 33cca898a..3ebba6e6f 100644
--- a/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp
+++ b/src/3rdparty/qtsingleapplication/qtlocalpeer.cpp
@@ -101,7 +101,7 @@ bool QtLocalPeer::isClient()
bool res = server->listen(socketName);
if (!res)
qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qPrintable(server->errorString()));
- QObject::connect(server, SIGNAL(newConnection()), SLOT(receiveConnection()));
+ QObject::connect(server, &QLocalServer::newConnection, this, &QtLocalPeer::receiveConnection);
return false;
}
diff --git a/src/3rdparty/qtsingleapplication/qtsingleapplication.cpp b/src/3rdparty/qtsingleapplication/qtsingleapplication.cpp
index 9610937de..844824cb4 100644
--- a/src/3rdparty/qtsingleapplication/qtsingleapplication.cpp
+++ b/src/3rdparty/qtsingleapplication/qtsingleapplication.cpp
@@ -95,7 +95,7 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char *
*pids = 0;
pidPeer = new QtLocalPeer(this, appId + QLatin1Char('-') +
QString::number(QCoreApplication::applicationPid()));
- connect(pidPeer, SIGNAL(messageReceived(QString,QObject*)), SIGNAL(messageReceived(QString,QObject*)));
+ connect(pidPeer, &QtLocalPeer::messageReceived, this, &QtSingleApplication::messageReceived);
pidPeer->isClient();
lockfile.unlock();
}
@@ -169,9 +169,9 @@ void QtSingleApplication::setActivationWindow(QWidget *aw, bool activateOnMessag
if (!pidPeer)
return;
if (activateOnMessage)
- connect(pidPeer, SIGNAL(messageReceived(QString,QObject*)), this, SLOT(activateWindow()));
+ connect(pidPeer, &QtLocalPeer::messageReceived, this, &QtSingleApplication::activateWindow);
else
- disconnect(pidPeer, SIGNAL(messageReceived(QString,QObject*)), this, SLOT(activateWindow()));
+ disconnect(pidPeer, &QtLocalPeer::messageReceived, this, &QtSingleApplication::activateWindow);
}
diff --git a/src/3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp b/src/3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
index 25a511f6c..e34fd6328 100644
--- a/src/3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
+++ b/src/3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
@@ -37,7 +37,7 @@ QtSingleCoreApplication::QtSingleCoreApplication(int &argc, char **argv)
{
peer = new QtLocalPeer(this);
block = false;
- connect(peer, SIGNAL(messageReceived(QString)), SIGNAL(messageReceived(QString)));
+ connect(peer, &QtLocalPeer::messageReceived, this, &QtSingleCoreApplication::messageReceived);
}
@@ -45,7 +45,7 @@ QtSingleCoreApplication::QtSingleCoreApplication(const QString &appId, int &argc
: QCoreApplication(argc, argv)
{
peer = new QtLocalPeer(this, appId);
- connect(peer, SIGNAL(messageReceived(QString)), SIGNAL(messageReceived(QString)));
+ connect(peer, &QtLocalPeer::messageReceived, this, &QtSingleCoreApplication::messageReceived);
}