[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=0bfa2ae

The following commit has been merged in the master branch:
commit 0bfa2ae4cc4694f3ef75a2c7dae5980bc20bed4e
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Sat Dec 10 15:38:53 2011 +0100

    port-to-0.9: Rename relevant include paths and variables
---
 app/chat-tab.cpp            |  4 ++--
 app/chat-window.cpp         |  8 ++++----
 app/main.cpp                | 12 ++++++------
 app/telepathy-chat-ui.cpp   |  8 ++++----
 app/telepathy-chat-ui.h     |  2 +-
 lib/channel-contact-model.h | 10 +++++-----
 lib/chat-widget.cpp         | 12 ++++++------
 lib/chat-widget.h           |  2 +-
 lib/logmanager.cpp          |  8 ++++----
 lib/logmanager.h            |  6 +++---
 10 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/chat-tab.cpp b/app/chat-tab.cpp
index 95bee03..8ea95ac 100644
--- a/app/chat-tab.cpp
+++ b/app/chat-tab.cpp
@@ -26,8 +26,8 @@
 #include <QStackedWidget>
 #include <KDE/KColorScheme>
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/TextChannel>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/TextChannel>
 #include "chat-window.h"
 
 ChatTab::ChatTab(const Tp::TextChannelPtr& channel, const Tp::AccountPtr& account, QWidget* parent)
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index d45cf57..ebec3e7 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -45,10 +45,10 @@
 #include <QEvent>
 #include <QWidgetAction>
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/ContactCapabilities>
-#include <TelepathyQt4/PendingChannelRequest>
-#include <TelepathyQt4/TextChannel>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/ContactCapabilities>
+#include <TelepathyQt/PendingChannelRequest>
+#include <TelepathyQt/TextChannel>
 
 #include <Sonnet/DictionaryComboBox>
 
diff --git a/app/main.cpp b/app/main.cpp
index e7eecd5..ce607a9 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -19,12 +19,12 @@
 #include "chat-window.h"
 #include "telepathy-chat-ui.h"
 
-#include <TelepathyQt4/ClientRegistrar>
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/ConnectionFactory>
-#include <TelepathyQt4/ChannelFactory>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/TextChannel>
+#include <TelepathyQt/ClientRegistrar>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/ConnectionFactory>
+#include <TelepathyQt/ChannelFactory>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/TextChannel>
 
 #include <KAboutData>
 #include <KCmdLineArgs>
diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index bf24ef2..91ef0e3 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -25,10 +25,10 @@
 #include <KConfigGroup>
 #include <KWindowSystem>
 
-#include <TelepathyQt4/ChannelClassSpec>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/ChannelRequest>
-#include <TelepathyQt4/ChannelRequestHints>
+#include <TelepathyQt/ChannelClassSpec>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/ChannelRequest>
+#include <TelepathyQt/ChannelRequestHints>
 
 
 inline Tp::ChannelClassSpecList channelClassList()
diff --git a/app/telepathy-chat-ui.h b/app/telepathy-chat-ui.h
index 0efe6fb..f9320df 100644
--- a/app/telepathy-chat-ui.h
+++ b/app/telepathy-chat-ui.h
@@ -21,7 +21,7 @@
 #ifndef TELEPATHYCHATUI_H
 #define TELEPATHYCHATUI_H
 
-#include <TelepathyQt4/AbstractClientHandler>
+#include <TelepathyQt/AbstractClientHandler>
 #include <KApplication>
 
 class ChatTab;
diff --git a/lib/channel-contact-model.h b/lib/channel-contact-model.h
index a025cf8..91fe4ad 100644
--- a/lib/channel-contact-model.h
+++ b/lib/channel-contact-model.h
@@ -22,11 +22,11 @@
 
 #include <QtCore/QAbstractListModel>
 
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/Presence>
 
 /** A model of all users in the channel.
   Also acts as a proxy for emiting presence and alias changes of any contacts in the channel
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index e28d52e..169a071 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -38,12 +38,12 @@
 #include <KColorScheme>
 #include <KLineEdit>
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Message>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Message>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/Presence>
 
 class ChatWidgetPrivate
 {
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index 7ea41eb..8253816 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -30,7 +30,7 @@
 #include <KIcon>
 #include <KColorScheme>
 
-#include <TelepathyQt4/ReceivedMessage>
+#include <TelepathyQt/ReceivedMessage>
 
 class AdiumThemeContentInfo;
 class ChatSearchBar;
diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index 738e075..f623526 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -38,10 +38,10 @@
 #include <QGlib/Init>
 #endif
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/ReceivedMessage>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/ReceivedMessage>
 
 LogManager::LogManager(const Tp::AccountPtr &account, const Tp::ContactPtr &contact, QObject *parent)
     : QObject(parent),
diff --git a/lib/logmanager.h b/lib/logmanager.h
index f91276c..4e11086 100644
--- a/lib/logmanager.h
+++ b/lib/logmanager.h
@@ -27,9 +27,9 @@
 #include <TelepathyLoggerQt4/Entity>
 #endif
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Contact>
 
 
 namespace Tpl {

-- 
ktp-text-ui packaging