yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make it compile with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"

Browse source
This commit is contained in:
Montel Laurent 2011-05-22 13:53:25 +02:00
parent 5e22d3912b
commit e08f67ff6e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client.cpp
View file

@ -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("");
}

2
data/update_default_rules.cpp
View file

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

2
plugins.cpp
View file

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