diff --git a/kcmkwin/kwindecoration/buttons.h b/kcmkwin/kwindecoration/buttons.h index 7e9e247658..b5e3ce94d9 100644 --- a/kcmkwin/kwindecoration/buttons.h +++ b/kcmkwin/kwindecoration/buttons.h @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -140,7 +140,7 @@ class ButtonSource : public KListView virtual Q3DragObject *dragObject(); }; -typedef Q3ValueList ButtonList; +typedef QList ButtonList; /** * This class renders and handles the demo titlebar dropsite diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index c6f84f8f39..73551442f1 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kcmkwin/kwindecoration/kwindecoration.cpp @@ -42,7 +42,6 @@ //Added by qt3to4: #include #include -#include #include #include @@ -235,7 +234,7 @@ void KWinDecorationModule::findDecorations() // Fills the decorationList with a list of available kwin decorations void KWinDecorationModule::createDecorationList() { - Q3ValueList::ConstIterator it; + QList::ConstIterator it; // Sync with kwin hardcoded KDE2 style which has no desktop item QStringList decorationNames; @@ -277,10 +276,10 @@ static const char* const border_names[ KDecorationDefines::BordersCount ] = I18N_NOOP( "Oversized" ) }; -int KWinDecorationModule::borderSizeToIndex( BorderSize size, Q3ValueList< BorderSize > sizes ) +int KWinDecorationModule::borderSizeToIndex( BorderSize size, QList< BorderSize > sizes ) { int pos = 0; - for( Q3ValueList< BorderSize >::ConstIterator it = sizes.begin(); + for( QList< BorderSize >::ConstIterator it = sizes.begin(); it != sizes.end(); ++it, ++pos ) if( size <= *it ) @@ -289,9 +288,9 @@ int KWinDecorationModule::borderSizeToIndex( BorderSize size, Q3ValueList< Borde } KDecorationDefines::BorderSize KWinDecorationModule::indexToBorderSize( int index, - Q3ValueList< BorderSize > sizes ) + QList< BorderSize > sizes ) { - Q3ValueList< BorderSize >::ConstIterator it = sizes.begin(); + QList< BorderSize >::ConstIterator it = sizes.begin(); for(; it != sizes.end(); ++it, --index ) @@ -305,7 +304,7 @@ void KWinDecorationModule::slotBorderChanged( int size ) if( lBorder->isHidden()) return; emit KCModule::changed( true ); - Q3ValueList< BorderSize > sizes; + QList< BorderSize > sizes; if( plugins->factory() != NULL ) sizes = plugins->factory()->borderSizes(); assert( sizes.count() >= 2 ); @@ -325,7 +324,7 @@ QString KWinDecorationModule::decorationName( QString& libName ) { QString decoName; - Q3ValueList::Iterator it; + QList::Iterator it; for( it = decorations.begin(); it != decorations.end(); ++it ) if ( (*it).libraryName == libName ) { @@ -343,7 +342,7 @@ QString KWinDecorationModule::decorationLibName( const QString& name ) // Find the corresponding library name to that of // the current plugin name - Q3ValueList::Iterator it; + QList::Iterator it; for( it = decorations.begin(); it != decorations.end(); ++it ) if ( (*it).name == name ) { @@ -563,7 +562,7 @@ void KWinDecorationModule::defaults() void KWinDecorationModule::checkSupportedBorderSizes() { - Q3ValueList< BorderSize > sizes; + QList< BorderSize > sizes; if( plugins->factory() != NULL ) sizes = plugins->factory()->borderSizes(); if( sizes.count() < 2 ) { @@ -571,7 +570,7 @@ void KWinDecorationModule::checkSupportedBorderSizes() cBorder->hide(); } else { cBorder->clear(); - for (Q3ValueList::const_iterator it = sizes.begin(); it != sizes.end(); ++it) { + for (QList::const_iterator it = sizes.begin(); it != sizes.end(); ++it) { BorderSize size = *it; cBorder->insertItem(i18n(border_names[size]), borderSizeToIndex(size,sizes) ); } diff --git a/kcmkwin/kwindecoration/kwindecoration.h b/kcmkwin/kwindecoration/kwindecoration.h index e4b3bceff9..818fae9771 100644 --- a/kcmkwin/kwindecoration/kwindecoration.h +++ b/kcmkwin/kwindecoration/kwindecoration.h @@ -41,7 +41,6 @@ #include "kwindecorationIface.h" //Added by qt3to4: #include -#include class KComboBox; class QCheckBox; @@ -101,14 +100,14 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface void resetPlugin( KConfig* conf, const QString& currentDecoName = QString::null ); void resetKWin(); void checkSupportedBorderSizes(); - static int borderSizeToIndex( BorderSize size, Q3ValueList< BorderSize > sizes ); - static BorderSize indexToBorderSize( int index, Q3ValueList< BorderSize > sizes ); + static int borderSizeToIndex( BorderSize size, QList< BorderSize > sizes ); + static BorderSize indexToBorderSize( int index, QList< BorderSize > sizes ); QTabWidget* tabWidget; // Page 1 KComboBox* decorationList; - Q3ValueList decorations; + QList decorations; KDecorationPreview* preview; KDecorationPlugins* plugins;