vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix no cast from ascii in Oxygen windeco

icc-effect-5.14.5
Martin Gräßlin 2013-07-30 06:59:41 +02:00
parent 9b6ae91011
commit acc6ce9092
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clients/oxygen/oxygenclient.cpp
View File

@ -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) );

10
clients/oxygen/oxygenfactory.cpp
View File

@ -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;