hide QXmppCodec

10 files changed, 27 insertions, 58 deletions

diff --git a/src/base/QXmppCodec.cpp b/src/base/QXmppCodec.cpp
index 869406ee..345044b3 100644
--- a/src/base/QXmppCodec.cpp
+++ b/src/base/QXmppCodec.cpp
@@ -29,7 +29,7 @@
 #include <QDebug>
 #include <QSize>
 
-#include "QXmppCodec.h"
+#include "QXmppCodec_p.h"
 #include "QXmppRtpChannel.h"
 
 #include <cstring>
diff --git a/src/base/QXmppCodec.h b/src/base/QXmppCodec_p.h
index f536463b..14928332 100644
--- a/src/base/QXmppCodec.h
+++ b/src/base/QXmppCodec_p.h
@@ -24,6 +24,7 @@
 #ifndef QXMPPCODEC_H
 #define QXMPPCODEC_H
 
+#include <QMap>
 #include <QtGlobal>
 
 #include "QXmppGlobal.h"
@@ -37,7 +38,7 @@ class QXmppVideoFrame;
 ///
 /// Samples must be 16-bit little endian.
 
-class QXMPP_EXPORT QXmppCodec
+class QXMPP_AUTOTEST_EXPORT QXmppCodec
 {
 public:
     virtual ~QXmppCodec();
@@ -90,7 +91,7 @@ typedef struct SpeexBits SpeexBits;
 ///
 /// The QXmppSpeexCodec class represent a SPEEX codec.
 
-class QXMPP_EXPORT QXmppSpeexCodec : public QXmppCodec
+class QXMPP_AUTOTEST_EXPORT QXmppSpeexCodec : public QXmppCodec
 {
 public:
     QXmppSpeexCodec(int clockrate);
@@ -111,7 +112,7 @@ private:
 /// \brief The QXmppVideoDecoder class is the base class for video decoders.
 ///
 
-class QXMPP_EXPORT QXmppVideoDecoder
+class QXMPP_AUTOTEST_EXPORT QXmppVideoDecoder
 {
 public:
     virtual ~QXmppVideoDecoder();
@@ -129,7 +130,7 @@ public:
 /// \brief The QXmppVideoEncoder class is the base class for video encoders.
 ///
 
-class QXMPP_EXPORT QXmppVideoEncoder
+class QXMPP_AUTOTEST_EXPORT QXmppVideoEncoder
 {
 public:
     virtual ~QXmppVideoEncoder();
@@ -148,7 +149,7 @@ public:
 class QXmppTheoraDecoderPrivate;
 class QXmppTheoraEncoderPrivate;
 
-class QXMPP_EXPORT QXmppTheoraDecoder : public QXmppVideoDecoder
+class QXMPP_AUTOTEST_EXPORT QXmppTheoraDecoder : public QXmppVideoDecoder
 {
 public:
     QXmppTheoraDecoder();
@@ -162,7 +163,7 @@ private:
     QXmppTheoraDecoderPrivate *d;
 };
 
-class QXMPP_EXPORT QXmppTheoraEncoder : public QXmppVideoEncoder
+class QXMPP_AUTOTEST_EXPORT QXmppTheoraEncoder : public QXmppVideoEncoder
 {
 public:
     QXmppTheoraEncoder();
@@ -181,7 +182,7 @@ private:
 class QXmppVpxDecoderPrivate;
 class QXmppVpxEncoderPrivate;
 
-class QXMPP_EXPORT QXmppVpxDecoder : public QXmppVideoDecoder
+class QXMPP_AUTOTEST_EXPORT QXmppVpxDecoder : public QXmppVideoDecoder
 {
 public:
     QXmppVpxDecoder();
@@ -195,7 +196,7 @@ private:
     QXmppVpxDecoderPrivate *d;
 };
 
-class QXMPP_EXPORT QXmppVpxEncoder : public QXmppVideoEncoder
+class QXMPP_AUTOTEST_EXPORT QXmppVpxEncoder : public QXmppVideoEncoder
 {
 public:
     QXmppVpxEncoder();
diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h
index d3799d5c..75381e15 100644
--- a/src/base/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
@@ -37,6 +37,12 @@
 #  endif
 #endif
 
+#if defined(QXMPP_BUILD_INTERNAL)
+#    define QXMPP_AUTOTEST_EXPORT QXMPP_EXPORT
+#else
+#    define QXMPP_AUTOTEST_EXPORT
+#endif
+
 /// This macro expands a numeric value of the form 0xMMNNPP (MM =
 /// major, NN = minor, PP = patch) that specifies QXmpp's version
 /// number. For example, if you compile your application against
diff --git a/src/base/QXmppRtpChannel.cpp b/src/base/QXmppRtpChannel.cpp
index 5d16fcad..dcea48e2 100644
--- a/src/base/QXmppRtpChannel.cpp
+++ b/src/base/QXmppRtpChannel.cpp
@@ -27,7 +27,7 @@
 #include <QMetaType>
 #include <QTimer>
 
-#include "QXmppCodec.h"
+#include "QXmppCodec_p.h"
 #include "QXmppJingleIq.h"
 #include "QXmppRtpChannel.h"
 
diff --git a/src/base/QXmppSasl_p.h b/src/base/QXmppSasl_p.h
index 636385ef..9713ae1f 100644
--- a/src/base/QXmppSasl_p.h
+++ b/src/base/QXmppSasl_p.h
@@ -48,7 +48,7 @@ class QXmppSaslServerPrivate;
 // We mean it.
 //
 
-class QXmppSaslClient : public QXmppLoggable
+class QXMPP_AUTOTEST_EXPORT QXmppSaslClient : public QXmppLoggable
 {
 public:
     QXmppSaslClient(QObject *parent = 0);
@@ -79,7 +79,7 @@ private:
 /// The QXmppServerClient class is the base class for all SASL server
 /// authentication methods.
 
-class QXmppSaslServer : public QXmppLoggable
+class QXMPP_AUTOTEST_EXPORT QXmppSaslServer : public QXmppLoggable
 {
 public:
     enum Response {
@@ -113,8 +113,7 @@ private:
     QXmppSaslServerPrivate *d;
 };
 
-
-class QXmppSaslDigestMd5
+class QXMPP_AUTOTEST_EXPORT QXmppSaslDigestMd5
 {
 public:
     static void setNonce(const QByteArray &nonce);
diff --git a/src/base/base.pri b/src/base/base.pri
index 21c3e138..21785c71 100644
--- a/src/base/base.pri
+++ b/src/base/base.pri
@@ -6,7 +6,6 @@ INSTALL_HEADERS += \
     base/QXmppBindIq.h \
     base/QXmppBookmarkSet.h \
     base/QXmppByteStreamIq.h \
-    base/QXmppCodec.h \
     base/QXmppConstants.h \
     base/QXmppDataForm.h \
     base/QXmppDiscoveryIq.h \
@@ -39,6 +38,10 @@ INSTALL_HEADERS += \
     base/QXmppVCardIq.h \
     base/QXmppVersionIq.h
 
+HEADERS += \
+    base/QXmppCodec_p.h \
+    base/QXmppSasl_p.h
+
 # Source files
 SOURCES += \
     base/QXmppArchiveIq.cpp \
diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp
index 6c6ca894..334d5747 100644
--- a/src/client/QXmppCallManager.cpp
+++ b/src/client/QXmppCallManager.cpp
@@ -26,7 +26,6 @@
 
 #include "QXmppCallManager.h"
 #include "QXmppClient.h"
-#include "QXmppCodec.h"
 #include "QXmppConstants.h"
 #include "QXmppJingleIq.h"
 #include "QXmppRtpChannel.h"
diff --git a/tests/tests.cpp b/tests/tests.cpp
index 6a972388..340f737d 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -33,7 +33,6 @@
 #include "QXmppArchiveIq.h"
 #include "QXmppBindIq.h"
 #include "QXmppClient.h"
-#include "QXmppCodec.h"
 #include "QXmppDiscoveryIq.h"
 #include "QXmppJingleIq.h"
 #include "QXmppMessage.h"
@@ -52,6 +51,7 @@
 #include "QXmppGlobal.h"
 #include "QXmppEntityTimeIq.h"
 
+#include "codec.h"
 #include "dataform.h"
 #include "message.h"
 #include "presence.h"
@@ -636,38 +636,6 @@ void TestPackets::testEntityTimeResult()
     serializePacket(entityTime, xml);
 }
 
-void TestCodec::testTheoraDecoder()
-{
-#ifdef QXMPP_USE_THEORA
-    QMap<QString, QString> params;
-    params.insert("delivery-method", "inline");
-    params.insert("configuration", "AAAAAcNFrgqZAio6gHRoZW9yYQMCAQAUAA8AAUAAAPAAAAAAAB4AAAABAAAAAAAAAAAAAMDAgXRoZW9yYSsAAABYaXBoLk9yZyBsaWJ0aGVvcmEgMS4xIDIwMDkwODIyIChUaHVzbmVsZGEpAAAAAIJ0aGVvcmG+zSj3uc1rGLWpSUoQc5zmMYxSlKQhCDGMYhCEIQhAAAAAAAAAAAAAEfThZC5VSbR2EvVwtJhrlaKpQJZIodBH05m41mQwF0slUpEslEYiEAeDkcDQZDEWiwVigTCURiEQB4OhwMhgLBUJhIIg8GgwFPuZF9aVVVQUEtLRkZBQTw8NzcyMi0tLSgoKCMjIx4eHh4ZGRkZFBQUFBQPDw8PDw8PCgoKCgoKCgoFBQUFBQUFAIQCwoQGCgzPQwMDhMaOjw3Dg0QGCg5RTgOERYdM1dQPhIWJTpEbWdNGCM3QFFocVwxQE5XZ3l4ZUhcX2JwZGdjERIYL2NjY2MSFRpCY2NjYxgaOGNjY2NjL0JjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjYxAQEBQYHCAoEBAUGBwgKDAQFBgcICgwQBQYHCAoMEBAGBwgKDBAQEAcICgwQEBAYCAoMEBAQGCAKDBAQEBggIA+L8t9ANMxO+Qo3g6om9uWYi3Ucb4D9yiSJe4NjJfWqpGmZXYuxCBORg9o6mS+cw2tWGxlUpXn27h+SdxDTMrsXYghfIo8NVqDYyXj85dzEro9o8k4T7qqQgxXNU+6qkV2NBGcppQe0eddyQ4GVrMbfOH8V4Xgl52/4TjtMPaPOpImMBdWszKag13wyWkKP7QL0KeNjmXZGgdyg9o865Tba72CuClUYEXxJ/xaLWOQfcIh3Nr/cQtI2GYsrQG6clcih7t51JeqpKhHmcJ0rWbBcbxQiuwNJA5PFD3brv/7JjeWwUg9ngWnWdxxYrMYfAZUcjRqJpZNr/6lLc7I4sPg+Tgmlk2jwW8Bn1dAsrAi0x5Mr/6lLchNaPXnYDaiL/gex8voTcwnZ9LbBWuBNLJrpigPMnd6qkQBJr9e5epxNLtQbnWbCJahuFlYaf4o8jvzhVSUoC6M6yYlGvwsrF5OTS7SPO3DmIQ7j3Ng/0tqKUBFc4YvWsosrHki/tu5Cbaj7MRmHQn/0yWw1FKBHCLKzdefak8z9tQiJc2HQtMnunBcx8SOe6iqkWVi+UPvfAbUT/69M8IxFIMuGKbm0XHem8MAX1rNRAdQ8Nvl1QpxWtzzk7RHpKomkj/NMjCfML51dgQ/nTuLbFc+gFNTS0OHKMJpXtEnmuRhvmDVzDe0nK7GNwEe37g7iBM9olk86qU5mT6Baw3AedmwUTeyyRNYb285XiszBy6j0yXH/HxVStYQB9exgJ8m417RdOYRZWuYDwlbFE3skehazf8KqRS+I3nf5O4zQWCu5uwDUmNqPZZImnRaycwmN9QqpGXJ1nCf43BwjCYoba+y6d2K7SDcvnCTyLD4QVKSN3haH7FJ5WscTjl1EhubhmDShtr7NLlf8KXE4xZtESMkJpdtbjm8798H1qysFEOH+4y6gqFVIdtATS7Sa0c3DOG+AfWn56ji6sKzzCduZY8CkRKAbTS6yaQr+jg9y8WmHfI+sVmLOP8gT3N6gsrqU7hPcRgmbay6SZQuC/3wdCjPDtb8cmMX8AqpORJkwx8gN3B7FaOvkLucRlANtZtJc7136ysVUkK17PuQOH0Y8XfrKzovk7cjDEGjbWbOVRlEKqW4DNo21yxlu+hIHDwvYKJvxFYrSdnS17Oj5EFSlwPRiNtWTTOjC/uw3Qq1qe4jRdDyWQTf/cg4ea7p7zE5Im1EMDOsWUqsi5odOwmlk9j/PsLQ+IfOGN5lufnaPXmcWVrjR0iBNLtJ7RgU1GcFotXwHzj9vOBooJCVtNr75hcCOLvnKssqUsWbqEPmWFKo/dQwC5jw3rLLS8CVM21k0jz5PHaJ7ROH11Ko5ZBolTNtZPY394O0SjPw6w4W2FcDcxhnED5/ypqFqGcdntAzGkzbWWTJ1fWWLvDgxwRR7jcn/XcoKikDIbapmmctDHDt1FWWIfjxGeyXuLRuhWi9QMmmZtriwmn7QK7CmoRfHUnI/Jfbo3nAqpHV/Ccwx5H1oQ0d/oBmiDbVIml0jy9LKy7zcU7nnC34CLKG6A5XhIJpW2umceD92xoLKyd71UKXwxJBtqlaTZ5UQt3Dr0PzCNFf4rsE/K1d2gqG9SmAO10XBb0+9EJeSGZtqlaTZMcP/DlOojWVjepSh4CPoSL2DFkNtUzTOX/2Acp11Bb9W8WIux5SqcEhelYDbUymaZ43J7RCi5gHr5R+srI3fW48qUi36Rz6QIVlZGC8mZNM2Btrjd/1EO06WjjcRnIXTF5gyxNM22tFvsiqApHXditKT//ELiJv4KR7CaUdQE7Dg/y+G9xiz5rLAiJCVtNrH35etqFVJcZd+BGCaVtrpJmiov+D9164YYoNy2xWQ8ziqkIyQlNJm2udF7ljgQ+fA7ZRf2j3rjcT3WK4AFGN/6fmBTULV3gJBmaTNtZcsIkfdhWhe9HH243OhiZJjTNtrKowSXo+VNRAefVlhP29uLeD+KEbieT5zEqpIEJ7/aWVjvqNwFAbasmmeLCZfLd4Nx+nXA0zbamFDLG+aSNAcnsv0JVSInltaw764ECRxKQuTr/vcqpLKyITnw21UML1xli0z9meWxg694pVPrQUAbapWk0mcePJDfcgfu2DKIT+WK9xTUgcOoR4n5V2Avju+WqDAkErSY21zyxibvXf4pqHfzq2AekcXKys83IX5ekYMRtrKTNM8riejgLKyLqFTUEb5cXhlM0zlG2uOEjlbRAebvR/P3wEblI+n9VUjfyAhKO4jixWFyVeNM22phMyx/t6DeL0Fr/7vjwsrBKuGWLTM21TML56OUnRAjhVUlKM3d9REBI4sK3JKF0zC/8bamWLTP5Qtn8PYaiqlARiyscb9krkTKJzbV/8MsWmZdawv69InkkIgeWqaghuc/k5gSCZpmbay5Y92Fe4URor/nDr0HX6ckBtqZTNM5WOF91SmAeOfhRFbuWOPVZ3HCKaiH0t58ICNQkJQ0zbamEzLG+7cP++LFZP86iCMAyxaZm2qZhfdL+n+5WVqahD5Abokii164ddj05KFp/MGWLTM21XML5+90FRS8cWEat0l+QopBvGSQxEA4HQY4M8i2dfcmfGuj/blR36WVvJVVI3jJIYiAcDoMcGeRbOvuTPjXR/tyo79LK3kqqkbxkkMRAOB0GODPItnX3Jnxro/25Ud+llbyVVSKqThP1ACJeCZpmbay5SMcIfFlYt5fei7sjo/3BbHDUpeuX9AsrgPNwuSGDEZTNMzbWW+fg7+RdAfz8+UqllYPqIvW8KA4JC9KNM22pMyxwu7RregsrOVr6fwjcJO2/pAhOj9KGEzLFeaZttbqIlNRSeRA+no7cc+hXZHANxafjLFpmTMLzbW6XqSGoQonqyulUgG8jwD5MvunWjXR/sY4M8peXbhR1GQIUZIEoutYXkyic76f/WKwbaueDLFpnv75EqpKqUBGLKxxv2SuRMonNtX/wyxaZl1rC/r0ieSQgA==");
-
-    QXmppTheoraDecoder decoder;
-    QCOMPARE(decoder.setParameters(params), true);
-
-    QXmppVideoFormat format = decoder.format();
-    QCOMPARE(format.frameSize(), QSize(320, 240));
-    QCOMPARE(format.pixelFormat(), QXmppVideoFrame::Format_YUV420P);
-#endif
-}
-
-void TestCodec::testTheoraEncoder()
-{
-#ifdef QXMPP_USE_THEORA
-    QXmppVideoFormat format;
-    format.setFrameSize(QSize(320, 240));
-    format.setPixelFormat(QXmppVideoFrame::Format_YUV420P);
-
-    QXmppTheoraEncoder encoder;
-    encoder.setFormat(format);
- 
-    QMap<QString, QString> params = encoder.parameters();
-    QCOMPARE(params.value("delivery-method"), QLatin1String("inline"));
-    QCOMPARE(params.value("configuration"), QLatin1String("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"));
-#endif
-}
-
 void TestJingle::testSession()
 {
     const QByteArray xml(
diff --git a/tests/tests.h b/tests/tests.h
index 640405e0..b6f2eeab 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -88,15 +88,6 @@ private slots:
     void testEntityTimeResult();
 };
 
-class TestCodec : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testTheoraDecoder();
-    void testTheoraEncoder();
-};
-
 class TestJingle : public QObject
 {
     Q_OBJECT
diff --git a/tests/tests.pro b/tests/tests.pro
index 60437972..f3248b11 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -6,6 +6,7 @@ TARGET = qxmpp-tests
 
 RESOURCES += tests.qrc
 SOURCES += \
+    codec.cpp \
     dataform.cpp \
     message.cpp \
     presence.cpp \
@@ -15,6 +16,7 @@ SOURCES += \
     sasl.cpp \
     tests.cpp
 HEADERS += \
+    codec.h \
     dataform.h \
     message.h \
     presence.h \