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

Less Krazy warnings please.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1042583
This commit is contained in:
Lucas Murray 2009-10-30 08:10:35 +00:00
parent 8a8428e41c
commit 424d358fd2
22 changed files with 97 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/b2/config/config.cpp
View file

@ -74,7 +74,7 @@ B2Config::B2Config(KConfig *conf, QWidget *parent)
//actionsGB->setOrientation(Qt::Horizontal);
QLabel *menuDblClickLabel = new QLabel(actionsGB);
menuDblClickLabel->setText(i18n("Double click on menu button:"));
menuDblClickOp = new QComboBox(actionsGB);
menuDblClickOp = new KComboBox(actionsGB);
menuDblClickOp->addItem(i18n("Do Nothing"));
menuDblClickOp->addItem(i18n("Minimize Window"));
menuDblClickOp->addItem(i18n("Shade Window"));

4
clients/b2/config/config.h
View file

@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QCheckBox>
#include <QGroupBox>
#include <QLabel>
#include <QComboBox>
#include <KComboBox>
#include <kconfig.h>
class B2Config: public QObject
@ -55,7 +55,7 @@ private:
QCheckBox *cbColorBorder;
QCheckBox *showGrabHandleCb;
QGroupBox *actionsGB;
QComboBox *menuDblClickOp;
KComboBox *menuDblClickOp;
QWidget *gb;
};

2
clients/kde2/kde2.cpp
View file

@ -9,7 +9,7 @@
Draws mini titlebars for tool windows.
Many features are now customizable.
drawColorBitmaps orignally from kdefx:
drawColorBitmaps originally from kdefx:
Copyright (C) 1999 Daniel M. Duley <mosfet@kde.org>
This program is free software; you can redistribute it and/or modify

2
clients/quartz/quartz.cpp
View file

@ -12,7 +12,7 @@
Includes mini titlebars for ToolWindow Support.
Button positions are now customizable.
drawColorBitmaps orignally from kdefx:
drawColorBitmaps originally from kdefx:
Copyright (C) 1999 Daniel M. Duley <mosfet@kde.org>
This program is free software; you can redistribute it and/or modify

6
compositingprefs.cpp
View file

@ -240,7 +240,7 @@ void CompositingPrefs::detectDriverAndVersion()
kDebug( 1212 ) << "GL version is" << mGLVersion;
kDebug( 1212 ) << "XGL:" << ( mXgl ? "yes" : "no" );
if( mGLRenderer.startsWith( "Mesa DRI Intel" ) || mGLRenderer.startsWith( "Mesa DRI Mobile Intel" ))
if( mGLRenderer.startsWith( "Mesa DRI Intel" ) || mGLRenderer.startsWith( "Mesa DRI Mobile Intel" )) // krazy:exclude=strings
{
mDriver = "intel";
QStringList words = mGLRenderer.split(' ');
@ -266,7 +266,7 @@ void CompositingPrefs::detectDriverAndVersion()
mVersion = Version( versionParts[1].mid( 1, versionParts[1].length() -2 ) );
}
}
else if( mGLRenderer.startsWith( "Mesa DRI R" ))
else if( mGLRenderer.startsWith( "Mesa DRI R" )) // krazy:exclude=strings
{
mDriver = "radeon";
mVersion = Version( mGLRenderer.split(' ')[ 3 ] );
@ -325,7 +325,7 @@ void CompositingPrefs::applyDriverSpecificOptions()
}
else if( mDriver == "radeon" )
{ // radeon r200 only ?
if( mGLRenderer.startsWith( "Mesa DRI R200" ) && mVersion >= Version( "20060602" ))
if( mGLRenderer.startsWith( "Mesa DRI R200" ) && mVersion >= Version( "20060602" )) // krazy:exclude=strings
{
kDebug( 1212 ) << "radeon r200 >= 20060602, enabling compositing";
mEnableCompositing = true;

2
data/update_default_rules.cpp
View file

@ -37,7 +37,7 @@ int main( int argc, char* argv[] )
KAboutData about( "kwin_update_default_rules", "kwin", KLocalizedString(), 0 );
KCmdLineArgs::init( argc, argv, &about );
KComponentData inst( &about );
Q_UNUSED( KGlobal::locale() ); // jump-start locales to get to translated desriptions
Q_UNUSED( KGlobal::locale() ); // jump-start locales to get to translated descriptions
QString file = KStandardDirs::locate( "data", QString( "kwin/default_rules/" ) + argv[ 1 ] );
if( file.isEmpty())
{

2
effects.cpp
View file

@ -891,7 +891,7 @@ bool EffectsHandlerImpl::loadEffect( const QString& name )
assert( current_build_quads == 0 );
assert( current_transform == 0 );
if( !name.startsWith("kwin4_effect_") )
if( !name.toLatin1().startsWith("kwin4_effect_") )
kWarning( 1212 ) << "Effect names usually have kwin4_effect_ prefix" ;
// Make sure a single effect won't be loaded multiple times

4
effects/slideback/slideback.cpp
View file

@ -55,7 +55,7 @@ void SlideBackEffect::windowActivated( EffectWindow* w )
return;
}
if( unminimizedWindow == w ){ // A window was activated by beeing unminimized. Don't trigger SlideBack.
if( unminimizedWindow == w ){ // A window was activated by being unminimized. Don't trigger SlideBack.
unminimizedWindow = NULL;
updateStackingOrder();
return;
@ -193,7 +193,7 @@ void SlideBackEffect::paintWindow( EffectWindow *w, int mask, QRegion region, Wi
if( stackingOrderChanged() && ( w == newTopWindow() ) && !disabled )
{
/* This can happen because of two reasons:
- a window has received the focus earlier without beeing raised and is raised now. -> call windowActivated() now
- a window has received the focus earlier without being raised and is raised now. -> call windowActivated() now
- paintWindow() is called with a new stackingOrder before activateWindow(). Bug? -> don't draw the overlapping content;*/
foreach( EffectWindow *tmp, oldStackingOrder )
{

4
kcmkwin/kwincompositing/main.cpp
View file

@ -366,7 +366,7 @@ void KWinCompositingConfig::loadGeneralTab()
void KWinCompositingConfig::setupCompositingState( bool active, bool enabled )
{
if( getenv( "KDE_FAILSAFE" ))
if( !qgetenv( "KDE_FAILSAFE" ).isNull() )
enabled = false;
// compositing state
QString stateIcon;
@ -645,7 +645,7 @@ void KWinCompositingConfig::save()
// This assumes that this KCM is running with the same environment variables as KWin
// TODO: Detect KWIN_COMPOSE=N as well
if( getenv( "KDE_FAILSAFE" ) && ui.useCompositing->isChecked() )
if( !qgetenv( "KDE_FAILSAFE" ).isNull() && ui.useCompositing->isChecked() )
{
KMessageBox::sorry( this, i18n(
"Your settings have been saved but as KDE is currently running in failsafe "

11
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -35,7 +35,8 @@
#include <QGroupBox>
#include <QGridLayout>
#include <QCheckBox>
#include <QTabWidget>
#include <KComboBox>
#include <KTabWidget>
#include <QLabel>
#include <QFile>
@ -88,7 +89,7 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
// cbUseMiniWindows = new QCheckBox( i18n( "Render mini &titlebars for all windows"), checkGroup );
// QWhatsThis::add( cbUseMiniWindows, i18n( "Note that this option is not available on all styles yet" ) );
tabWidget = new QTabWidget( this );
tabWidget = new KTabWidget( this );
layout->addWidget( tabWidget );
// Page 1 (General Options)
@ -114,7 +115,7 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
// Border size chooser
lBorder = new QLabel (i18n("B&order size:"), pluginSettingsGrp);
cBorder = new QComboBox(pluginSettingsGrp);
cBorder = new KComboBox(pluginSettingsGrp);
lBorder->setBuddy(cBorder);
cBorder->setWhatsThis( i18n( "Use this combobox to change the border size of the decoration." ));
lBorder->hide();
@ -226,7 +227,7 @@ void KWinDecorationModule::findDecorations()
KDesktopFile desktopFile(filename);
QString libName = desktopFile.desktopGroup().readEntry("X-KDE-Library");
if (!libName.isEmpty() && libName.startsWith( "kwin3_" ))
if (!libName.isEmpty() && libName.toLatin1().startsWith( "kwin3_" ))
{
DecorationInfo di;
di.name = desktopFile.readName();
@ -589,7 +590,7 @@ void KWinDecorationModule::checkSupportedBorderSizes()
QString KWinDecorationModule::styleToConfigLib( QString& styleLib )
{
if( styleLib.startsWith( "kwin3_" ))
if( styleLib.toLatin1().startsWith( "kwin3_" ))
return "kwin_" + styleLib.mid( 6 ) + "_config";
else
return styleLib + "_config";

7
kcmkwin/kwindecoration/kwindecoration.h
View file

@ -44,7 +44,8 @@
class KComboBox;
class QCheckBox;
class QLabel;
class QTabWidget;
class KComboBox;
class KTabWidget;
class KVBox;
class KDecorationPlugins;
@ -98,7 +99,7 @@ class KWinDecorationModule : public KCModule, public KDecorationDefines
static int borderSizeToIndex( BorderSize size, QList< BorderSize > sizes );
static BorderSize indexToBorderSize( int index, QList< BorderSize > sizes );
QTabWidget* tabWidget;
KTabWidget* tabWidget;
// Page 1
KComboBox* decorationList;
@ -112,7 +113,7 @@ class KWinDecorationModule : public KCModule, public KDecorationDefines
// QCheckBox* cbUseMiniWindows;
QCheckBox* cbShowToolTips;
QLabel* lBorder;
QComboBox* cBorder;
KComboBox* cBorder;
BorderSize border_size;
QObject* pluginObject;

4
kcmkwin/kwinoptions/main.cpp
View file

@ -73,7 +73,7 @@ KWinOptions::KWinOptions(QWidget *parent, const QVariantList &)
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
tab = new QTabWidget(this);
tab = new KTabWidget(this);
layout->addWidget(tab);
mFocus = new KFocusConfig(false, mConfig, componentData(), this);
@ -186,7 +186,7 @@ KActionsOptions::KActionsOptions(QWidget *parent, const QVariantList &)
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
tab = new QTabWidget(this);
tab = new KTabWidget(this);
layout->addWidget(tab);
mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, componentData(), this);

6
kcmkwin/kwinoptions/main.h
View file

@ -25,7 +25,7 @@
#ifndef __MAIN_H__
#define __MAIN_H__
#include <QTabWidget>
#include <KTabWidget>
#include <kcmodule.h>
class KConfig;
@ -57,7 +57,7 @@ protected slots:
private:
QTabWidget *tab;
KTabWidget *tab;
KFocusConfig *mFocus;
KTitleBarActionsConfig *mTitleBarActions;
@ -88,7 +88,7 @@ protected slots:
private:
QTabWidget *tab;
KTabWidget *tab;
KTitleBarActionsConfig *mTitleBarActions;
KWindowActionsConfig *mWindowActions;

40
kcmkwin/kwinoptions/mouse.cpp
View file

@ -20,7 +20,7 @@
#include "mouse.h"
#include <QLabel>
#include <QComboBox>
#include <KComboBox>
#include <QLayout>
#include <QSizePolicy>
@ -154,7 +154,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
QGridLayout *gLayout = new QGridLayout(titlebarActions);
layout->addWidget( titlebarActions );
QComboBox* combo = new QComboBox(this);
KComboBox* combo = new KComboBox(this);
combo->addItem(i18n("Maximize"));
combo->addItem(i18n("Maximize (vertical only)"));
combo->addItem(i18n("Maximize (horizontal only)"));
@ -177,7 +177,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
/** Mouse Wheel Events **************/
// Titlebar and frame mouse Wheel
QComboBox* comboW = new QComboBox(this);
KComboBox* comboW = new KComboBox(this);
comboW->addItem(i18n("Raise/Lower"));
comboW->addItem(i18n("Shade/Unshade"));
comboW->addItem(i18n("Maximize/Restore"));
@ -245,7 +245,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
" or the frame of an active window.") );
// Titlebar and frame, active, mouse button 1
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
grid->addWidget(combo, 1, 1);
combo->addItem(i18n("Raise"));
@ -277,7 +277,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
<< i18n("Close")
<< i18n("Nothing");
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
grid->addWidget(combo, 2, 1);
combo->addItems(items);
@ -286,7 +286,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
combo->setWhatsThis( i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window."));
// Titlebar and frame, active, mouse button 3
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
grid->addWidget(combo, 3, 1);
combo->addItems(items);
@ -320,7 +320,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
<< i18n("Close")
<< i18n("Nothing");
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
grid->addWidget(combo, 1, 2);
combo->addItems(items);
@ -328,7 +328,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
coTiInAct1 = combo;
combo->setWhatsThis( txtButton1);
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
grid->addWidget(combo, 2, 2);
combo->addItems(items);
@ -336,7 +336,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
coTiInAct2 = combo;
combo->setWhatsThis( i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>inactive</em> window."));
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
grid->addWidget(combo, 3, 2);
combo->addItems(items);
@ -514,7 +514,7 @@ static int tbl_txt_lookup( const char* const arr[], const char* txt )
return 0;
}
void KTitleBarActionsConfig::setComboText( QComboBox* combo, const char*txt )
void KTitleBarActionsConfig::setComboText( KComboBox* combo, const char*txt )
{
if( combo == coTiDbl )
combo->setCurrentIndex( tbl_txt_lookup( tbl_TiDbl, txt ));
@ -680,7 +680,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
<< i18n("Activate")
<< i18n("Activate & Raise");
QComboBox* combo = new QComboBox(box);
KComboBox* combo = new KComboBox(box);
coWin1 = combo;
combo->addItems(items);
connect(combo, SIGNAL(activated(int)), SLOT(changed()));
@ -692,7 +692,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
gridLayout->addWidget(label, 0, 0);
gridLayout->addWidget(combo, 0, 1);
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->addItems(items);
connect(combo, SIGNAL(activated(int)), SLOT(changed()));
coWin2 = combo;
@ -704,7 +704,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
gridLayout->addWidget(label, 1, 0);
gridLayout->addWidget(combo, 1, 1);
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->addItems(items);
connect(combo, SIGNAL(activated(int)), SLOT(changed()));
coWin3 = combo;
@ -721,7 +721,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
<< i18n("Activate & Scroll")
<< i18n("Activate, Raise & Scroll");
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->addItems(items);
connect(combo, SIGNAL(activated(int)), SLOT(changed()));
coWinWheel = combo;
@ -770,7 +770,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
}
// Combo's
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->addItem(i18n("Meta"));
combo->addItem(i18n("Alt"));
connect(combo, SIGNAL(activated(int)), SLOT(changed()));
@ -796,7 +796,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
<< i18n("Minimize")
<< i18n("Nothing");
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->addItems(items);
connect(combo, SIGNAL(activated(int)), SLOT(changed()));
coAll1 = combo;
@ -809,7 +809,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
gridLayout->addWidget(combo, 0, 1);
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->addItems(items);
connect(combo, SIGNAL(activated(int)), SLOT(changed()));
coAll2 = combo;
@ -821,7 +821,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
gridLayout->addWidget(label, 1, 0);
gridLayout->addWidget(combo, 1, 1);
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->addItems(items);
connect(combo, SIGNAL(activated(int)), SLOT(changed()));
coAll3 = combo;
@ -834,7 +834,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
gridLayout->addWidget(combo, 2, 1);
combo = new QComboBox(box);
combo = new KComboBox(box);
combo->addItem(i18n("Raise/Lower"));
combo->addItem(i18n("Shade/Unshade"));
combo->addItem(i18n("Maximize/Restore"));
@ -864,7 +864,7 @@ KWindowActionsConfig::~KWindowActionsConfig()
delete config;
}
void KWindowActionsConfig::setComboText( QComboBox* combo, const char*txt )
void KWindowActionsConfig::setComboText( KComboBox* combo, const char*txt )
{
if( combo == coWin1 || combo == coWin2 || combo == coWin3 )
combo->setCurrentIndex( tbl_txt_lookup( tbl_Win, txt ));

44
kcmkwin/kwinoptions/mouse.h
View file

@ -25,17 +25,17 @@
class KConfig;
#include <kcmodule.h>
#include <QComboBox>
#include <KComboBox>
#include <klocale.h>
class ToolTipComboBox: public QComboBox
class ToolTipComboBox: public KComboBox
{
Q_OBJECT
public:
ToolTipComboBox(QWidget * owner, char const * const * toolTips_)
: QComboBox(owner)
: KComboBox(owner)
, toolTips(toolTips_) {}
public slots:
@ -64,15 +64,15 @@ public slots:
void changed() { emit KCModule::changed(true); }
private:
QComboBox* coTiDbl;
KComboBox* coTiDbl;
QComboBox* coTiAct1;
QComboBox* coTiAct2;
QComboBox* coTiAct3;
QComboBox* coTiAct4;
QComboBox* coTiInAct1;
QComboBox* coTiInAct2;
QComboBox* coTiInAct3;
KComboBox* coTiAct1;
KComboBox* coTiAct2;
KComboBox* coTiAct3;
KComboBox* coTiAct4;
KComboBox* coTiInAct1;
KComboBox* coTiInAct2;
KComboBox* coTiInAct3;
ToolTipComboBox * coMax[3];
@ -85,7 +85,7 @@ private:
const char* functionTiInAc(int);
const char* functionMax(int);
void setComboText(QComboBox* combo, const char* text);
void setComboText(KComboBox* combo, const char* text);
const char* fixup( const char* s );
private slots:
@ -110,16 +110,16 @@ public slots:
void changed() { emit KCModule::changed(true); }
private:
QComboBox* coWin1;
QComboBox* coWin2;
QComboBox* coWin3;
QComboBox* coWinWheel;
KComboBox* coWin1;
KComboBox* coWin2;
KComboBox* coWin3;
KComboBox* coWinWheel;
QComboBox* coAllKey;
QComboBox* coAll1;
QComboBox* coAll2;
QComboBox* coAll3;
QComboBox* coAllW;
KComboBox* coAllKey;
KComboBox* coAll1;
KComboBox* coAll2;
KComboBox* coAll3;
KComboBox* coAllW;
KConfig *config;
bool standAlone;
@ -130,7 +130,7 @@ private:
const char* functionAll(int);
const char* functionAllW(int);
void setComboText(QComboBox* combo, const char* text);
void setComboText(KComboBox* combo, const char* text);
const char* fixup( const char* s );
};

8
kcmkwin/kwinoptions/windows.cpp
View file

@ -27,7 +27,7 @@
#include <QCheckBox>
#include <QRadioButton>
#include <QLabel>
#include <QComboBox>
#include <KComboBox>
#include <QHBoxLayout>
#include <QFormLayout>
#include <QtDBus/QtDBus>
@ -117,7 +117,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, const KComponent
fcsBox->setLayout( gLay );
focusStealing = new QComboBox( this );
focusStealing = new KComboBox( this );
focusStealing->addItem( i18nc( "Focus Stealing Prevention Level", "None" ));
focusStealing->addItem( i18nc( "Focus Stealing Prevention Level", "Low" ));
focusStealing->addItem( i18nc( "Focus Stealing Prevention Level", "Medium" ));
@ -151,7 +151,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, const KComponent
gLay->addWidget(label, 0, 0, 1, 2);
gLay->addWidget(focusStealing, 0, 2);
focusCombo = new QComboBox(fcsBox);
focusCombo = new KComboBox(fcsBox);
focusCombo->setEditable( false );
focusCombo->addItem(i18n("Click to Focus"), CLICK_TO_FOCUS);
focusCombo->addItem(i18n("Focus Follows Mouse"), FOCUS_FOLLOWS_MOUSE);
@ -652,7 +652,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, const KCom
QGridLayout *vLay = new QGridLayout();
lay->addLayout( vLay );
placementCombo = new QComboBox(this);
placementCombo = new KComboBox(this);
placementCombo->setEditable( false );
placementCombo->addItem(i18n("Smart"), SMART_PLACEMENT);
placementCombo->addItem(i18n("Maximizing"), MAXIMIZING_PLACEMENT);

8
kcmkwin/kwinoptions/windows.h
View file

@ -29,7 +29,7 @@
class QRadioButton;
class QCheckBox;
class QPushButton;
class QComboBox;
class KComboBox;
class QGroupBox;
class QLabel;
class QSlider;
@ -107,11 +107,11 @@ private:
void setShowPopupinfo(bool);
void setFocusStealing( int );
QComboBox* focusStealing;
KComboBox* focusStealing;
//QGroupBox *fcsBox;
QWidget* fcsBox;
QComboBox *focusCombo;
KComboBox *focusCombo;
QLabel *autoRaiseOnLabel;
QCheckBox *autoRaiseOn;
QLabel *delayFocusOnLabel;
@ -217,7 +217,7 @@ private:
int getPlacement( void ); //CT
void setPlacement(int); //CT
QComboBox *placementCombo;
KComboBox *placementCombo;
};
#endif // KKWMWINDOWS_H

2
lib/kdecoration_plugins_p.cpp
View file

@ -106,7 +106,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
nameStr = group.readEntry("PluginLib", defaultPlugin );
}
// make sure people can switch between HEAD and kwin_iii branch
if( nameStr.startsWith( "kwin_" ))
if( nameStr.toLatin1().startsWith( "kwin_" ))
nameStr = "kwin3_" + nameStr.mid( 5 );
KLibrary *oldLibrary = library;

2
lib/kwineffects.h
View file

@ -565,7 +565,7 @@ class KWIN_EXPORT EffectsHandler
*/
virtual int currentDesktop() const = 0;
/**
* @returns Total number of desktops currently in existance.
* @returns Total number of desktops currently in existence.
*/
virtual int numberOfDesktops() const = 0;
/**

25
main.cpp
View file

@ -43,8 +43,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kdialog.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kde_file.h>
#include <QLabel>
#include <QComboBox>
#include <KComboBox>
#include <QVBoxLayout>
#include "atoms.h"
@ -208,7 +209,7 @@ class AlternativeWMDialog : public KDialog
"You can select another window manager to run:" );
QLabel* textLabel = new QLabel( text, mainWidget );
layout->addWidget( textLabel );
wmList = new QComboBox( mainWidget );
wmList = new KComboBox( mainWidget );
wmList->setEditable( true );
layout->addWidget( wmList );
@ -233,7 +234,7 @@ class AlternativeWMDialog : public KDialog
{ return wmList->currentText(); }
private:
QComboBox* wmList;
KComboBox* wmList;
};
int Application::crashes = 0;
@ -418,7 +419,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
{ // We only do the multihead fork if we are not restored by the session
// manager, since the session manager will register multiple kwins,
// one for each screen...
QByteArray multiHead = getenv( "KDE_MULTIHEAD" );
QByteArray multiHead = qgetenv( "KDE_MULTIHEAD" );
if( multiHead.toLower() == "true" )
{
Display* dpy = XOpenDisplay( NULL );
@ -488,15 +489,15 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
args.add( "crashes <n>", ki18n( "Indicate that KWin has recently crashed n times" ));
KCmdLineArgs::addCmdLineOptions( args );
if( signal( SIGTERM, KWin::sighandler ) == SIG_IGN )
signal( SIGTERM, SIG_IGN );
if( signal( SIGINT, KWin::sighandler ) == SIG_IGN )
signal( SIGINT, SIG_IGN );
if( signal( SIGHUP, KWin::sighandler ) == SIG_IGN )
signal( SIGHUP, SIG_IGN );
if( KDE_signal( SIGTERM, KWin::sighandler ) == SIG_IGN )
KDE_signal( SIGTERM, SIG_IGN );
if( KDE_signal( SIGINT, KWin::sighandler ) == SIG_IGN )
KDE_signal( SIGINT, SIG_IGN );
if( KDE_signal( SIGHUP, KWin::sighandler ) == SIG_IGN )
KDE_signal( SIGHUP, SIG_IGN );
// HACK: This is needed for AIGLX
if( qstrcmp( getenv( "KWIN_DIRECT_GL" ), "1" ) != 0 )
if( qstrcmp( qgetenv( "KWIN_DIRECT_GL" ), "1" ) != 0 )
setenv( "LIBGL_ALWAYS_INDIRECT","1", true );
// HACK: this is needed to work around a Qt4.4.0RC1 bug (#157659)
@ -508,7 +509,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
KGlobal::locale()->insertCatalog( "kwin_effects" );
// Announce when KWIN_DIRECT_GL is set for above HACK
if( qstrcmp( getenv( "KWIN_DIRECT_GL" ), "1" ) == 0 )
if( qstrcmp( qgetenv( "KWIN_DIRECT_GL" ), "1" ) == 0 )
kDebug( 1212 ) << "KWIN_DIRECT_GL set, not forcing LIBGL_ALWAYS_INDIRECT=1";
fcntl( XConnectionNumber( KWin::display() ), F_SETFD, 1 );

2
nvidiahack.cpp
View file

@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
// krazy:skip
/*
The only purpose of this file is to be later in the link order than

2
workspace.h
View file

@ -172,7 +172,7 @@ class Workspace : public QObject, public KDecorationDefines
public:
/**
* @returns Total number of desktops currently in existance.
* @returns Total number of desktops currently in existence.
*/
int numberOfDesktops() const;
/**