Qt3 still isn't 100% fixed...

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1162841 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

qtinterface/tqpaintdevice.cpp

@@ -24,6 +24,24 @@ Boston, MA 02110-1301, USA.
 
 #ifdef USE_QT4
 
+// the following is necessary to work around breakage in many versions
+// of XFree86's Xlib.h still in use
+// ### which versions?
+#if defined(_XLIB_H_) // crude hack, but...
+#error "cannot include <X11/Xlib.h> before this file"
+#endif
+#define XRegisterIMInstantiateCallback qt_XRegisterIMInstantiateCallback
+#define XUnregisterIMInstantiateCallback qt_XUnregisterIMInstantiateCallback
+#define XSetIMValues qt_XSetIMValues
+#include <X11/Xlib.h>
+#undef XRegisterIMInstantiateCallback
+#undef XUnregisterIMInstantiateCallback
+#undef XSetIMValues
+
+#include <X11/Xutil.h>
+#include <X11/Xos.h>
+#include <X11/Xatom.h>
+
 /*!
     Returns the window system handle of the paint device for XRender
     support. Use of this function is not portable. This function will
@@ -46,6 +64,7 @@ static GC*	app_gc_tmp_m	= 0;		// temporary GC (monochrome)
 static GC create_gc( int scrn, bool monochrome )
 {
     GC gc;
+    Display *appDpy = QX11Info::display();
     if ( monochrome ) {
 	Pixmap pm = XCreatePixmap( appDpy, RootWindow( appDpy, scrn ), 8, 8, 1 );
 	gc = XCreateGC( appDpy, pm, 0, 0 );

qtinterface/tqslider.h

@@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QSlider class
 // For Qt3, no changes are needed
 
-#include <tqt4/Qt/qslider.h>
+#include <qslider.h>
 
 #endif // USE_QT3
 
@@ -38,8 +38,8 @@ Boston, MA 02110-1301, USA.
 // Reimplement the QSlider class
 // For Qt4, some changes are needed
 
-#include <Qt/qslider.h>
+#include <tqt4/Qt/qslider.h>
 
 #endif // USE_QT4
 
-#endif /* TQSLIDER_H */
+#endif /* TQSLIDER_H */

qtinterface/tqt.h

@@ -673,7 +673,8 @@ class QUObject;
 #define TQNoBrush Qt::NoBrush
 
 #define QMetaData QMetaMethod
-#define qt_xdisplay QPaintDevice::x11Display
+//#define qt_xdisplay QPaintDevice::x11Display
+#define qt_xdisplay QX11Info::display
 #define qt_xrootwin QPaintDevice::x11AppRootWindow
 #define qt_xscreen QPaintDevice::x11Screen
 #define qt_xget_temp_gc QPaintDevice::qt_xget_temp_gc