From e08f67ff6e266dc1fb09358093df501c07d07feb Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Sun, 22 May 2011 13:53:25 +0200
Subject: [PATCH] Make it compile with "-DQT_USE_FAST_CONCATENATION
 -DQT_USE_FAST_OPERATOR_PLUS"

---
 client.cpp                    | 6 +++---
 data/update_default_rules.cpp | 2 +-
 plugins.cpp                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client.cpp b/client.cpp
index f4988ff83a..b4cc949549 100644
--- a/client.cpp
+++ b/client.cpp
@@ -128,11 +128,11 @@ Client::Client(Workspace* ws)
     , padding_bottom(0)
     , sm_stacking_order(-1)
     , demandAttentionKNotifyTimer(NULL)
+    , m_responsibleForDecoPixmap(false)
     , paintRedirector(0)
     , electricMaximizing(false)
     , activitiesDefined(false)
     , needsSessionInteract(false)
-    , m_responsibleForDecoPixmap(false)
 {
     // TODO: Do all as initialization
 
@@ -1824,7 +1824,7 @@ void Client::setCaption(const QString& _s, bool force)
             info->setVisibleIconName("");
         } else if (!cap_suffix.isEmpty() && !cap_iconic.isEmpty())
             // Keep the same suffix in iconic name if it's set
-            info->setVisibleIconName((cap_iconic + cap_suffix).toUtf8());
+            info->setVisibleIconName(QString(cap_iconic + cap_suffix).toUtf8());
 
         if (isManaged() && decoration != NULL) {
             if (client_group)
@@ -1851,7 +1851,7 @@ void Client::fetchIconicName()
         cap_iconic = s;
         if (!cap_suffix.isEmpty()) {
             if (!cap_iconic.isEmpty())  // Keep the same suffix in iconic name if it's set
-                info->setVisibleIconName((s + cap_suffix).toUtf8());
+                info->setVisibleIconName(QString(s + cap_suffix).toUtf8());
             else if (was_set)
                 info->setVisibleIconName("");
         }
diff --git a/data/update_default_rules.cpp b/data/update_default_rules.cpp
index 0f4b7873ff..c78b8caa3b 100644
--- a/data/update_default_rules.cpp
+++ b/data/update_default_rules.cpp
@@ -38,7 +38,7 @@ int main( int argc, char* argv[] )
     KCmdLineArgs::init( argc, argv, &about );
     KComponentData inst( &about );
     Q_UNUSED( KGlobal::locale() ); // jump-start locales to get to translated descriptions
-    QString file = KStandardDirs::locate( "data", QString( "kwin/default_rules/" ) + argv[ 1 ] );
+    QString file = KStandardDirs::locate( "data", QString( "kwin/default_rules/%1" ).arg(argv[ 1 ] ));
     if( file.isEmpty())
         {
         kWarning(1212) << "File " << argv[ 1 ] << " not found!" ;
diff --git a/plugins.cpp b/plugins.cpp
index 4ed12e53f1..3dee8b5de5 100644
--- a/plugins.cpp
+++ b/plugins.cpp
@@ -45,7 +45,7 @@ PluginMgr::PluginMgr()
 
 void PluginMgr::error(const QString &error_msg)
 {
-    qWarning("%s", (i18n("KWin: ") + error_msg).toLocal8Bit().data());
+    qWarning("%s", QString(i18n("KWin: ") + error_msg).toLocal8Bit().data());
 
     setNoDecoration(true);
 }