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 | 330c33ab6f97b279737bf9527c9add7bb1475450 (patch) | |
tree | 85cb998d3077ae295d65944ebb4d0189fc660ead /languages/cpp/debugger | |
parent | 093de0db4fea89b3f94a2359c6981f353d035eb7 (diff) | |
download | tdevelop-330c33ab6f97b279737bf9527c9add7bb1475450.tar.gz tdevelop-330c33ab6f97b279737bf9527c9add7bb1475450.zip |
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
Diffstat (limited to 'languages/cpp/debugger')
-rw-r--r-- | languages/cpp/debugger/dbgpsdlg.cpp | 6 | ||||
-rw-r--r-- | languages/cpp/debugger/dbgtoolbar.cpp | 2 | ||||
-rw-r--r-- | languages/cpp/debugger/debuggerpart.cpp | 4 | ||||
-rw-r--r-- | languages/cpp/debugger/gdbbreakpointwidget.cpp | 12 | ||||
-rw-r--r-- | languages/cpp/debugger/gdbbreakpointwidget.h | 2 | ||||
-rw-r--r-- | languages/cpp/debugger/gdbcontroller.cpp | 6 | ||||
-rw-r--r-- | languages/cpp/debugger/gdboutputwidget.cpp | 4 | ||||
-rw-r--r-- | languages/cpp/debugger/gdbparser.cpp | 4 | ||||
-rw-r--r-- | languages/cpp/debugger/memviewdlg.cpp | 2 | ||||
-rw-r--r-- | languages/cpp/debugger/stty.cpp | 2 | ||||
-rw-r--r-- | languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop | 2 | ||||
-rw-r--r-- | languages/cpp/debugger/variablewidget.cpp | 6 |
12 files changed, 26 insertions, 26 deletions
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index e08a1cec..fe04ffd4 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -155,14 +155,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; static TQRegExp ps_output_line("^\\s*(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.+)"); - while ( (pos = pidLines_.tqfind('\n', start)) != -1) { + while ( (pos = pidLines_.find('\n', start)) != -1) { TQString item = pidLines_.mid(start, pos-start); - if (!item.isEmpty() && item.tqfind(pidCmd_) == -1) + if (!item.isEmpty() && item.find(pidCmd_) == -1) { if(ps_output_line.search(item) == -1) { diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 088aff77..58cea851 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -229,7 +229,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/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 22621630..43d6990e 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -376,7 +376,7 @@ void DebuggerPart::setupDcop() { QCStringList objects = kapp->dcopClient()->registeredApplications(); for (QCStringList::Iterator it = objects.begin(); it != objects.end(); ++it) - if ((*it).tqfind("drkonqi-") == 0) + if ((*it).find("drkonqi-") == 0) slotDCOPApplicationRegistered(*it); connect(kapp->dcopClient(), TQT_SIGNAL(applicationRegistered(const TQCString&)), TQT_SLOT(slotDCOPApplicationRegistered(const TQCString&))); @@ -385,7 +385,7 @@ void DebuggerPart::setupDcop() void DebuggerPart::slotDCOPApplicationRegistered(const TQCString& appId) { - if (appId.tqfind("drkonqi-") == 0) { + if (appId.find("drkonqi-") == 0) { TQByteArray answer; TQCString replyType; diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index 38d9e7e8..dffdf5d4 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -385,7 +385,7 @@ void GDBBreakpointWidget::slotWatchpointHit(int id, /***************************************************************************/ -BreakpointTableRow* GDBBreakpointWidget::tqfind(Breakpoint *breakpoint) +BreakpointTableRow* GDBBreakpointWidget::find(Breakpoint *breakpoint) { // NOTE:- The match doesn't have to be equal. Each type of bp // must decide on the match criteria. @@ -493,7 +493,7 @@ void GDBBreakpointWidget::slotToggleBreakpoint(const TQString &fileName, int lin { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); if (btr) { removeBreakpoint(btr); @@ -508,7 +508,7 @@ void GDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, { FilePosBreakpoint *fpBP = new FilePosBreakpoint(fileName, lineNum+1); - BreakpointTableRow* btr = tqfind(fpBP); + BreakpointTableRow* btr = find(fpBP); delete fpBP; if (btr) { @@ -523,7 +523,7 @@ void GDBBreakpointWidget::slotToggleBreakpointEnabled(const TQString &fileName, void GDBBreakpointWidget::slotToggleWatchpoint(const TQString &varName) { Watchpoint *watchpoint = new Watchpoint(varName, false, true); - BreakpointTableRow* btr = tqfind(watchpoint); + BreakpointTableRow* btr = find(watchpoint); if (btr) { removeBreakpoint(btr); @@ -917,7 +917,7 @@ void GDBBreakpointWidget::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) @@ -946,7 +946,7 @@ void GDBBreakpointWidget::slotBreakpointModified(Breakpoint* b) { emit publishBPState(*b); - if (BreakpointTableRow* btr = tqfind(b)) + if (BreakpointTableRow* btr = find(b)) { if (b->isActionDie()) { diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h index f67bb03e..2379a318 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.h +++ b/languages/cpp/debugger/gdbbreakpointwidget.h @@ -106,7 +106,7 @@ signals: void tracingOutput(const char*); private: - BreakpointTableRow* tqfind(Breakpoint *bp); + BreakpointTableRow* find(Breakpoint *bp); BreakpointTableRow* findId(int id); BreakpointTableRow* findKey(int BPKey); diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index 93424396..ffa86b2b 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -401,7 +401,7 @@ void GDBController::executeCmd() setStateOn(s_waitForWrite); TQString prettyCmd = currentCmd_->cmdToSend(); - prettyCmd.tqreplace( TQRegExp("set prompt \032.\n"), "" ); + prettyCmd.replace( TQRegExp("set prompt \032.\n"), "" ); prettyCmd = "(gdb) " + prettyCmd; if (currentCmd_->isUserCommand()) @@ -1349,7 +1349,7 @@ void GDBController::defaultErrorHandler(const GDBMI::ResultRecord& result) { TQString msg = result["msg"].literal(); - if (msg.tqcontains("No such process")) + if (msg.contains("No such process")) { setState(s_appNotStarted|s_programExited); emit dbgtqStatus (i18n("Process exited"), state_); @@ -1447,7 +1447,7 @@ void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) int i; bool got_any_command = false; // For each gdb reply. In MI mode, each reply is one string. - while((i = holdingZone_.tqfind('\n')) != -1) + while((i = holdingZone_.find('\n')) != -1) { got_any_command = true; diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index ba51e871..fe5059cb 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -291,8 +291,8 @@ void GDBOutputWidget::focusInEvent(TQFocusEvent */*e*/) TQString GDBOutputWidget::html_escape(const TQString& s) { TQString r(s); - r.tqreplace("<", "<"); - r.tqreplace(">", ">"); + r.replace("<", "<"); + r.replace(">", ">"); return r; } diff --git a/languages/cpp/debugger/gdbparser.cpp b/languages/cpp/debugger/gdbparser.cpp index 46f5251b..5a8588b1 100644 --- a/languages/cpp/debugger/gdbparser.cpp +++ b/languages/cpp/debugger/gdbparser.cpp @@ -138,7 +138,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s) if (value[0] == '@') { // It's a reference, we need to show just the value. - if (int i = value.tqfind(":")) + if (int i = value.find(":")) { value = value.mid(i+2); } @@ -149,7 +149,7 @@ TQString GDBParser::undecorateValue(DataType type, const TQString& s) } } - if (value.tqfind("Cannot access memory") == 0) + if (value.find("Cannot access memory") == 0) value = "(inaccessible)"; return value.stripWhiteSpace(); diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index 44a95b1a..c594d134 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -457,7 +457,7 @@ namespace GDBDebugger TQWidget* ncs = const_cast<TQWidget*>(s); TQString cap = caption; // Prevent intepreting '&' as accelerator specifier. - cap.tqreplace("&", "&&"); + cap.replace("&", "&&"); toolBox_->setItemLabel(toolBox_->indexOf(ncs), cap); } diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 27bde0aa..07b848d9 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -105,7 +105,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/cpp/debugger/tests/print_pointers/print_pointers.kdevelop b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop index af025ba1..03faba9a 100644 --- a/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop +++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.kdevelop @@ -9,7 +9,7 @@ <ignoreparts> <part>kdevsecurity</part> <part>kdevkonsoleview</part> - <part>kdevtqreplace</part> + <part>kdevreplace</part> <part>kdevctags2</part> <part>kdevvalgrind</part> </ignoreparts> diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index c5293c8c..2b9e4de3 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -711,7 +711,7 @@ void VariableTree::frameIdReady(const TQValueVector<TQString>& lines) frame_info += lines[i]; kdDebug(9012) << "frame info: " << frame_info << "\n"; - frame_info.tqreplace('\n', ""); + frame_info.replace('\n', ""); static TQRegExp frame_base_rx("frame at 0x([0-9a-fA-F]*)"); static TQRegExp frame_code_rx("saved [a-zA-Z0-9]* 0x([0-9a-fA-F]*)"); @@ -1619,7 +1619,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs) TQString s(xs); if (s[0] == '$') { - int i = s.tqfind('='); + int i = s.find('='); if (i != -1) s = s.mid(i+2); } @@ -1638,7 +1638,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs) // one TQChar from two characters from gdb. But to do that, we *should* // now if the data if generic gdb value, and result of request for string // data. Fixing is is for later. - s.tqreplace( TQRegExp("\\\\000|\\\\0"), "" ); + s.replace( TQRegExp("\\\\000|\\\\0"), "" ); // FIXME: for now, assume that all special representations are // just strings. |