[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=bc72e08

The following commit has been merged in the master branch:
commit bc72e088ae1ad102db2d11344f9d08299a848205
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue May 1 12:14:53 2012 +1000

    Fix imports in MessageProcessor
    
    Use forward-declarations instead of #includes whenever possible.
---
 KTp/message-filters-private.h |  2 +-
 KTp/message-processor.cpp     |  2 ++
 KTp/message-processor.h       | 12 +++++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/KTp/message-filters-private.h b/KTp/message-filters-private.h
index 34a4daa..cb9b20a 100644
--- a/KTp/message-filters-private.h
+++ b/KTp/message-filters-private.h
@@ -19,7 +19,7 @@
 #ifndef FILTERS_H
 #define FILTERS_H
 
-#include "message-processor.h"
+#include "abstract-message-filter.h"
 
 #include <QObject>
 
diff --git a/KTp/message-processor.cpp b/KTp/message-processor.cpp
index 2e39832..8fbd4e2 100644
--- a/KTp/message-processor.cpp
+++ b/KTp/message-processor.cpp
@@ -20,6 +20,8 @@
 #include "message-processor.h"
 #include "filters.h"
 
+#include <QMutex>
+
 #include <KDebug>
 #include <KService>
 #include <KServiceTypeTrader>
diff --git a/KTp/message-processor.h b/KTp/message-processor.h
index a4e26ae..246f331 100644
--- a/KTp/message-processor.h
+++ b/KTp/message-processor.h
@@ -20,13 +20,19 @@
 #ifndef MESSAGE_PROCESSOR_H
 #define MESSAGE_PROCESSOR_H
 
-#include "message.h"
-#include "abstract-message-filter.h"
-
+#include <QObject>
 #include <QList>
 
+#include <message.h>
 #include <ktpchat_export.h>
 
+namespace Tp
+{
+class ReceivedMessage;
+class Message;
+}
+
+class AbstractMessageFilter;
 
 //each thing that displays message will have an instance of this
 class KDE_TELEPATHY_CHAT_EXPORT MessageProcessor : public QObject

-- 
ktp-common-internals packaging