Merge branch 'master' of github.com:qxmpp-project/qxmpp

2 files changed, 23 insertions, 32 deletions

diff --git a/src/base/QXmppLogger.cpp b/src/base/QXmppLogger.cpp
index e326e037..dbd6aa07 100644
--- a/src/base/QXmppLogger.cpp
+++ b/src/base/QXmppLogger.cpp
@@ -106,23 +106,19 @@ void QXmppLoggable::childEvent(QChildEvent *event)
 class QXmppLoggerPrivate
 {
 public:
-    QXmppLoggerPrivate(QXmppLogger *qq);
+    QXmppLoggerPrivate();
 
     QXmppLogger::LoggingType loggingType;
     QFile *logFile;
     QString logFilePath;
     QXmppLogger::MessageTypes messageTypes;
-
-private:
-    QXmppLogger *q;
 };
 
-QXmppLoggerPrivate::QXmppLoggerPrivate(QXmppLogger *qq)
-    : loggingType(QXmppLogger::NoLogging),
-    logFile(0),
-    logFilePath("QXmppClientLog.log"),
-    messageTypes(QXmppLogger::AnyMessage),
-    q(qq)
+QXmppLoggerPrivate::QXmppLoggerPrivate()
+    : loggingType(QXmppLogger::NoLogging)
+    , logFile(0)
+    , logFilePath("QXmppClientLog.log")
+    , messageTypes(QXmppLogger::AnyMessage)
 {
 }
 
@@ -132,9 +128,8 @@ QXmppLoggerPrivate::QXmppLoggerPrivate(QXmppLogger *qq)
 
 QXmppLogger::QXmppLogger(QObject *parent)
     : QObject(parent)
+    , d(new QXmppLoggerPrivate())
 {
-    d = new QXmppLoggerPrivate(this);
-
     // make it possible to pass QXmppLogger::MessageType between threads
     qRegisterMetaType< QXmppLogger::MessageType >("QXmppLogger::MessageType");
 }
diff --git a/src/base/QXmppRtpChannel.cpp b/src/base/QXmppRtpChannel.cpp
index 55dad68c..dd00947c 100644
--- a/src/base/QXmppRtpChannel.cpp
+++ b/src/base/QXmppRtpChannel.cpp
@@ -171,7 +171,7 @@ QByteArray renderTone(QXmppRtpAudioChannel::Tone tone, int clockrate, quint32 cl
 class QXmppRtpAudioChannelPrivate
 {
 public:
-    QXmppRtpAudioChannelPrivate(QXmppRtpAudioChannel *qq);
+    QXmppRtpAudioChannelPrivate();
     QXmppCodec *codecForPayloadType(const QXmppJinglePayloadType &payloadType);
 
     // signals
@@ -203,26 +203,22 @@ public:
     QXmppJinglePayloadType outgoingTonesType;
 
     QXmppJinglePayloadType payloadType;
-
-private:
-    QXmppRtpAudioChannel *q;
 };
 
-QXmppRtpAudioChannelPrivate::QXmppRtpAudioChannelPrivate(QXmppRtpAudioChannel *qq)
-    : signalsEmitted(false),
-    writtenSinceLastEmit(0),
-    incomingBuffering(true),
-    incomingMinimum(0),
-    incomingMaximum(0),
-    incomingPos(0),
-    incomingSequence(0),
-    outgoingCodec(0),
-    outgoingMarker(true),
-    outgoingPayloadNumbered(false),
-    outgoingSequence(1),
-    outgoingStamp(0),
-    outgoingTimer(0),
-    q(qq)
+QXmppRtpAudioChannelPrivate::QXmppRtpAudioChannelPrivate()
+    : signalsEmitted(false)
+    , writtenSinceLastEmit(0)
+    , incomingBuffering(true)
+    , incomingMinimum(0)
+    , incomingMaximum(0)
+    , incomingPos(0)
+    , incomingSequence(0)
+    , outgoingCodec(0)
+    , outgoingMarker(true)
+    , outgoingPayloadNumbered(false)
+    , outgoingSequence(1)
+    , outgoingStamp(0)
+    , outgoingTimer(0)
 {
     qRegisterMetaType<QXmppRtpAudioChannel::Tone>("QXmppRtpAudioChannel::Tone");
 }
@@ -251,8 +247,8 @@ QXmppCodec *QXmppRtpAudioChannelPrivate::codecForPayloadType(const QXmppJinglePa
 
 QXmppRtpAudioChannel::QXmppRtpAudioChannel(QObject *parent)
     : QIODevice(parent)
+    , d(new QXmppRtpAudioChannelPrivate())
 {
-    d = new QXmppRtpAudioChannelPrivate(this);
     QXmppLoggable *logParent = qobject_cast<QXmppLoggable*>(parent);
     if (logParent) {
         connect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),