diff options
| author | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-07-12 17:51:47 +0400 |
|---|---|---|
| committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-07-12 17:51:47 +0400 |
| commit | 85c9c7800603f0c240035a7ba331da23907a62a7 (patch) | |
| tree | a7b10aa66d5d477f7e304325841e25f69e501d8f /src/murmur/RPC.cpp | |
| parent | 5ccce1371c2e6e547f0fc5ed8f157ca6bbb26958 (diff) | |
Fix Ice callbacks and examples
Diffstat (limited to 'src/murmur/RPC.cpp')
| -rw-r--r-- | src/murmur/RPC.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp index 1042f2984..154cac7ed 100644 --- a/src/murmur/RPC.cpp +++ b/src/murmur/RPC.cpp @@ -213,7 +213,7 @@ void Server::setTempGroups(int userid, Channel *cChannel, const QStringList &gro void Server::connectAuthenticator(QObject *obj) { connect(this, SIGNAL(registerUserSig(int &, const QMap<QString, QString> &)), obj, SLOT(registerUserSlot(int &, const QMap<QString, QString> &))); connect(this, SIGNAL(unregisterUserSig(int &, int)), obj, SLOT(unregisterUserSlot(int &, int))); - connect(this, SIGNAL(getRegisteredUsersSig(const QString &, QMap<int, QString> &)), obj, SLOT(getRegisteredUsersSlot(const QString &, QMap<int, QString, QString> &))); + connect(this, SIGNAL(getRegisteredUsersSig(const QString &, QMap<int, QString> &)), obj, SLOT(getRegisteredUsersSlot(const QString &, QMap<int, QString> &))); connect(this, SIGNAL(getRegistrationSig(int &, int, QMap<QString, QString> &)), obj, SLOT(getRegistrationSlot(int &, int, QMap<QString, QString> &))); connect(this, SIGNAL(authenticateSig(int &, QString &, const QString &)), obj, SLOT(authenticateSlot(int &, QString &, const QString &))); connect(this, SIGNAL(setInfoSig(int &, int, const QMap<QString, QString> &)), obj, SLOT(setInfoSlot(int &, int, const QMap<QString, QString> &))); @@ -224,14 +224,12 @@ void Server::connectAuthenticator(QObject *obj) { } void Server::disconnectAuthenticator(QObject *obj) { - disconnect(this, SIGNAL(registerUserSig(int &, const QString &)), obj, SLOT(registerUserSlot(int &, const QString &))); + disconnect(this, SIGNAL(registerUserSig(int &, const QMap<QString, QString> &)), obj, SLOT(registerUserSlot(int &, const QMap<QString, QString> &))); disconnect(this, SIGNAL(unregisterUserSig(int &, int)), obj, SLOT(unregisterUserSlot(int &, int))); - disconnect(this, SIGNAL(getRegisteredUsersSig(const QString &, QMap<int, QPair<QString, QString> > &)), obj, SLOT(getRegisteredUsersSlot(const QString &, QMap<int, QPair<QString, QString> > &))); - disconnect(this, SIGNAL(getRegistrationSig(int &, int, QString &, QString &)), obj, SLOT(getRegistrationSlot(int &, int, QString &, QString &))); + disconnect(this, SIGNAL(getRegisteredUsersSig(const QString &, QMap<int, QString> &)), obj, SLOT(getRegisteredUsersSlot(const QString &, QMap<int, QString> &))); + disconnect(this, SIGNAL(getRegistrationSig(int &, int, QMap<QString, QString> &)), obj, SLOT(getRegistrationSlot(int &, int, QMap<QString, QString> &))); disconnect(this, SIGNAL(authenticateSig(int &, QString &, const QString &)), obj, SLOT(authenticateSlot(int &, QString &, const QString &))); - disconnect(this, SIGNAL(setPwSig(int &, int, const QString &)), obj, SLOT(setPwSlot(int &, int, const QString &))); - disconnect(this, SIGNAL(setEmailSig(int &, int, const QString &)), obj, SLOT(setEmailSlot(int &, int, const QString &))); - disconnect(this, SIGNAL(setNameSig(int &, int, const QString &)), obj, SLOT(setNameSlot(int &, int, const QString &))); + disconnect(this, SIGNAL(setInfoSig(int &, int, const QMap<QString, QString> &)), obj, SLOT(setInfoSlot(int &, int, const QMap<QString, QString> &))); disconnect(this, SIGNAL(setTextureSig(int &, int, const QByteArray &)), obj, SLOT(setTextureSlot(int &, int, const QByteArray &))); disconnect(this, SIGNAL(idToNameSig(QString &, int)), obj, SLOT(idToNameSlot(QString &, int))); disconnect(this, SIGNAL(nameToIdSig(int &, const QString &)), obj, SLOT(nameToIdSlot(int &, const QString &))); |