diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-09-04 14:45:13 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-09-04 14:45:13 +0200 |
| commit | 90b681f47c7370d23bf7cd8cdda0fe41449cc255 (patch) | |
| tree | 3346468f5edfa51b2c0147e08e902ea789639625 /src/base/QXmppLogger.cpp | |
| parent | 96dffa6abe480a90b819fded437c857fa041c2a0 (diff) | |
| parent | 034c318739c93c347697e1cb960232d194ca7090 (diff) | |
| download | qxmpp-90b681f47c7370d23bf7cd8cdda0fe41449cc255.tar.gz | |
Merge branch 'master' of github.com:qxmpp-project/qxmpp
Diffstat (limited to 'src/base/QXmppLogger.cpp')
| -rw-r--r-- | src/base/QXmppLogger.cpp | 19 |
1 files changed, 7 insertions, 12 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"); } |
