summaryrefslogtreecommitdiffstats
path: root/languages/ruby
diff options
context:
space:
mode:
authorsamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-18 15:51:10 +0000
committersamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-18 15:51:10 +0000
commit4dc0617cbcfb47b3301cf9b9a1127fa3b4fea732 (patch)
tree4b49b17308b073f7e94dbd668de9cc72f95e5672 /languages/ruby
parentcf21ddc3cce570e574364e841758b59c0f8e8e04 (diff)
downloadtdevelop-4dc0617cbcfb47b3301cf9b9a1127fa3b4fea732.tar.gz
tdevelop-4dc0617cbcfb47b3301cf9b9a1127fa3b4fea732.zip
[kdevelop] fixed gcc-4.5 incompatibilities
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1221512 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'languages/ruby')
-rw-r--r--languages/ruby/debugger/stty.cpp5
-rw-r--r--languages/ruby/rubysupport_part.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp
index 4316da50..bfdb5bd3 100644
--- a/languages/ruby/debugger/stty.cpp
+++ b/languages/ruby/debugger/stty.cpp
@@ -309,7 +309,6 @@ bool STTY::findExternalTTY(const TQString &termApp)
"exec<&-;exec>&-;" // close stdin and stdout
"while :;do sleep 3600;done");
const char* scriptStr = script.latin1();
- const char* end = 0;
if ( termApp == "konsole" )
{
@@ -317,14 +316,14 @@ bool STTY::findExternalTTY(const TQString &termApp)
"-caption", i18n("kdevelop: Debug application console").local8Bit().data(),
"-e", "sh",
"-c", scriptStr,
- end);
+ NULL);
}
else
{
::execlp( prog, prog,
"-e", "sh",
"-c", scriptStr,
- end);
+ NULL);
}
// Should not get here, as above should always work
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index a8728c77..411f06ff 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -614,7 +614,7 @@ TQString RubySupportPart::characterCoding() {
void RubySupportPart::startApplication(const TQString &program) {
bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevrubysupport/run/terminal");
if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend"))
- appFrontend->startAppCommand(TQString::TQString(), program, inTerminal);
+ appFrontend->startAppCommand(TQString(), program, inTerminal);
}