From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/keys/commandShortcuts.cpp | 14 +++++++------- kcontrol/keys/commandShortcuts.h | 2 +- kcontrol/keys/kaccelaction.h | 2 +- kcontrol/keys/keyconfig.cpp | 14 +++++++------- kcontrol/keys/keyconfig.h | 2 +- kcontrol/keys/modifiers.h | 2 +- kcontrol/keys/shortcuts.cpp | 18 +++++++++--------- kcontrol/keys/shortcuts.h | 2 +- kcontrol/keys/treeview.cpp | 14 +++++++------- 9 files changed, 35 insertions(+), 35 deletions(-) (limited to 'kcontrol/keys') diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index a38f46f29..fb0f06681 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -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, @@ -131,7 +131,7 @@ void CommandShortcutsModule::initGUI() void CommandShortcutsModule::launchMenuEditor() { if ( KApplication::startServiceByDesktopName( "kmenuedit", - TQString::null /*url*/, + TQString() /*url*/, 0 /*error*/, 0 /*dcopservice*/, 0 /*pid*/, @@ -156,9 +156,9 @@ void CommandShortcutsModule::shortcutRadioToggled(bool remove) if (remove) { - m_shortcutButton->setShortcut(TQString::null, false); - item->setAccel(TQString::null); - if (m_changedItems.findRef(item) == -1) + m_shortcutButton->setShortcut(TQString(), false); + item->setAccel(TQString()); + if (m_changedItems.tqfindRef(item) == -1) { m_changedItems.append(item); } @@ -186,7 +186,7 @@ void CommandShortcutsModule::shortcutChanged(const KShortcut& shortcut) m_shortcutButton->setShortcut(accel, false); item->setAccel(accel); m_noneRadio->blockSignals(false); - if (m_changedItems.findRef(item) == -1) + if (m_changedItems.tqfindRef(item) == -1) { m_changedItems.append(item); } diff --git a/kcontrol/keys/commandShortcuts.h b/kcontrol/keys/commandShortcuts.h index d9194e0bc..3650b4e8c 100644 --- a/kcontrol/keys/commandShortcuts.h +++ b/kcontrol/keys/commandShortcuts.h @@ -35,7 +35,7 @@ class TQListViewItem; typedef TQPtrList treeItemList; typedef TQPtrListIterator treeItemListIterator; -class CommandShortcutsModule : public QWidget +class CommandShortcutsModule : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h index 144427d9c..e28846a3a 100644 --- a/kcontrol/keys/kaccelaction.h +++ b/kcontrol/keys/kaccelaction.h @@ -111,7 +111,7 @@ class KAccelAction bool setKeySequence( uint i, const KKeySequence& ); void clearShortcut(); - bool contains( const KKeySequence& ); + bool tqcontains( const KKeySequence& ); TQString toString() const; TQString toStringInternal() const; diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 09726de63..0bd08b1fd 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -75,7 +75,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) for( uint i = 0; i < actions.size(); i++ ) { TQString sConfigKey = actions[i].m_sName; //kdDebug(125) << "sConfigKey: " << sConfigKey << endl; - int iLastSpace = sConfigKey.findRev( ' ' ); + int iLastSpace = sConfigKey.tqfindRev( ' ' ); bool bIsNum = false; if( iLastSpace >= 0 ) sConfigKey.mid( iLastSpace+1 ).toInt( &bIsNum ); @@ -83,7 +83,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) kdDebug(125) << "sConfigKey: " << sConfigKey << " bIsNum: " << bIsNum << " bSeriesOnly: " << bSeriesOnly << endl; - if( ((bSeriesOnly && !bIsNum) || (bSeriesNone && bIsNum)) && !sConfigKey.contains( ':' ) ) { + if( ((bSeriesOnly && !bIsNum) || (bSeriesNone && bIsNum)) && !sConfigKey.tqcontains( ':' ) ) { actions.removeAction( sConfigKey ); i--; } @@ -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 (){ @@ -318,7 +318,7 @@ void KKeyModule::readScheme( int index ) // parse the string for first white space - ind = sFile.find(" "); + ind = sFile.tqfind(" "); if (ind == -1) { ind = sFile.length(); break; @@ -332,7 +332,7 @@ void KKeyModule::readScheme( int index ) TQString s = sFile.mid( ind, 1 ); s = s.upper(); - sFile.replace( ind, 1, s ); + sFile.tqreplace( ind, 1, s ); } @@ -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->at(indx)).tqcontains( "/global-" ) || + (*sFileList->at(indx)).tqcontains( "/app-" ) ) { removeBt->setEnabled( FALSE ); } else { removeBt->setEnabled( TRUE ); diff --git a/kcontrol/keys/keyconfig.h b/kcontrol/keys/keyconfig.h index c7291fa78..cecadf328 100644 --- a/kcontrol/keys/keyconfig.h +++ b/kcontrol/keys/keyconfig.h @@ -20,7 +20,7 @@ class TQCheckBox; class KeyChooserSpec; -class KKeyModule : public QWidget +class KKeyModule : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/keys/modifiers.h b/kcontrol/keys/modifiers.h index f19dc8481..5cb57bfcb 100644 --- a/kcontrol/keys/modifiers.h +++ b/kcontrol/keys/modifiers.h @@ -8,7 +8,7 @@ class TQLabel; class KComboBox; class KListView; -class ModifiersModule : public QWidget +class ModifiersModule : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 9f997b7e5..acd55e47f 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -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()) ); @@ -227,14 +227,14 @@ void ShortcutsModule::createActionsGeneral() for( uint i = 0; i < actions.count(); i++ ) { TQString sConfigKey = actions[i].name(); //kdDebug(125) << "sConfigKey: " << sConfigKey << endl; - int iLastSpace = sConfigKey.findRev( ' ' ); + int iLastSpace = sConfigKey.tqfindRev( ' ' ); bool bIsNum = false; if( iLastSpace >= 0 ) sConfigKey.mid( iLastSpace+1 ).toInt( &bIsNum ); //kdDebug(125) << "sConfigKey: " << sConfigKey // << " bIsNum: " << bIsNum << endl; - if( bIsNum && !sConfigKey.contains( ':' ) ) { + if( bIsNum && !sConfigKey.tqcontains( ':' ) ) { actions[i].setConfigurable( false ); actions[i].setName( TQString::null ); } @@ -248,14 +248,14 @@ void ShortcutsModule::createActionsSequence() for( uint i = 0; i < actions.count(); i++ ) { TQString sConfigKey = actions[i].name(); //kdDebug(125) << "sConfigKey: " << sConfigKey << endl; - int iLastSpace = sConfigKey.findRev( ' ' ); + int iLastSpace = sConfigKey.tqfindRev( ' ' ); bool bIsNum = false; if( iLastSpace >= 0 ) sConfigKey.mid( iLastSpace+1 ).toInt( &bIsNum ); //kdDebug(125) << "sConfigKey: " << sConfigKey // << " bIsNum: " << bIsNum << endl; - if( !bIsNum && !sConfigKey.contains( ':' ) ) { + if( !bIsNum && !sConfigKey.tqcontains( ':' ) ) { actions[i].setConfigurable( false ); actions[i].setName( TQString::null ); } @@ -372,7 +372,7 @@ void ShortcutsModule::slotSaveSchemeAs() int ind = 0; while( ind < (int) sFile.length() ) { // parse the string for first white space - ind = sFile.find(" "); + ind = sFile.tqfind(" "); if( ind == -1 ) { ind = sFile.length(); break; @@ -384,7 +384,7 @@ void ShortcutsModule::slotSaveSchemeAs() // Make the next letter upper case TQString s = sFile.mid( ind, 1 ); s = s.upper(); - sFile.replace( ind, 1, s ); + sFile.tqreplace( ind, 1, s ); } iScheme = -1; diff --git a/kcontrol/keys/shortcuts.h b/kcontrol/keys/shortcuts.h index d45034c9d..0fa8818a8 100644 --- a/kcontrol/keys/shortcuts.h +++ b/kcontrol/keys/shortcuts.h @@ -33,7 +33,7 @@ #include #include -class ShortcutsModule : public QWidget +class ShortcutsModule : public TQWidget { Q_OBJECT public: diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 58de8a1f5..4d41b91c2 100644 --- a/kcontrol/keys/treeview.cpp +++ b/kcontrol/keys/treeview.cpp @@ -55,7 +55,7 @@ void AppTreeItem::setName(const TQString &name) void AppTreeItem::setAccel(const TQString &accel) { m_accel = accel; - int temp = accel.find(';'); + int temp = accel.tqfind(';'); if (temp != -1) { setText(1, accel.left(temp)); @@ -157,7 +157,7 @@ void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent) // Item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. - groupCaption.replace("&", "&&"); + groupCaption.tqreplace("&", "&&"); AppTreeItem *item; if (parent == 0) @@ -178,7 +178,7 @@ void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent) // Item names may contain ampersands. To avoid them being converted // to accelerators, replace them with two ampersands. - serviceCaption.replace("&", "&&"); + serviceCaption.tqreplace("&", "&&"); AppTreeItem* item; if (parent == 0) @@ -209,7 +209,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath) TQString relativePath = rPath; // truncate "/.directory" - int pos = relativePath.findRev("/.directory"); + int pos = relativePath.tqfindRev("/.directory"); if (pos > 0) relativePath.truncate(pos); TQStringList filelist; @@ -228,7 +228,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath) TQStringList files = dir.entryList(); for (TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { // does not work?! - //if (filelist.contains(*it)) continue; + //if (filelist.tqcontains(*it)) continue; if (relativePath.isEmpty()) { filelist.remove(*it); // hack @@ -248,7 +248,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath) TQString relativePath = rPath; // truncate "/.directory" - int pos = relativePath.findRev("/.directory"); + int pos = relativePath.tqfindRev("/.directory"); if (pos > 0) relativePath.truncate(pos); TQStringList dirlist; @@ -266,7 +266,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath) for (TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) { if ((*it) == "." || (*it) == "..") continue; // does not work?! - // if (dirlist.contains(*it)) continue; + // if (dirlist.tqcontains(*it)) continue; if (relativePath.isEmpty()) { dirlist.remove(*it); //hack -- cgit v1.2.3