summaryrefslogtreecommitdiffstats
path: root/languages/ruby
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 12:00:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 12:00:33 -0600
commit7e66d7c3611d907ea28b140281b472bb1c406be6 (patch)
treed0512bf457c2bfe012f455b42ab78651afb81438 /languages/ruby
parentc3b301575a98e4c3505ad95534d6192b65539dab (diff)
downloadtdevelop-7e66d7c3611d907ea28b140281b472bb1c406be6.tar.gz
tdevelop-7e66d7c3611d907ea28b140281b472bb1c406be6.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'languages/ruby')
-rw-r--r--languages/ruby/app_templates/dcopservice/app.cpp4
-rw-r--r--languages/ruby/app_templates/kapp/app.cpp4
-rw-r--r--languages/ruby/app_templates/kxt/app.cpp4
-rw-r--r--languages/ruby/debugger/breakpoint.cpp6
-rw-r--r--languages/ruby/debugger/dbgtoolbar.cpp4
-rw-r--r--languages/ruby/debugger/debuggerpart.cpp6
-rw-r--r--languages/ruby/debugger/framestackwidget.cpp4
-rw-r--r--languages/ruby/debugger/rdbbreakpointwidget.cpp2
-rw-r--r--languages/ruby/debugger/rdbcontroller.cpp24
-rw-r--r--languages/ruby/debugger/variablewidget.cpp4
-rw-r--r--languages/ruby/debugger/variablewidget.h6
-rw-r--r--languages/ruby/rubysupport_part.cpp24
12 files changed, 46 insertions, 46 deletions
diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp
index b659dbfb..46086a9e 100644
--- a/languages/ruby/app_templates/dcopservice/app.cpp
+++ b/languages/ruby/app_templates/dcopservice/app.cpp
@@ -17,8 +17,8 @@ int main(int argc, char **argv) {
char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
rubyargs[0] = strdup(argv[0]);
rubyargs[1] = strdup("-KU");
- rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1());
- rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1());
+ rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
+ rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
rubyargs[4] = strdup(program.fileName().latin1());
for (int i = 1; i < argc; i++) {
rubyargs[i+4] = argv[i];
diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp
index b659dbfb..46086a9e 100644
--- a/languages/ruby/app_templates/kapp/app.cpp
+++ b/languages/ruby/app_templates/kapp/app.cpp
@@ -17,8 +17,8 @@ int main(int argc, char **argv) {
char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
rubyargs[0] = strdup(argv[0]);
rubyargs[1] = strdup("-KU");
- rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1());
- rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1());
+ rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
+ rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
rubyargs[4] = strdup(program.fileName().latin1());
for (int i = 1; i < argc; i++) {
rubyargs[i+4] = argv[i];
diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp
index b659dbfb..46086a9e 100644
--- a/languages/ruby/app_templates/kxt/app.cpp
+++ b/languages/ruby/app_templates/kxt/app.cpp
@@ -17,8 +17,8 @@ int main(int argc, char **argv) {
char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
rubyargs[0] = strdup(argv[0]);
rubyargs[1] = strdup("-KU");
- rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1());
- rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1());
+ rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
+ rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
rubyargs[4] = strdup(program.fileName().latin1());
for (int i = 1; i < argc; i++) {
rubyargs[i+4] = argv[i];
diff --git a/languages/ruby/debugger/breakpoint.cpp b/languages/ruby/debugger/breakpoint.cpp
index 9b3ed18d..8504ce93 100644
--- a/languages/ruby/debugger/breakpoint.cpp
+++ b/languages/ruby/debugger/breakpoint.cpp
@@ -70,7 +70,7 @@ Breakpoint::~Breakpoint()
TQString Breakpoint::dbgRemoveCommand() const
{
// if (dbgId_>0)
-// return TQString("delete %1").tqarg(dbgId_); // gdb command - not translatable
+// return TQString("delete %1").arg(dbgId_); // gdb command - not translatable
return TQString();
}
@@ -161,9 +161,9 @@ TQString FilePosBreakpoint::dbgSetCommand() const
{
TQString cmdStr;
if (fileName_.isEmpty())
- cmdStr = TQString("break %1").tqarg(lineNo_); // gdb command - not translatable
+ cmdStr = TQString("break %1").arg(lineNo_); // gdb command - not translatable
else {
- cmdStr = TQString("break %1:%2").tqarg(fileName_).tqarg(lineNo_);
+ cmdStr = TQString("break %1:%2").arg(fileName_).arg(lineNo_);
}
if (isTemporary())
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index f4e63c64..5561098b 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -127,7 +127,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e)
setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
TQApplication::setOverrideCursor(TQCursor(sizeAllCursor));
setPalette(TQPalette(colorGroup().background()));
- tqrepaint();
+ repaint();
}
}
@@ -141,7 +141,7 @@ void DbgMoveHandle::mouseReleaseEvent(TQMouseEvent *e)
setFrameStyle(TQFrame::Panel|TQFrame::Raised);
TQApplication::restoreOverrideCursor();
setPalette(TQPalette(colorGroup().background()));
- tqrepaint();
+ repaint();
}
// **************************************************************************
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index c93f3cf7..5d468de7 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -317,10 +317,10 @@ void RubyDebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (!m_contextIdent.isEmpty())
{
TQString squeezed = KStringHandler::csqueeze(m_contextIdent, 30);
- int id = popup->insertItem( i18n("Watch: %1").tqarg(squeezed), this, TQT_SLOT(contextWatch()) );
+ int id = popup->insertItem( i18n("Watch: %1").arg(squeezed), this, TQT_SLOT(contextWatch()) );
popup->setWhatsThis(id, i18n("<b>Watch</b><p>Adds an expression under the cursor to the Variables/Watch list."));
- id = popup->insertItem( i18n("Inspect: %1").tqarg(squeezed), this, TQT_SLOT(contextRubyInspect()) );
+ id = popup->insertItem( i18n("Inspect: %1").arg(squeezed), this, TQT_SLOT(contextRubyInspect()) );
popup->setWhatsThis(id, i18n("<b>Inspect</b><p>Evaluates an expression under the cursor."));
}
}
@@ -478,7 +478,7 @@ bool RubyDebuggerPart::startDebugger()
{
KMessageBox::error(
mainWindow()->main(),
- i18n("Could not locate the debugging shell '%1'.").tqarg( shell ),
+ i18n("Could not locate the debugging shell '%1'.").arg( shell ),
i18n("Debugging Shell Not Found") );
return false;
}
diff --git a/languages/ruby/debugger/framestackwidget.cpp b/languages/ruby/debugger/framestackwidget.cpp
index 72b148b6..5d3a606e 100644
--- a/languages/ruby/debugger/framestackwidget.cpp
+++ b/languages/ruby/debugger/framestackwidget.cpp
@@ -119,7 +119,7 @@ void FramestackWidget::parseRDBThreadList(char *str)
ThreadStackItem* thread;
thread = new ThreadStackItem( this,
thread_re.cap(2).toInt(),
- TQString("%1 %2").tqarg(thread_re.cap(2)).tqarg(thread_re.cap(3)) );
+ TQString("%1 %2").arg(thread_re.cap(2)).arg(thread_re.cap(3)) );
// The thread with a '+' is always the viewedthread
if (thread_re.cap(1) == "+") {
viewedThread_ = thread;
@@ -148,7 +148,7 @@ void FramestackWidget::parseRDBBacktraceList(char *str)
}
int frameNo = frame_re.cap(1).toInt();
- TQString frameName = TQString("T%1#%2 %3").tqarg(viewedThread_->threadNo()).tqarg(frame_re.cap(1)).tqarg(method);
+ TQString frameName = TQString("T%1#%2 %3").arg(viewedThread_->threadNo()).arg(frame_re.cap(1)).arg(method);
new FrameStackItem(viewedThread_, frameNo, TQString(frame_re.cap(0)), frameName);
// Tell the Variable Tree that this frame is active
diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp
index f9aaac7e..f176a3ed 100644
--- a/languages/ruby/debugger/rdbbreakpointwidget.cpp
+++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp
@@ -904,7 +904,7 @@ void RDBBreakpointWidget::slotAddBreakpoint( )
{
if (m_add->popup())
{
- m_add->popup()->popup(mapToGlobal(this->tqgeometry().topLeft()));
+ m_add->popup()->popup(mapToGlobal(this->geometry().topLeft()));
}
}
diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp
index ddf2ed7d..25fcd6a4 100644
--- a/languages/ruby/debugger/rdbcontroller.cpp
+++ b/languages/ruby/debugger/rdbcontroller.cpp
@@ -341,7 +341,7 @@ void RDBController::programNoApp(const TQString &msg, bool msgBox)
varTree_->viewport()->setUpdatesEnabled(false);
varTree_->prune();
varTree_->viewport()->setUpdatesEnabled(true);
- varTree_->tqrepaint();
+ varTree_->repaint();
frameStack_->clear();
@@ -394,9 +394,9 @@ void RDBController::parseProgramLocation(char *buf)
}
if (stateIsOn(s_appBusy))
- actOnProgramPause(i18n("No source: %1").tqarg(sourceFile));
+ actOnProgramPause(i18n("No source: %1").arg(sourceFile));
else
- emit dbgStatus (i18n("No source: %1").tqarg(sourceFile), state_);
+ emit dbgStatus (i18n("No source: %1").arg(sourceFile), state_);
}
// **************************************************************************
@@ -458,7 +458,7 @@ void RDBController::parseFrameMove(char *buf)
}
}
- emit dbgStatus(i18n("No source: %1").tqarg(sourceFile), state_);
+ emit dbgStatus(i18n("No source: %1").arg(sourceFile), state_);
}
// **************************************************************************
@@ -492,7 +492,7 @@ void RDBController::parseRequestedData(char *buf)
varTree_->viewport()->setUpdatesEnabled(false);
item->expandValue(buf);
varTree_->viewport()->setUpdatesEnabled(true);
- varTree_->tqrepaint();
+ varTree_->repaint();
}
}
@@ -505,7 +505,7 @@ void RDBController::parseFrameSelected(char *buf)
{
if (!stateIsOn(s_silent)) {
emit showStepInSource("", -1, "");
- emit dbgStatus (i18n("No source: %1").tqarg(TQString(buf)), state_);
+ emit dbgStatus (i18n("No source: %1").arg(TQString(buf)), state_);
}
}
@@ -517,7 +517,7 @@ void RDBController::parseDisplay(char *buf, char * expr)
varTree_->viewport()->setUpdatesEnabled(false);
varTree_->watchRoot()->setWatchExpression(buf, expr);
varTree_->viewport()->setUpdatesEnabled(true);
- varTree_->tqrepaint();
+ varTree_->repaint();
}
// **************************************************************************
@@ -538,7 +538,7 @@ void RDBController::parseUpdateDisplay(char *buf)
}
varTree_->viewport()->setUpdatesEnabled(true);
- varTree_->tqrepaint();
+ varTree_->repaint();
}
// **************************************************************************
@@ -549,7 +549,7 @@ void RDBController::parseGlobals(char *buf)
varTree_->viewport()->setUpdatesEnabled(false);
varTree_->globalRoot()->setGlobals(buf);
varTree_->viewport()->setUpdatesEnabled(true);
- varTree_->tqrepaint();
+ varTree_->repaint();
}
// **************************************************************************
@@ -584,7 +584,7 @@ void RDBController::parseLocals(char type, char *buf)
}
varTree_->viewport()->setUpdatesEnabled(true);
- varTree_->tqrepaint();
+ varTree_->repaint();
}
@@ -766,9 +766,9 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString&
// BUT the app hasn't been started yet! A run command is about to be issued
// by whoever is controlling us.
- if (!dbgProcess_->writeStdin(TQString("%1\n").tqarg(unixSocketPath_.data()).latin1(), strlen(unixSocketPath_) + 1)) {
+ if (!dbgProcess_->writeStdin(TQString("%1\n").arg(unixSocketPath_.data()).latin1(), strlen(unixSocketPath_) + 1)) {
kdDebug(9012) << "failed to write Unix domain socket path to rdb "
- << TQString("%1\n").tqarg(unixSocketPath_.data()).latin1() << endl;
+ << TQString("%1\n").arg(unixSocketPath_.data()).latin1() << endl;
}
setStateOff(s_programExited);
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index 289b2811..c618abf0 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -280,7 +280,7 @@ void VariableTree::prune()
// **************************************************************************
-// The debugger has moved onto the next program pause, so tqinvalidate
+// The debugger has moved onto the next program pause, so invalidate
// everything in the Variable Tree
void VariableTree::nextActivationId()
{
@@ -635,7 +635,7 @@ void VarItem::setText(int column, const TQString &data)
}
TQListViewItem::setText(column, data);
- tqrepaint();
+ repaint();
}
// **************************************************************************
diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h
index 60e73218..9e2b8ce9 100644
--- a/languages/ruby/debugger/variablewidget.h
+++ b/languages/ruby/debugger/variablewidget.h
@@ -276,7 +276,7 @@ public:
virtual int rtti() const { return RTTI_VAR_FRAME_ROOT; }
virtual TQString key(int column, bool /*ascending*/) const {
- return TQString("%1%2").tqarg(RTTI_VAR_FRAME_ROOT).tqarg(text(column));
+ return TQString("%1%2").arg(RTTI_VAR_FRAME_ROOT).arg(text(column));
}
void addLocals(char *variables);
@@ -311,7 +311,7 @@ public:
virtual int rtti() const { return RTTI_WATCH_ROOT; }
virtual TQString key(int column, bool /*ascending*/) const {
- return TQString("%1%2").tqarg(RTTI_WATCH_ROOT).tqarg(text(column));
+ return TQString("%1%2").arg(RTTI_WATCH_ROOT).arg(text(column));
}
void setWatchExpression(char * buf, char * expr);
@@ -334,7 +334,7 @@ public:
virtual int rtti() const { return RTTI_GLOBAL_ROOT; }
virtual TQString key(int column, bool /*ascending*/) const {
- return TQString("%1%2").tqarg(RTTI_GLOBAL_ROOT).tqarg(text(column));
+ return TQString("%1%2").arg(RTTI_GLOBAL_ROOT).arg(text(column));
}
void setOpen(bool open);
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 4ccc54e5..664dabd4 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -532,12 +532,12 @@ void RubySupportPart::slotRun ()
appFrontend->startAppCommand(project()->projectDirectory(), cmd, false);
} else {
TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6")
- .tqarg(interpreter())
- .tqarg(characterCoding())
- .tqarg(runDirectory())
- .tqarg(program.dirPath())
- .tqarg(program.fileName())
- .tqarg(programArgs());
+ .arg(interpreter())
+ .arg(characterCoding())
+ .arg(runDirectory())
+ .arg(program.dirPath())
+ .arg(program.fileName())
+ .arg(programArgs());
startApplication(cmd);
}
}
@@ -896,12 +896,12 @@ void RubySupportPart::slotRunTestUnderCursor()
TQFileInfo program(prog);
TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6")
- .tqarg(interpreter())
- .tqarg(characterCoding())
- .tqarg(runDirectory())
- .tqarg(program.dirPath())
- .tqarg(program.fileName())
- .tqarg(" -n " + fun->name());
+ .arg(interpreter())
+ .arg(characterCoding())
+ .arg(runDirectory())
+ .arg(program.dirPath())
+ .arg(program.fileName())
+ .arg(" -n " + fun->name());
startApplication(cmd);
}