[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=1f03771

The following commit has been merged in the master branch:
commit 1f037717ee35e793f4a6184feeb1e7a08e66d1a7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Aug 23 19:15:40 2010 +0000

    Convert test applications to use KApplication (from QApplication) so
    that KLocale will always be available during initialisation.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1167142
---
 app/main.cpp    | 19 +++++++++++++------
 config/main.cpp | 18 +++++++++++++++---
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/app/main.cpp b/app/main.cpp
index b273581..fc39886 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -17,18 +17,25 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <QtGui/QApplication>
 #include "mainwindow.h"
 
-#include <QDebug>
-
 #include <TelepathyQt4/Channel>
 #include <TelepathyQt4/ClientRegistrar>
-#include "mainwindow.h"
+
+#include <KApplication>
+#include <KAboutData>
+#include <KCmdLineArgs>
 
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
+
+    KAboutData aboutData("telepathy-chat-handler",
+                         0,
+                         ki18n("Telepathy Chat Handler"),
+                         "0.1");
+
+    KCmdLineArgs::init( argc, argv, &aboutData );
+    KApplication app;
 
     registerTypes();
 
@@ -40,6 +47,6 @@ int main(int argc, char *argv[])
 
     mainWindow->show();
 
-    return a.exec();
+    return app.exec();
     delete mainWindow;
 }
diff --git a/config/main.cpp b/config/main.cpp
index 9ae175b..179267d 100644
--- a/config/main.cpp
+++ b/config/main.cpp
@@ -1,11 +1,23 @@
-#include <QtGui/QApplication>
 #include "mainwindow.h"
 
+#include <KApplication>
+#include <KAboutData>
+#include <KCmdLineArgs>
+
+
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
+    KAboutData aboutData("telepathy-chat-window-config",
+                         0,
+                         ki18n("Telepathy Chat Window Config"),
+                         "0.1");
+
+    KCmdLineArgs::init( argc, argv, &aboutData );
+
+    KApplication app;
+
     MainWindow w;
     w.show();
 
-    return a.exec();
+    return app.exec();
 }

-- 
ktp-text-ui packaging