diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-03 23:58:37 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-03 23:58:37 +0000 |
| commit | e057cf9e08ab13e3f6ed139f6b0be3a06c2ec20c (patch) | |
| tree | a022bd82c4c7b10cd396a463dd491d2897f70abe /klipper/toplevel.cpp | |
| parent | c3e2931a5bb4c067b0983cf23d064264d1d6b175 (diff) | |
| download | tdebase-e057cf9e08ab13e3f6ed139f6b0be3a06c2ec20c.tar.gz tdebase-e057cf9e08ab13e3f6ed139f6b0be3a06c2ec20c.zip | |
Wean kdebase off of hacky static qt_x_*_tim variables
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1227011 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'klipper/toplevel.cpp')
| -rw-r--r-- | klipper/toplevel.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index cbbce7de5..a64f1d55a 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -1037,9 +1037,6 @@ bool KlipperWidget::ignoreClipboardChanges() const // Call KApplication::updateUserTime() only from functions that are // called from outside (DCOP), or from TQTimer timeout ! -extern Time qt_x_time; -extern Time qt_x_user_time; - static Time next_x_time; static Bool update_x_time_predicate( Display*, XEvent* event, XPointer ) { @@ -1080,7 +1077,7 @@ void KlipperWidget::updateTimestamp() { // Qt3.3.0 and 3.3.1 use qt_x_user_time for clipboard operations Time& time = ( strcmp( qVersion(), "3.3.1" ) == 0 || strcmp( qVersion(), "3.3.0" ) == 0 ) - ? qt_x_user_time : qt_x_time; + ? GET_QT_X_USER_TIME() : GET_QT_X_TIME(); static TQWidget* w = 0; if ( !w ) w = new TQWidget; |