Test conversion to TQt3 from Qt3 8c6fc1f8e35fd264dd01c582ca5e7549b32ab731

4 files changed, 414 insertions, 0 deletions

diff --git a/src/embedded/qgfxdriverinterface_p.h b/src/embedded/qgfxdriverinterface_p.h
new file mode 100644
index 000000000..21cb0a608
--- /dev/null
+++ b/src/embedded/qgfxdriverinterface_p.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Definition of TQt/Embedded Graphics Driver Interface
+**
+** Created : 20020211
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of the kernel module of the TQt GUI Toolkit.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** Licensees holding valid TQt Commercial licenses may use this file in
+** accordance with the TQt Commercial License Agreement provided with
+** the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef TQGFXDRIVERINTERFACE_P_H
+#define TQGFXDRIVERINTERFACE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the TQt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
+
+#ifndef QT_H
+#include <private/qcom_p.h>
+#endif // QT_H
+
+#ifndef QT_NO_COMPONENT
+
+// {449EC6C6-DF3E-43E3-9E57-354A3D05AB34}
+#ifndef IID_QGfxDriver
+#define IID_QGfxDriver TQUuid( 0x449ec6c6, 0xdf3e, 0x43e3, 0x9e, 0x57, 0x35, 0x4a, 0x3d, 0x05, 0xab, 0x34)
+#endif
+
+class TQScreen;
+
+struct Q_EXPORT TQGfxDriverInterface : public TQFeatureListInterface
+{
+    virtual TQScreen* create( const TQString& driver, int displayId ) = 0;
+};
+
+#endif // QT_NO_COMPONENT
+
+#endif // TQGFXDRIVERINTERFACE_P_H
diff --git a/src/embedded/qkbddriverinterface_p.h b/src/embedded/qkbddriverinterface_p.h
new file mode 100644
index 000000000..f25a609ef
--- /dev/null
+++ b/src/embedded/qkbddriverinterface_p.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Definition of TQt/Embedded Keyboard Driver Interface
+**
+** Created : 20020218
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of the kernel module of the TQt GUI Toolkit.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** Licensees holding valid TQt Commercial licenses may use this file in
+** accordance with the TQt Commercial License Agreement provided with
+** the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef TQKBDDRIVERINTERFACE_P_H
+#define TQKBDDRIVERINTERFACE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the TQt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
+
+#ifndef QT_H
+#include <private/qcom_p.h>
+#endif // QT_H
+
+#ifndef QT_NO_COMPONENT
+
+// {C7C838EA-FC3E-4905-92AD-F479E81F1D02}
+#ifndef IID_QKbdDriver
+#define IID_QKbdDriver TQUuid( 0xc7c838ea, 0xfc3e, 0x4905, 0x92, 0xad, 0xf4, 0x79, 0xe8, 0x1f, 0x1d, 0x02)
+#endif
+
+class TQWSKeyboardHandler;
+
+struct Q_EXPORT TQKbdDriverInterface : public TQFeatureListInterface
+{
+    virtual TQWSKeyboardHandler* create( const TQString& driver, const TQString& device ) = 0;
+};
+
+#endif // QT_NO_COMPONENT
+
+#endif // TQKBDDRIVERINTERFACE_P_H
diff --git a/src/embedded/qmousedriverinterface_p.h b/src/embedded/qmousedriverinterface_p.h
new file mode 100644
index 000000000..c9cdd3866
--- /dev/null
+++ b/src/embedded/qmousedriverinterface_p.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Definition of TQt/Embedded Mouse Driver Interface
+**
+** Created : 20020220
+**
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of the kernel module of the TQt GUI Toolkit.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing retquirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** Licensees holding valid TQt Commercial licenses may use this file in
+** accordance with the TQt Commercial License Agreement provided with
+** the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef TQMOUSEDRIVERINTERFACE_P_H
+#define TQMOUSEDRIVERINTERFACE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the TQt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
+
+#ifndef QT_H
+#include <private/qcom_p.h>
+#endif // QT_H
+
+#ifndef QT_NO_COMPONENT
+
+// {4367CF5A-F7CE-407B-8BB6-DF19AEDA2EBB}
+#ifndef IID_QMouseDriver
+#define IID_QMouseDriver TQUuid( 0x4367cf5a, 0xf7ce, 0x407b, 0x8b, 0xb6, 0xdf, 0x19, 0xae, 0xda, 0x2e, 0xbb)
+#endif
+
+class TQWSMouseHandler;
+
+struct Q_EXPORT TQMouseDriverInterface : public TQFeatureListInterface
+{
+    virtual TQWSMouseHandler* create( const TQString& driver, const TQString &device ) = 0;
+};
+
+#endif // QT_NO_COMPONENT
+
+#endif // TQMOUSEDRIVERINTERFACE_P_H
diff --git a/src/embedded/qt_embedded.pri b/src/embedded/qt_embedded.pri
new file mode 100644
index 000000000..a4e2223bf
--- /dev/null
+++ b/src/embedded/qt_embedded.pri
@@ -0,0 +1,192 @@
+# Qt/Embedded Drivers
+
+embedded {
+	EMBEDDED_P = embedded
+
+	HEADERS += $$EMBEDDED_P/qgfxdriverinterface_p.h \
+		    $$EMBEDDED_H/qgfxdriverplugin_qws.h \
+		    $$EMBEDDED_H/qgfxdriverfactory_qws.h \
+		    $$EMBEDDED_H/qkbd_qws.h \
+		    $$EMBEDDED_P/qkbddriverinterface_p.h \
+		    $$EMBEDDED_H/qkbddriverplugin_qws.h \
+		    $$EMBEDDED_H/qkbddriverfactory_qws.h \
+		    $$EMBEDDED_H/qmouse_qws.h \
+		    $$EMBEDDED_P/qmousedriverinterface_p.h \
+		    $$EMBEDDED_H/qmousedriverplugin_qws.h \
+		    $$EMBEDDED_H/qmousedriverfactory_qws.h
+
+	SOURCES += $$EMBEDDED_CPP/qgfxdriverplugin_qws.cpp \
+		    $$EMBEDDED_CPP/qgfxdriverfactory_qws.cpp \
+		    $$EMBEDDED_CPP/qkbd_qws.cpp \
+		    $$EMBEDDED_CPP/qkbddriverplugin_qws.cpp \
+		    $$EMBEDDED_CPP/qkbddriverfactory_qws.cpp \
+		    $$EMBEDDED_CPP/qmouse_qws.cpp \
+		    $$EMBEDDED_CPP/qmousedriverplugin_qws.cpp \
+		    $$EMBEDDED_CPP/qmousedriverfactory_qws.cpp
+
+#
+# Graphics drivers
+#
+        linux-* {
+	        HEADERS += $$EMBEDDED_H/qgfxlinuxfb_qws.h
+		SOURCES += $$EMBEDDED_CPP/qgfxlinuxfb_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_LINUXFB
+
+	contains( gfx-drivers, qvfb ) {
+		HEADERS += $$EMBEDDED_H/qgfxvfb_qws.h
+		SOURCES += $$EMBEDDED_CPP/qgfxvfb_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_VFB
+
+	contains( gfx-drivers, vnc ) {
+		HEADERS += $$EMBEDDED_H/qgfxvnc_qws.h
+		SOURCES += $$EMBEDDED_CPP/qgfxvnc_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_VNC
+
+	!contains( DEFINES, QT_NO_QWS_LINUXFB):contains( gfx-drivers, vga16 ) {
+		HEADERS += $$EMBEDDED_H/qgfxvga16_qws.h
+		SOURCES += $$EMBEDDED_CPP/qgfxvga16_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_VGA16
+
+	contains( gfx-drivers, transformed ) {
+		HEADERS += $$EMBEDDED_H/qgfxtransformed_qws.h
+		SOURCES += $$EMBEDDED_CPP/qgfxtransformed_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_TRANSFORMED
+
+	contains( gfx-drivers, snap ) {
+        exists( $(SCITECH)/include/snap/graphics.h) {
+    		HEADERS += $$EMBEDDED_H/qgfxsnap_qws.h
+    		SOURCES += $$EMBEDDED_CPP/qgfxsnap_qws.cpp
+            INCLUDEPATH += $(SCITECH)/include
+            debug:LIBS  += -L$(SCITECH)/lib/debug/linux/gcc/x86/so -lpm
+            else:LIBS   += -L$(SCITECH)/lib/release/linux/gcc/x86/so -lpm
+        }
+        else {
+            message("SciTech SNAP SDK is not properly set up! Please make sure the SCITECH")
+            message("environment variable is pointing to the SciTech SNAP SDK.")
+            error("Please fix and re-build the makefiles.")
+        }
+	}
+	else:DEFINES += QT_NO_QWS_SNAP
+
+	contains( gfx-drivers, mach64 ) {
+		HEADERS += $$EMBEDDED_H/qgfxmach64_qws.h \
+			   $$EMBEDDED_H/qgfxmach64defs_qws.h
+		SOURCES += $$EMBEDDED_CPP/qgfxmach64_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_MACH64
+
+	contains( gfx-drivers, voodoo ) {
+		HEADERS += $$EMBEDDED_H/qgfxvoodoo_qws.h \
+			   $$EMBEDDED_H/qgfxvoodoodefs_qws.h
+		SOURCES += $$EMBEDDED_CPP/qgfxvoodoo_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_VOODOO3
+
+	contains( gfx-drivers, matrox ) {
+		HEADERS += $$EMBEDDED_H/qgfxmatrox_qws.h \
+			   $$EMBEDDED_H/qgfxmatroxdefs_qws.h
+		SOURCES += $$EMBEDDED_CPP/qgfxmatrox_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_MATROX
+
+	contains( gfx-drivers, shadowfb ) {
+		HEADERS += $$EMBEDDED_H/qgfxshadow_qws.h
+		SOURCES += $$EMBEDDED_CPP/qgfxshadow_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_SHADOWFB
+
+	contains( gfx-drivers, repeater ) {
+		HEADERS += $$EMBEDDED_H/qgfxrepeater_qws.h
+		SOURCES += $$EMBEDDED_CPP/qgfxrepeater_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_REPEATER
+
+#
+# Keyboard drivers
+#
+
+	contains( kbd-drivers, sl5000 ) {
+		HEADERS +=$$EMBEDDED_H/qkbdsl5000_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qkbdsl5000_qws.cpp
+		!contains( kbd-drivers, tty ) {
+		    kbd-drivers += tty
+		}
+	}
+	else:DEFINES += QT_NO_QWS_KBD_SL5000
+
+	contains( kbd-drivers, tty ) {
+		HEADERS +=$$EMBEDDED_H/qkbdtty_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qkbdtty_qws.cpp
+		!contains( kbd-drivers, pc101 ) {
+		    kbd-drivers += pc101
+		}
+	}
+	else:DEFINES += QT_NO_QWS_KBD_TTY
+
+	contains( kbd-drivers, usb ) {
+		HEADERS +=$$EMBEDDED_H/qkbdusb_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qkbdusb_qws.cpp
+		!contains( kbd-drivers, pc101 ) {
+		    kbd-drivers += pc101
+		}
+	}
+	else:DEFINES += QT_NO_QWS_KBD_USB
+
+	contains( kbd-drivers, pc101 ) {
+		HEADERS +=$$EMBEDDED_H/qkbdpc101_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qkbdpc101_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_KBD_PC101
+
+	contains( kbd-drivers, yopy ) {
+		HEADERS +=$$EMBEDDED_H/qkbdyopy_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qkbdyopy_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_KBD_YOPY
+
+	contains( kbd-drivers, vr41xx ) {
+		HEADERS +=$$EMBEDDED_H/qkbdvr41xx_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qkbdvr41xx_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_KBD_VR41
+
+#
+# Mouse drivers
+#
+
+	contains( mouse-drivers, pc ) {
+		HEADERS +=$$EMBEDDED_H/qmousepc_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qmousepc_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_MOUSE_PC
+
+	contains( mouse-drivers, bus ) {
+		HEADERS +=$$EMBEDDED_H/qmousebus_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qmousebus_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_MOUSE_BUS
+
+	contains( mouse-drivers, linuxtp ) {
+		HEADERS +=$$EMBEDDED_H/qmouselinuxtp_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qmouselinuxtp_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_MOUSE_LINUXTP
+
+	contains( mouse-drivers, vr41xx ) {
+		HEADERS +=$$EMBEDDED_H/qmousevr41xx_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qmousevr41xx_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_MOUSE_VR41
+
+	contains( mouse-drivers, yopy ) {
+		HEADERS +=$$EMBEDDED_H/qmouseyopy_qws.h
+		SOURCES +=$$EMBEDDED_CPP/qmouseyopy_qws.cpp
+	}
+	else:DEFINES += QT_NO_QWS_MOUSE_YOPY
+}
+