diff --git a/clients/b2/config/config.cpp b/clients/b2/config/config.cpp index 0815606faf..d131a2e617 100644 --- a/clients/b2/config/config.cpp +++ b/clients/b2/config/config.cpp @@ -124,7 +124,7 @@ void B2Config::load(KConfig * /*conf*/) op = 0; } - menuDblClickOp->setCurrentItem(op); + menuDblClickOp->setCurrentIndex(op); } @@ -162,7 +162,7 @@ void B2Config::defaults() { cbColorBorder->setChecked(false); showGrabHandleCb->setChecked(true); - menuDblClickOp->setCurrentItem(0); + menuDblClickOp->setCurrentIndex(0); } #include "config.moc" diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp index 3fb095dbc5..396e7d4500 100644 --- a/kcmkwin/kwinoptions/mouse.cpp +++ b/kcmkwin/kwinoptions/mouse.cpp @@ -489,16 +489,16 @@ static int tbl_txt_lookup( const char* const arr[], const char* txt ) void KTitleBarActionsConfig::setComboText( QComboBox* combo, const char*txt ) { if( combo == coTiDbl ) - combo->setCurrentItem( tbl_txt_lookup( tbl_TiDbl, txt )); + combo->setCurrentIndex( tbl_txt_lookup( tbl_TiDbl, txt )); else if( combo == coTiAct1 || combo == coTiAct2 || combo == coTiAct3 ) - combo->setCurrentItem( tbl_txt_lookup( tbl_TiAc, txt )); + combo->setCurrentIndex( tbl_txt_lookup( tbl_TiAc, txt )); else if( combo == coTiInAct1 || combo == coTiInAct2 || combo == coTiInAct3 ) - combo->setCurrentItem( tbl_txt_lookup( tbl_TiInAc, txt )); + combo->setCurrentIndex( tbl_txt_lookup( tbl_TiInAc, txt )); else if( combo == coTiAct4 ) - combo->setCurrentItem( tbl_txt_lookup( tbl_TiWAc, txt )); + combo->setCurrentIndex( tbl_txt_lookup( tbl_TiWAc, txt )); else if( combo == coMax[0] || combo == coMax[1] || combo == coMax[2] ) { - combo->setCurrentItem( tbl_txt_lookup( tbl_Max, txt )); + combo->setCurrentIndex( tbl_txt_lookup( tbl_Max, txt )); static_cast(combo)->changed(); } else @@ -781,13 +781,13 @@ KWindowActionsConfig::~KWindowActionsConfig() void KWindowActionsConfig::setComboText( QComboBox* combo, const char*txt ) { if( combo == coWin1 || combo == coWin2 || combo == coWin3 ) - combo->setCurrentItem( tbl_txt_lookup( tbl_Win, txt )); + combo->setCurrentIndex( tbl_txt_lookup( tbl_Win, txt )); else if( combo == coAllKey ) - combo->setCurrentItem( tbl_txt_lookup( tbl_AllKey, txt )); + combo->setCurrentIndex( tbl_txt_lookup( tbl_AllKey, txt )); else if( combo == coAll1 || combo == coAll2 || combo == coAll3 ) - combo->setCurrentItem( tbl_txt_lookup( tbl_All, txt )); + combo->setCurrentIndex( tbl_txt_lookup( tbl_All, txt )); else if( combo == coAllW ) - combo->setCurrentItem( tbl_txt_lookup( tbl_AllW, txt )); + combo->setCurrentIndex( tbl_txt_lookup( tbl_AllW, txt )); else abort(); } diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp index 7f2fe949dd..8d4d070b22 100644 --- a/kcmkwin/kwinoptions/windows.cpp +++ b/kcmkwin/kwinoptions/windows.cpp @@ -280,7 +280,7 @@ int KFocusConfig::getFocus() void KFocusConfig::setFocus(int foc) { - focusCombo->setCurrentItem(foc); + focusCombo->setCurrentIndex(foc); // this will disable/hide the auto raise delay widget if focus==click setAutoRaiseEnabled(); @@ -656,7 +656,7 @@ void KAdvancedConfig::setAnimateShade(bool a) { void KAdvancedConfig::setFocusStealing(int l) { l = qMax( 0, qMin( 4, l )); - focusStealing->setCurrentItem(l); + focusStealing->setCurrentIndex(l); } void KAdvancedConfig::setHideUtilityWindowsForInactive(bool s) { @@ -854,7 +854,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, KInstance *ins // CT: disabling is needed as long as functionality misses in kwin //placementCombo->insertItem(i18n("Interactive"), INTERACTIVE_PLACEMENT); //placementCombo->insertItem(i18n("Manual"), MANUAL_PLACEMENT); - placementCombo->setCurrentItem(SMART_PLACEMENT); + placementCombo->setCurrentIndex(SMART_PLACEMENT); // FIXME, when more policies have been added to KWin wtstr = i18n("The placement policy determines where a new window" @@ -970,7 +970,7 @@ int KMovingConfig::getPlacement() void KMovingConfig::setPlacement(int plac) { - placementCombo->setCurrentItem(plac); + placementCombo->setCurrentIndex(plac); } bool KMovingConfig::getMinimizeAnim()