[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:22:42 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=f4eb877

The following commit has been merged in the master branch:
commit f4eb87771d6a123951f1e85d7fa27eb6fdf6c997
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>
---
 lib/message.cpp | 4 ----
 lib/message.h   | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/message.cpp b/lib/message.cpp
index 74db8e1..4e11bd4 100644
--- a/lib/message.cpp
+++ b/lib/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/lib/message.h b/lib/message.h
index 7432130..2f6afa4 100644
--- a/lib/message.h
+++ b/lib/message.h
@@ -24,6 +24,7 @@
 
 #ifdef TELEPATHY_LOGGER_QT4_FOUND
 #include <TelepathyLoggerQt4/Types>
+#include <TelepathyLoggerQt4/TextEvent>
 #endif
 
 #include <ktpchat_export.h>

-- 
ktp-text-ui packaging



More information about the pkg-kde-commits mailing list