diff options
Diffstat (limited to 'kcontrol/keys')
-rw-r--r-- | kcontrol/keys/commandShortcuts.cpp | 20 | ||||
-rw-r--r-- | kcontrol/keys/commandShortcuts.h | 2 | ||||
-rw-r--r-- | kcontrol/keys/keyconfig.cpp | 20 | ||||
-rw-r--r-- | kcontrol/keys/keyconfig.h | 4 | ||||
-rw-r--r-- | kcontrol/keys/main.cpp | 20 | ||||
-rw-r--r-- | kcontrol/keys/main.h | 2 | ||||
-rw-r--r-- | kcontrol/keys/modifiers.cpp | 18 | ||||
-rw-r--r-- | kcontrol/keys/modifiers.h | 2 | ||||
-rw-r--r-- | kcontrol/keys/shortcuts.cpp | 20 | ||||
-rw-r--r-- | kcontrol/keys/shortcuts.h | 2 | ||||
-rw-r--r-- | kcontrol/keys/treeview.cpp | 10 | ||||
-rw-r--r-- | kcontrol/keys/treeview.h | 2 |
12 files changed, 61 insertions, 61 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/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h index 54be5345b..9cb328f15 100644 --- a/kcontrol/keys/commandShortcuts.h +++ b/kcontrol/keys/commandShortcuts.h @@ -37,7 +37,7 @@ typedef TQPtrListIterator<AppTreeItem> treeItemListIterator; class CommandShortcutsModule : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CommandShortcutsModule( TQWidget *parent = 0, const char *name = 0 ); ~CommandShortcutsModule(); 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/keyconfig.h b/kcontrol/keys/keyconfig.h index f442a2c31..4da3f16b2 100644 --- a/kcontrol/keys/keyconfig.h +++ b/kcontrol/keys/keyconfig.h @@ -22,7 +22,7 @@ class KeyChooserSpec; class KKeyModule : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDEAccelActions actions; //TDEAccelActions dict; @@ -77,7 +77,7 @@ protected: class KeyChooserSpec : public KKeyChooser { - Q_OBJECT + TQ_OBJECT public: KeyChooserSpec( TDEAccelActions& actions, TQWidget* parent, bool bGlobal ); diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index d002b667f..bba777adb 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() @@ -146,7 +146,7 @@ TQString KeyModule::handbookSection() const extern "C" { - KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/) { // What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15 TDEGlobal::locale()->insertCatalogue("twin"); @@ -155,7 +155,7 @@ extern "C" return new KeyModule(parent, "kcmkeys"); } - KDE_EXPORT void initModifiers() + TDE_EXPORT void initModifiers() { kdDebug(125) << "KeyModule::initModifiers()" << endl; @@ -165,7 +165,7 @@ extern "C" ModifiersModule::setupMacModifierKeys(); } - KDE_EXPORT void init_keys() + TDE_EXPORT void init_keys() { kdDebug(125) << "KeyModule::init()\n"; @@ -181,9 +181,9 @@ extern "C" kdDebug(125) << "KeyModule::init() - Load Included Bindings\n"; // this should match the included files above #define NOSLOTS -#define SHIFT Qt::SHIFT -#define CTRL Qt::CTRL -#define ALT Qt::ALT +#define SHIFT TQt::SHIFT +#define CTRL TQt::CTRL +#define ALT TQt::ALT #include "../../klipper/klipperbindings.cpp" #include "../../twin/twinbindings.cpp" #define KICKER_ALL_BINDINGS diff --git a/kcontrol/keys/main.h b/kcontrol/keys/main.h index 281b2d37a..1830438a9 100644 --- a/kcontrol/keys/main.h +++ b/kcontrol/keys/main.h @@ -33,7 +33,7 @@ class ModifiersModule; class KeyModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: KeyModule( TQWidget *parent, const char *name ); ~KeyModule(); diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index 39dfb7010..bc182f944 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -172,7 +172,7 @@ void ModifiersModule::initGUI() TQGridLayout* pLayoutTop = new TQGridLayout( this, 6, 2, KDialog::marginHint() ); pLayoutTop->setColStretch( 1, 1 ); - TQGroupBox* pGroup = new TQGroupBox( 2, Qt::Horizontal, i18n("TDE Modifiers"), this ); + TQGroupBox* pGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("TDE Modifiers"), this ); pLayoutTop->addWidget( pGroup, 0, 0 ); TQLabel* plbl = new TQLabel( i18n("Modifier"), pGroup ); @@ -183,13 +183,13 @@ void ModifiersModule::initGUI() plbl = new TQLabel( i18n("X11-Mod"), pGroup ); plbl->setFont( font ); - new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Shift"), pGroup ); + new TQLabel( i18n("TQAccel", "Shift"), pGroup ); new TQLabel( "shift", pGroup ); - m_plblCtrl = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl"), pGroup ); + m_plblCtrl = new TQLabel( i18n("TQAccel", "Ctrl"), pGroup ); new TQLabel( "control", pGroup ); - m_plblAlt = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt"), pGroup ); + m_plblAlt = new TQLabel( i18n("TQAccel", "Alt"), pGroup ); new TQLabel( "mod1", pGroup ); m_plblWin = new TQLabel( i18n("Win"), pGroup ); @@ -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,13 +220,13 @@ 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 ); //------------------ pLayoutTop->addRowSpacing( 3, KDialog::spacingHint() * 3 ); - pGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("X Modifier Mapping"), this ); + pGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("X Modifier Mapping"), this ); pLayoutTop->addWidget( pGroup, 4, 0 ); m_plstXMods = new TDEListView( pGroup ); @@ -286,8 +286,8 @@ void ModifiersModule::updateWidgets() } m_pchkMacSwap->setEnabled( true ); } else { - m_plblCtrl->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl") ); - m_plblAlt->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt") ); + m_plblCtrl->setText( i18n("TQAccel", "Ctrl") ); + m_plblAlt->setText( i18n("TQAccel", "Alt") ); m_plblWin->setText( i18n("Win") ); m_pchkMacSwap->setEnabled( false ); } diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h index b600bfafb..64b73fa5b 100644 --- a/kcontrol/keys/modifiers.h +++ b/kcontrol/keys/modifiers.h @@ -10,7 +10,7 @@ class TDEListView; class ModifiersModule : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ModifiersModule( TQWidget *parent = 0, const char *name = 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/shortcuts.h b/kcontrol/keys/shortcuts.h index c1f1b2822..2ffc0e68f 100644 --- a/kcontrol/keys/shortcuts.h +++ b/kcontrol/keys/shortcuts.h @@ -35,7 +35,7 @@ class ShortcutsModule : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ShortcutsModule( TQWidget *parent = 0, const char *name = 0 ); ~ShortcutsModule(); diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 36d0e3bf4..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() @@ -122,7 +122,7 @@ AppTreeView::~AppTreeView() void AppTreeView::fill() { - TQApplication::setOverrideCursor(Qt::WaitCursor); + TQApplication::setOverrideCursor(TQt::WaitCursor); clear(); fillBranch(TQString::null, 0); TQApplication::restoreOverrideCursor(); diff --git a/kcontrol/keys/treeview.h b/kcontrol/keys/treeview.h index 4da6d2351..591658ffe 100644 --- a/kcontrol/keys/treeview.h +++ b/kcontrol/keys/treeview.h @@ -61,7 +61,7 @@ private: class AppTreeView : public TDEListView { friend class AppTreeItem; - Q_OBJECT + TQ_OBJECT public: AppTreeView(TQWidget *parent=0, const char *name=0); ~AppTreeView(); |