[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=c93b47e

The following commit has been merged in the master branch:
commit c93b47ea9eb1393f54e8f5bb6a10088e664e9520
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Aug 31 14:41:47 2012 +0200

    Move Tpl::TextEvent include in header.
    
    This fixes this kind of error
    
      error: invalid use of incomplete type ‘class Tpl::TextEvent’
      In instantiation of ‘class QGlib::RefPointer<Tpl::TextEvent>’:
    
    when trying to instantiate a message using the default constructor.
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 KTp/message.cpp | 4 ----
 KTp/message.h   | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/KTp/message.cpp b/KTp/message.cpp
index 74db8e1..4e11bd4 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -20,10 +20,6 @@
 #include "message.h"
 #include <KDebug>
 
-#ifdef TELEPATHY_LOGGER_QT4_FOUND
-#include <TelepathyLoggerQt4/TextEvent>
-#endif
-
 Message::Message(const Tp::Message &original) :
       m_sentTime(original.sent()),
       m_token(original.messageToken()),
diff --git a/KTp/message.h b/KTp/message.h
index 7432130..2f6afa4 100644
--- a/KTp/message.h
+++ b/KTp/message.h
@@ -24,6 +24,7 @@
 
 #ifdef TELEPATHY_LOGGER_QT4_FOUND
 #include <TelepathyLoggerQt4/Types>
+#include <TelepathyLoggerQt4/TextEvent>
 #endif
 
 #include <ktpchat_export.h>

-- 
ktp-common-internals packaging