Fix build failure

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211108 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 15 years ago
parent 560378aaca
commit 73a98149e7

@ -4,7 +4,7 @@
/* Usage: /* Usage:
If you get compile errors caused by X11 includes (the line If you get compile errors caused by X11 includes (the line
where first error appears tqcontains word like None, Unsorted, where first error appears contains word like None, Unsorted,
Below, etc.), put #include <fixx11h.h> in the .cpp file Below, etc.), put #include <fixx11h.h> in the .cpp file
(not .h file!) between the place where X11 headers are (not .h file!) between the place where X11 headers are
included and the place where the file with compile included and the place where the file with compile
@ -21,7 +21,7 @@
The original X11 symbols are still accessible The original X11 symbols are still accessible
(e.g. for None) as X::None, XNone, and also still (e.g. for None) as X::None, XNone, and also still
None, unless name lookup tqfinds different None None, unless name lookup finds different None
first (in the current class, etc.) first (in the current class, etc.)
Use 'Unsorted', 'Bool' and 'index' as templates. Use 'Unsorted', 'Bool' and 'index' as templates.
@ -168,25 +168,25 @@ const int GrayScale = XGrayScale;
#endif #endif
// Affects: Should be without side effects. // Affects: Should be without side effects.
#ifdef tqStatus #ifdef Status
#ifndef FIXX11H_tqStatus #ifndef FIXX11H_Status
#define FIXX11H_tqStatus #define FIXX11H_Status
typedef tqStatus XtqStatus; typedef Status XStatus;
#undef tqStatus #undef Status
typedef XtqStatus tqStatus; typedef XStatus Status;
#endif #endif
#undef tqStatus #undef Status
#endif #endif
// Affects: Should be without side effects. // Affects: Should be without side effects.
#ifdef tqCursorShape #ifdef CursorShape
#ifndef FIXX11H_tqCursorShape #ifndef FIXX11H_CursorShape
#define FIXX11H_tqCursorShape #define FIXX11H_CursorShape
const int XtqCursorShape = tqCursorShape; const int XCursorShape = CursorShape;
#undef tqCursorShape #undef CursorShape
const int tqCursorShape = tqCursorShape; const int CursorShape = CursorShape;
#endif #endif
#undef tqCursorShape #undef CursorShape
#endif #endif
// template ---> // template --->

Loading…
Cancel
Save