diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2011-07-07 09:08:39 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2011-07-07 09:08:39 +0000 |
| commit | 7df119586bbb595f8f00ca1cb54bc3beebfc14a5 (patch) | |
| tree | 2c30b72af484ce0821730b9c8f4955ea8b86aaf1 | |
| parent | 498881bcf60b59b945beed450e31592b1c8e96a3 (diff) | |
| download | qxmpp-7df119586bbb595f8f00ca1cb54bc3beebfc14a5.tar.gz | |
normalize Qt signal / slot signatures
| -rw-r--r-- | examples/GuiClient/capabilitiesCache.cpp | 4 | ||||
| -rw-r--r-- | examples/GuiClient/mainDialog.cpp | 56 | ||||
| -rw-r--r-- | examples/GuiClient/profileDialog.cpp | 8 | ||||
| -rw-r--r-- | examples/GuiClient/rosterListView.cpp | 12 | ||||
| -rw-r--r-- | examples/GuiClient/statusTextWidget.cpp | 2 | ||||
| -rw-r--r-- | examples/GuiClient/statusWidget.cpp | 2 | ||||
| -rw-r--r-- | examples/example_1_echoClient/echoClient.cpp | 4 | ||||
| -rw-r--r-- | examples/example_2_rosterHandling/xmppClient.cpp | 4 | ||||
| -rw-r--r-- | examples/example_9_vCard/xmppClient.cpp | 4 | ||||
| -rw-r--r-- | src/QXmppClient.cpp | 24 | ||||
| -rw-r--r-- | src/QXmppOutgoingClient.cpp | 4 | ||||
| -rw-r--r-- | src/QXmppRosterManager.cpp | 4 | ||||
| -rw-r--r-- | src/QXmppServer.cpp | 4 | ||||
| -rw-r--r-- | src/QXmppTransferManager.cpp | 8 | ||||
| -rw-r--r-- | src/server/mod_proxy65.cpp | 4 |
15 files changed, 72 insertions, 72 deletions
diff --git a/examples/GuiClient/capabilitiesCache.cpp b/examples/GuiClient/capabilitiesCache.cpp index 43533952..00d1895a 100644 --- a/examples/GuiClient/capabilitiesCache.cpp +++ b/examples/GuiClient/capabilitiesCache.cpp @@ -38,8 +38,8 @@ capabilitiesCache::capabilitiesCache(QXmppClient* client) : QXmppDiscoveryManager* ext = m_client->findExtension<QXmppDiscoveryManager>(); if(ext) { - bool check = connect(ext, SIGNAL(infoReceived(const QXmppDiscoveryIq&)), - SLOT(infoReceived(const QXmppDiscoveryIq&))); + bool check = connect(ext, SIGNAL(infoReceived(QXmppDiscoveryIq)), + SLOT(infoReceived(QXmppDiscoveryIq))); Q_ASSERT(check); Q_UNUSED(check); } diff --git a/examples/GuiClient/mainDialog.cpp b/examples/GuiClient/mainDialog.cpp index 66638be6..f172383b 100644 --- a/examples/GuiClient/mainDialog.cpp +++ b/examples/GuiClient/mainDialog.cpp @@ -67,8 +67,8 @@ mainDialog::mainDialog(QWidget *parent): QDialog(parent, Qt::Window), loadAccounts(); bool check = connect(ui->lineEdit_userName->completer(), - SIGNAL(activated(const QString &)), - this, SLOT(userNameCompleter_activated(const QString &))); + SIGNAL(activated(QString)), + this, SLOT(userNameCompleter_activated(QString))); Q_ASSERT(check); check = connect(&m_xmppClient.rosterManager(), @@ -77,8 +77,8 @@ mainDialog::mainDialog(QWidget *parent): QDialog(parent, Qt::Window), Q_ASSERT(check); check = connect(&m_xmppClient.rosterManager(), - SIGNAL(rosterChanged(const QString&)), - this, SLOT(rosterChanged(const QString&))); + SIGNAL(rosterChanged(QString)), + this, SLOT(rosterChanged(QString))); Q_ASSERT(check); check = connect(&m_xmppClient, @@ -87,36 +87,36 @@ mainDialog::mainDialog(QWidget *parent): QDialog(parent, Qt::Window), Q_ASSERT(check); check = connect(&m_xmppClient, - SIGNAL(presenceReceived(const QXmppPresence&)), - this, SLOT(presenceReceived(const QXmppPresence&))); + SIGNAL(presenceReceived(QXmppPresence)), + this, SLOT(presenceReceived(QXmppPresence))); Q_ASSERT(check); QXmppLogger::getLogger()->setLoggingType(QXmppLogger::SignalLogging); check = connect(&m_xmppClient.rosterManager(), - SIGNAL(presenceChanged(const QString&, const QString&)), - this, SLOT(presenceChanged(const QString&, const QString&))); + SIGNAL(presenceChanged(QString,QString)), + this, SLOT(presenceChanged(QString,QString))); Q_ASSERT(check); - check = connect(ui->lineEdit_filter, SIGNAL(textChanged(const QString&)), - this, SLOT(filterChanged(const QString&))); + check = connect(ui->lineEdit_filter, SIGNAL(textChanged(QString)), + this, SLOT(filterChanged(QString))); Q_ASSERT(check); - check = connect(ui->listView, SIGNAL(showChatDialog(const QString&)), - this, SLOT(showChatDialog(const QString&))); + check = connect(ui->listView, SIGNAL(showChatDialog(QString)), + this, SLOT(showChatDialog(QString))); Q_ASSERT(check); - check = connect(ui->listView, SIGNAL(showProfile(const QString&)), - this, SLOT(showProfile(const QString&))); + check = connect(ui->listView, SIGNAL(showProfile(QString)), + this, SLOT(showProfile(QString))); Q_ASSERT(check); - check = connect(ui->listView, SIGNAL(removeContact(const QString&)), - this, SLOT(action_removeContact(const QString&))); + check = connect(ui->listView, SIGNAL(removeContact(QString)), + this, SLOT(action_removeContact(QString))); Q_ASSERT(check); - check = connect(&m_xmppClient, SIGNAL(messageReceived(const QXmppMessage&)), - SLOT(messageReceived(const QXmppMessage&))); + check = connect(&m_xmppClient, SIGNAL(messageReceived(QXmppMessage)), + SLOT(messageReceived(QXmppMessage))); Q_ASSERT(check); check = connect(ui->pushButton_signIn, SIGNAL(clicked(bool)), SLOT(signIn())); @@ -135,8 +135,8 @@ mainDialog::mainDialog(QWidget *parent): QDialog(parent, Qt::Window), ui->listView->setFocus(); ui->verticalLayout_3->insertWidget(0, &m_statusWidget); - check = connect(&m_statusWidget, SIGNAL(statusTextChanged(const QString&)), - SLOT(statusTextChanged(const QString&))); + check = connect(&m_statusWidget, SIGNAL(statusTextChanged(QString)), + SLOT(statusTextChanged(QString))); Q_ASSERT(check); check = connect(&m_statusWidget, SIGNAL(presenceTypeChanged(QXmppPresence::Type)), SLOT(presenceTypeChanged(QXmppPresence::Type))); @@ -146,8 +146,8 @@ mainDialog::mainDialog(QWidget *parent): QDialog(parent, Qt::Window), SLOT(presenceStatusTypeChanged(QXmppPresence::Status::Type))); Q_ASSERT(check); check = connect(&m_statusWidget, - SIGNAL(avatarChanged(const QImage&)), - SLOT(avatarChanged(const QImage&))); + SIGNAL(avatarChanged(QImage)), + SLOT(avatarChanged(QImage))); Q_ASSERT(check); check = connect(&m_xmppClient, SIGNAL(connected()), SLOT(updateStatusWidget())); @@ -170,22 +170,22 @@ mainDialog::mainDialog(QWidget *parent): QDialog(parent, Qt::Window), Q_ASSERT(check); check = connect(&m_xmppClient.vCardManager(), - SIGNAL(vCardReceived(const QXmppVCardIq&)), &m_vCardCache, - SLOT(vCardReceived(const QXmppVCardIq&))); + SIGNAL(vCardReceived(QXmppVCardIq)), &m_vCardCache, + SLOT(vCardReceived(QXmppVCardIq))); Q_ASSERT(check); check = connect(&m_vCardCache, - SIGNAL(vCardReadyToUse(const QString&)), - SLOT(updateVCard(const QString&))); + SIGNAL(vCardReadyToUse(QString)), + SLOT(updateVCard(QString))); Q_ASSERT(check); check = connect(ui->pushButton_addContact, SIGNAL(clicked()), SLOT(action_addContact())); Q_ASSERT(check); check = connect(QXmppLogger::getLogger(), - SIGNAL(message(QXmppLogger::MessageType, const QString &)), + SIGNAL(message(QXmppLogger::MessageType,QString)), &m_consoleDlg, - SLOT(message(QXmppLogger::MessageType, const QString &))); + SLOT(message(QXmppLogger::MessageType,QString))); Q_ASSERT(check); check = connect(ui->pushButton_settings, diff --git a/examples/GuiClient/profileDialog.cpp b/examples/GuiClient/profileDialog.cpp index d06842e0..8dbbbd58 100644 --- a/examples/GuiClient/profileDialog.cpp +++ b/examples/GuiClient/profileDialog.cpp @@ -41,16 +41,16 @@ profileDialog::profileDialog(QWidget *parent, const QString& bareJid, QXmppClien { ui->setupUi(this); - bool check = connect(&m_xmppClient.versionManager(), SIGNAL(versionReceived(const QXmppVersionIq&)), - SLOT(versionReceived(const QXmppVersionIq&))); + bool check = connect(&m_xmppClient.versionManager(), SIGNAL(versionReceived(QXmppVersionIq)), + SLOT(versionReceived(QXmppVersionIq))); Q_ASSERT(check); QXmppEntityTimeManager* timeManager = m_xmppClient.findExtension<QXmppEntityTimeManager>(); if(timeManager) { - check = connect(timeManager, SIGNAL(timeReceived(const QXmppEntityTimeIq&)), - SLOT(timeReceived(const QXmppEntityTimeIq&))); + check = connect(timeManager, SIGNAL(timeReceived(QXmppEntityTimeIq)), + SLOT(timeReceived(QXmppEntityTimeIq))); Q_ASSERT(check); } diff --git a/examples/GuiClient/rosterListView.cpp b/examples/GuiClient/rosterListView.cpp index f08b3a72..ac4d2c4f 100644 --- a/examples/GuiClient/rosterListView.cpp +++ b/examples/GuiClient/rosterListView.cpp @@ -31,14 +31,14 @@ rosterListView::rosterListView(QWidget* parent):QListView(parent), m_chat("Chat", this), m_profile("View Profile", this), m_removeContact("Remove", this) { - bool check = connect(this, SIGNAL(pressed(const QModelIndex&)), this, - SLOT(mousePressed(const QModelIndex&))); + bool check = connect(this, SIGNAL(pressed(QModelIndex)), this, + SLOT(mousePressed(QModelIndex))); Q_ASSERT(check); - check = connect(this, SIGNAL(doubleClicked(const QModelIndex&)), this, - SLOT(doubleClicked(const QModelIndex&))); + check = connect(this, SIGNAL(doubleClicked(QModelIndex)), this, + SLOT(doubleClicked(QModelIndex))); Q_ASSERT(check); - check = connect(this, SIGNAL(clicked(const QModelIndex&)), this, - SLOT(clicked(const QModelIndex&))); + check = connect(this, SIGNAL(clicked(QModelIndex)), this, + SLOT(clicked(QModelIndex))); Q_ASSERT(check); check = connect(&m_chat, SIGNAL(triggered()), this, SLOT(showChatDialog_helper())); diff --git a/examples/GuiClient/statusTextWidget.cpp b/examples/GuiClient/statusTextWidget.cpp index c0e3fe0c..3853aa16 100644 --- a/examples/GuiClient/statusTextWidget.cpp +++ b/examples/GuiClient/statusTextWidget.cpp @@ -81,7 +81,7 @@ statusTextWidget::statusTextWidget(QWidget* parent) : QWidget(parent), bool check = connect(m_statusButton, SIGNAL(clicked(bool)), SLOT(showMenu())); Q_ASSERT(check); - check = connect(m_statusLineEdit, SIGNAL(textChanged(const QString&)), SLOT(textChanged())); + check = connect(m_statusLineEdit, SIGNAL(textChanged(QString)), SLOT(textChanged())); Q_ASSERT(check); check = connect(m_statusLineEdit, SIGNAL(editingFinished()), SLOT(statusTextChanged_helper())); Q_ASSERT(check); diff --git a/examples/GuiClient/statusWidget.cpp b/examples/GuiClient/statusWidget.cpp index 8bbae63a..4db28009 100644 --- a/examples/GuiClient/statusWidget.cpp +++ b/examples/GuiClient/statusWidget.cpp @@ -41,7 +41,7 @@ statusWidget::statusWidget(QWidget* parent) menu->addAction(actionSign_out); toolButton_userName->setMenu(menu); - bool check = connect(statusTextWidgetObject, SIGNAL(statusTextChanged(const QString&)), SIGNAL(statusTextChanged(const QString&))); + bool check = connect(statusTextWidgetObject, SIGNAL(statusTextChanged(QString)), SIGNAL(statusTextChanged(QString))); Q_ASSERT(check); check = connect(actionAvailable, SIGNAL(triggered()), SLOT(presenceMenuTriggered())); diff --git a/examples/example_1_echoClient/echoClient.cpp b/examples/example_1_echoClient/echoClient.cpp index 84244ed4..acde6c28 100644 --- a/examples/example_1_echoClient/echoClient.cpp +++ b/examples/example_1_echoClient/echoClient.cpp @@ -28,8 +28,8 @@ echoClient::echoClient(QObject *parent) : QXmppClient(parent) { - bool check = connect(this, SIGNAL(messageReceived(const QXmppMessage&)), - SLOT(messageReceived(const QXmppMessage&))); + bool check = connect(this, SIGNAL(messageReceived(QXmppMessage)), + SLOT(messageReceived(QXmppMessage))); Q_ASSERT(check); Q_UNUSED(check); } diff --git a/examples/example_2_rosterHandling/xmppClient.cpp b/examples/example_2_rosterHandling/xmppClient.cpp index 37873c52..bcf8b104 100644 --- a/examples/example_2_rosterHandling/xmppClient.cpp +++ b/examples/example_2_rosterHandling/xmppClient.cpp @@ -42,8 +42,8 @@ xmppClient::xmppClient(QObject *parent) /// Then QXmppRoster::presenceChanged() is emitted whenever presence of someone /// in roster changes check = connect(&this->rosterManager(), - SIGNAL(presenceChanged(const QString&, const QString&)), - SLOT(presenceChanged(const QString&, const QString&))); + SIGNAL(presenceChanged(QString,QString)), + SLOT(presenceChanged(QString,QString))); Q_ASSERT(check); } diff --git a/examples/example_9_vCard/xmppClient.cpp b/examples/example_9_vCard/xmppClient.cpp index d85081b7..5ecc9ab3 100644 --- a/examples/example_9_vCard/xmppClient.cpp +++ b/examples/example_9_vCard/xmppClient.cpp @@ -62,8 +62,8 @@ void xmppClient::clientConnected() void xmppClient::rosterReceived() { std::cout<<"example_9_vCard:: Roster Received"<<std::endl; - bool check = connect(&this->vCardManager(), SIGNAL(vCardReceived(const QXmppVCardIq&)), - SLOT(vCardReceived(const QXmppVCardIq&))); + bool check = connect(&this->vCardManager(), SIGNAL(vCardReceived(QXmppVCardIq)), + SLOT(vCardReceived(QXmppVCardIq))); Q_ASSERT(check); Q_UNUSED(check); diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp index 7f17fa7b..56f1688e 100644 --- a/src/QXmppClient.cpp +++ b/src/QXmppClient.cpp @@ -134,20 +134,20 @@ QXmppClient::QXmppClient(QObject *parent) d->stream = new QXmppOutgoingClient(this); d->addProperCapability(d->clientPresence); - bool check = connect(d->stream, SIGNAL(elementReceived(const QDomElement&, bool&)), - this, SLOT(_q_elementReceived(const QDomElement&, bool&))); + bool check = connect(d->stream, SIGNAL(elementReceived(QDomElement,bool)), + this, SLOT(_q_elementReceived(QDomElement,bool))); Q_ASSERT(check); - check = connect(d->stream, SIGNAL(messageReceived(const QXmppMessage&)), - this, SIGNAL(messageReceived(const QXmppMessage&))); + check = connect(d->stream, SIGNAL(messageReceived(QXmppMessage)), + this, SIGNAL(messageReceived(QXmppMessage))); Q_ASSERT(check); - check = connect(d->stream, SIGNAL(presenceReceived(const QXmppPresence&)), - this, SIGNAL(presenceReceived(const QXmppPresence&))); + check = connect(d->stream, SIGNAL(presenceReceived(QXmppPresence)), + this, SIGNAL(presenceReceived(QXmppPresence))); Q_ASSERT(check); - check = connect(d->stream, SIGNAL(iqReceived(const QXmppIq&)), - this, SIGNAL(iqReceived(const QXmppIq&))); + check = connect(d->stream, SIGNAL(iqReceived(QXmppIq)), + this, SIGNAL(iqReceived(QXmppIq))); Q_ASSERT(check); check = connect(d->stream->socket(), SIGNAL(stateChanged(QAbstractSocket::SocketState)), @@ -567,14 +567,14 @@ void QXmppClient::setLogger(QXmppLogger *logger) { if (logger != d->logger) { if (d->logger) { - disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType, QString)), - d->logger, SLOT(log(QXmppLogger::MessageType, QString))); + disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)), + d->logger, SLOT(log(QXmppLogger::MessageType,QString))); } d->logger = logger; if (d->logger) { - connect(this, SIGNAL(logMessage(QXmppLogger::MessageType, QString)), - d->logger, SLOT(log(QXmppLogger::MessageType, QString))); + connect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)), + d->logger, SLOT(log(QXmppLogger::MessageType,QString))); } emit loggerChanged(d->logger); diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp index fd533565..ee4483b1 100644 --- a/src/QXmppOutgoingClient.cpp +++ b/src/QXmppOutgoingClient.cpp @@ -100,8 +100,8 @@ QXmppOutgoingClient::QXmppOutgoingClient(QObject *parent) setSocket(socket); // initialise logger - bool check = connect(socket, SIGNAL(sslErrors(const QList<QSslError>&)), - this, SLOT(socketSslErrors(const QList<QSslError>&))); + bool check = connect(socket, SIGNAL(sslErrors(QList<QSslError>)), + this, SLOT(socketSslErrors(QList<QSslError>))); Q_ASSERT(check); check = connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), diff --git a/src/QXmppRosterManager.cpp b/src/QXmppRosterManager.cpp index 0dfda018..5322bd33 100644 --- a/src/QXmppRosterManager.cpp +++ b/src/QXmppRosterManager.cpp @@ -43,8 +43,8 @@ QXmppRosterManager::QXmppRosterManager(QXmppClient* client) this, SLOT(disconnected())); Q_ASSERT(check); - check = QObject::connect(client, SIGNAL(presenceReceived(const QXmppPresence&)), - this, SLOT(presenceReceived(const QXmppPresence&))); + check = QObject::connect(client, SIGNAL(presenceReceived(QXmppPresence)), + this, SLOT(presenceReceived(QXmppPresence))); Q_ASSERT(check); } diff --git a/src/QXmppServer.cpp b/src/QXmppServer.cpp index 6acac104..5fab41ea 100644 --- a/src/QXmppServer.cpp +++ b/src/QXmppServer.cpp @@ -455,8 +455,8 @@ QXmppLogger *QXmppServer::logger() void QXmppServer::setLogger(QXmppLogger *logger) { if (d->logger) - QObject::disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType, QString)), - d->logger, SLOT(log(QXmppLogger::MessageType, QString))); + QObject::disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)), + d->logger, SLOT(log(QXmppLogger::MessageType,QString))); d->logger = logger; d->logger = logger; if (d->logger) diff --git a/src/QXmppTransferManager.cpp b/src/QXmppTransferManager.cpp index baa5d4aa..b9ab0c41 100644 --- a/src/QXmppTransferManager.cpp +++ b/src/QXmppTransferManager.cpp @@ -479,8 +479,8 @@ QXmppTransferManager::QXmppTransferManager() m_socksServer = new QXmppSocksServer(this); if (m_socksServer->listen()) { - bool check = connect(m_socksServer, SIGNAL(newConnection(QTcpSocket*, const QString&, quint16)), - this, SLOT(socksServerConnected(QTcpSocket*, const QString&, quint16))); + bool check = connect(m_socksServer, SIGNAL(newConnection(QTcpSocket*,QString,quint16)), + this, SLOT(socksServerConnected(QTcpSocket*,QString,quint16))); Q_ASSERT(check); Q_UNUSED(check); } else { @@ -493,8 +493,8 @@ void QXmppTransferManager::setClient(QXmppClient *client) QXmppClientExtension::setClient(client); // XEP-0047: In-Band Bytestreams - bool check = QObject::connect(client, SIGNAL(iqReceived(const QXmppIq&)), - this, SLOT(iqReceived(const QXmppIq&))); + bool check = QObject::connect(client, SIGNAL(iqReceived(QXmppIq)), + this, SLOT(iqReceived(QXmppIq))); Q_ASSERT(check); Q_UNUSED(check); } diff --git a/src/server/mod_proxy65.cpp b/src/server/mod_proxy65.cpp index c5edbd4a..99b840f8 100644 --- a/src/server/mod_proxy65.cpp +++ b/src/server/mod_proxy65.cpp @@ -188,8 +188,8 @@ QXmppServerProxy65::QXmppServerProxy65() d->totalBytes = 0; d->totalTransfers = 0; - bool check = connect(d->server, SIGNAL(newConnection(QTcpSocket*, const QString&, quint16)), - this, SLOT(slotSocketConnected(QTcpSocket*, const QString &, quint16))); + bool check = connect(d->server, SIGNAL(newConnection(QTcpSocket*,QString,quint16)), + this, SLOT(slotSocketConnected(QTcpSocket*,QString,quint16))); Q_ASSERT(check); check = connect(d->statisticsTimer, SIGNAL(timeout()), |
