diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 937b2991d8e78166eea904c80ad04d34607017a4 (patch) | |
tree | 2accb8161eab09df5d7a5484ea9ea080ad123168 /kget | |
parent | dba26cb985af370c33d1767037851705cc561726 (diff) | |
download | tdenetwork-937b2991d8e78166eea904c80ad04d34607017a4.tar.gz tdenetwork-937b2991d8e78166eea904c80ad04d34607017a4.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kget')
-rw-r--r-- | kget/dlgDirectories.cpp | 4 | ||||
-rw-r--r-- | kget/kfileio.h | 2 | ||||
-rw-r--r-- | kget/kmainwidget.cpp | 4 | ||||
-rw-r--r-- | kget/logwindow.cpp | 16 | ||||
-rw-r--r-- | kget/transferlist.cpp | 2 | ||||
-rw-r--r-- | kget/transferlist.h | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp index 7d429757..acd8f6fb 100644 --- a/kget/dlgDirectories.cpp +++ b/kget/dlgDirectories.cpp @@ -86,7 +86,7 @@ void DlgDirectories::addEntry() TQString ext = le_ext->text(); TQString dir = le_dir->url(); - if (ext.tqcontains(",") || dir.tqcontains(",") || ext.isEmpty() || dir.isEmpty()) { + if (ext.contains(",") || dir.contains(",") || ext.isEmpty() || dir.isEmpty()) { KMessageBox::error(this, i18n("Each row consists of exactly one\nextension type and one folder."), i18n("Error")); return; } @@ -122,7 +122,7 @@ void DlgDirectories::changeEntry() TQString ext = le_ext->text(); TQString dir = le_dir->url(); - if (ext.tqcontains(",") || dir.tqcontains(",") || ext.isEmpty() || dir.isEmpty()) { + if (ext.contains(",") || dir.contains(",") || ext.isEmpty() || dir.isEmpty()) { KMessageBox::error(this, i18n("Each row consists of exactly one\nextension type and one folder."), i18n("Error")); return; } diff --git a/kget/kfileio.h b/kget/kfileio.h index c47eb173..84a50cd2 100644 --- a/kget/kfileio.h +++ b/kget/kfileio.h @@ -20,7 +20,7 @@ #ifndef kfileio_h #define kfileio_h -/** Load a file. Returns a pointer to the memory-block that tqcontains +/** Load a file. Returns a pointer to the memory-block that contains * the loaded file. Returns a NULL string if the file could not be loaded. * If withDialogs is FALSE no warning dialogs are opened if there are * problems. diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index 6e830d67..aa65437e 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -555,7 +555,7 @@ void KMainWidget::slotImportTextFile() list = kFileToString(filename.path()); // file not accessible -> give error message i = 0; - while ((j = list.tqfind('\n', i)) != -1) { + while ((j = list.find('\n', i)) != -1) { TQString newtransfer = list.mid(i, j - i); addTransfer(newtransfer); i = j + 1; @@ -2466,7 +2466,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) return false; } // if we find this URL in the list - Transfer *transfer = myTransferList->tqfind( url ); + Transfer *transfer = myTransferList->find( url ); if ( transfer ) { if ( transfer->gettqStatus() != Transfer::ST_FINISHED ) diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp index 7ce11939..b87743ed 100644 --- a/kget/logwindow.cpp +++ b/kget/logwindow.cpp @@ -45,8 +45,8 @@ // res.simplifyWhiteSpace(); // int pos; -// while ( (pos = res.tqfind(' ')) != -1) { -// res.tqreplace(pos, 1, new TQChar( 0x00a0 ), 1); +// while ( (pos = res.find(' ')) != -1) { +// res.replace(pos, 1, new TQChar( 0x00a0 ), 1); // } // return res; @@ -58,14 +58,14 @@ static TQString removeHTML(const TQString & str) TQString res = str; int pos; - // tqreplace <br/> with a newline - while ((pos = res.tqfind("<br/>")) != -1) { - res.tqreplace(pos, 4, "\n"); + // replace <br/> with a newline + while ((pos = res.find("<br/>")) != -1) { + res.replace(pos, 4, "\n"); } // remove all tags - while ((pos = res.tqfind('<')) != -1) { - int pos2 = res.tqfind('>', pos); + while ((pos = res.find('<')) != -1) { + int pos2 = res.find('>', pos); if (pos2 == -1) { pos2 = res.length() + 1; @@ -112,7 +112,7 @@ SeparatedLog::SeparatedLog(TQWidget * tqparent):TQWidget(tqparent) void SeparatedLog::addLog(uint id, const TQString & filename, const TQString & message) { - if (!trMap.tqcontains(id)) { + if (!trMap.contains(id)) { trMap.insert(id, message); TQListViewItem *last=lv_log->lastItem(); new TQListViewItem(lv_log, last); diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 9de03889..2686d168 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -211,7 +211,7 @@ bool TransferList::areTransfersQueuedOrScheduled() } -Transfer * TransferList::tqfind(const KURL& _src) +Transfer * TransferList::find(const KURL& _src) { TransferIterator it(this); diff --git a/kget/transferlist.h b/kget/transferlist.h index e9c7d546..c20ce411 100644 --- a/kget/transferlist.h +++ b/kget/transferlist.h @@ -77,7 +77,7 @@ public: return phasesNum; } bool updatetqStatus(int counter); - Transfer * tqfind(const KURL& _src); + Transfer * find(const KURL& _src); bool areTransfersQueuedOrScheduled(); void readTransfers(const KURL& file); |