[carbons] rename QXmppCarbonsManager to QXmppCarbonManager

4 files changed, 17 insertions, 24 deletions

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 \