aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2015-07-31 13:30:46 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2015-07-31 13:30:46 +0200
commitad1cf20d2ad46099d4de8dbeda1db51e91efcd7a (patch)
treed4af54574162829b5cc903d035c88d44b0c96332
parent5d8e309f46a825fa254bda56fae743ff80cbfe2a (diff)
downloadqxmpp-ad1cf20d2ad46099d4de8dbeda1db51e91efcd7a.tar.gz
Make QXmppClient::connectToServer(config, presence) a slot (closes #63)
-rw-r--r--CHANGELOG2
-rw-r--r--src/client/QXmppClient.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 60a48efe..b89d5bb7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,8 @@ QXmpp 0.8.4 (UNRELEASED)
- Fix phone numbers incorrectly read from / written to vCard as "PHONE"
element instead of "TEL" (issue 65).
+ - Make QXmppClient::connectToServer(QXmppConfiguration, QXmppPresence) a
+ slot (issue 63).
QXmpp 0.8.3 (Mar 13, 2015)
--------------------------
diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h
index bfda2abe..22a7af65 100644
--- a/src/client/QXmppClient.h
+++ b/src/client/QXmppClient.h
@@ -137,9 +137,6 @@ public:
return 0;
}
- void connectToServer(const QXmppConfiguration&,
- const QXmppPresence& initialPresence =
- QXmppPresence());
bool isAuthenticated() const;
bool isConnected() const;
@@ -222,6 +219,9 @@ signals:
void stateChanged(QXmppClient::State state);
public slots:
+ void connectToServer(const QXmppConfiguration&,
+ const QXmppPresence& initialPresence =
+ QXmppPresence());
void connectToServer(const QString &jid,
const QString &password);
void disconnectFromServer();