summaryrefslogtreecommitdiffstats
path: root/kcontrol/keys
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2024-01-12 10:51:50 +0900
committerMichele Calgaro <[email protected]>2024-01-16 10:03:43 +0900
commita4241b7911d2e0b36edfb02f616b8b282050c0ec (patch)
tree316c9a3298857645d5da57b682fce707c8e2a907 /kcontrol/keys
parentf9d06cee3d2b4ffe415b1d52c9ad5575643a9e34 (diff)
downloadtdebase-a4241b7911d2e0b36edfb02f616b8b282050c0ec.tar.gz
tdebase-a4241b7911d2e0b36edfb02f616b8b282050c0ec.zip
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'kcontrol/keys')
-rw-r--r--kcontrol/keys/commandShortcuts.cpp20
-rw-r--r--kcontrol/keys/keyconfig.cpp20
-rw-r--r--kcontrol/keys/main.cpp8
-rw-r--r--kcontrol/keys/modifiers.cpp4
-rw-r--r--kcontrol/keys/shortcuts.cpp20
-rw-r--r--kcontrol/keys/treeview.cpp8
6 files changed, 40 insertions, 40 deletions
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index 4ae379a50..31e1b0500 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -84,8 +84,8 @@ void CommandShortcutsModule::initGUI()
"To edit, add or remove entries from this list use the "
"<a href=\"launchMenuEditor\">TDE menu editor</a>.</qt>"));
label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
- disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &)));
- connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor()));
+ disconnect(label, TQ_SIGNAL(linkClicked(const TQString &)), label, TQ_SLOT(openLink(const TQString &)));
+ connect(label, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(launchMenuEditor()));
mainLayout->addWidget(label);
m_tree = new AppTreeView(this, "appTreeView");
@@ -97,10 +97,10 @@ void CommandShortcutsModule::initGUI()
"currently defined on this system. Click to select a command to "
"assign a keyboard shortcut to. Complete management of these "
"entries can be done via the menu editor program."));
- connect(m_tree, TQT_SIGNAL(entrySelected(const TQString&, const TQString &, bool)),
- this, TQT_SLOT(commandSelected(const TQString&, const TQString &, bool)));
- connect(m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
- this, TQT_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int)));
+ connect(m_tree, TQ_SIGNAL(entrySelected(const TQString&, const TQString &, bool)),
+ this, TQ_SLOT(commandSelected(const TQString&, const TQString &, bool)));
+ connect(m_tree, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
+ this, TQ_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int)));
m_shortcutBox = new TQButtonGroup(i18n("Shortcut for Selected Command"), this);
mainLayout->addWidget(m_shortcutBox);
TQHBoxLayout* buttonLayout = new TQHBoxLayout(m_shortcutBox, KDialog::marginHint() * 2);
@@ -121,10 +121,10 @@ void CommandShortcutsModule::initGUI()
"to the currently selected command."));
buttonLayout->addSpacing(KDialog::spacingHint() * 2);
buttonLayout->addWidget(m_shortcutButton);
- connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
- this, TQT_SLOT(shortcutChanged(const TDEShortcut&)));
- connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool)));
- connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool)));
+ connect(m_shortcutButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)),
+ this, TQ_SLOT(shortcutChanged(const TDEShortcut&)));
+ connect(m_customRadio, TQ_SIGNAL(toggled(bool)), m_shortcutButton, TQ_SLOT(setEnabled(bool)));
+ connect(m_noneRadio, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(shortcutRadioToggled(bool)));
buttonLayout->addStretch(1);
}
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index ee39447a1..90fa59f82 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -112,8 +112,8 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
//readSchemeNames();
sList->setCurrentItem( 0 );
- connect( sList, TQT_SIGNAL( highlighted( int ) ),
- TQT_SLOT( slotPreviewScheme( int ) ) );
+ connect( sList, TQ_SIGNAL( highlighted( int ) ),
+ TQ_SLOT( slotPreviewScheme( int ) ) );
TQLabel *label = new TQLabel( sList, i18n("&Key Scheme"), this );
@@ -124,12 +124,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
TQWhatsThis::add( sList, wtstr );
addBt = new TQPushButton( i18n("&Save Scheme..."), this );
- connect( addBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) );
+ connect( addBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) );
TQWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name."));
removeBt = new TQPushButton( i18n("&Remove Scheme"), this );
removeBt->setEnabled(FALSE);
- connect( removeBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) );
+ connect( removeBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) );
TQWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not"
" remove the standard system wide schemes, 'Current scheme' and 'TDE default'.") );
@@ -143,7 +143,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
if( !KKeySequence::keyboardHasMetaKey() )
preferMetaBt->setEnabled( false );
preferMetaBt->setChecked( KKeySequence::useFourModifierKeys() );
- connect( preferMetaBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotPreferMeta()) );
+ connect( preferMetaBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotPreferMeta()) );
TQWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would "
"like TDE to prefer the 3-modifier configuration defaults, then this option "
"should be unchecked.") );
@@ -153,7 +153,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
KSeparator* line = new KSeparator( KSeparator::HLine, this );
kc = new KeyChooserSpec( actions, this, isGlobal );
- connect( kc, TQT_SIGNAL(keyChange()), this, TQT_SLOT(slotKeyChange()) );
+ connect( kc, TQ_SIGNAL(keyChange()), this, TQ_SLOT(slotKeyChange()) );
readScheme();
@@ -356,8 +356,8 @@ void KKeyModule::readScheme( int index )
} while ( nameValid == FALSE );
- disconnect( sList, TQT_SIGNAL( highlighted( int ) ), this,
- TQT_SLOT( slotPreviewScheme( int ) ) );
+ disconnect( sList, TQ_SIGNAL( highlighted( int ) ), this,
+ TQ_SLOT( slotPreviewScheme( int ) ) );
TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/");
@@ -403,8 +403,8 @@ void KKeyModule::readScheme( int index )
slotSave();
- connect( sList, TQT_SIGNAL( highlighted( int ) ), this,
- TQT_SLOT( slotPreviewScheme( int ) ) );
+ connect( sList, TQ_SIGNAL( highlighted( int ) ), this,
+ TQ_SLOT( slotPreviewScheme( int ) ) );
slotPreviewScheme( sList->currentItem() );
}*/
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index eccc5210a..de0cc2dbc 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -75,16 +75,16 @@ void KeyModule::initGUI()
m_pShortcuts = new ShortcutsModule( this );
m_pTab->addTab( m_pShortcuts, i18n("Shortcut Schemes") );
- connect( m_pShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+ connect( m_pShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
m_pCommandShortcuts = new CommandShortcutsModule ( this );
m_pTab->addTab( m_pCommandShortcuts, i18n("Command Shortcuts") );
- connect( m_pCommandShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
- connect( m_pTab, TQT_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQT_SLOT(showing(TQWidget*)) );
+ connect( m_pCommandShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
+ connect( m_pTab, TQ_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQ_SLOT(showing(TQWidget*)) );
m_pModifiers = new ModifiersModule( this );
m_pTab->addTab( m_pModifiers, i18n("Modifier Keys") );
- connect( m_pModifiers, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+ connect( m_pModifiers, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
}
void KeyModule::load()
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 349bd492d..bc182f944 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -207,7 +207,7 @@ void ModifiersModule::initGUI()
m_pchkMacKeyboard = new TQCheckBox( i18n("Macintosh keyboard"), this );
m_pchkMacKeyboard->setChecked( m_bMacKeyboardOrig );
- connect( m_pchkMacKeyboard, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacKeyboardClicked()) );
+ connect( m_pchkMacKeyboard, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacKeyboardClicked()) );
pLayoutTop->addWidget( m_pchkMacKeyboard, 1, 0 );
m_pchkMacSwap = new TQCheckBox( i18n("MacOS-style modifier usage"), this );
@@ -220,7 +220,7 @@ void ModifiersModule::initGUI()
"<b>Command</b> will be used for application and console commands, "
"<b>Option</b> as a command modifier and for navigating menus and dialogs, "
"and <b>Control</b> for window manager commands.") );
- connect( m_pchkMacSwap, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacSwapClicked()) );
+ connect( m_pchkMacSwap, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacSwapClicked()) );
pLayoutTop->addWidget( m_pchkMacSwap, 2, 0 );
//------------------
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index e7f599dda..18f6803ab 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -139,21 +139,21 @@ void ShortcutsModule::initGUI()
pGroup->hide();
m_prbPre = new TQRadioButton( "", this );
- connect( m_prbPre, TQT_SIGNAL(clicked()), TQT_SLOT(slotSchemeCur()) );
+ connect( m_prbPre, TQ_SIGNAL(clicked()), TQ_SLOT(slotSchemeCur()) );
pGroup->insert( m_prbPre );
pHLayout->addWidget( m_prbPre );
m_pcbSchemes = new KComboBox( this );
m_pcbSchemes->setMinimumWidth( 100 );
m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
- connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
+ connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) );
pHLayout->addWidget( m_pcbSchemes );
pHLayout->addSpacing( KDialog::marginHint() );
m_pbtnRemove = new TQPushButton( i18n("&Remove"), this );
m_pbtnRemove->setEnabled( false );
- connect( m_pbtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveScheme()) );
+ connect( m_pbtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveScheme()) );
TQWhatsThis::add( m_pbtnRemove, i18n("Click here to remove the selected key bindings scheme. You cannot"
" remove the standard system-wide schemes 'Current scheme' and 'TDE default'.") );
pHLayout->addWidget( m_pbtnRemove );
@@ -168,7 +168,7 @@ void ShortcutsModule::initGUI()
m_pbtnSave = new TQPushButton( i18n("&Save..."), this );
m_pbtnSave->setEnabled( false );
TQWhatsThis::add( m_pbtnSave, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.") );
- connect( m_pbtnSave, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveSchemeAs()) );
+ connect( m_pbtnSave, TQ_SIGNAL(clicked()), TQ_SLOT(slotSaveSchemeAs()) );
pHLayout->addWidget( m_pbtnSave );
pHLayout->addStretch( 1 );
@@ -196,20 +196,20 @@ void ShortcutsModule::initGUI()
m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() );
m_useRmWinKeys->setChecked( m_bUseRmWinKeys );
pVLayout->addWidget( m_useRmWinKeys, 1, 0 );
- connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) );
+ connect( m_useRmWinKeys, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseRmWinKeysClicked()) );
}
m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") );
- connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+ connect( m_pkcGeneral, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
m_pListSequence = new TDEAccelShortcutList( m_actionsSequence, true );
m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false );
m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") );
- connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+ connect( m_pkcSequence, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
m_pListApplication = new TDEStdAccel::ShortcutList;
m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false );
m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") );
- connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) );
+ connect( m_pkcApplication, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) );
kdDebug(125) << "G-----------" << endl;
readSchemeNames();
@@ -404,7 +404,7 @@ void ShortcutsModule::slotSaveSchemeAs()
return;
} while( !bNameValid );
- disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) );
+ disconnect( m_pcbSchemes, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelectScheme(int)) );
TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" );
@@ -434,7 +434,7 @@ void ShortcutsModule::slotSaveSchemeAs()
saveScheme();
- connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
+ connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) );
slotSelectScheme();
}
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 06d01e317..31879e2f2 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -109,11 +109,11 @@ AppTreeView::AppTreeView( TQWidget *parent, const char *name )
addColumn(i18n("Shortcut"));
addColumn(i18n("Alternate"));
- connect(this, TQT_SIGNAL(clicked( TQListViewItem* )),
- TQT_SLOT(itemSelected( TQListViewItem* )));
+ connect(this, TQ_SIGNAL(clicked( TQListViewItem* )),
+ TQ_SLOT(itemSelected( TQListViewItem* )));
- connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
- TQT_SLOT(itemSelected( TQListViewItem* )));
+ connect(this,TQ_SIGNAL(selectionChanged ( TQListViewItem * )),
+ TQ_SLOT(itemSelected( TQListViewItem* )));
}
AppTreeView::~AppTreeView()