diff options
| -rw-r--r-- | khelpcenter/navigator.cpp | 4 | ||||
| -rw-r--r-- | konqueror/konq_mainwindow.cpp | 8 | ||||
| -rw-r--r-- | twin/lib/kdecoration.h | 23 |
3 files changed, 2 insertions, 33 deletions
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index d2658e8e1..fdd037565 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -237,7 +237,6 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem { kdDebug(1400) << "Requested IOSlave documents for ID " << name << endl; -#if KDE_IS_VERSION( 3, 1, 90 ) TQStringList list = KProtocolInfo::protocols(); list.sort(); @@ -257,9 +256,6 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem item->setAutoDeleteDocEntry( true ); } } -#else - Q_UNUSED( topItem ); -#endif } void Navigator::insertAppletDocs( NavigatorItem *topItem ) diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index a1da0ad7d..9a919e363 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -5857,14 +5857,6 @@ void KonqMainWindow::resetWindow() XChangeProperty( tqt_xdisplay(), winId(), atom, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &x_time, 1); set_tqt_x_user_time(CurrentTime); // won't have _NET_WM_USER_TIME set -#if !KDE_IS_VERSION( 3, 2, 90 ) // _KDE_NET_USER_TIME is obsolete - static Atom atom2 = XInternAtom( tqt_xdisplay(), "_KDE_NET_USER_TIME", False ); - timeval tv; - gettimeofday( &tv, NULL ); - unsigned long now = tv.tv_sec * 10 + tv.tv_usec / 100000; - XChangeProperty(tqt_xdisplay(), winId(), atom2, XA_CARDINAL, - 32, PropModeReplace, (unsigned char *)&now, 1); -#endif static Atom atom3 = XInternAtom( tqt_xdisplay(), "_NET_WM_USER_TIME", False ); XDeleteProperty( tqt_xdisplay(), winId(), atom3 ); // Qt remembers the iconic state if the window was withdrawn while on another virtual desktop diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h index 03daebc28..00f86a9b8 100644 --- a/twin/lib/kdecoration.h +++ b/twin/lib/kdecoration.h @@ -626,9 +626,7 @@ class KWIN_EXPORT KDecoration * isShade() to get the current state. */ virtual void shadeChange() = 0; -#if KDE_IS_VERSION( 3, 90, 0 ) -#warning Redo all the XYZChange() virtuals as signals. -#endif + // Redo all the XYZChange() virtuals as signals. signals: /** * This signal is emitted whenever the window's keep-above state changes. @@ -751,27 +749,10 @@ class KWIN_EXPORT KDecoration * Changes the maximize mode of the decorated window. This function should * be preferred to the other maximize() overload for reacting on clicks * on the maximize titlebar button. - * NOTE: This function is new in KDE3.3. In order to support also KDE3.2, - * it is recommended to use code like this: - * \code - * ButtonState button = ... ; - * #if KDE_IS_VERSION( 3, 3, 0 ) - * maximize( button ); - * #else - * if( button == MidButton ) - * maximize( maximizeMode() ^ MaximizeVertical ); - * else if( button == RightButton ) - * maximize( maximizeMode() ^ MaximizeHorizontal ); - * else - * maximize( maximizeMode() == MaximizeFull ? MaximizeRestore : MaximizeFull ); - * #endif * \endcode * @since 3.3 */ -#if KDE_IS_VERSION( 3, 90, 0 ) -#warning Update the docs. -#endif - void maximize( ButtonState button ); + void maximize( ButtonState button ); /** * Set the maximize mode of the decorated window. * @param mode The maximization mode to be set. |