[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=49d25e1

The following commit has been merged in the master branch:
commit 49d25e115f1a49ec823b197c83a0a1de22cdf502
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Jan 12 19:22:36 2015 +0100

    [app] Port K4AboutData to KAboutData
---
 app/main.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/main.cpp b/app/main.cpp
index 12a7171..cb47d7e 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -35,8 +35,9 @@
 #include <KTp/core.h>
 #include <KTp/OTR/types.h>
 
-#include <k4aboutdata.h>
-#include <KCmdLineArgs>
+#include <KAboutData>
+#include <KLocalizedString>
+
 #include <Kdelibs4ConfigMigrator>
 
 int main(int argc, char *argv[])
@@ -47,18 +48,14 @@ int main(int argc, char *argv[])
     migrator.setUiFiles(QStringList() << QLatin1String("chatwindow.rc"));
     migrator.migrate();
 
-    K4AboutData aboutData("ktp-text-ui", 0,
-                         ki18n("Chat Application"),
-                         KTP_TEXT_UI_VERSION_STRING);
-    aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Developer"), "david at davidedmundson.co.uk");
-    aboutData.addAuthor(ki18n("Dominik Schmidt"), ki18n("Developer"), "kde at dominik-schmidt.de");
-    aboutData.addAuthor(ki18n("Francesco Nwokeka"), ki18n("Developer"), "francesco.nwokeka at gmail.com");
-    aboutData.addAuthor(ki18n("Marcin Ziemiński"), ki18n("Developer"), "zieminn at gmail.com");
+    KAboutData aboutData("ktp-text-ui", i18n("Chat Application"),
+                         QStringLiteral(KTP_TEXT_UI_VERSION_STRING));
+    aboutData.addAuthor(i18n("David Edmundson"), i18n("Developer"), "david at davidedmundson.co.uk");
+    aboutData.addAuthor(i18n("Dominik Schmidt"), i18n("Developer"), "kde at dominik-schmidt.de");
+    aboutData.addAuthor(i18n("Francesco Nwokeka"), i18n("Developer"), "francesco.nwokeka at gmail.com");
+    aboutData.addAuthor(i18n("Marcin Ziemiński"), i18n("Developer"), "zieminn at gmail.com");
     aboutData.setProductName("telepathy/text-ui"); //set the correct name for bug reporting
-    aboutData.setLicense(K4AboutData::License_GPL_V2);
-    aboutData.setProgramIconName(QLatin1String("telepathy-kde"));
-
-    KCmdLineArgs::init(argc, argv, &aboutData);
+    aboutData.setLicense(KAboutLicense::GPL_V2);
 
     Tp::registerTypes();
     KTp::registerOtrTypes();
@@ -80,5 +77,8 @@ int main(int argc, char *argv[])
     Tp::AbstractClientPtr handler = Tp::AbstractClientPtr(app);
     registrar->registerClient(handler, QLatin1String(KTP_TEXTUI_CLIENT_NAME));
 
+    QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("telepathy-kde")));
+    KAboutData::setApplicationData(aboutData);
+
     return app->exec();
 }

-- 
ktp-text-ui packaging