summaryrefslogtreecommitdiffstats
path: root/kdecore
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 05:50:03 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 05:50:03 +0000
commit73a98149e76c195571c8b9b3ecd6753f204ccd97 (patch)
tree06b2ad494d278a9a91901d7f615eac09d4e9366d /kdecore
parent560378aaca1784ba19806a0414a32b20c744de39 (diff)
downloadtdelibs-73a98149e76c195571c8b9b3ecd6753f204ccd97.tar.gz
tdelibs-73a98149e76c195571c8b9b3ecd6753f204ccd97.zip
Fix build failure
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211108 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore')
-rw-r--r--kdecore/fixx11h.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/kdecore/fixx11h.h b/kdecore/fixx11h.h
index 2672c59d1..ec8e53ab9 100644
--- a/kdecore/fixx11h.h
+++ b/kdecore/fixx11h.h
@@ -4,7 +4,7 @@
/* Usage:
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
(not .h file!) between the place where X11 headers are
included and the place where the file with compile
@@ -21,7 +21,7 @@
The original X11 symbols are still accessible
(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.)
Use 'Unsorted', 'Bool' and 'index' as templates.
@@ -168,25 +168,25 @@ const int GrayScale = XGrayScale;
#endif
// Affects: Should be without side effects.
-#ifdef tqStatus
-#ifndef FIXX11H_tqStatus
-#define FIXX11H_tqStatus
-typedef tqStatus XtqStatus;
-#undef tqStatus
-typedef XtqStatus tqStatus;
+#ifdef Status
+#ifndef FIXX11H_Status
+#define FIXX11H_Status
+typedef Status XStatus;
+#undef Status
+typedef XStatus Status;
#endif
-#undef tqStatus
+#undef Status
#endif
// Affects: Should be without side effects.
-#ifdef tqCursorShape
-#ifndef FIXX11H_tqCursorShape
-#define FIXX11H_tqCursorShape
-const int XtqCursorShape = tqCursorShape;
-#undef tqCursorShape
-const int tqCursorShape = tqCursorShape;
+#ifdef CursorShape
+#ifndef FIXX11H_CursorShape
+#define FIXX11H_CursorShape
+const int XCursorShape = CursorShape;
+#undef CursorShape
+const int CursorShape = CursorShape;
#endif
-#undef tqCursorShape
+#undef CursorShape
#endif
// template --->