From acc6ce9092a6c7c306a06d9547c21642bf6f5d71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Tue, 30 Jul 2013 06:59:41 +0200
Subject: [PATCH] Fix no cast from ascii in Oxygen windeco

---
 clients/oxygen/oxygenclient.cpp  |  8 ++++----
 clients/oxygen/oxygenfactory.cpp | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index 5ae234797e..58f24268db 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -554,7 +554,7 @@ namespace Oxygen
                 // make sure button exists
                 if( !item._closeButton )
                 {
-                    item._closeButton = ClientGroupItemData::ButtonPointer( new Button( *this, "Close this tab", ButtonItemClose ) );
+                    item._closeButton = ClientGroupItemData::ButtonPointer( new Button( *this, QStringLiteral("Close this tab"), ButtonItemClose ) );
                     item._closeButton.data()->show();
                     item._closeButton.data()->installEventFilter( this );
                 }
@@ -1331,7 +1331,7 @@ namespace Oxygen
 
     //_________________________________________________________
     QString Client::defaultButtonsRight() const
-    { return "HIAX"; }
+    { return QStringLiteral("HIAX"); }
 
     //________________________________________________________________
     void Client::updateWindowShape()
@@ -1749,7 +1749,7 @@ namespace Oxygen
             const int shadowSize( shadowCache().shadowSize() );
             const bool drawShadow(
                 compositingActive() &&
-                KStyle::customStyleHint( "SH_ArgbDndWindow", widget() ) &&
+                KStyle::customStyleHint( QStringLiteral("SH_ArgbDndWindow"), widget() ) &&
                 shadowSize > 0 );
 
             if( drawShadow )
@@ -1882,7 +1882,7 @@ namespace Oxygen
 
         if( widget() != event->source() ) setForceActive( true );
 
-        const long source = QString( groupData->data( tabDragMimeType() ) ).toLong();
+        const long source = QString::fromUtf8( groupData->data( tabDragMimeType() ) ).toLong();
         const int clickedIndex( tabIndexAt( point, true ) );
         if( clickedIndex < 0 ) tab_A_behind_B( source, tabId(_itemData.count()-1) );
         else tab_A_before_B( source, tabId(clickedIndex) );
diff --git a/clients/oxygen/oxygenfactory.cpp b/clients/oxygen/oxygenfactory.cpp
index b7f2a9b382..bb43377392 100644
--- a/clients/oxygen/oxygenfactory.cpp
+++ b/clients/oxygen/oxygenfactory.cpp
@@ -88,11 +88,11 @@ namespace Oxygen
 
         // initialize default configuration and read
         if( !_defaultConfiguration ) _defaultConfiguration = ConfigurationPtr(new Configuration());
-        _defaultConfiguration->setCurrentGroup( "Windeco" );
+        _defaultConfiguration->setCurrentGroup( QStringLiteral("Windeco") );
         _defaultConfiguration->readConfig();
 
         // create a config object
-        KSharedConfig::Ptr config( KSharedConfig::openConfig( "oxygenrc" ) );
+        KSharedConfig::Ptr config( KSharedConfig::openConfig( QStringLiteral("oxygenrc") ) );
 
         // clear exceptions and read
         ExceptionList exceptions;
@@ -189,9 +189,9 @@ namespace Oxygen
                     {
                         // retrieve class name
                         KWindowInfo info( client.windowId(), 0, NET::WM2WindowClass );
-                        QString window_className( info.windowClassName() );
-                        QString window_class( info.windowClassClass() );
-                        className = window_className + ' ' + window_class;
+                        QString window_className( QString::fromUtf8(info.windowClassName()) );
+                        QString window_class( QString::fromUtf8(info.windowClassClass()) );
+                        className = window_className + QStringLiteral(" ") + window_class;
                     }
 
                     value = className;