From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab. --- kcontrol/keys/commandShortcuts.cpp | 6 +++--- kcontrol/keys/keyconfig.cpp | 16 ++++++++-------- kcontrol/keys/main.cpp | 2 +- kcontrol/keys/modifiers.cpp | 2 +- kcontrol/keys/shortcuts.cpp | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kcontrol/keys') diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index 7a4c4bd7f..cf564e89f 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -83,13 +83,13 @@ void CommandShortcutsModule::initGUI() label->setText(i18n("Below is a list of known commands which you may assign keyboard shortcuts to. " "To edit, add or remove entries from this list use the " "KDE menu editor.")); - label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + label->tqsetSizePolicy(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())); mainLayout->addWidget(label); m_tree = new AppTreeView(this, "appTreeView"); - m_tree->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + m_tree->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mainLayout->setStretchFactor(m_tree, 10); mainLayout->addWidget(m_tree); TQWhatsThis::add(m_tree, diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 6e4fac386..75ec4edcb 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include @@ -170,7 +170,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) topLayout->addRowSpacing(3, 15); topLayout->addMultiCellWidget(kc, 5, 5, 0, 1); - setMinimumSize(topLayout->sizeHint()); + setMinimumSize(topLayout->tqsizeHint()); } KKeyModule::~KKeyModule (){ @@ -238,7 +238,7 @@ void KKeyModule::defaults() uint ind = sList->currentItem(); - if ( !d.remove( *sFileList->at( ind ) ) ) { + if ( !d.remove( *sFileList->tqat( ind ) ) ) { KMessageBox::sorry( 0, i18n("This key scheme could not be removed.\n" "Perhaps you do not have permission to alter the file " @@ -247,7 +247,7 @@ void KKeyModule::defaults() } sList->removeItem( ind ); - sFileList->remove( sFileList->at(ind) ); + sFileList->remove( sFileList->tqat(ind) ); }*/ void KKeyModule::slotKeyChange() @@ -258,7 +258,7 @@ void KKeyModule::slotKeyChange() /*void KKeyModule::slotSave( ) { - KSimpleConfig config(*sFileList->at( sList->currentItem() ) ); + KSimpleConfig config(*sFileList->tqat( sList->currentItem() ) ); // global=true is necessary in order to // let both 'Global Shortcuts' and 'Shortcut Sequences' be // written to the same scheme file. @@ -281,7 +281,7 @@ void KKeyModule::readScheme( int index ) else { KConfigBase* config = 0; if( index == 0 ) config = new KConfig( "kdeglobals" ); - //else config = new KSimpleConfig( *sFileList->at( index ), true ); + //else config = new KSimpleConfig( *sFileList->tqat( index ), true ); actions.readActions( (index == 0) ? KeySet : KeyScheme, config ); kc->listSync(); @@ -416,8 +416,8 @@ void KKeyModule::readScheme( int index ) // Set various appropriate for the scheme if ( indx < nSysSchemes || - (*sFileList->at(indx)).contains( "/global-" ) || - (*sFileList->at(indx)).contains( "/app-" ) ) { + (*sFileList->tqat(indx)).contains( "/global-" ) || + (*sFileList->tqat(indx)).contains( "/app-" ) ) { removeBt->setEnabled( FALSE ); } else { removeBt->setEnabled( TRUE ); diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index 79ae90efe..a91fca234 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index 97ae3473b..8cde6989e 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 13e0b0cf7..c133d0de7 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include @@ -145,7 +145,7 @@ void ShortcutsModule::initGUI() m_pcbSchemes = new KComboBox( this ); m_pcbSchemes->setMinimumWidth( 100 ); - m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); + m_pcbSchemes->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); pHLayout->addWidget( m_pcbSchemes ); @@ -190,10 +190,10 @@ void ShortcutsModule::initGUI() m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true ); m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false ); - m_pkcGeneral->resize (m_pkcGeneral->sizeHint() ); + m_pkcGeneral->resize (m_pkcGeneral->tqsizeHint() ); if (system("xmodmap 1> /dev/null 2> /dev/null") == 0) { m_useRmWinKeys = new TQCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this ); - m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() ); + m_useRmWinKeys->resize( m_useRmWinKeys->tqsizeHint() ); m_useRmWinKeys->setChecked( m_bUseRmWinKeys ); pVLayout->addWidget( m_useRmWinKeys, 1, 0 ); connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) ); -- cgit v1.2.1