Commit 819c525e authored by Laurent Montel's avatar Laurent Montel 😁

Normalize signals/slots

svn path=/trunk/KDE/kdegames/ksirk/; revision=1244155
parent f3d8783f
......@@ -89,17 +89,17 @@ void KsirkJabberGameWidget::init(GameAutomaton* automaton)
? KLed::On : KLed::Off);
QObject::connect(startnewgamebutton,SIGNAL(clicked()),m_automaton->game(),SLOT(slotNewJabberGame()));
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL ( csDisconnected () ), this, SLOT ( slotJabberDisconnected() ) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL ( csError ( int ) ), this, SLOT ( slotJabberError( int ) ) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL ( tlsWarning ( QCA::TLS::IdentityResult, QCA::Validity ) ), this, SLOT ( slotHandleTLSWarning ( QCA::TLS::IdentityResult, QCA::Validity ) ) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL ( connected () ), this, SLOT ( slotJabberConnected() ) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL ( error ( JabberClient::ErrorCode ) ), this, SLOT ( slotJabberClientError( JabberClient::ErrorCode ) ) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL ( rosterRequestFinished ( bool ) ), this, SLOT ( slotRosterRequestFinished ( bool ) ) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (groupChatJoined (const XMPP::Jid&)), this, SLOT(slotGroupChatJoined(const XMPP::Jid&)));
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (groupChatLeft(const XMPP::Jid&)), this, SLOT(slotGroupChatLeft(const XMPP::Jid&)));
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (groupChatPresence(const XMPP::Jid&, const XMPP::Status&)), this, SLOT(slotGroupChatPresence(const XMPP::Jid&, const XMPP::Status&)));
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (groupChatError(const XMPP::Jid&, int, const QString&)), this, SLOT(slotGroupChatError(const XMPP::Jid&, int, const QString&)));
QObject::connect(automaton, SIGNAL(newJabberGame(const QString&, int, const QString&)), this, SLOT(slotNewJabberGame(const QString&, int, const QString&) ) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (csDisconnected()), this, SLOT (slotJabberDisconnected()) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (csError(int)), this, SLOT (slotJabberError(int)) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (tlsWarning(QCA::TLS::IdentityResult,QCA::Validity)), this, SLOT (slotHandleTLSWarning(QCA::TLS::IdentityResult,QCA::Validity)) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (connected()), this, SLOT (slotJabberConnected()) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (error(JabberClient::ErrorCode)), this, SLOT (slotJabberClientError(JabberClient::ErrorCode)) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (rosterRequestFinished(bool)), this, SLOT (slotRosterRequestFinished(bool)) );
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (groupChatJoined(XMPP::Jid)), this, SLOT(slotGroupChatJoined(XMPP::Jid)));
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (groupChatLeft(XMPP::Jid)), this, SLOT(slotGroupChatLeft(XMPP::Jid)));
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (groupChatPresence(XMPP::Jid,XMPP::Status)), this, SLOT(slotGroupChatPresence(XMPP::Jid,XMPP::Status)));
QObject::connect ( m_automaton->game()->jabberClient(), SIGNAL (groupChatError(XMPP::Jid,int,QString)), this, SLOT(slotGroupChatError(XMPP::Jid,int,QString)));
QObject::connect(automaton, SIGNAL(newJabberGame(QString,int,QString)), this, SLOT(slotNewJabberGame(QString,int,QString)) );
QObject::connect(this, SIGNAL(cancelled(int)), m_automaton->game(), SLOT(slotJabberGameCanceled(int)));
}
......
......@@ -56,7 +56,7 @@ KPlayerSetupWidget::KPlayerSetupWidget(QWidget *parent) :
setupUi(this);
connect(nationCombo, SIGNAL(activated(int)), this, SLOT(slotNationChanged()));
connect(nameLineEdit, SIGNAL(textEdited(const QString&)), this, SLOT(slotNameEdited (const QString&)));
connect(nameLineEdit, SIGNAL(textEdited(QString)), this, SLOT(slotNameEdited(QString)));
connect(nationCombo, SIGNAL(activated(int)), this, SLOT(slotNationChanged()));
connect(nextButton, SIGNAL(pressed()),this,SLOT(slotNext()));
connect(previousButton, SIGNAL(pressed()),this,SLOT(slotPrevious()));
......
......@@ -196,7 +196,7 @@ void NewGameWidget::slotGHNS()
/* KConfigDialog *dialog = new KConfigDialog(this, "settings", KsirkSettings::self());
KGameThemeSelector* kgts = new KGameThemeSelector(dialog, KsirkSettings::self());
dialog->addPage(kgts, i18n("Theme"), "games-config-theme");*/
/* connect(dialog, SIGNAL(settingsChanged(const QString &)), view, SLOT(settingsChanged()));
/* connect(dialog, SIGNAL(settingsChanged(QString)), view, SLOT(settingsChanged()));
connect(dialog, SIGNAL(hidden()), view, SLOT(resumeFromConfigure()));*/
// dialog->show();
......
......@@ -174,23 +174,23 @@ GameAutomaton::GameAutomaton() :
// Connect the most important slot which tells us which properties are
// changed
connect(this,SIGNAL(signalPropertyChanged(KGamePropertyBase *,KGame *)),
this,SLOT(slotPropertyChanged(KGamePropertyBase *,KGame *)));
connect(this,SIGNAL(signalPropertyChanged(KGamePropertyBase*,KGame*)),
this,SLOT(slotPropertyChanged(KGamePropertyBase*,KGame*)));
connect(this,SIGNAL(signalPlayerJoinedGame(KPlayer*)),
this,SLOT(slotPlayerJoinedGame(KPlayer*)));
connect(this,SIGNAL(signalNetworkData(int, const QByteArray&, quint32, quint32)),
this,SLOT(slotNetworkData(int, const QByteArray&, quint32, quint32)));
connect(this,SIGNAL(signalNetworkData(int,QByteArray,quint32,quint32)),
this,SLOT(slotNetworkData(int,QByteArray,quint32,quint32)));
connect(this,SIGNAL(signalClientJoinedGame(quint32, KGame*)),
this,SLOT(slotClientJoinedGame(quint32, KGame*)));
connect(this,SIGNAL(signalClientJoinedGame(quint32,KGame*)),
this,SLOT(slotClientJoinedGame(quint32,KGame*)));
connect(messageClient(),SIGNAL(connectionBroken()),
this,SLOT(slotConnectionToServerBroken()));
connect(messageServer(),SIGNAL(connectionLost(KMessageIO *)),
this,SLOT(slotConnectionToClientBroken(KMessageIO *)));
connect(messageServer(),SIGNAL(connectionLost(KMessageIO*)),
this,SLOT(slotConnectionToClientBroken(KMessageIO*)));
setPolicy(KGame::PolicyDirty,true);
......@@ -1041,9 +1041,9 @@ void GameAutomaton::createIO(KPlayer *player,KGameIO::IOMode io)
// Connect mouse input to a function to process the actual input
connect(
input,
SIGNAL(signalMouseEvent(KGameIO *,QDataStream &,QMouseEvent *,bool *)),
SIGNAL(signalMouseEvent(KGameIO*,QDataStream&,QMouseEvent*,bool*)),
m_game->frame(),
SLOT(slotMouseInput(KGameIO *,QDataStream &,QMouseEvent *,bool *)));
SLOT(slotMouseInput(KGameIO*,QDataStream&,QMouseEvent*,bool*)));
// Add the device to the player
player->addGameIO(input);
......@@ -1198,8 +1198,8 @@ bool GameAutomaton::connectToServ()
kDebug();
if (messageServer() != 0)
{
QObject::disconnect(messageServer(),SIGNAL(connectionLost(KMessageIO *)),
this,SLOT(slotConnectionToClientBroken(KMessageIO *)));
QObject::disconnect(messageServer(),SIGNAL(connectionLost(KMessageIO*)),
this,SLOT(slotConnectionToClientBroken(KMessageIO*)));
}
kDebug() << "Before connectToServer" << endl;
QString host = m_game->newGameSetup()->host();
......@@ -1207,8 +1207,8 @@ bool GameAutomaton::connectToServ()
bool status = connectToServer(host, port);
kDebug() << "After connectToServer" << status;
if (messageServer())
connect(messageServer(),SIGNAL(connectionLost(KMessageIO *)),
this,SLOT(slotConnectionToClientBroken(KMessageIO *)));
connect(messageServer(),SIGNAL(connectionLost(KMessageIO*)),
this,SLOT(slotConnectionToClientBroken(KMessageIO*)));
return status;
}
......@@ -1223,8 +1223,8 @@ bool GameAutomaton::joinJabberGame(const QString& nick)
if (messageServer() != 0)
{
QObject::disconnect(messageServer(),SIGNAL(connectionLost(KMessageIO *)),
this,SLOT(slotConnectionToClientBroken(KMessageIO *)));
QObject::disconnect(messageServer(),SIGNAL(connectionLost(KMessageIO*)),
this,SLOT(slotConnectionToClientBroken(KMessageIO*)));
}
kDebug() << "Before connectToServer" << endl;
......@@ -1242,8 +1242,8 @@ bool GameAutomaton::joinJabberGame(const QString& nick)
message.setBody(msg);
m_game->jabberClient()->sendMessage(message);
}
// connect(messageServer(),SIGNAL(connectionLost(KMessageIO *)),
// this,SLOT(slotConnectionToClientBroken(KMessageIO *)));
// connect(messageServer(),SIGNAL(connectionLost(KMessageIO*)),
// this,SLOT(slotConnectionToClientBroken(KMessageIO*)));
return status;
}
return false;
......@@ -2480,8 +2480,8 @@ void GameAutomaton::slotNetworkData(int msgid, const QByteArray &buffer, quint32
finalizePlayers();
break;
case Winner:
QObject::disconnect(messageServer(),SIGNAL(connectionLost(KMessageIO *)),
this,SLOT(slotConnectionToClientBroken(KMessageIO *)));
QObject::disconnect(messageServer(),SIGNAL(connectionLost(KMessageIO*)),
this,SLOT(slotConnectionToClientBroken(KMessageIO*)));
stream >> playerId;
m_game->winner(dynamic_cast<Player*>(findPlayer(playerId)));
break;
......
......@@ -251,40 +251,40 @@ void JabberAccount::connectWithPassword ( const QString &password )
{
m_jabberClient = new JabberClient;
QObject::connect ( m_jabberClient, SIGNAL ( csDisconnected () ), this, SLOT ( slotCSDisconnected () ) );
QObject::connect ( m_jabberClient, SIGNAL ( csError ( int ) ), this, SLOT ( slotCSError ( int ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( tlsWarning ( QCA::TLS::IdentityResult, QCA::Validity ) ), this, SLOT ( slotHandleTLSWarning ( QCA::TLS::IdentityResult, QCA::Validity ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( connected () ), this, SLOT ( slotConnected () ) );
QObject::connect ( m_jabberClient, SIGNAL ( error ( JabberClient::ErrorCode ) ), this, SLOT ( slotClientError ( JabberClient::ErrorCode ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( subscription ( const XMPP::Jid &, const QString & ) ),
this, SLOT ( slotSubscription ( const XMPP::Jid &, const QString & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( rosterRequestFinished ( bool ) ),
this, SLOT ( slotRosterRequestFinished ( bool ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( newContact ( const XMPP::RosterItem & ) ),
this, SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( contactUpdated ( const XMPP::RosterItem & ) ),
this, SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( contactDeleted ( const XMPP::RosterItem & ) ),
this, SLOT ( slotContactDeleted ( const XMPP::RosterItem & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( resourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ),
this, SLOT ( slotResourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( resourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ),
this, SLOT ( slotResourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( messageReceived ( const XMPP::Message & ) ),
this, SLOT ( slotReceivedMessage ( const XMPP::Message & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( incomingFileTransfer () ),
this, SLOT ( slotIncomingFileTransfer () ) );
QObject::connect ( m_jabberClient, SIGNAL ( groupChatJoined ( const XMPP::Jid & ) ),
this, SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ),
this, SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ),
this, SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( groupChatError ( const XMPP::Jid &, int, const QString & ) ),
this, SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const QString & ) ) );
QObject::connect ( m_jabberClient, SIGNAL ( debugMessage ( const QString & ) ),
this, SLOT ( slotClientDebugMessage ( const QString & ) ) );
QObject::connect ( m_jabberClient, SIGNAL (csDisconnected()), this, SLOT (slotCSDisconnected()) );
QObject::connect ( m_jabberClient, SIGNAL (csError(int)), this, SLOT (slotCSError(int)) );
QObject::connect ( m_jabberClient, SIGNAL (tlsWarning(QCA::TLS::IdentityResult,QCA::Validity)), this, SLOT (slotHandleTLSWarning(QCA::TLS::IdentityResult,QCA::Validity)) );
QObject::connect ( m_jabberClient, SIGNAL (connected()), this, SLOT (slotConnected()) );
QObject::connect ( m_jabberClient, SIGNAL (error(JabberClient::ErrorCode)), this, SLOT (slotClientError(JabberClient::ErrorCode)) );
QObject::connect ( m_jabberClient, SIGNAL (subscription(XMPP::Jid,QString)),
this, SLOT (slotSubscription(XMPP::Jid,QString)) );
QObject::connect ( m_jabberClient, SIGNAL (rosterRequestFinished(bool)),
this, SLOT (slotRosterRequestFinished(bool)) );
QObject::connect ( m_jabberClient, SIGNAL (newContact(XMPP::RosterItem)),
this, SLOT (slotContactUpdated(XMPP::RosterItem)) );
QObject::connect ( m_jabberClient, SIGNAL (contactUpdated(XMPP::RosterItem)),
this, SLOT (slotContactUpdated(XMPP::RosterItem)) );
QObject::connect ( m_jabberClient, SIGNAL (contactDeleted(XMPP::RosterItem)),
this, SLOT (slotContactDeleted(XMPP::RosterItem)) );
QObject::connect ( m_jabberClient, SIGNAL (resourceAvailable(XMPP::Jid,XMPP::Resource)),
this, SLOT (slotResourceAvailable(XMPP::Jid,XMPP::Resource)) );
QObject::connect ( m_jabberClient, SIGNAL (resourceUnavailable(XMPP::Jid,XMPP::Resource)),
this, SLOT (slotResourceUnavailable(XMPP::Jid,XMPP::Resource)) );
QObject::connect ( m_jabberClient, SIGNAL (messageReceived(XMPP::Message)),
this, SLOT (slotReceivedMessage(XMPP::Message)) );
QObject::connect ( m_jabberClient, SIGNAL (incomingFileTransfer()),
this, SLOT (slotIncomingFileTransfer()) );
QObject::connect ( m_jabberClient, SIGNAL (groupChatJoined(XMPP::Jid)),
this, SLOT (slotGroupChatJoined(XMPP::Jid)) );
QObject::connect ( m_jabberClient, SIGNAL (groupChatLeft(XMPP::Jid)),
this, SLOT (slotGroupChatLeft(XMPP::Jid)) );
QObject::connect ( m_jabberClient, SIGNAL (groupChatPresence(XMPP::Jid,XMPP::Status)),
this, SLOT (slotGroupChatPresence(XMPP::Jid,XMPP::Status)) );
QObject::connect ( m_jabberClient, SIGNAL (groupChatError(XMPP::Jid,int,QString)),
this, SLOT (slotGroupChatError(XMPP::Jid,int,QString)) );
QObject::connect ( m_jabberClient, SIGNAL (debugMessage(QString)),
this, SLOT (slotClientDebugMessage(QString)) );
}
else
{
......@@ -548,7 +548,7 @@ void JabberAccount::slotConnected ()
{
kDebug(JABBER_DEBUG_GLOBAL) << "Creating Jingle Voice caller...";
m_voiceCaller = new JingleVoiceCaller( this );
QObject::connect(m_voiceCaller,SIGNAL(incoming(const Jid&)),this,SLOT(slotIncomingVoiceCall( const Jid& )));
QObject::connect(m_voiceCaller,SIGNAL(incoming(Jid)),this,SLOT(slotIncomingVoiceCall(Jid)));
m_voiceCaller->initialize();
}
......@@ -557,7 +557,7 @@ void JabberAccount::slotConnected ()
{
kDebug(JABBER_DEBUG_GLOBAL) << "Creating Jingle Session Manager...";
m_jingleSessionManager = new JingleSessionManager( this );
QObject::connect(m_jingleSessionManager, SIGNAL(incomingSession(const QString &, JingleSession *)), this, SLOT(slotIncomingJingleSession(const QString &, JingleSession *)));
QObject::connect(m_jingleSessionManager, SIGNAL(incomingSession(QString,JingleSession*)), this, SLOT(slotIncomingJingleSession(QString,JingleSession*)));
}
#endif
......@@ -1080,10 +1080,10 @@ void JabberAccount::slotXMPPConsole ()
}
/* dlgXMPPConsole *w = new dlgXMPPConsole( client (), 0);
QObject::connect( m_jabberClient, SIGNAL ( incomingXML (const QString &) ),
w, SLOT ( slotIncomingXML ( const QString &) ) );
QObject::connect( m_jabberClient, SIGNAL ( outgoingXML (const QString &) ),
w, SLOT ( slotOutgoingXML ( const QString &) ) );
QObject::connect( m_jabberClient, SIGNAL (incomingXML(QString)),
w, SLOT (slotIncomingXML(QString)) );
QObject::connect( m_jabberClient, SIGNAL (outgoingXML(QString)),
w, SLOT (slotOutgoingXML(QString)) );
w->show();*/
}
......@@ -1680,7 +1680,7 @@ void JabberAccount::slotGetServices ()
// }
//
// XMPP::JT_Register *task = new XMPP::JT_Register ( client()->rootTask () );
// QObject::connect ( task, SIGNAL ( finished () ), this, SLOT ( slotUnregisterFinished ) );
// QObject::connect ( task, SIGNAL (finished()), this, SLOT (slotUnregisterFinished) );
// task->unreg ();
// task->go ( true );
// m_removing=true;
......
......@@ -30,7 +30,7 @@
JabberBookmarks::JabberBookmarks(JabberAccount *parent) : QObject(parent) , m_account(parent)
{
connect( m_account , SIGNAL( isConnectedChanged() ) , this , SLOT( accountConnected() ) );
connect( m_account , SIGNAL(isConnectedChanged()) , this , SLOT(accountConnected()) );
}
void JabberBookmarks::accountConnected()
......@@ -40,7 +40,7 @@ void JabberBookmarks::accountConnected()
JT_PrivateStorage * task = new JT_PrivateStorage ( m_account->client()->rootTask ());
task->get( "storage" , "storage:bookmarks" );
QObject::connect ( task, SIGNAL ( finished () ), this, SLOT ( slotReceivedBookmarks() ) );
QObject::connect ( task, SIGNAL (finished()), this, SLOT (slotReceivedBookmarks()) );
task->go ( true );
}
......@@ -134,7 +134,7 @@ KAction * JabberBookmarks::bookmarksAction(QObject * /*parent*/)
groupchatBM->setIcon( KIcon( QLatin1String( "jabber_group" )) );
groupchatBM->setText( i18n("Groupchat bookmark") );
groupchatBM->setItems(m_conferencesJID);
QObject::connect(groupchatBM, SIGNAL(triggered(const QString&)) , this , SLOT(slotJoinChatBookmark(const QString&)));
QObject::connect(groupchatBM, SIGNAL(triggered(QString)) , this , SLOT(slotJoinChatBookmark(QString)));
return groupchatBM;
}
......
......@@ -42,11 +42,11 @@ void JabberByteStream::connect ( QString host, int port )
mSocket = KSocketFactory::connectToHost("xmpp", host, port);
QObject::connect ( mSocket, SIGNAL ( error ( QAbstractSocket::SocketError ) ), this, SLOT ( slotError ( QAbstractSocket::SocketError ) ) );
QObject::connect ( mSocket, SIGNAL ( connected () ), this, SLOT ( slotConnected () ) );
QObject::connect ( mSocket, SIGNAL ( disconnected () ), this, SLOT ( slotConnectionClosed () ) );
QObject::connect ( mSocket, SIGNAL ( readyRead () ), this, SLOT ( slotReadyRead () ) );
QObject::connect ( mSocket, SIGNAL ( bytesWritten ( qint64 ) ), this, SLOT ( slotBytesWritten ( qint64 ) ) );
QObject::connect ( mSocket, SIGNAL (error(QAbstractSocket::SocketError)), this, SLOT (slotError(QAbstractSocket::SocketError)) );
QObject::connect ( mSocket, SIGNAL (connected()), this, SLOT (slotConnected()) );
QObject::connect ( mSocket, SIGNAL (disconnected()), this, SLOT (slotConnectionClosed()) );
QObject::connect ( mSocket, SIGNAL (readyRead()), this, SLOT (slotReadyRead()) );
QObject::connect ( mSocket, SIGNAL (bytesWritten(qint64)), this, SLOT (slotBytesWritten(qint64)) );
}
bool JabberByteStream::isOpen () const
......
......@@ -136,7 +136,7 @@ JabberClient::JabberClient ()
cleanUp ();
// initiate penalty timer
QTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, SLOT ( slotUpdatePenaltyTime () ) );
QTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, SLOT (slotUpdatePenaltyTime()) );
}
......@@ -201,7 +201,7 @@ void JabberClient::slotUpdatePenaltyTime ()
else
d->currentPenaltyTime = 0;
QTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, SLOT ( slotUpdatePenaltyTime () ) );
QTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, SLOT (slotUpdatePenaltyTime()) );
}
......@@ -246,7 +246,7 @@ XMPP::S5BServer *JabberClient::s5bServer ()
if ( !d->s5bServer )
{
d->s5bServer = new XMPP::S5BServer ();
QObject::connect ( d->s5bServer, SIGNAL ( destroyed () ), this, SLOT ( slotS5BServerGone () ) );
QObject::connect ( d->s5bServer, SIGNAL (destroyed()), this, SLOT (slotS5BServerGone()) );
/*
* Try to start the server at the default port here.
......@@ -660,7 +660,7 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const QStr
d->jabberTLSHandler = new QCATLSHandler(d->jabberTLS);
d->jabberTLSHandler->setXMPPCertCheck(true);
QObject::connect ( d->jabberTLSHandler, SIGNAL ( tlsHandshaken() ), SLOT ( slotTLSHandshaken () ) );
QObject::connect ( d->jabberTLSHandler, SIGNAL (tlsHandshaken()), SLOT (slotTLSHandshaken()) );
}
/*
......@@ -673,18 +673,18 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const QStr
{
using namespace XMPP;
QObject::connect ( d->jabberClientStream, SIGNAL ( needAuthParams(bool, bool, bool) ),
this, SLOT ( slotCSNeedAuthParams (bool, bool, bool) ) );
QObject::connect ( d->jabberClientStream, SIGNAL ( authenticated () ),
this, SLOT ( slotCSAuthenticated () ) );
QObject::connect ( d->jabberClientStream, SIGNAL ( connectionClosed () ),
this, SLOT ( slotCSDisconnected () ) );
QObject::connect ( d->jabberClientStream, SIGNAL ( delayedCloseFinished () ),
this, SLOT ( slotCSDisconnected () ) );
QObject::connect ( d->jabberClientStream, SIGNAL ( warning (int) ),
this, SLOT ( slotCSWarning (int) ) );
QObject::connect ( d->jabberClientStream, SIGNAL ( error (int) ),
this, SLOT ( slotCSError (int) ) );
QObject::connect ( d->jabberClientStream, SIGNAL (needAuthParams(bool,bool,bool)),
this, SLOT (slotCSNeedAuthParams(bool,bool,bool)) );
QObject::connect ( d->jabberClientStream, SIGNAL (authenticated()),
this, SLOT (slotCSAuthenticated()) );
QObject::connect ( d->jabberClientStream, SIGNAL (connectionClosed()),
this, SLOT (slotCSDisconnected()) );
QObject::connect ( d->jabberClientStream, SIGNAL (delayedCloseFinished()),
this, SLOT (slotCSDisconnected()) );
QObject::connect ( d->jabberClientStream, SIGNAL (warning(int)),
this, SLOT (slotCSWarning(int)) );
QObject::connect ( d->jabberClientStream, SIGNAL (error(int)),
this, SLOT (slotCSError(int)) );
}
d->jabberClientStream->setOldOnly ( useXMPP09 () );
......@@ -723,8 +723,8 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const QStr
{
using namespace XMPP;
QObject::connect ( d->jabberClient->fileTransferManager(), SIGNAL ( incomingReady() ),
this, SLOT ( slotIncomingFileTransfer () ) );
QObject::connect ( d->jabberClient->fileTransferManager(), SIGNAL (incomingReady()),
this, SLOT (slotIncomingFileTransfer()) );
}
}
......@@ -734,37 +734,37 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const QStr
{
using namespace XMPP;
kDebug() << "Connecting subscription";
QObject::connect ( d->jabberClient, SIGNAL ( subscription (const Jid &, const QString &, const QString &) ),
this, SLOT ( slotSubscription (const Jid&, const QString&) ) );
QObject::connect ( d->jabberClient, SIGNAL (subscription(Jid,QString,QString)),
this, SLOT (slotSubscription(Jid,QString)) );
kDebug() << "Connecting rosterRequestFinished";
QObject::connect ( d->jabberClient, SIGNAL ( rosterRequestFinished ( bool, int, const QString & ) ),
this, SLOT ( slotRosterRequestFinished ( bool, int, const QString & ) ) );
QObject::connect ( d->jabberClient, SIGNAL ( rosterItemAdded (const RosterItem &) ),
this, SLOT ( slotNewContact (const RosterItem &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( rosterItemUpdated (const RosterItem &) ),
this, SLOT ( slotContactUpdated (const RosterItem &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( rosterItemRemoved (const RosterItem &) ),
this, SLOT ( slotContactDeleted (const RosterItem &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( resourceAvailable (const Jid &, const Resource &) ),
this, SLOT ( slotResourceAvailable (const Jid &, const Resource &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( resourceUnavailable (const Jid &, const Resource &) ),
this, SLOT ( slotResourceUnavailable (const Jid &, const Resource &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( messageReceived (const Message &) ),
this, SLOT ( slotReceivedMessage (const Message &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( groupChatJoined (const Jid &) ),
this, SLOT ( slotGroupChatJoined (const Jid &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( groupChatLeft (const Jid &) ),
this, SLOT ( slotGroupChatLeft (const Jid &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( groupChatPresence (const Jid &, const Status &) ),
this, SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( groupChatError (const Jid &, int, const QString &) ),
this, SLOT ( slotGroupChatError (const Jid &, int, const QString &) ) );
//QObject::connect ( d->jabberClient, SIGNAL (debugText (const QString &) ),
// this, SLOT ( slotPsiDebug (const QString &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( xmlIncoming(const QString& ) ),
this, SLOT ( slotIncomingXML (const QString &) ) );
QObject::connect ( d->jabberClient, SIGNAL ( xmlOutgoing(const QString& ) ),
this, SLOT ( slotOutgoingXML (const QString &) ) );
QObject::connect ( d->jabberClient, SIGNAL (rosterRequestFinished(bool,int,QString)),
this, SLOT (slotRosterRequestFinished(bool,int,QString)) );
QObject::connect ( d->jabberClient, SIGNAL (rosterItemAdded(RosterItem)),
this, SLOT (slotNewContact(RosterItem)) );
QObject::connect ( d->jabberClient, SIGNAL (rosterItemUpdated(RosterItem)),
this, SLOT (slotContactUpdated(RosterItem)) );
QObject::connect ( d->jabberClient, SIGNAL (rosterItemRemoved(RosterItem)),
this, SLOT (slotContactDeleted(RosterItem)) );
QObject::connect ( d->jabberClient, SIGNAL (resourceAvailable(Jid,Resource)),
this, SLOT (slotResourceAvailable(Jid,Resource)) );
QObject::connect ( d->jabberClient, SIGNAL (resourceUnavailable(Jid,Resource)),
this, SLOT (slotResourceUnavailable(Jid,Resource)) );
QObject::connect ( d->jabberClient, SIGNAL (messageReceived(Message)),
this, SLOT (slotReceivedMessage(Message)) );
QObject::connect ( d->jabberClient, SIGNAL (groupChatJoined(Jid)),
this, SLOT (slotGroupChatJoined(Jid)) );
QObject::connect ( d->jabberClient, SIGNAL (groupChatLeft(Jid)),
this, SLOT (slotGroupChatLeft(Jid)) );
QObject::connect ( d->jabberClient, SIGNAL (groupChatPresence(Jid,Status)),
this, SLOT (slotGroupChatPresence(Jid,Status)) );
QObject::connect ( d->jabberClient, SIGNAL (groupChatError(Jid,int,QString)),
this, SLOT (slotGroupChatError(Jid,int,QString)) );
//QObject::connect ( d->jabberClient, SIGNAL (debugText(QString)),
// this, SLOT (slotPsiDebug(QString)) );
QObject::connect ( d->jabberClient, SIGNAL (xmlIncoming(QString)),
this, SLOT (slotIncomingXML(QString)) );
QObject::connect ( d->jabberClient, SIGNAL (xmlOutgoing(QString)),
this, SLOT (slotOutgoingXML(QString)) );
}
d->jabberClient->setClientName ( clientName () );
......
......@@ -31,8 +31,8 @@ JabberConnector::JabberConnector ( QObject *parent )
mByteStream = new JabberByteStream ( this );
connect ( mByteStream, SIGNAL ( connected () ), this, SLOT ( slotConnected () ) );
connect ( mByteStream, SIGNAL ( error ( int ) ), this, SLOT ( slotError ( int ) ) );
connect ( mByteStream, SIGNAL (connected()), this, SLOT (slotConnected()) );
connect ( mByteStream, SIGNAL (error(int)), this, SLOT (slotError(int)) );
}
......
......@@ -94,19 +94,19 @@ JabberContact::JabberContact (const XMPP::RosterItem &rosterItem, Kopete::Accoun
{
// this contact is a regular contact
connect ( this,
SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ),
this, SLOT ( slotCheckVCard () ) );
SIGNAL (onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
this, SLOT (slotCheckVCard()) );
}
else
{
// this contact is the myself instance
connect ( account()->myself (),
SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ),
this, SLOT ( slotCheckVCard () ) );
SIGNAL (onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
this, SLOT (slotCheckVCard()) );
connect ( account()->myself (),
SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ),
this, SLOT ( slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) );
SIGNAL (onlineStatusChanged(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)),
this, SLOT (slotCheckLastActivity(Kopete::Contact*,Kopete::OnlineStatus,Kopete::OnlineStatus)) );
/*
* Trigger update once if we're already connected for contacts
......@@ -247,7 +247,7 @@ QList<KAction*> *JabberContact::customContextMenuActions ()
#ifdef SUPPORT_JINGLE
KAction *actionVoiceCall = new KAction( (i18n ("Voice call"), "voicecall", 0, this, SLOT (voiceCall ()), 0, "jabber_voicecall");
KAction *actionVoiceCall = new KAction( (i18n ("Voice call"), "voicecall", 0, this, SLOT (voiceCall()), 0, "jabber_voicecall");
actionVoiceCall->setEnabled( false );
actionCollection->append( actionVoiceCall );
......@@ -469,7 +469,7 @@ void JabberContact::slotCheckVCard ()
mVCardUpdateInProgress = true;
// current data is older than 24 hours, request a new one
QTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, SLOT ( slotGetTimedVCard () ) );
QTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, SLOT (slotGetTimedVCard()) );
}
}
......@@ -508,7 +508,7 @@ void JabberContact::slotGetTimedVCard ()
// request vCard
XMPP::JT_VCard *task = new XMPP::JT_VCard ( account()->client()->rootTask () );
// signal to ourselves when the vCard data arrived
QObject::connect ( task, SIGNAL ( finished () ), this, SLOT ( slotGotVCard () ) );
QObject::connect ( task, SIGNAL (finished()), this, SLOT (slotGotVCard()) );
task->get ( mRosterItem.jid () );
task->go ( true );
......@@ -567,7 +567,7 @@ void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::Onl
{
kDebug ( JABBER_DEBUG_GLOBAL ) << "Scheduling request for last activity for " << mRosterItem.jid().bare ();
QTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, SLOT ( slotGetTimedLastActivity () ) );
QTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, SLOT (slotGetTimedLastActivity()) );
}
}
......@@ -594,7 +594,7 @@ void JabberContact::slotGetTimedLastActivity ()
kDebug ( JABBER_DEBUG_GLOBAL ) << "Requesting last activity from timer for " << mRosterItem.jid().bare ();
JT_GetLastActivity *task = new JT_GetLastActivity ( account()->client()->rootTask () );
QObject::connect ( task, SIGNAL ( finished () ), this, SLOT ( slotGotLastActivity () ) );