From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/modules/objects/class_process.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/modules/objects/class_process.cpp') diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index 81efaae4..16ed7a42 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -25,11 +25,11 @@ #include "kvi_debug.h" #include "kvi_settings.h" #include "kvi_locale.h" -#include +#include #ifdef COMPILE_USE_QT4 -#include +#include #else -#include +#include #endif /* @@ -82,7 +82,7 @@ %tt=$new(test)[br] %A=$new(widget)[br] %A->$setGeometry(100,100,400,300)[br] - %layoutA=$new(layout,%A)[br] + %tqlayoutA=$new(tqlayout,%A)[br] %Ainput=$new(lineedit,%A)[br] #%Aoutput=$new(textedit,%A)// coming soon in the new texteditor class[br] %Aoutput=$new(label,%A)[br] @@ -92,11 +92,11 @@ %bkill->$settext("&Kill ")[br] %bterminate=$new(button,%A)[br] %bterminate->$settext("&Ask to Terminate ")[br] - %layoutA->$addwidget(%Ainput,0,0)[br] - %layoutA->$addwidget(%Aoutput,1,0)[br] - %layoutA->$addwidget(%bclosekill,3,0)[br] - %layoutA->$addwidget(%bkill,4,0,)[br] - %layoutA->$addwidget(%bterminate,5,0)[br] + %tqlayoutA->$addwidget(%Ainput,0,0)[br] + %tqlayoutA->$addwidget(%Aoutput,1,0)[br] + %tqlayoutA->$addwidget(%bclosekill,3,0)[br] + %tqlayoutA->$addwidget(%bkill,4,0,)[br] + %tqlayoutA->$addwidget(%bterminate,5,0)[br] %Process=$new(process)[br] %Process->$addArg("cmd.exe")[br] @@ -187,10 +187,10 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_process,KviKvsObject) #ifdef COMPILE_USE_QT4 m_pProcess = new Q3Process(); #else - m_pProcess = new QProcess(); + m_pProcess = new TQProcess(); #endif - connect(m_pProcess,SIGNAL(readyReadStdout()),this,SLOT(slotReadStdout())); - connect(m_pProcess,SIGNAL(readyReadStderr()),this,SLOT(slotReadStderr())); + connect(m_pProcess,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(slotReadStdout())); + connect(m_pProcess,TQT_SIGNAL(readyReadStderr()),this,TQT_SLOT(slotReadStderr())); KVSO_END_CONSTRUCTOR(KviKvsObject_process) @@ -205,7 +205,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_process) bool KviKvsObject_process::functionaddArgument(KviKvsObjectFunctionCall *c) { - QString szArgument; + TQString szArgument; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("argument",KVS_PT_NONEMPTYSTRING,0,szArgument) KVSO_PARAMETERS_END(c) @@ -224,7 +224,7 @@ bool KviKvsObject_process::functionstartProcess(KviKvsObjectFunctionCall *c) //-->Read the standard output. bool KviKvsObject_process::functionreadStderr(KviKvsObjectFunctionCall *c) { - QString ng_Process =m_pProcess->readStderr(); + TQString ng_Process =m_pProcess->readStderr(); c->returnValue()->setString(ng_Process); return true; } @@ -232,7 +232,7 @@ bool KviKvsObject_process::functionreadStderr(KviKvsObjectFunctionCall *c) //-->Read the standard error. bool KviKvsObject_process::functionreadStdout(KviKvsObjectFunctionCall *c) { - QString ng_Process =m_pProcess->readStdout(); + TQString ng_Process =m_pProcess->readStdout(); c->returnValue()->setString(ng_Process); return true; } @@ -255,7 +255,7 @@ bool KviKvsObject_process::functionreadyReadStderrEvent(KviKvsObjectFunctionCall bool KviKvsObject_process::functionwriteToStdin(KviKvsObjectFunctionCall *c) { - QString szCommand; + TQString szCommand; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("command",KVS_PT_STRING,0,szCommand) KVSO_PARAMETERS_END(c) @@ -269,7 +269,7 @@ bool KviKvsObject_process::functionclosekill(KviKvsObjectFunctionCall *c) //I try to to terminate the process the nice way.... m_pProcess->tryTerminate(); //If the process is still running after 5 seconds, I'll terminate the process in the hard way. - QTimer::singleShot( 5000, m_pProcess, SLOT( kill() ) ); + TQTimer::singleShot( 5000, m_pProcess, TQT_SLOT( kill() ) ); return true; } bool KviKvsObject_process::functionkill(KviKvsObjectFunctionCall *c) -- cgit v1.2.1