summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-04-21 18:16:50 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-04-21 18:16:50 +0900
commit115138a5a0e7e00c2092345972d9a003384af8a7 (patch)
treeda6a5c3d7a765c0baf75981acf4eb7ed1a5dcc58
parent8b69d90d3fbacd82efff43e5ecbe64fdb2c23882 (diff)
downloadtdebase-115138a5a0e7e00c2092345972d9a003384af8a7.tar.gz
tdebase-115138a5a0e7e00c2092345972d9a003384af8a7.zip
Renamed two check box objects in KControl/Konsole to maintain name
consistency with other check boxes.
-rw-r--r--kcontrol/konsole/kcmkonsole.cpp12
-rw-r--r--kcontrol/konsole/kcmkonsoledialog.ui4
2 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 97d3d0db0..e2b280dfa 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -71,8 +71,8 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
connect(dialog->frameCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->tabsCycleWheel,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
- connect(dialog->menuAccelerators,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->tabsCycleWheelCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
+ connect(dialog->menuAcceleratorsCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
connect(dialog->metaAsAltModeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() ));
connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() ));
@@ -98,8 +98,8 @@ void KCMKonsole::load(bool useDefaults)
bidiOrig = config.readBoolEntry("EnableBidi",false);
dialog->bidiCB->setChecked(bidiOrig);
dialog->matchTabWinTitleCB->setChecked(config.readBoolEntry("MatchTabWinTitle",false));
- dialog->tabsCycleWheel->setChecked(config.readBoolEntry("TabsCycleWheel",true));
- dialog->menuAccelerators->setChecked(config.readBoolEntry("MenuAccelerators",false));
+ dialog->tabsCycleWheelCB->setChecked(config.readBoolEntry("TabsCycleWheel",true));
+ dialog->menuAcceleratorsCB->setChecked(config.readBoolEntry("MenuAccelerators",false));
dialog->warnCB->setChecked(config.readBoolEntry("WarnQuit",true));
dialog->ctrldragCB->setChecked(config.readBoolEntry("CtrlDrag",true));
dialog->cutToBeginningOfLineCB->setChecked(config.readBoolEntry("CutToBeginningOfLine",false));
@@ -139,8 +139,8 @@ void KCMKonsole::save()
bool bidiNew = dialog->bidiCB->isChecked();
config.writeEntry("EnableBidi", bidiNew);
config.writeEntry("MatchTabWinTitle", dialog->matchTabWinTitleCB->isChecked());
- config.writeEntry("TabsCycleWheel", dialog->tabsCycleWheel->isChecked());
- config.writeEntry("MenuAccelerators", dialog->menuAccelerators->isChecked());
+ config.writeEntry("TabsCycleWheel", dialog->tabsCycleWheelCB->isChecked());
+ config.writeEntry("MenuAccelerators", dialog->menuAcceleratorsCB->isChecked());
config.writeEntry("WarnQuit", dialog->warnCB->isChecked());
config.writeEntry("CtrlDrag", dialog->ctrldragCB->isChecked());
config.writeEntry("CutToBeginningOfLine", dialog->cutToBeginningOfLineCB->isChecked());
diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui
index 6e06747c3..ec01401cf 100644
--- a/kcontrol/konsole/kcmkonsoledialog.ui
+++ b/kcontrol/konsole/kcmkonsoledialog.ui
@@ -169,7 +169,7 @@
</widget>
<widget class="TQCheckBox" row="10" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tabsCycleWheel</cstring>
+ <cstring>tabsCycleWheelCB</cstring>
</property>
<property name="text">
<string>Cycle tabs with mouse wheel</string>
@@ -177,7 +177,7 @@
</widget>
<widget class="TQCheckBox" row="11" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>menuAccelerators</cstring>
+ <cstring>menuAcceleratorsCB</cstring>
</property>
<property name="text">
<string>Enable main menu accelerator keys</string>