[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=b76f259

The following commit has been merged in the master branch:
commit b76f2597d2aa1474061edc64c3b660b47647cf58
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Mar 13 02:22:53 2012 +0100

    Cleanup code and use two different pointers for installers
---
 .../adiumxtra-protocol-handler.cpp                 | 70 +++++++++++-----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
index 728a372..406e2f1 100644
--- a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
+++ b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
@@ -91,44 +91,44 @@ BundleInstaller::BundleStatus AdiumxtraProtocolHandler::install(const QString &p
         return BundleInstaller::BundleCannotOpen;
     }
 
-    BundleInstaller *installer = new ChatStyleInstaller(archive, tmpFile);
-    if(installer->validate() == BundleInstaller::BundleValid) {
-        installer->showRequest();
+    ChatStyleInstaller *chatStyleInstaller = new ChatStyleInstaller(archive, tmpFile);
+    if (chatStyleInstaller->validate() == BundleInstaller::BundleValid) {
+        chatStyleInstaller->showRequest();
 
-        QObject::connect(installer, SIGNAL(finished(BundleInstaller::BundleStatus)),
-                         installer, SLOT(showResult()));
-        QObject::connect(installer, SIGNAL(showedResult()), this, SLOT(quit()));
-        QObject::connect(installer, SIGNAL(ignoredRequest()), this, SLOT(quit()));
+        QObject::connect(chatStyleInstaller, SIGNAL(finished(BundleInstaller::BundleStatus)),
+                         chatStyleInstaller, SLOT(showResult()));
+        QObject::connect(chatStyleInstaller, SIGNAL(showedResult()), this, SLOT(quit()));
+        QObject::connect(chatStyleInstaller, SIGNAL(ignoredRequest()), this, SLOT(quit()));
 
         kDebug() << "sent messagestyle request";
-    } else {
-        delete installer;
-        installer = new EmoticonSetInstaller(archive, tmpFile);
-        if(installer->validate() == BundleInstaller::BundleValid) {
-            installer->showRequest();
-
-            QObject::connect(installer, SIGNAL(finished(BundleInstaller::BundleStatus)),
-                             installer, SLOT(showResult()));
-            QObject::connect(installer, SIGNAL(showedResult()), this, SLOT(quit()));
-            QObject::connect(installer, SIGNAL(ignoredRequest()), this, SLOT(quit()));
-
-            kDebug() << "sent emoticonset request";
-        } else {
-            KNotification *notification = new KNotification(QLatin1String("packagenotrecognized"), NULL,
-                                                            KNotification::Persistent);
-            notification->setText( i18n("Package type not recognized or not supported") );
-            QObject::connect(notification, SIGNAL(action1Activated()), this, SLOT(install()));
-            QObject::connect(notification, SIGNAL(action1Activated()), notification, SLOT(close()));
-
-            QObject::connect(notification, SIGNAL(ignored()), this, SLOT(ignoreRequest()));
-            QObject::connect(notification, SIGNAL(ignored()), notification, SLOT(close()));
-            notification->setActions( QStringList() << i18n("OK") );
-            notification->sendEvent();
-            kDebug() << "sent error";
-
-            return BundleInstaller::BundleUnknownError;
-        }
+        return BundleInstaller::BundleValid;
+    }
+
+    EmoticonSetInstaller *emoticonSetInstaller = new EmoticonSetInstaller(archive, tmpFile);
+    if(emoticonSetInstaller->validate() == BundleInstaller::BundleValid) {
+        emoticonSetInstaller->showRequest();
+
+        QObject::connect(emoticonSetInstaller, SIGNAL(finished(BundleInstaller::BundleStatus)),
+                         emoticonSetInstaller, SLOT(showResult()));
+        QObject::connect(emoticonSetInstaller, SIGNAL(showedResult()), this, SLOT(quit()));
+        QObject::connect(emoticonSetInstaller, SIGNAL(ignoredRequest()), this, SLOT(quit()));
+
+        kDebug() << "sent emoticonset request";
+        return BundleInstaller::BundleValid;
     }
 
-    return BundleInstaller::BundleValid;
+    KNotification *notification = new KNotification(QLatin1String("packagenotrecognized"),
+                                                    NULL,
+                                                    KNotification::Persistent);
+    notification->setText( i18n("Package type not recognized or not supported") );
+    QObject::connect(notification, SIGNAL(action1Activated()), this, SLOT(install()));
+    QObject::connect(notification, SIGNAL(action1Activated()), notification, SLOT(close()));
+
+    QObject::connect(notification, SIGNAL(ignored()), this, SLOT(ignoreRequest()));
+    QObject::connect(notification, SIGNAL(ignored()), notification, SLOT(close()));
+    notification->setActions( QStringList() << i18n("OK") );
+    notification->sendEvent();
+    kDebug() << "sent error";
+
+    return BundleInstaller::BundleUnknownError;
 }

-- 
ktp-text-ui packaging