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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a67b46c7574a33cf7e1ba39418729450b7df3b37
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Sep 20 20:33:46 2013 +0100

    Fix includes
---
 adiumxtra-protocol-handler/chat-style-installer.cpp   |  4 ++--
 adiumxtra-protocol-handler/emoticon-set-installer.cpp |  2 +-
 config/appearance-config-tab.cpp                      | 11 ++++++-----
 config/appearance-config.cpp                          | 11 ++++++-----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/adiumxtra-protocol-handler/chat-style-installer.cpp b/adiumxtra-protocol-handler/chat-style-installer.cpp
index 38862ed..9676c96 100644
--- a/adiumxtra-protocol-handler/chat-style-installer.cpp
+++ b/adiumxtra-protocol-handler/chat-style-installer.cpp
@@ -18,8 +18,8 @@
 
 #include "chat-style-installer.h"
 
-#include <KTp/ChatWindowStyleManager>
-#include <KTp/ChatStylePlistFileReader>
+#include "chat-window-style-manager.h"
+#include "chat-style-plist-file-reader.h"
 
 #include <KDebug>
 #include <KTemporaryFile>
diff --git a/adiumxtra-protocol-handler/emoticon-set-installer.cpp b/adiumxtra-protocol-handler/emoticon-set-installer.cpp
index 4aecbdf..a2011a3 100644
--- a/adiumxtra-protocol-handler/emoticon-set-installer.cpp
+++ b/adiumxtra-protocol-handler/emoticon-set-installer.cpp
@@ -18,7 +18,7 @@
 
 #include "emoticon-set-installer.h"
 
-#include <KTp/ChatStylePlistFileReader>
+#include "chat-style-plist-file-reader.h"
 
 #include <KDebug>
 #include <KTemporaryFile>
diff --git a/config/appearance-config-tab.cpp b/config/appearance-config-tab.cpp
index 5ce98cf..ffef4f6 100644
--- a/config/appearance-config-tab.cpp
+++ b/config/appearance-config-tab.cpp
@@ -20,11 +20,12 @@
 #include "appearance-config-tab.h"
 #include "ui_appearance-config.h"
 
-#include <KTp/ChatWindowStyleManager>
-#include <KTp/ChatWindowStyle>
-#include <KTp/AdiumThemeHeaderInfo>
-#include <KTp/AdiumThemeContentInfo>
-#include <KTp/AdiumThemeStatusInfo>
+#include "chat-window-style-manager.h"
+#include "chat-window-style.h"
+#include "adium-theme-header-info.h"
+#include "adium-theme-content-info.h"
+#include "adium-theme-status-info.h"
+
 #include <KMessageBox>
 
 AppearanceConfigTab::AppearanceConfigTab(QWidget *parent, TabMode mode)
diff --git a/config/appearance-config.cpp b/config/appearance-config.cpp
index cca4d06..79462f6 100644
--- a/config/appearance-config.cpp
+++ b/config/appearance-config.cpp
@@ -22,11 +22,12 @@
 #include "appearance-config-tab.h"
 
 #include <KTabWidget>
-#include <KTp/ChatWindowStyleManager>
-#include <KTp/ChatWindowStyle>
-#include <KTp/AdiumThemeHeaderInfo>
-#include <KTp/AdiumThemeContentInfo>
-#include <KTp/AdiumThemeStatusInfo>
+
+#include "chat-window-style-manager.h"
+#include "chat-window-style.h"
+#include "adium-theme-header-info.h"
+#include "adium-theme-content-info.h"
+#include "adium-theme-status-info.h"
 
 #include <KDebug>
 #include <KLocalizedString>

-- 
ktp-text-ui packaging