[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=d68dcf8

The following commit has been merged in the master branch:
commit d68dcf80088ffddb5f53c9391644775943981dd7
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Sep 21 10:27:12 2012 +0200

    Use join instead of concatenating the string manually
---
 KTp/message.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/KTp/message.cpp b/KTp/message.cpp
index d832011..451143c 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -55,7 +55,11 @@ void Message::appendMessagePart(const QString& part)
 
 void Message::appendScript(const QString& script)
 {
-    m_scripts << script;
+    // Append the script only if it is not already appended to avoid multiple
+    // execution of the scripts.
+    if (!m_scripts.contains(script)) {
+        m_scripts << script;
+    }
 }
 
 QString Message::finalizedMessage() const
@@ -73,13 +77,8 @@ QString Message::finalizedScript() const
         return QString();
     }
 
-    QString finalScript;
+    QString finalScript = m_scripts.join(QLatin1String(""));
 
-    Q_FOREACH(const QString &script, m_scripts) {
-        if (!finalScript.contains(script)) {
-            finalScript.append(script);
-        }
-    }
     if (!finalScript.isEmpty()) {
         finalScript.append(QLatin1String("false;"));
     }

-- 
ktp-common-internals packaging