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

SVN_SILENT Fixed some krazy warnings in tiling related code

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1122067
This commit is contained in:
Nikhil Marathe 2010-05-03 05:18:52 +00:00
parent 94e42cf134
commit 19d29d0c8f
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcmkwin/kwinoptions/windows.cpp
View file

@ -654,7 +654,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, const KCom
tilingLayoutLabel = new QLabel( i18n("Default Tiling &Layout"), tilBox );
tilBoxLay->addWidget( tilingLayoutLabel, 1, 0 );
tilingLayoutCombo = new QComboBox( tilBox );
tilingLayoutCombo = new KComboBox( tilBox );
// NOTE: add your layout to the bottom of this list
tilingLayoutCombo->addItem( "Spiral" );
@ -668,7 +668,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, const KCom
tilingRaiseLabel = new QLabel( i18n("Floating &Windows Raising"), tilBox );
tilBoxLay->addWidget( tilingRaiseLabel, 2, 0 );
tilingRaiseCombo = new QComboBox( tilBox );
tilingRaiseCombo = new KComboBox( tilBox );
tilingRaiseCombo->addItem( i18nc( "Window Raising Policy", "Raise/Lower all floating windows" ) );
tilingRaiseCombo->addItem( i18nc( "Window Raising Policy", "Raise/Lower current window only") );
tilingRaiseCombo->addItem( i18nc( "Window Raising Policy", "Floating windows are always on top" ) );

4
kcmkwin/kwinoptions/windows.h
View file

@ -236,8 +236,8 @@ private:
QCheckBox *tilingOn;
QLabel *tilingLayoutLabel;
QLabel *tilingRaiseLabel;
QComboBox *tilingLayoutCombo;
QComboBox *tilingRaiseCombo;
KComboBox *tilingLayoutCombo;
KComboBox *tilingRaiseCombo;
void setTilingOn( bool );
void setTilingLayout( int );
void setTilingRaisePolicy( int );

2
tilinglayoutfactory.cpp
View file

@ -40,7 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
layout = new lay( w );\
layout->setLayoutType( lay##L );\
KNotification::event( "tilinglayoutchanged", \
i18n( "Layout changed to %1" ).arg( #lay ),\
i18n( "Layout changed to %1", i18n(#lay) ),\
QPixmap(), NULL, KNotification::CloseOnTimeout, KComponentData( "kwin" ) );\
break

2
tilinglayouts/columns/columns.cpp
View file

@ -149,7 +149,7 @@ void Columns::arrange( QRect wgeom )
int mult = 0;
int originalTop = wgeom.y();
for( QList<Tile *>::const_iterator it = ++tiled.constBegin() ; it != tiled.constEnd() ; it++ )
for( QList<Tile *>::const_iterator it = ++tiled.constBegin() ; it != tiled.constEnd() ; ++it )
{
if( (*it)->floating() )
continue;