diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-26 22:29:12 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-26 22:29:12 +0000 |
| commit | 107dd1f98367d07df7cbe2042786511e44706d3a (patch) | |
| tree | 75fab70f7b695c6c4a6d177eef6df669ff8d37aa /kwin | |
| parent | b6fc43ccd522dfbc1e215b12adb8208c156bbd31 (diff) | |
| download | tdebase-107dd1f98367d07df7cbe2042786511e44706d3a.tar.gz tdebase-107dd1f98367d07df7cbe2042786511e44706d3a.zip | |
Fix recursive repaint
Add Qt4 support to kwin
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1217377 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin')
| -rw-r--r-- | kwin/client.h | 2 | ||||
| -rw-r--r-- | kwin/utils.cpp | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/kwin/client.h b/kwin/client.h index 52fb025f6..d715a8558 100644 --- a/kwin/client.h +++ b/kwin/client.h @@ -580,7 +580,7 @@ class Client : public TQObject, public KDecorationDefines friend struct CheckIgnoreFocusStealingProcedure; friend struct ResetupRulesProcedure; friend class GeometryUpdatesPostponer; - void show() { assert( false ); } // SELI remove after Client is no longer QWidget + void show() { assert( false ); } // SELI remove after Client is no longer TQWidget void hide() { assert( false ); } uint opacity_; uint savedOpacity_; diff --git a/kwin/utils.cpp b/kwin/utils.cpp index 67c3aa1c9..5a8d5ad3c 100644 --- a/kwin/utils.cpp +++ b/kwin/utils.cpp @@ -32,6 +32,16 @@ License. See the file "COPYING" for the exact licensing terms. #include "atoms.h" #include "notifications.h" +#ifdef USE_QT4 +#include <Qt/qx11info_x11.h> +#endif // USE_QT4 + +#ifdef USE_QT4 +#define SET_X_TIME(x) QX11Info::setAppTime(x) +#else // USE_QT4 +#define SET_X_TIME(x) qt_x_time = x +#endif // USE_QT4 + extern Time qt_x_time; #endif @@ -271,7 +281,7 @@ void updateXTime() XCheckIfEvent( qt_xdisplay(), &dummy, update_x_time_predicate, NULL ); } assert( next_x_time != CurrentTime ); - qt_x_time = next_x_time; + SET_X_TIME(next_x_time); XEvent ev; // remove the PropertyNotify event from the events queue XWindowEvent( qt_xdisplay(), w->winId(), PropertyChangeMask, &ev ); } |