[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=623b350

The following commit has been merged in the master branch:
commit 623b3505203d8ee9d4cbedf25b7f4e4169a4b5d2
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Sat Jan 10 00:27:29 2015 +0100

    [lib] Last porting bits and fixes - no more KDELibs4Support
---
 lib/CMakeLists.txt                |  1 +
 lib/adium-theme-view.cpp          |  2 ++
 lib/authenticationwizard.cpp      |  1 +
 lib/chat-widget.cpp               |  3 +--
 lib/chat-window-style-manager.cpp |  5 +----
 lib/chat-window-style.cpp         | 14 +++++++-------
 lib/contact-delegate.cpp          |  2 --
 lib/proxy-service.cpp             |  3 ++-
 lib/text-chat-config.cpp          |  2 --
 9 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 8c34e3d..6fa26b4 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -47,6 +47,7 @@ target_link_libraries(ktpchat
     KF5::SonnetCore
     KF5::Notifications
     KF5::TextWidgets
+    KF5::ConfigCore
     KF5::ConfigWidgets
     KF5::WindowSystem
     KF5::XmlGui #for KActionCollection
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index de53b66..26e6d50 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -44,12 +44,14 @@
 #include <QLocale>
 
 #include <KEmoticonsTheme>
+#include <KSharedConfig>
 #include <KConfig>
 #include <KConfigGroup>
 #include <KMessageBox>
 #include <KToolInvocation>
 #include <KIconLoader>
 #include <KProtocolInfo>
+#include <KLocalizedString>
 
 AdiumThemeView::AdiumThemeView(QWidget *parent)
         : KWebView(parent),
diff --git a/lib/authenticationwizard.cpp b/lib/authenticationwizard.cpp
index f8b3d33..bd22b72 100644
--- a/lib/authenticationwizard.cpp
+++ b/lib/authenticationwizard.cpp
@@ -34,6 +34,7 @@
 #include <QRadioButton>
 #include <QGroupBox>
 #include <QProgressBar>
+#include <QVBoxLayout>
 
 namespace
 {
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 7b6f4bd..bac4c6d 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -50,6 +50,7 @@
 #include <KMessageWidget>
 #include <KMessageBox>
 #include <KIconLoader>
+#include <KLocalizedString>
 
 #include <TelepathyQt/Account>
 #include <TelepathyQt/Message>
@@ -1553,5 +1554,3 @@ void ChatWidget::onSendFileClicked()
 
     KTp::Actions::startFileTransfer(d->account, contact, filename);
 }
-
-#include "chat-widget.moc"
diff --git a/lib/chat-window-style-manager.cpp b/lib/chat-window-style-manager.cpp
index e0be81f..88ae1f6 100644
--- a/lib/chat-window-style-manager.cpp
+++ b/lib/chat-window-style-manager.cpp
@@ -34,7 +34,6 @@
 #include <KArchive>
 #include <KZip>
 #include <KTar>
-#include <KIO/NetAccess>
 #include <KSharedConfig>
 #include <KConfigGroup>
 
@@ -132,7 +131,7 @@ int ChatWindowStyleManager::installStyle(const QString &styleBundlePath)
     KArchive *archive = 0L;
 
     QMimeDatabase mimeDb;
-    QString currentBundleMimeType = db.mimeTypeForFile(styleBundlePath).name();
+    QString currentBundleMimeType = mimeDb.mimeTypeForFile(styleBundlePath).name();
     if (currentBundleMimeType == QLatin1String("application/zip")) {
         archive = new KZip(styleBundlePath);
     } else if (currentBundleMimeType == QLatin1String("application/x-compressed-tar") ||
@@ -381,5 +380,3 @@ void ChatWindowStyleManager::slotDirectoryFinished()
         Q_EMIT loadStylesFinished();
     }
 }
-
-#include "chat-window-style-manager.moc"
diff --git a/lib/chat-window-style.cpp b/lib/chat-window-style.cpp
index 96ea242..8675d4d 100644
--- a/lib/chat-window-style.cpp
+++ b/lib/chat-window-style.cpp
@@ -20,13 +20,13 @@
 #include "ktp-debug.h"
 
 // Qt includes
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTextStream>
-#include <QtCore/qmath.h>
+#include <QFile>
+#include <QDir>
+#include <QHash>
+#include <QStringList>
+#include <QTextCodec>
+#include <QTextStream>
+#include <qmath.h>
 #include <QStandardPaths>
 #include <QFont>
 #include <QFontDatabase>
diff --git a/lib/contact-delegate.cpp b/lib/contact-delegate.cpp
index 5f0651b..6be1e55 100644
--- a/lib/contact-delegate.cpp
+++ b/lib/contact-delegate.cpp
@@ -137,5 +137,3 @@ QSize ContactDelegate::sizeHint(const QStyleOptionViewItem &option, const QModel
 
     return QSize(0, qMax(m_avatarSize + 2 * m_spacing, QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pixelSize() + m_spacing));
 }
-
-#include "contact-delegate.moc"
diff --git a/lib/proxy-service.cpp b/lib/proxy-service.cpp
index 0011b39..9f9a8a7 100644
--- a/lib/proxy-service.cpp
+++ b/lib/proxy-service.cpp
@@ -244,7 +244,8 @@ void ProxyService::onDialogClosed()
     for(QMap<QString, KeyGenDialog*>::iterator it = d->dialogs.begin(); it != d->dialogs.end(); ++it) {
         if(it.value() == dialog) {
             d->dialogs.erase(it);
-            dialog->delayedDestruct();
+            dialog->hide();
+            dialog->deleteLater();
             return;
         }
     }
diff --git a/lib/text-chat-config.cpp b/lib/text-chat-config.cpp
index 9b7f5e6..5cf5f6e 100644
--- a/lib/text-chat-config.cpp
+++ b/lib/text-chat-config.cpp
@@ -244,5 +244,3 @@ TextChatConfig::TextChatConfig() :
 
 TextChatConfig::~TextChatConfig()
 {}
-
-#include "text-chat-config.moc"

-- 
ktp-text-ui packaging