diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /lib/util/execcommand.cpp | |
parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lib/util/execcommand.cpp')
-rw-r--r-- | lib/util/execcommand.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index 7c4fea89..e1236474 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -26,8 +26,8 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, const TQString& workingDir, const TQStringList& env, - TQObject* parent, const char* name ): - TQObject( parent, name ), out( "" ) /* make sure out is not TQString::null since that would mean "error" */ + TQObject* tqparent, const char* name ): + TQObject( tqparent, name ), out( "" ) /* make sure out is not TQString() since that would mean "error" */ { progressDlg = 0; @@ -49,15 +49,15 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); if ( !ok ) { - KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ), + KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").tqarg( executable ), i18n("Error Invoking Command") ); - emit finished( TQString::null, TQString::null ); + emit finished( TQString(), TQString() ); deleteLater(); } else { progressDlg = new KProgressDialog( 0, 0, i18n("Command running..."), - i18n("Please wait until the \"%1\" command finishes.").arg( executable ), false ); + i18n("Please wait until the \"%1\" command finishes.").tqarg( executable ), false ); connect( progressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()) ); } @@ -88,7 +88,7 @@ void ExecCommand::cancelClicked() progressDlg = 0; proc->kill(); - emit finished( TQString::null, TQString::null ); + emit finished( TQString(), TQString() ); deleteLater(); } |