From 6335dc55802871b5a43492f217b6edbb420204c4 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/kdeutils@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kedit/kedit.cpp | 16 ++++++++-------- kedit/kedit.h | 2 +- kedit/ktextfiledlg.cpp | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kedit') diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index d374987..efffb67 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -215,7 +215,7 @@ void TopLevel::setupActions() KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(select_all()), actionCollection()); KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection()); KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(search_again()), actionCollection()); - KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(tqreplace()), actionCollection()); + KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(replace()), actionCollection()); (void)new KAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(file_insert()), actionCollection(), "insert_file"); @@ -445,11 +445,11 @@ TQString TopLevel::replaceISpell(TQString msg, int client) { switch(client) { - case KS_CLIENT_ISPELL: msg.tqreplace("ISpell", "ispell"); break; - case KS_CLIENT_ASPELL: msg.tqreplace("ISpell", "aspell"); break; - case KS_CLIENT_HSPELL: msg.tqreplace("ISpell", "hspell"); break; + case KS_CLIENT_ISPELL: msg.replace("ISpell", "ispell"); break; + case KS_CLIENT_ASPELL: msg.replace("ISpell", "aspell"); break; + case KS_CLIENT_HSPELL: msg.replace("ISpell", "hspell"); break; } - msg.tqreplace("\n", "

"); + msg.replace("\n", "

"); return ""+msg+""; } @@ -762,7 +762,7 @@ void TopLevel::mail() // Default subject string // TQString defaultsubject = name(); - int index = defaultsubject.tqfindRev('/'); + int index = defaultsubject.findRev('/'); if( index != -1) defaultsubject = defaultsubject.right(defaultsubject.length() - index - 1 ); @@ -788,7 +788,7 @@ void TopLevel::fancyprint(){ y += fm.ascent(); TQString line; line = eframe->textLine(i); - line.tqreplace( TQRegExp("\t"), " " ); + line.replace( TQRegExp("\t"), " " ); strncpy(buf,line.local8Bit(),160); for (int j = 0 ; j <150; j++){ if (!isprint(buf[j])) @@ -818,7 +818,7 @@ void TopLevel::search(){ statusbar_slot(); } -void TopLevel::tqreplace(){ +void TopLevel::replace(){ eframe->replace(); statusbar_slot(); } diff --git a/kedit/kedit.h b/kedit/kedit.h index 4ea6f36..6bc22d4 100644 --- a/kedit/kedit.h +++ b/kedit/kedit.h @@ -177,7 +177,7 @@ public slots: void file_save_as(); void helpselected(); void search(); - void tqreplace(); + void replace(); void search_again(); void toggle_overwrite(); diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp index 11649a4..a35f82e 100644 --- a/kedit/ktextfiledlg.cpp +++ b/kedit/ktextfiledlg.cpp @@ -50,7 +50,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir, TQStringList::Iterator it; int i = 0; for( it = encodings.begin(); it != encodings.end(); ++it) { - if ( (*it).tqcontains( encodingStr ) ) { + if ( (*it).contains( encodingStr ) ) { mEncoding->setCurrentItem( i ); break; } @@ -111,7 +111,7 @@ void KTextFileDialog::slotShowEncCombo() int i = 1; for( it = encodings.begin(); it != encodings.end(); ++it) { - if ( (*it).tqcontains( encoding() ) ) { + if ( (*it).contains( encoding() ) ) { encCombo->setCurrentItem( i ); break; } -- cgit v1.2.1