8 files changed, 5 insertions, 11 deletions
diff --git a/admin b/admin
-Subproject 60f84493601273e216a013532248513e733f72c
+Subproject 95578bc83bad7ea609c9c3fbfbfba54864c7abe
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 7370a062..6312cd2a 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -799,11 +799,9 @@ void Part::slotFind()
     dlg.setHasCursor( false );
     if ( !m_searchHistory.empty() )
         dlg.setFindHistory( m_searchHistory );
-#if KDE_IS_VERSION(3,3,90)
     dlg.setSupportsBackwardsFind( false );
     dlg.setSupportsWholeWordsFind( false );
     dlg.setSupportsRegularExpressionFind( false );
-#endif
     if ( savedCaseSensitive )
     {
         dlg.setOptions( dlg.options() | KFindDialog::CaseSensitive );
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index f05b8931..286047d1 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -402,9 +402,7 @@ HoverButton::HoverButton( TQWidget * parent )
     : TQPushButton( parent )
 {
     setMouseTracking( true );
-#if KDE_IS_VERSION(3,3,90)
     TDEAcceleratorManager::setNoAccel( this );
-#endif
 }
 
 void HoverButton::enterEvent( TQPaintEvent * e )
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index db3bcbf8..11fb6423 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -248,9 +248,7 @@ void PageView::setupActions( TDEActionCollection * ac )
     // Zoom actions ( higher scales takes lots of memory! )
     d->aZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, this, TQ_SLOT( slotZoom() ), ac, "zoom_to" );
     d->aZoom->setEditable( true );
-#if KDE_IS_VERSION(3,4,89)
     d->aZoom->setMaxComboViewCount( 13 );
-#endif
     updateZoomText();
 
     KStdAction::zoomIn( this, TQ_SLOT( slotZoomIn() ), ac, "zoom_in" );
diff --git a/kuickshow/src/kuick.h b/kuickshow/src/kuick.h
index c55745ec..a827a44c 100644
--- a/kuickshow/src/kuick.h
+++ b/kuickshow/src/kuick.h
@@ -57,7 +57,7 @@ public:
 	return s_self;
     }
 
-    KWinModule winModule;
+    TWinModule winModule;
 
 private:
     Kuick() {}
diff --git a/kuickshow/src/kuickglobals.h b/kuickshow/src/kuickglobals.h
index bd5be8cc..6a6a5a81 100644
--- a/kuickshow/src/kuickglobals.h
+++ b/kuickshow/src/kuickglobals.h
@@ -24,7 +24,7 @@
 class KuickGlobals
 {
 public:
-    KWinModule winModule;
+    TWinModule winModule;
 
 
 };
diff --git a/kview/kview.cpp b/kview/kview.cpp
index 3ef926b8..4f3b4888 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -59,7 +59,7 @@ KView::KView()
     : KParts::MainWindow( 0, "KView" )
 	, m_pViewer( 0 )
 	, m_pCanvas( 0 )
-	, m_pWinModule( new KWinModule( this, KWinModule::INFO_DESKTOP ) )
+	, m_pWinModule( new TWinModule( this, TWinModule::INFO_DESKTOP ) )
 	, m_bImageSizeChangedBlocked( false )
 	, m_bFullscreen( false )
 {
diff --git a/kview/kview.h b/kview/kview.h
index c0749718..5e64cbe0 100644
--- a/kview/kview.h
+++ b/kview/kview.h
@@ -36,7 +36,7 @@ class TQRect;
 class TDEAction;
 class TDEToggleAction;
 class TDERecentFilesAction;
-class KWinModule;
+class TWinModule;
 class TQStringList;
 class KProgress;
 
@@ -102,7 +102,7 @@ class KView : public KParts::MainWindow
 
 		KImageViewer::Viewer * m_pViewer;
 		KImageViewer::Canvas * m_pCanvas;
-		KWinModule * m_pWinModule;
+		TWinModule * m_pWinModule;
 
 		// Actions:
 		TDEAction * m_paOpenFile;