hide QXmppCodec

6 files changed, 24 insertions, 15 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 \