diff options
author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-18 15:51:10 +0000 |
---|---|---|
committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-18 15:51:10 +0000 |
commit | 4dc0617cbcfb47b3301cf9b9a1127fa3b4fea732 (patch) | |
tree | 4b49b17308b073f7e94dbd668de9cc72f95e5672 /languages | |
parent | cf21ddc3cce570e574364e841758b59c0f8e8e04 (diff) | |
download | tdevelop-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')
-rw-r--r-- | languages/bash/bashsupport_part.cpp | 2 | ||||
-rw-r--r-- | languages/cpp/debugger/stty.cpp | 5 | ||||
-rw-r--r-- | languages/csharp/csharpsupportpart.cpp | 2 | ||||
-rw-r--r-- | languages/perl/perlparser.cpp | 2 | ||||
-rw-r--r-- | languages/perl/perlsupportpart.cpp | 2 | ||||
-rw-r--r-- | languages/python/pythonsupportpart.cpp | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/stty.cpp | 5 | ||||
-rw-r--r-- | languages/ruby/rubysupport_part.cpp | 2 |
8 files changed, 10 insertions, 12 deletions
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index 1420356d..a36761a8 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -183,7 +183,7 @@ void BashSupportPart::startApplication(const TQString &program) { kdDebug() << "starting application" << program << endl; if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend")) - appFrontend->startAppCommand(TQString::TQString(), program, TRUE); + appFrontend->startAppCommand(TQString(), program, TRUE); } diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index cdf4c81e..ac3cd4e1 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -325,7 +325,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" ) { @@ -333,14 +332,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/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index 292a63f3..d0bc9be6 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -194,7 +194,7 @@ void CSharpSupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevcsharpsupport/run/terminal"); if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend")) - appFrontend->startAppCommand(TQString::TQString(), program, inTerminal); + appFrontend->startAppCommand(TQString(), program, inTerminal); } diff --git a/languages/perl/perlparser.cpp b/languages/perl/perlparser.cpp index ad0b5de2..60cca8f5 100644 --- a/languages/perl/perlparser.cpp +++ b/languages/perl/perlparser.cpp @@ -464,7 +464,7 @@ void perlparser::getPerlINC() { return; } array.setRawData(buffer, n); - result=TQString::TQString(array); + result=TQString(array); array.resetRawData(buffer, n); } pclose(fd); diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index bb9b51c3..d5b0868f 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -194,7 +194,7 @@ void PerlSupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevperlsupport/run/terminal"); if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend")) - appFrontend->startAppCommand(TQString::TQString(), program, inTerminal); + appFrontend->startAppCommand(TQString(), program, inTerminal); } diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 9e6b0b0c..dc7df754 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -328,7 +328,7 @@ void PythonSupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevpythonsupport/run/terminal"); if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("KDevelop/AppFrontend")) - appFrontend->startAppCommand(TQString::TQString(), program, inTerminal); + appFrontend->startAppCommand(TQString(), program, inTerminal); } 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); } |