summaryrefslogtreecommitdiffstats
path: root/kmenuedit/basictab.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kmenuedit/basictab.cpp
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmenuedit/basictab.cpp')
-rw-r--r--kmenuedit/basictab.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index a5cd9ac64..1ab175c17 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -53,7 +53,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
_menuFolderInfo = 0;
_menuEntryInfo = 0;
- TQGridLayout *tqlayout = new TQGridLayout(this, 6, 2,
+ TQGridLayout *layout = new TQGridLayout(this, 6, 2,
KDialog::marginHint(),
KDialog::spacingHint());
@@ -75,7 +75,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
_execEdit = new KURLRequester(general_group);
_execEdit->lineEdit()->setAcceptDrops(false);
TQWhatsThis::add(_execEdit,i18n(
- "Following the command, you can have several place holders which will be tqreplaced "
+ "Following the command, you can have several place holders which will be replaced "
"with the actual values when the actual program is run:\n"
"%f - a single file name\n"
"%F - a list of files; use for applications that can open several local files at once\n"
@@ -129,8 +129,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
connect(_iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(slotChanged()));
grid->addMultiCellWidget(_iconButton, 0, 1, 2, 2);
- // add the general group to the main tqlayout
- tqlayout->addMultiCellWidget(general_group, 0, 0, 0, 1);
+ // add the general group to the main layout
+ layout->addMultiCellWidget(general_group, 0, 0, 0, 1);
// path group
_path_group = new TQGroupBox(this);
@@ -151,7 +151,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
connect(_pathEdit, TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(slotChanged()));
vbox->addWidget(hbox);
- tqlayout->addMultiCellWidget(_path_group, 1, 1, 0, 1);
+ layout->addMultiCellWidget(_path_group, 1, 1, 0, 1);
// terminal group
_term_group = new TQGroupBox(this);
@@ -172,7 +172,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
connect(_termOptEdit, TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(slotChanged()));
vbox->addWidget(hbox);
- tqlayout->addMultiCellWidget(_term_group, 2, 2, 0, 1);
+ layout->addMultiCellWidget(_term_group, 2, 2, 0, 1);
_termOptEdit->setEnabled(false);
@@ -195,18 +195,18 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
connect(_uidEdit, TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(slotChanged()));
vbox->addWidget(hbox);
- tqlayout->addMultiCellWidget(_uid_group, 3, 3, 0, 1);
+ layout->addMultiCellWidget(_uid_group, 3, 3, 0, 1);
_uidEdit->setEnabled(false);
- tqlayout->setRowStretch(0, 2);
+ layout->setRowStretch(0, 2);
// key binding group
general_group_keybind = new TQGroupBox(this);
- tqlayout->addMultiCellWidget( general_group_keybind, 4, 4, 0, 1 );
+ layout->addMultiCellWidget( general_group_keybind, 4, 4, 0, 1 );
// dummy widget in order to make it look a bit better
- tqlayout->addWidget( new TQWidget(this), 5, 0 );
- tqlayout->setRowStretch( 5, 4 );
+ layout->addWidget( new TQWidget(this), 5, 0 );
+ layout->setRowStretch( 5, 4 );
TQGridLayout *grid_keybind = new TQGridLayout(general_group_keybind, 3, 1,
KDialog::marginHint(),
KDialog::spacingHint());
@@ -468,8 +468,8 @@ void BasicTab::slotCapturedShortcut(const KShortcut& cut)
if (signalsBlocked())
return;
- if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, tqtopLevelWidget())
- || KKeyChooser::checkStandardShortcutsConflict( cut, true, tqtopLevelWidget()))
+ if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, topLevelWidget())
+ || KKeyChooser::checkStandardShortcutsConflict( cut, true, topLevelWidget()))
return;
if ( KHotKeys::present() )