From 539a35866f0bac8f00e493654d4a8ec6863726e2 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kpilot/conduitConfigDialog.cc | 8 ++++---- kpilot/dbSelectionDialog.cc | 8 ++++---- kpilot/fileInstallWidget.cc | 2 +- kpilot/hotSync.cc | 8 ++++---- kpilot/kpilot.cc | 2 +- kpilot/kpilotConfig.cc | 6 +++--- kpilot/kpilotConfigWizard.cc | 2 +- kpilot/listItems.cc | 6 +++--- kpilot/pilotDaemon.cc | 8 ++++---- 9 files changed, 25 insertions(+), 25 deletions(-) (limited to 'kpilot') diff --git a/kpilot/conduitConfigDialog.cc b/kpilot/conduitConfigDialog.cc index ac5a3dc..f2a3d54 100644 --- a/kpilot/conduitConfigDialog.cc +++ b/kpilot/conduitConfigDialog.cc @@ -133,7 +133,7 @@ ConduitTip::~ConduitTip() TQString s = l->text(CONDUIT_COMMENT); if (s.isEmpty()) return; - if (s.tqfind(CSL1(""),0,false) == -1) + if (s.find(CSL1(""),0,false) == -1) { s.prepend(CSL1("")); s.append(CSL1("")); @@ -412,7 +412,7 @@ void ConduitConfigWidget::fillLists() p->setText(CONDUIT_COMMENT,i18n(c)); \ p->setText(CONDUIT_LIBRARY,CSL1("internal_" b)); \ p->setText(CONDUIT_DESKTOP,CSL1("internal_" b)); \ - if (potentiallyInstalled.tqfindIndex(p->text(CONDUIT_DESKTOP))>=0) \ + if (potentiallyInstalled.findIndex(p->text(CONDUIT_DESKTOP))>=0) \ p->setOriginalState(true); IC("Install Files","fileinstall", @@ -450,7 +450,7 @@ void ConduitConfigWidget::fillLists() p->setText(CONDUIT_DESKTOP,o->desktopEntryName()); p->setText(CONDUIT_LIBRARY,o->library()); - if (potentiallyInstalled.tqfindIndex(o->desktopEntryName()) < 0) + if (potentiallyInstalled.findIndex(o->desktopEntryName()) < 0) { p->setOriginalState(false); } @@ -805,7 +805,7 @@ void ConduitConfigWidget::load() TQCheckListItem*qq=dynamic_cast(q); if (qq) { - qq->setOn(! (potentiallyInstalled.tqfindIndex(qq->text(CONDUIT_DESKTOP))<0) ); + qq->setOn(! (potentiallyInstalled.findIndex(qq->text(CONDUIT_DESKTOP))<0) ); } q = q->nextSibling(); } diff --git a/kpilot/dbSelectionDialog.cc b/kpilot/dbSelectionDialog.cc index 81cf50e..4ce9c02 100644 --- a/kpilot/dbSelectionDialog.cc +++ b/kpilot/dbSelectionDialog.cc @@ -57,17 +57,17 @@ KPilotDBSelectionDialog::KPilotDBSelectionDialog(TQStringList &selectedDBs, TQSt // Fill the encodings list TQStringList items(deviceDBs); for ( TQStringList::Iterator it = fAddedDBs.begin(); it != fAddedDBs.end(); ++it ) { - if (items.tqcontains(*it)==0) items << (*it); + if (items.contains(*it)==0) items << (*it); } for ( TQStringList::Iterator it = fSelectedDBs.begin(); it != fSelectedDBs.end(); ++it ) { - if (items.tqcontains(*it)==0) items << (*it); + if (items.contains(*it)==0) items << (*it); } items.sort(); for ( TQStringList::Iterator it = items.begin(); it != items.end(); ++it ) { TQCheckListItem*checkitem=new TQCheckListItem(fSelectionWidget->fDatabaseList, *it, TQCheckListItem::CheckBox); - if (fSelectedDBs.tqcontains(*it)) checkitem->setOn(true); + if (fSelectedDBs.contains(*it)) checkitem->setOn(true); } connect(fSelectionWidget->fNameEdit, TQT_SIGNAL(textChanged( const TQString & )), @@ -103,7 +103,7 @@ void KPilotDBSelectionDialog::removeDB() if (item) { TQString dbname=item->text(0); - if (fDeviceDBs.tqcontains(dbname)) + if (fDeviceDBs.contains(dbname)) { KMessageBox::error(this, i18n("This is a database that exists on the device. It was not added manually, so it can not removed from the list."), i18n("Database on Device")); } diff --git a/kpilot/fileInstallWidget.cc b/kpilot/fileInstallWidget.cc index e8b55de..c9ce561 100644 --- a/kpilot/fileInstallWidget.cc +++ b/kpilot/fileInstallWidget.cc @@ -285,7 +285,7 @@ void FileInstallWidget::contextMenu(TQMouseEvent *event) TQPopupMenu popup(fIconView); - item = fIconView->tqfindItem(event->pos()); + item = fIconView->findItem(event->pos()); if(item) { // Popup for the right clicked item popup.insertItem(i18n("Delete a single file item","Delete"), 10); diff --git a/kpilot/hotSync.cc b/kpilot/hotSync.cc index b8b7356..96e006c 100644 --- a/kpilot/hotSync.cc +++ b/kpilot/hotSync.cc @@ -121,11 +121,11 @@ public: TQString dbname = Pilot::fromPilot( info->name, 32 ); - if ( !fDeviceDBs.tqcontains( creator ) ) + if ( !fDeviceDBs.contains( creator ) ) { fDeviceDBs << creator; } - if ( !fDeviceDBs.tqcontains( dbname ) ) + if ( !fDeviceDBs.contains( dbname ) ) { fDeviceDBs << dbname; } @@ -151,7 +151,7 @@ public: return false; } - if (fNoBackupCreators.tqfindIndex(info->creator) != -1) + if (fNoBackupCreators.findIndex(info->creator) != -1) { return false; } @@ -501,7 +501,7 @@ bool BackupAction::startBackupThread(DBInfo *info) // if we're here then we are going to back this database up. do some basic sanity // checks and proceed.... TQString databaseName(Pilot::fromPilot(info->name)); - databaseName.tqreplace('/', '_'); + databaseName.replace('/', '_'); TQString fullBackupName = fP->fBackupDir + databaseName; diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc index 91d8d31..328029f 100644 --- a/kpilot/kpilot.cc +++ b/kpilot/kpilot.cc @@ -189,7 +189,7 @@ void KPilotInstaller::startDaemonIfNeeded() { int wordoffset; s.remove(0,12); - wordoffset=s.tqfind(';'); + wordoffset=s.find(';'); if (wordoffset>0) s.truncate(wordoffset); fLogWidget->addMessage( diff --git a/kpilot/kpilotConfig.cc b/kpilot/kpilotConfig.cc index cec6382..35f25fa 100644 --- a/kpilot/kpilotConfig.cc +++ b/kpilot/kpilotConfig.cc @@ -125,7 +125,7 @@ void KPilotConfig::addDirtyDatabase(TQString db) { FUNCTIONSETUP; TQStringList l(KPilotSettings::dirtyDatabases()); - if (!l.tqcontains(db)) + if (!l.contains(db)) { l.append(db); KPilotSettings::setDirtyDatabases(l); @@ -136,7 +136,7 @@ void KPilotConfig::addDirtyDatabase(TQString db) void KPilotConfig::addAppBlockChangedDatabase(TQString db) { TQStringList l(KPilotSettings::appBlockChangedDatabases()); - if (!l.tqcontains(db)) + if (!l.contains(db)) { l.append(db); KPilotSettings::setAppBlockChangedDatabases(l); @@ -146,7 +146,7 @@ void KPilotConfig::addAppBlockChangedDatabase(TQString db) void KPilotConfig::addFlagsChangedDatabase(TQString db) { TQStringList l(KPilotSettings::flagsChangedDatabases()); - if (!l.tqcontains(db)) + if (!l.contains(db)) { l.append(db); KPilotSettings::setFlagsChangedDatabases(l); diff --git a/kpilot/kpilotConfigWizard.cc b/kpilot/kpilotConfigWizard.cc index d26fbb6..fd6036d 100644 --- a/kpilot/kpilotConfigWizard.cc +++ b/kpilot/kpilotConfigWizard.cc @@ -123,7 +123,7 @@ void ConfigWizard::accept() TQStringList conduits = KPilotSettings::installedConduits(); int version(0); -#define APPEND_CONDUIT(a) if (!conduits.tqcontains(a)) conduits.append(a) +#define APPEND_CONDUIT(a) if (!conduits.contains(a)) conduits.append(a) TQString applicationName(i18n("general KDE-PIM")); APPEND_CONDUIT("internal_fileinstall"); APPEND_CONDUIT("todo-conduit"); diff --git a/kpilot/listItems.cc b/kpilot/listItems.cc index 1dbc09e..2b5b98e 100644 --- a/kpilot/listItems.cc +++ b/kpilot/listItems.cc @@ -176,12 +176,12 @@ void PilotListViewItem::setNumericCol(int col, bool numeric) // FUNCTIONSETUP; if (numeric) { - if (!numericCols.tqcontains(col)) + if (!numericCols.contains(col)) numericCols.append(col); } else { - if (numericCols.tqcontains(col)) + if (numericCols.contains(col)) numericCols.remove(col); } } @@ -211,7 +211,7 @@ int PilotListViewItem::compare( TQListViewItem *i, int col, bool ascending ) con /*#ifdef DEBUG DEBUGKPILOT<<"Item of dyn cast: "<insert( CSL1("internal_fileinstall"), new TQString(i18n("File Installer")) ); } @@ -739,7 +739,7 @@ static void fillConduitNameMap() TQStringList::ConstIterator end = l.end(); for (TQStringList::ConstIterator i = l.begin(); i != end; ++i) { - if (!conduitNameMap->tqfind(*i)) + if (!conduitNameMap->find(*i)) { TQString readableName = CSL1(""); KSharedPtr < KService > o = KService::serviceByDesktopName(*i); @@ -774,7 +774,7 @@ TQStringList PilotDaemon::configuredConduitList() TQStringList result; for (TQStringList::ConstIterator i = keys.begin(); i != end; ++i) { - result << *(conduitNameMap->tqfind(*i)); + result << *(conduitNameMap->find(*i)); } return result; @@ -920,7 +920,7 @@ static void queueInstaller(ActionQueue *fSyncStack, FileInstaller *fInstaller, const TQStringList &c) { - if (c.tqfindIndex(CSL1("internal_fileinstall")) >= 0) + if (c.findIndex(CSL1("internal_fileinstall")) >= 0) { fSyncStack->addAction(new FileInstallAction(pilotLink,fInstaller->dir())); } -- cgit v1.2.3