diff options
author | Timothy Pearson <[email protected]> | 2012-02-14 21:16:22 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-02-14 21:16:22 -0600 |
commit | 989d6a19014011bd6981abb3decb91a7b3af0971 (patch) | |
tree | d04e94ec18fd643e4ab53f6ca8ed1f4e8934e06e /nsplugins | |
parent | 77041d785dbbede734f8dc44aa454d07d14f0317 (diff) | |
download | tdebase-989d6a19014011bd6981abb3decb91a7b3af0971.tar.gz tdebase-989d6a19014011bd6981abb3decb91a7b3af0971.zip |
Update various qt function definitions and static methods for tqt3
Diffstat (limited to 'nsplugins')
-rw-r--r-- | nsplugins/viewer/kxt.cpp | 2 | ||||
-rw-r--r-- | nsplugins/viewer/kxt.h | 2 | ||||
-rw-r--r-- | nsplugins/viewer/nsplugin.cpp | 2 | ||||
-rw-r--r-- | nsplugins/viewer/qxteventloop.cpp | 2 | ||||
-rw-r--r-- | nsplugins/viewer/qxteventloop.h | 2 | ||||
-rw-r--r-- | nsplugins/viewer/viewer.cpp | 8 |
6 files changed, 9 insertions, 9 deletions
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp index 1d85f674a..05b2673be 100644 --- a/nsplugins/viewer/kxt.cpp +++ b/nsplugins/viewer/kxt.cpp @@ -45,7 +45,7 @@ *****************************************************************************/ #include <tqglobal.h> -#if QT_VERSION < 0x030100 +#if TQT_VERSION < 0x030100 #include <kapplication.h> #include <tqwidget.h> diff --git a/nsplugins/viewer/kxt.h b/nsplugins/viewer/kxt.h index 44f05db19..d7c46a594 100644 --- a/nsplugins/viewer/kxt.h +++ b/nsplugins/viewer/kxt.h @@ -47,7 +47,7 @@ #define KXT_H #include <tqglobal.h> -#if QT_VERSION < 0x030100 +#if TQT_VERSION < 0x030100 #include <kapplication.h> #include <tqwidget.h> diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index 310210c66..7092d1024 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -1292,7 +1292,7 @@ void NSPluginViewer::shutdown() { kdDebug(1431) << "NSPluginViewer::shutdown" << endl; _classes.clear(); -#if QT_VERSION < 0x030100 +#if TQT_VERSION < 0x030100 quitXt(); #else tqApp->quit(); diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp index 4e1d13a21..8250f6bba 100644 --- a/nsplugins/viewer/qxteventloop.cpp +++ b/nsplugins/viewer/qxteventloop.cpp @@ -37,7 +37,7 @@ #include "qxteventloop.h" -#if QT_VERSION >= 0x030100 +#if TQT_VERSION >= 0x030100 #include <tqapplication.h> #include <tqwidgetintdict.h> diff --git a/nsplugins/viewer/qxteventloop.h b/nsplugins/viewer/qxteventloop.h index 31351f201..5fdb81414 100644 --- a/nsplugins/viewer/qxteventloop.h +++ b/nsplugins/viewer/qxteventloop.h @@ -38,7 +38,7 @@ #include <tqglobal.h> -// #if QT_VERSION >= 0x030100 +// #if TQT_VERSION >= 0x030100 #include <tqeventloop.h> diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp index e15b52eb0..eb5a0956d 100644 --- a/nsplugins/viewer/viewer.cpp +++ b/nsplugins/viewer/viewer.cpp @@ -46,7 +46,7 @@ #endif #include <kconfig.h> -#if QT_VERSION < 0x030100 +#if TQT_VERSION < 0x030100 #include "kxt.h" #include <X11/Intrinsic.h> #include <X11/Shell.h> @@ -103,7 +103,7 @@ void parseCommandLine(int argc, char *argv[]) } } -#if QT_VERSION < 0x030100 +#if TQT_VERSION < 0x030100 static XtAppContext g_appcon; static bool g_quit = false; @@ -227,7 +227,7 @@ int main(int argc, char** argv) kdDebug(1430) << "2 - parseCommandLine" << endl; parseCommandLine(argc, argv); -#if QT_VERSION < 0x030100 +#if TQT_VERSION < 0x030100 // Create application kdDebug(1430) << "3 - XtToolkitInitialize" << endl; XtToolkitInitialize(); @@ -298,7 +298,7 @@ int main(int argc, char** argv) NSPluginViewer *viewer = new NSPluginViewer( "viewer", 0 ); // start main loop -#if QT_VERSION < 0x030100 +#if TQT_VERSION < 0x030100 kdDebug(1430) << "8 - XtAppProcessEvent" << endl; while (!g_quit) XtAppProcessEvent( g_appcon, XtIMAll); |