diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:46:43 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:46:43 +0000 |
| commit | ffe8a83e053396df448e9413828527613ca3bd46 (patch) | |
| tree | a73d4169e02df4a50f9a12cb165fcd0ab5bac7c6 /dcop/dcopserver_shutdown_win.cpp | |
| parent | 682bf3bfdcbcbb1fca85e8a36ed03e062e0555d5 (diff) | |
| download | tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.tar.gz tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'dcop/dcopserver_shutdown_win.cpp')
| -rw-r--r-- | dcop/dcopserver_shutdown_win.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/dcop/dcopserver_shutdown_win.cpp b/dcop/dcopserver_shutdown_win.cpp index 5e9c6b9ca..ebc7897da 100644 --- a/dcop/dcopserver_shutdown_win.cpp +++ b/dcop/dcopserver_shutdown_win.cpp @@ -48,13 +48,13 @@ #endif #define QT_CLEAN_NAMESPACE 1 -#include <qfile.h> +#include <tqfile.h> #include <dcopclient.h> #define BUFFER_SIZE 4096 -extern QCString dcopServerFile(const QCString &hostname, bool old); +extern TQCString dcopServerFile(const TQCString &hostname, bool old); static char *getDisplay() { @@ -63,9 +63,9 @@ static char *getDisplay() char *screen; char *colon; /* - don't test for a value from qglobal.h but instead distinguish + don't test for a value from tqglobal.h but instead distinguish Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS - on the commandline (which in qglobal.h however triggers Q_WS_QWS, + on the commandline (which in tqglobal.h however triggers Q_WS_QWS, but we don't want to include that here) (Simon) #ifdef Q_WS_X11 */ @@ -131,8 +131,8 @@ static void killDCOPWin(pid_t pid) static void cleanupDCOP(int dont_kill_dcop, int wait_for_exit) { - QCString host; - QCString strDCOPServer = DCOPClient::dcopServerFile(host); + TQCString host; + TQCString strDCOPServer = DCOPClient::dcopServerFile(host); if(strDCOPServer.isEmpty()) { @@ -142,10 +142,10 @@ static void cleanupDCOP(int dont_kill_dcop, int wait_for_exit) printf("server file %s\n",(const char *)strDCOPServer); pid_t pid = 0; - QFile f(strDCOPServer); + TQFile f(strDCOPServer); if(f.open(IO_ReadOnly)) { - QString str; + TQString str; while(f.readLine(str,2048)) { pid = str.toULong(); @@ -156,7 +156,7 @@ static void cleanupDCOP(int dont_kill_dcop, int wait_for_exit) } f.close(); /* Clean up .DCOPserver file */ - QFile::remove(strDCOPServer); + TQFile::remove(strDCOPServer); printf("remove server file %s\n",(const char *)strDCOPServer); if(pid) @@ -200,7 +200,7 @@ static void cleanupDCOP(int dont_kill_dcop, int wait_for_exit) int main(int argc, char **argv) { - QCString host; + TQCString host; int dont_kill_dcop = (argc == 2) && (strcmp(argv[1], "--nokill") == 0); int wait_for_exit = (argc == 2) && (strcmp(argv[1], "--wait") == 0); |