From 330c33ab6f97b279737bf9527c9add7bb1475450 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/kdevelop@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- languages/ruby/app_templates/dcopservice/app.cpp | 2 +- languages/ruby/app_templates/kapp/app.cpp | 2 +- languages/ruby/app_templates/kxt/app.cpp | 2 +- languages/ruby/debugger/dbgpsdlg.cpp | 6 +++--- languages/ruby/debugger/dbgtoolbar.cpp | 2 +- languages/ruby/debugger/debuggee.rb | 6 +++--- languages/ruby/debugger/rdbbreakpointwidget.cpp | 12 ++++++------ languages/ruby/debugger/rdbbreakpointwidget.h | 2 +- languages/ruby/debugger/rdbparser.cpp | 4 ++-- languages/ruby/debugger/stty.cpp | 2 +- languages/ruby/debugger/variablewidget.cpp | 6 +++--- languages/ruby/doc/ruby.toc | 10 +++++----- languages/ruby/rubyimplementationwidget.cpp | 6 +++--- languages/ruby/rubysupport_part.cpp | 4 ++-- 14 files changed, 33 insertions(+), 33 deletions(-) (limited to 'languages/ruby') diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp index 5458ae8b..b659dbfb 100644 --- a/languages/ruby/app_templates/dcopservice/app.cpp +++ b/languages/ruby/app_templates/dcopservice/app.cpp @@ -10,7 +10,7 @@ int main(int argc, char **argv) { TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { - qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n"); + qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n"); } TQFileInfo program(appdir); diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp index 5458ae8b..b659dbfb 100644 --- a/languages/ruby/app_templates/kapp/app.cpp +++ b/languages/ruby/app_templates/kapp/app.cpp @@ -10,7 +10,7 @@ int main(int argc, char **argv) { TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { - qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n"); + qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n"); } TQFileInfo program(appdir); diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp index 5458ae8b..b659dbfb 100644 --- a/languages/ruby/app_templates/kxt/app.cpp +++ b/languages/ruby/app_templates/kxt/app.cpp @@ -10,7 +10,7 @@ int main(int argc, char **argv) { TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance); delete instance; if (appdir.isNull()) { - qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n"); + qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n"); } TQFileInfo program(appdir); diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index 336a48b6..1389e0f6 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -149,14 +149,14 @@ void Dbg_PS_Dialog::slotProcessExited() pidLines_ += '\n'; - int start = pidLines_.tqfind('\n', 0); // Skip the first line (header line) + int start = pidLines_.find('\n', 0); // Skip the first line (header line) int pos; if (start != -1) heading_->setText(pidLines_.left(start)); - while ( (pos = pidLines_.tqfind('\n', start)) != -1) { + while ( (pos = pidLines_.find('\n', start)) != -1) { TQString item = pidLines_.mid(start, pos-start); if (!item.isEmpty()) { - if (item.tqfind(pidCmd_) == -1) + if (item.find(pidCmd_) == -1) pids_->insertItem(item); } diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index a11d1c02..75264b60 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -228,7 +228,7 @@ DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pi void DbgDocker::mousePressEvent(TQMouseEvent *e) { - if (!TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos())) + if (!TQT_TQRECT_OBJECT(rect()).contains( e->pos())) return; switch (e->button()) { diff --git a/languages/ruby/debugger/debuggee.rb b/languages/ruby/debugger/debuggee.rb index 51df5867..38e2dea7 100644 --- a/languages/ruby/debugger/debuggee.rb +++ b/languages/ruby/debugger/debuggee.rb @@ -441,7 +441,7 @@ class Context stdout.printf "Set watchpoint %d\n", break_points.size, exp when /^\s*b(?:reak)?$/ - if break_points.tqfind{|b| b[1] == 0} + if break_points.find{|b| b[1] == 0} n = 1 stdout.print "Breakpoints:\n" for b in break_points @@ -451,7 +451,7 @@ class Context n += 1 end end - if break_points.tqfind{|b| b[1] == 1} + if break_points.find{|b| b[1] == 1} n = 1 stdout.print "\n" stdout.print "Watchpoints:\n" @@ -827,7 +827,7 @@ EOHELP exit end - if @catch and ($!.class.ancestors.tqfind { |e| e.to_s == @catch }) + if @catch and ($!.class.ancestors.find { |e| e.to_s == @catch }) stdout.printf "%s:%d: `%s' (%s)\n", file, line, $!, $!.class fs = @frames.size tb = caller(0)[-fs..-1] diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index b448cbb4..200f97f4 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -311,7 +311,7 @@ void RDBBreakpointWidget::slotRefreshBP(const KURL &filename) /***************************************************************************/ -BreakpointTableRow* RDBBreakpointWidget::tqfind(Breakpoint *breakpoint) +BreakpointTableRow* RDBBreakpointWidget::find(Breakpoint *breakpoint) { // NOTE:- The match doesn't have to be equal. Each type of bp // must decide on the match criteria. @@ -398,7 +398,7 @@ void RDBBreakpointWidget::slotToggleBreakpoint(const TQString &fileName, int lin { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); if (btr) { delete fpBP; @@ -414,7 +414,7 @@ void RDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); delete fpBP; if (btr) { @@ -429,7 +429,7 @@ void RDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, void RDBBreakpointWidget::slotToggleWatchpoint(const TQString &varName) { Watchpoint *watchpoint = new Watchpoint(varName, false, true); - BreakpointTableRow* btr = tqfind(watchpoint); + BreakpointTableRow* btr = find(watchpoint); if (btr) { removeBreakpoint(btr); @@ -792,7 +792,7 @@ void RDBBreakpointWidget::slotEditBreakpoint(const TQString &fileName, int lineN { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); delete fpBP; if (btr) @@ -889,7 +889,7 @@ void RDBBreakpointWidget::restorePartialProjectSession(const TQDomElement* el) bp->setEnabled(breakpointEl.attribute( "enabled", "1").toInt()); // Add the bp if we don't already have it. - if (!tqfind(bp)) + if (!find(bp)) addBreakpoint(bp); else delete bp; diff --git a/languages/ruby/debugger/rdbbreakpointwidget.h b/languages/ruby/debugger/rdbbreakpointwidget.h index 58275842..ad1e0605 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.h +++ b/languages/ruby/debugger/rdbbreakpointwidget.h @@ -94,7 +94,7 @@ signals: void clearAllBreakpoints(); private: - BreakpointTableRow* tqfind(Breakpoint *bp); + BreakpointTableRow* find(Breakpoint *bp); BreakpointTableRow* findId(int id); BreakpointTableRow* findKey(int BPKey); diff --git a/languages/ruby/debugger/rdbparser.cpp b/languages/ruby/debugger/rdbparser.cpp index dc7e0226..d0e8e31b 100644 --- a/languages/ruby/debugger/rdbparser.cpp +++ b/languages/ruby/debugger/rdbparser.cpp @@ -64,7 +64,7 @@ void RDBParser::parseVariables(LazyFetchItem *tqparent, char *buf) while (pos != -1) { varName = var_re.cap(1); if (ref_re.search(var_re.cap(2)) != -1) { - if (var_re.cap(2).tqcontains("=") > 0) { + if (var_re.cap(2).contains("=") > 0) { value = (ref_re.cap(1) + ">").latin1(); } else { // There are no 'name=value' pairs, as in # @@ -128,7 +128,7 @@ void RDBParser::parseExpandedVariable(VarItem *tqparent, char *buf) varName = ppvalue_re.cap(1); if (ppref_re.search(ppvalue_re.cap(2)) != -1) { - if (ppvalue_re.cap(2).tqcontains("=") > 0) { + if (ppvalue_re.cap(2).contains("=") > 0) { value = (ppref_re.cap(1) + ">").latin1(); } else { // There are no 'name=value' pairs, as in # diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp index 7381ae2a..f28b32b9 100644 --- a/languages/ruby/debugger/stty.cpp +++ b/languages/ruby/debugger/stty.cpp @@ -104,7 +104,7 @@ static int chownpty(int fd, int grant) // { // signal from other child, behave like catchChild. // // guess this gives quite some control chaos... - // Shell* sh = shells.tqfind(rc); + // Shell* sh = shells.find(rc); // if (sh) { shells.remove(rc); sh->doneShell(w); } // goto retry; // } diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index fc562baa..42a14322 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -609,13 +609,13 @@ TQString VarItem::fullName() const } // Change 'self.@foobar' to '@foobar' - vPath.tqreplace(TQRegExp("^self\\.@"), "@"); + vPath.replace(TQRegExp("^self\\.@"), "@"); // Use instance_variable_get() to access any '@var's in the middle of a path TQRegExp re_instance_var("\\.(@[^\\[.]+)"); int pos = re_instance_var.search(vPath); while (pos != -1) { - vPath.tqreplace( pos, + vPath.replace( pos, re_instance_var.matchedLength(), TQString(".instance_variable_get(:") + re_instance_var.cap(1) + ")" ); pos = re_instance_var.search(vPath, pos); @@ -816,7 +816,7 @@ void VarFrameRoot::setActivationId() bool VarFrameRoot::needsVariables() const { - return ( text(VAR_NAME_COLUMN).tqcontains("try_initialize") == 0 + return ( text(VAR_NAME_COLUMN).contains("try_initialize") == 0 && isOpen() && !isWaitingForData() && needsVariables_ ); diff --git a/languages/ruby/doc/ruby.toc b/languages/ruby/doc/ruby.toc index e732ae4d..bce60158 100644 --- a/languages/ruby/doc/ruby.toc +++ b/languages/ruby/doc/ruby.toc @@ -448,8 +448,8 @@ - - + + @@ -970,9 +970,9 @@ - - - + + + diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp index 3ddaec11..0b54fe2f 100644 --- a/languages/ruby/rubyimplementationwidget.cpp +++ b/languages/ruby/rubyimplementationwidget.cpp @@ -44,9 +44,9 @@ TQStringList RubyImplementationWidget::createClassFiles() TQString template_rb = "require '$BASEFILENAME$'\n\nclass $CLASSNAME$ < $BASECLASSNAME$\n\n def initialize(*k)\n super(*k)\n end\n\nend\n"; TQFileInfo formInfo(m_formName); - template_rb.tqreplace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".rb"); - template_rb.tqreplace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text()); - template_rb.tqreplace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName); + template_rb.replace(TQRegExp("\\$BASEFILENAME\\$"), formInfo.baseName()+".rb"); + template_rb.replace(TQRegExp("\\$CLASSNAME\\$"), classNameEdit->text()); + template_rb.replace(TQRegExp("\\$BASECLASSNAME\\$"), m_baseClassName); template_rb = FileTemplate::read(m_part, "rb") + template_rb; diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index 7c451a05..cc895770 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -205,7 +205,7 @@ void RubySupportPart::savedFile(const KURL &fileName) { kdDebug() << "savedFile()" << endl; - if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { + if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { maybeParse(fileName.path()); emit addedSourceInfo( fileName.path() ); } @@ -715,7 +715,7 @@ void RubySupportPart::slotSwitchToController() } else if (ext == "rjs" || ext == "rxml" || ext == "rhtml" || ext == "js.rjs" || ext == "xml.builder" || ext == "html.erb") { - //this is a view, we need to find the directory of this view and try to tqfind + //this is a view, we need to find the directory of this view and try to find //the controller basing on the directory information switchTo = file.dir().dirName(); } -- cgit v1.2.1