diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-06 22:09:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-06 22:09:18 +0000 |
| commit | d1fb90134ab8504932ee36de6157f846b50f7415 (patch) | |
| tree | 191f2f1f1ed00a754687d1258d47f78e99723182 /style/qtc_fixx11h.h | |
| parent | b23b8edce7cbd48165084dbd852875afeb800735 (diff) | |
| download | tde-style-qtcurve-d1fb90134ab8504932ee36de6157f846b50f7415.tar.gz tde-style-qtcurve-d1fb90134ab8504932ee36de6157f846b50f7415.zip | |
TQt4 port kde-style-qtcurve
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kde-style-qtcurve@1230744 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'style/qtc_fixx11h.h')
| -rw-r--r-- | style/qtc_fixx11h.h | 30 |
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 ---> |