encapsulate QXmppUtils methods in a QXmppUtils class

5 files changed, 15 insertions, 15 deletions

diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp
index 363881af..953b2935 100644
--- a/src/client/QXmppCallManager.cpp
+++ b/src/client/QXmppCallManager.cpp
@@ -837,7 +837,7 @@ QXmppCall *QXmppCallManager::call(const QString &jid)
     }
 
     QXmppCall *call = new QXmppCall(jid, QXmppCall::OutgoingDirection, this);
-    call->d->sid = generateStanzaHash();
+    call->d->sid = QXmppUtils::generateStanzaHash();
 
     // register call
     d->calls << call;
diff --git a/src/client/QXmppConfiguration.cpp b/src/client/QXmppConfiguration.cpp
index dc4087b7..7f4f9818 100644
--- a/src/client/QXmppConfiguration.cpp
+++ b/src/client/QXmppConfiguration.cpp
@@ -134,9 +134,9 @@ void QXmppConfiguration::setResource(const QString& resource)
 
 void QXmppConfiguration::setJid(const QString& jid)
 {
-    m_user = jidToUser(jid);
-    m_domain = jidToDomain(jid);
-    const QString resource = jidToResource(jid);
+    m_user = QXmppUtils::jidToUser(jid);
+    m_domain = QXmppUtils::jidToDomain(jid);
+    const QString resource = QXmppUtils::jidToResource(jid);
     if (!resource.isEmpty())
         m_resource = resource;
 }
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index 5c2a6236..eead5df7 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -275,7 +275,7 @@ bool QXmppMucRoom::join()
 bool QXmppMucRoom::kick(const QString &jid, const QString &reason)
 {
     QXmppMucItem item;
-    item.setNick(jidToResource(jid));
+    item.setNick(QXmppUtils::jidToResource(jid));
     item.setRole(QXmppMucItem::NoRole);
     item.setReason(reason);
 
@@ -549,7 +549,7 @@ void QXmppMucRoom::_q_disconnected()
 
 void QXmppMucRoom::_q_messageReceived(const QXmppMessage &message)
 {
-    if (jidToBareJid(message.from())!= d->jid)
+    if (QXmppUtils::jidToBareJid(message.from())!= d->jid)
         return;
 
     // handle message subject
@@ -573,7 +573,7 @@ void QXmppMucRoom::_q_presenceReceived(const QXmppPresence &presence)
         d->client->sendPacket(packet);
     }
 
-    if (jidToBareJid(jid) != d->jid)
+    if (QXmppUtils::jidToBareJid(jid) != d->jid)
         return;
 
     if (presence.type() == QXmppPresence::Available) {
diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp
index 7c2f56ed..ccd054ce 100644
--- a/src/client/QXmppRosterManager.cpp
+++ b/src/client/QXmppRosterManager.cpp
@@ -122,7 +122,7 @@ bool QXmppRosterManager::handleStanza(const QDomElement &element)
     // Security check: only server should send this iq
     // from() should be either empty or bareJid of the user
     const QString fromJid = element.attribute("from");
-    if (!fromJid.isEmpty() && jidToBareJid(fromJid) != client()->configuration().jidBare())
+    if (!fromJid.isEmpty() && QXmppUtils::jidToBareJid(fromJid) != client()->configuration().jidBare())
         return false;
 
     QXmppRosterIq rosterIq;
@@ -190,8 +190,8 @@ bool QXmppRosterManager::handleStanza(const QDomElement &element)
 void QXmppRosterManager::_q_presenceReceived(const QXmppPresence& presence)
 {
     const QString jid = presence.from();
-    const QString bareJid = jidToBareJid(jid);
-    const QString resource = jidToResource(jid);
+    const QString bareJid = QXmppUtils::jidToBareJid(jid);
+    const QString resource = QXmppUtils::jidToResource(jid);
 
     if (bareJid.isEmpty())
         return;
@@ -307,7 +307,7 @@ bool QXmppRosterManager::renameItem(const QString &bareJid, const QString &name)
 bool QXmppRosterManager::subscribe(const QString &bareJid)
 {
     QXmppPresence packet;
-    packet.setTo(jidToBareJid(bareJid));
+    packet.setTo(QXmppUtils::jidToBareJid(bareJid));
     packet.setType(QXmppPresence::Subscribe);
     return client()->sendPacket(packet);
 }
@@ -320,7 +320,7 @@ bool QXmppRosterManager::subscribe(const QString &bareJid)
 bool QXmppRosterManager::unsubscribe(const QString &bareJid)
 {
     QXmppPresence packet;
-    packet.setTo(jidToBareJid(bareJid));
+    packet.setTo(QXmppUtils::jidToBareJid(bareJid));
     packet.setType(QXmppPresence::Unsubscribe);
     return client()->sendPacket(packet);
 }
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index 25779227..77b82675 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -1257,7 +1257,7 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, QIODevice *
 
     QXmppTransferOutgoingJob *job = new QXmppTransferOutgoingJob(jid, client(), this);
     if (sid.isEmpty())
-        job->d->sid = generateStanzaHash();
+        job->d->sid = QXmppUtils::generateStanzaHash();
     else
         job->d->sid = sid;
     job->d->fileInfo = fileInfo;
@@ -1285,7 +1285,7 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, QIODevice *
     QXmppElement file;
     file.setTagName("file");
     file.setAttribute("xmlns", ns_stream_initiation_file_transfer);
-    file.setAttribute("date", datetimeToString(job->fileDate()));
+    file.setAttribute("date", QXmppUtils::datetimeToString(job->fileDate()));
     file.setAttribute("hash", job->fileHash().toHex());
     file.setAttribute("name", job->fileName());
     file.setAttribute("size", QString::number(job->fileSize()));
@@ -1571,7 +1571,7 @@ void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiati
         }
         else if (item.tagName() == "file" && item.attribute("xmlns") == ns_stream_initiation_file_transfer)
         {
-            job->d->fileInfo.setDate(datetimeFromString(item.attribute("date")));
+            job->d->fileInfo.setDate(QXmppUtils::datetimeFromString(item.attribute("date")));
             job->d->fileInfo.setHash(QByteArray::fromHex(item.attribute("hash").toAscii()));
             job->d->fileInfo.setName(item.attribute("name"));
             job->d->fileInfo.setSize(item.attribute("size").toLongLong());