[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=2b64a5b

The following commit has been merged in the master branch:
commit 2b64a5b075c7d9ce4c4488a2fd283e79f977db9f
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Jan 12 19:23:11 2015 +0100

    [app] Various small KF5 porting bits
---
 app/chat-tab.cpp                    |  3 ++-
 app/chat-window.cpp                 | 12 +++++-------
 app/emoticon-text-edit-action.cpp   |  4 +---
 app/emoticon-text-edit-selector.cpp |  2 --
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/chat-tab.cpp b/app/chat-tab.cpp
index 80e73e8..9f2d0f4 100644
--- a/app/chat-tab.cpp
+++ b/app/chat-tab.cpp
@@ -23,8 +23,9 @@
 
 #include "defines.h"
 
-#include <KTabWidget>
+#include <QTabWidget>
 #include <QStackedWidget>
+
 #include <KColorScheme>
 #include <KWindowSystem>
 
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index b9f3340..cdbcf6c 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -30,29 +30,29 @@
 #include <KTp/contact.h>
 
 #include <KStandardAction>
-#include <KLocale>
-#include <KApplication>
+#include <KLocalizedString>
 #include <KActionCollection>
 #include <KColorScheme>
-#include <KTabBar>
 #include <KSettings/Dialog>
 #include <kcmodulecontainer.h>
 #include <KNotification>
 #include <KNotifyConfigWidget>
-#include <KLineEdit>
 #include <KToolBar>
 #include <KToolInvocation>
 #include <KCModuleProxy>
 #include <KIconLoader>
 
+#include <QApplication>
 #include <QFileDialog>
 #include <QUrl>
 #include <QMenu>
 #include <QMenuBar>
+#include <QTabBar>
 #include <QAction>
 #include <QEvent>
 #include <QWidgetAction>
 #include <QLabel>
+#include <QLineEdit>
 
 #include <TelepathyQt/Account>
 #include <TelepathyQt/ContactCapabilities>
@@ -118,7 +118,7 @@ ChatWindow::ChatWindow()
     KStandardAction::zoomOut(this, SLOT(onZoomOut()), actionCollection());
 
     m_keyboardLayoutInterface = new QDBusInterface(QLatin1String("org.kde.keyboard"), QLatin1String("/Layouts"),
-						   QLatin1String("org.kde.KeyboardLayouts"), QDBusConnection::sessionBus(), this);
+                                                   QLatin1String("org.kde.KeyboardLayouts"), QDBusConnection::sessionBus(), this);
 
     connect(m_keyboardLayoutInterface, SIGNAL(currentLayoutChanged(QString)), this, SLOT(onKeyboardLayoutChange(QString)));
 
@@ -1329,5 +1329,3 @@ void ChatWindow::onLeaveChannelTriggered()
     tab->textChannel()->requestLeave();
     closeCurrentTab();
 }
-
-#include "chat-window.moc"
diff --git a/app/emoticon-text-edit-action.cpp b/app/emoticon-text-edit-action.cpp
index 9d348be..2ee628e 100644
--- a/app/emoticon-text-edit-action.cpp
+++ b/app/emoticon-text-edit-action.cpp
@@ -19,8 +19,8 @@
 */
 #include "emoticon-text-edit-action.h"
 #include "emoticon-text-edit-selector.h"
-#include <KLocale>
 
+#include <KLocalizedString>
 
 
 #include <QMenu>
@@ -61,5 +61,3 @@ EmoticonTextEditAction::~EmoticonTextEditAction()
 {
   delete d;
 }
-
-#include "emoticon-text-edit-action.moc"
diff --git a/app/emoticon-text-edit-selector.cpp b/app/emoticon-text-edit-selector.cpp
index 2f7588e..22742fb 100644
--- a/app/emoticon-text-edit-selector.cpp
+++ b/app/emoticon-text-edit-selector.cpp
@@ -130,5 +130,3 @@ void EmoticonTextEditSelector::slotEmoticonClicked(QListWidgetItem*item)
     parentWidget()->close();
   }
 }
-
-#include "emoticon-text-edit-selector.moc"

-- 
ktp-text-ui packaging