summaryrefslogtreecommitdiffstats
path: root/style/qtc_fixx11h.h
diff options
context:
space:
mode:
Diffstat (limited to 'style/qtc_fixx11h.h')
-rw-r--r--style/qtc_fixx11h.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/style/qtc_fixx11h.h b/style/qtc_fixx11h.h
index ec8e53a..efa125a 100644
--- a/style/qtc_fixx11h.h
+++ b/style/qtc_fixx11h.h
@@ -16,7 +16,7 @@
symbols may now refer to different variables
(e.g. if X11 #defined NoButton, after this file
is included NoButton would no longer be X11's
- NoButton, but Qt::NoButton instead). At this time,
+ NoButton, but TQt::NoButton instead). At this time,
there's no conflict known that could cause problems.
The original X11 symbols are still accessible
@@ -168,25 +168,25 @@ const int GrayScale = XGrayScale;
#endif
// Affects: Should be without side effects.
-#ifdef Status
-#ifndef FIXX11H_Status
-#define FIXX11H_Status
-typedef Status XStatus;
-#undef Status
-typedef XStatus Status;
+#ifdef tqStatus
+#ifndef FIXX11H_tqStatus
+#define FIXX11H_tqStatus
+typedef tqStatus XtqStatus;
+#undef tqStatus
+typedef XtqStatus tqStatus;
#endif
-#undef Status
+#undef tqStatus
#endif
// Affects: Should be without side effects.
-#ifdef CursorShape
-#ifndef FIXX11H_CursorShape
-#define FIXX11H_CursorShape
-const int XCursorShape = CursorShape;
-#undef CursorShape
-const int CursorShape = CursorShape;
+#ifdef tqCursorShape
+#ifndef FIXX11H_tqCursorShape
+#define FIXX11H_tqCursorShape
+const int XtqCursorShape = tqCursorShape;
+#undef tqCursorShape
+const int tqCursorShape = tqCursorShape;
#endif
-#undef CursorShape
+#undef tqCursorShape
#endif
// template --->