[carbons] rename QXmppCarbonsManager to QXmppCarbonManager

7 files changed, 33 insertions, 40 deletions

diff --git a/src/client/QXmppCarbonsManager.cpp b/src/client/QXmppCarbonManager.cpp
index f09e149c..106e8ef5 100644
--- a/src/client/QXmppCarbonsManager.cpp
+++ b/src/client/QXmppCarbonManager.cpp
@@ -23,7 +23,7 @@
 
 #include <QDomElement>
 
-#include "QXmppCarbonsManager.h"
+#include "QXmppCarbonManager.h"
 #include "QXmppConstants.h"
 #include "QXmppClient.h"
 #include "QXmppDiscoveryManager.h"
@@ -31,20 +31,20 @@
 #include "QXmppUtils.h"
 
 
-QXmppCarbonsManager::QXmppCarbonsManager()
+QXmppCarbonManager::QXmppCarbonManager()
     : m_carbonsEnabled(false)
 {
 
 }
 
-QXmppCarbonsManager::~QXmppCarbonsManager()
+QXmppCarbonManager::~QXmppCarbonManager()
 {
 
 }
 
 /// Returns whether message carbons are currently enabled
 
-bool QXmppCarbonsManager::carbonsEnabled() const
+bool QXmppCarbonManager::carbonsEnabled() const
 {
     return m_carbonsEnabled;
 }
@@ -57,7 +57,7 @@ bool QXmppCarbonsManager::carbonsEnabled() const
 ///
 /// By default, carbon copies are disabled.
 
-void QXmppCarbonsManager::setCarbonsEnabled(bool enabled)
+void QXmppCarbonManager::setCarbonsEnabled(bool enabled)
 {
     if(m_carbonsEnabled == enabled)
         return;
@@ -75,12 +75,12 @@ void QXmppCarbonsManager::setCarbonsEnabled(bool enabled)
     }
 }
 
-QStringList QXmppCarbonsManager::discoveryFeatures() const
+QStringList QXmppCarbonManager::discoveryFeatures() const
 {
     return QStringList() << ns_carbons;
 }
 
-bool QXmppCarbonsManager::handleStanza(const QDomElement &element)
+bool QXmppCarbonManager::handleStanza(const QDomElement &element)
 {
     if(element.tagName() != "message")
         return false;
diff --git a/src/client/QXmppCarbonsManager.h b/src/client/QXmppCarbonManager.h
index eab8c658..923f55ee 100644
--- a/src/client/QXmppCarbonsManager.h
+++ b/src/client/QXmppCarbonManager.h
@@ -22,14 +22,14 @@
  */
 
 
-#ifndef QXMPPCARBONSMANAGER_H
-#define QXMPPCARBONSMANAGER_H
+#ifndef QXMPPCARBONMANAGER_H
+#define QXMPPCARBONMANAGER_H
 
 #include "QXmppClientExtension.h"
 
 class QXmppMessage;
 
-/// \brief The QXmppCarbonsManager class handles message carbons
+/// \brief The QXmppCarbonManager class handles message carbons
 /// as described in XEP-0280: Message Carbons.
 ///
 /// This class emits signals whenever another resource of the
@@ -37,13 +37,13 @@ class QXmppMessage;
 ///
 /// \ingroup Managers
 
-class QXMPP_EXPORT QXmppCarbonsManager : public QXmppClientExtension
+class QXMPP_EXPORT QXmppCarbonManager : public QXmppClientExtension
 {
     Q_OBJECT
 
 public:
-    QXmppCarbonsManager();
-    ~QXmppCarbonsManager();
+    QXmppCarbonManager();
+    ~QXmppCarbonManager();
 
     bool carbonsEnabled() const;
     void setCarbonsEnabled(bool enabled);
@@ -68,4 +68,4 @@ private:
     bool m_carbonsEnabled;
 };
 
-#endif // QXMPPCARBONSMANAGER_H
+#endif // QXMPPCARBONMANAGER_H
diff --git a/src/client/client.pri b/src/client/client.pri
index 6479a81f..650300be 100644
--- a/src/client/client.pri
+++ b/src/client/client.pri
@@ -3,7 +3,7 @@ INSTALL_HEADERS += \
     client/QXmppArchiveManager.h \
     client/QXmppBookmarkManager.h \
     client/QXmppCallManager.h \
-    client/QXmppCarbonsManager.h \
+    client/QXmppCarbonManager.h \
     client/QXmppClient.h \
     client/QXmppClientExtension.h \
     client/QXmppConfiguration.h \
@@ -27,7 +27,7 @@ SOURCES += \
     client/QXmppArchiveManager.cpp \
     client/QXmppBookmarkManager.cpp \
     client/QXmppCallManager.cpp \
-    client/QXmppCarbonsManager.cpp \
+    client/QXmppCarbonManager.cpp \
     client/QXmppClient.cpp \
     client/QXmppClientExtension.cpp \
     client/QXmppConfiguration.cpp \
diff --git a/tests/qxmppcarbonmanager/qxmppcarbonmanager.pro b/tests/qxmppcarbonmanager/qxmppcarbonmanager.pro
new file mode 100644
index 00000000..7f118000
--- /dev/null
+++ b/tests/qxmppcarbonmanager/qxmppcarbonmanager.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+TARGET = tst_qxmppcarbonmanager
+SOURCES += tst_qxmppcarbonmanager.cpp
diff --git a/tests/qxmppcarbonsmanager/tst_qxmppcarbonsmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
index 1a681305..b26416f7 100644
--- a/tests/qxmppcarbonsmanager/tst_qxmppcarbonsmanager.cpp
+++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
@@ -24,10 +24,10 @@
 
 #include <QObject>
 #include "QXmppMessage.h"
-#include "QXmppCarbonsManager.h"
+#include "QXmppCarbonManager.h"
 #include "util.h"
 
-class QXmppCarbonsTestHelper  : public QObject
+class QXmppCarbonTestHelper  : public QObject
 {
     Q_OBJECT
 
@@ -43,7 +43,7 @@ public:
     void compareMessages(const QXmppMessage& lhs, const QXmppMessage& rhs);
 };
 
-class tst_QXmppCarbonsManager : public QObject
+class tst_QXmppCarbonManager : public QObject
 {
     Q_OBJECT
 
@@ -56,11 +56,11 @@ private slots:
 
 
 private:
-    QXmppCarbonsTestHelper m_helper;
-    QXmppCarbonsManager m_manager;
+    QXmppCarbonTestHelper m_helper;
+    QXmppCarbonManager m_manager;
 };
 
-void tst_QXmppCarbonsManager::initTestCase()
+void tst_QXmppCarbonManager::initTestCase()
 {
     connect(&m_manager, SIGNAL(messageSent(const QXmppMessage&)),
             &m_helper, SLOT(messageSent(const QXmppMessage&)));
@@ -69,7 +69,7 @@ void tst_QXmppCarbonsManager::initTestCase()
             &m_helper, SLOT(messageReceived(const QXmppMessage&)));
 }
 
-void tst_QXmppCarbonsManager::testHandleStanza_data()
+void tst_QXmppCarbonManager::testHandleStanza_data()
 {
     QTest::addColumn<QByteArray>("xml");
     QTest::addColumn<bool>("accept");
@@ -151,7 +151,7 @@ void tst_QXmppCarbonsManager::testHandleStanza_data()
 
 }
 
-void tst_QXmppCarbonsManager::testHandleStanza()
+void tst_QXmppCarbonManager::testHandleStanza()
 {
     QFETCH(QByteArray, xml);
     QFETCH(bool, accept);
@@ -176,14 +176,7 @@ void tst_QXmppCarbonsManager::testHandleStanza()
     QCOMPARE(m_helper.m_signalTriggered, accept);
 }
 
-
-
-
-
-
-
-
-void QXmppCarbonsTestHelper::messageSent(const QXmppMessage &msg)
+void QXmppCarbonTestHelper::messageSent(const QXmppMessage &msg)
 {
     m_signalTriggered = true;
     QCOMPARE(m_expectSent, true);
@@ -191,7 +184,7 @@ void QXmppCarbonsTestHelper::messageSent(const QXmppMessage &msg)
     compareMessages(m_expectedMessage, msg);
 }
 
-void QXmppCarbonsTestHelper::messageReceived(const QXmppMessage &msg)
+void QXmppCarbonTestHelper::messageReceived(const QXmppMessage &msg)
 {
     m_signalTriggered = true;
     QCOMPARE(m_expectSent, false);
@@ -199,7 +192,7 @@ void QXmppCarbonsTestHelper::messageReceived(const QXmppMessage &msg)
     compareMessages(m_expectedMessage, msg);
 }
 
-void QXmppCarbonsTestHelper::compareMessages(const QXmppMessage &lhs, const QXmppMessage &rhs)
+void QXmppCarbonTestHelper::compareMessages(const QXmppMessage &lhs, const QXmppMessage &rhs)
 {
     QCOMPARE(lhs.body(), rhs.body());
     QCOMPARE(lhs.from(), rhs.from());
@@ -215,5 +208,5 @@ void QXmppCarbonsTestHelper::compareMessages(const QXmppMessage &lhs, const QXmp
     QCOMPARE(lhs.type(), rhs.type());
 }
 
-QTEST_MAIN(tst_QXmppCarbonsManager)
-#include "tst_qxmppcarbonsmanager.moc"
+QTEST_MAIN(tst_QXmppCarbonManager)
+#include "tst_qxmppcarbonmanager.moc"
diff --git a/tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro b/tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro
deleted file mode 100644
index da75db12..00000000
--- a/tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppcarbonsmanager
-SOURCES += tst_qxmppcarbonsmanager.cpp
diff --git a/tests/tests.pro b/tests/tests.pro
index 193f51aa..69418ade 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -3,7 +3,7 @@ SUBDIRS = \
     qxmpparchiveiq \
     qxmppbindiq \
     qxmppcallmanager \
-    qxmppcarbonsmanager \
+    qxmppcarbonmanager \
     qxmppdataform \
     qxmppdiscoveryiq \
     qxmppentitytimeiq \