Remove use of KDE_IS_VERSIONHEADmaster

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

33 files changed, 11 insertions, 174 deletions

diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
index 1233fc1be..7877276e1 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
@@ -128,13 +128,7 @@ void KisToolZoom::deactivate()
 
 void KisToolZoom::slotTimer()
 {
-#if KDE_IS_VERSION(3,4,0)
     int state = tdeApp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
-#else
-    int state = tdeApp->keyboardModifiers() & (TDEApplication::ShiftModifier
-            |TDEApplication::ControlModifier|TDEApplication::Modifier1);
-#endif
-
     if (state & TQt::ControlButton) {
         m_subject->canvasController()->setCanvasCursor(m_minusCursor);
     } else {
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
index b1a232450..4a15e9b73 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
@@ -165,12 +165,7 @@ void KisToolSelectSimilar::buttonPress(KisButtonPressEvent *e)
 
 void KisToolSelectSimilar::slotTimer()
 {
-#if KDE_IS_VERSION(3,4,0)
     int state = tdeApp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
-#else
-    int state = tdeApp->keyboardModifiers() & (TDEApplication::ShiftModifier
-            |TDEApplication::ControlModifier|TDEApplication::Modifier1);
-#endif
     enumSelectionMode action;
 
     if (state == TQt::ShiftButton)
diff --git a/chalk/ui/kis_dlg_preferences.cpp b/chalk/ui/kis_dlg_preferences.cpp
index c8396be2b..0fe58d5ad 100644
--- a/chalk/ui/kis_dlg_preferences.cpp
+++ b/chalk/ui/kis_dlg_preferences.cpp
@@ -652,10 +652,8 @@ GridSettingsTab::GridSettingsTab(TQWidget* parent) : WdgGridSettingsBase(parent)
     selectMainStyle->setCurrentItem(cfg.getGridMainStyle());
     selectSubdivisionStyle->setCurrentItem(cfg.getGridSubdivisionStyle());
 
-#if KDE_IS_VERSION(3,4,0)
     colorMain->setDefaultColor( TQColor( 99, 99, 99 ) );
     colorSubdivision->setDefaultColor( TQColor( 200, 200, 200 ) );
-#endif
     colorMain->setColor(cfg.getGridMainColor());
     colorSubdivision->setColor(cfg.getGridSubdivisionColor());
 
diff --git a/filters/kword/oowriter/oowriterimport.cpp b/filters/kword/oowriter/oowriterimport.cpp
index 46d5b1696..ac3443799 100644
--- a/filters/kword/oowriter/oowriterimport.cpp
+++ b/filters/kword/oowriter/oowriterimport.cpp
@@ -46,10 +46,6 @@
 #include <KoRect.h>
 #include <KoDom.h>
 
-#if ! KDE_IS_VERSION(3,1,90)
-# include <kdebugclasses.h>
-#endif
-
 typedef KGenericFactory<OoWriterImport, KoFilter> OoWriterImportFactory;
 K_EXPORT_COMPONENT_FACTORY( liboowriterimport, OoWriterImportFactory(  "kofficefilters" ) )
 
diff --git a/filters/xsltfilter/export/xsltexportdia.cpp b/filters/xsltfilter/export/xsltexportdia.cpp
index d6347ec19..0cd7c1115 100644
--- a/filters/xsltfilter/export/xsltexportdia.cpp
+++ b/filters/xsltfilter/export/xsltexportdia.cpp
@@ -226,11 +226,7 @@ void XSLTExportDia::okSlot()
 		while(_recentList.size() > 0)
 		{
 			kdDebug() << "save : " << _recentList.first() << endl;
-#if KDE_IS_VERSION(3,1,3)
 			_config->writePathEntry( TQString("Recent%1").arg(i), _recentList.first());
-#else
-			_config->writeEntry( TQString("Recent%1").arg(i), _recentList.first());
-#endif
 			_recentList.pop_front();
 			i = i + 1;
 		}
diff --git a/filters/xsltfilter/import/xsltimportdia.cpp b/filters/xsltfilter/import/xsltimportdia.cpp
index 764170401..f5bb3cf5b 100644
--- a/filters/xsltfilter/import/xsltimportdia.cpp
+++ b/filters/xsltfilter/import/xsltimportdia.cpp
@@ -225,11 +225,7 @@ void XSLTImportDia::okSlot()
 		while(_recentList.size() > 0)
 		{
 			kdDebug() << "save : " << _recentList.first() << endl;
-#if KDE_IS_VERSION(3,1,3)
 			_config->writePathEntry( TQString("Recent%1").arg(i), _recentList.first());
-#else
-			_config->writeEntry( TQString("Recent%1").arg(i), _recentList.first());
-#endif
 			_recentList.pop_front();
 			i = i + 1;
 		}
diff --git a/karbon/karbon_view.cpp b/karbon/karbon_view.cpp
index a9535429a..0a5add759 100644
--- a/karbon/karbon_view.cpp
+++ b/karbon/karbon_view.cpp
@@ -980,9 +980,7 @@ KarbonView::initActions()
 
 	m_showPageMargins = new TDEToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "view_show_margins" );
 	connect( m_showPageMargins, TQ_SIGNAL(toggled(bool)), TQ_SLOT(togglePageMargins(bool)));
-#if KDE_IS_VERSION(3,2,90)
 	m_showPageMargins->setCheckedState(i18n("Hide Page Margins"));
-#endif
 
 	// No need for the other actions in read-only (embedded) mode
 	if( !shell() )
@@ -1085,15 +1083,11 @@ KarbonView::initActions()
 		actionCollection(), "object_distribute_vertical_top" );
 
 	m_showRulerAction = new TDEToggleAction( i18n( "Show Rulers" ), 0, this, TQ_SLOT( showRuler() ), actionCollection(), "view_show_ruler" );
-#if KDE_IS_VERSION(3,2,90)
 	m_showRulerAction->setCheckedState(i18n("Hide Rulers"));
-#endif
 	m_showRulerAction->setToolTip( i18n( "Shows or hides rulers." ) );
 	m_showRulerAction->setChecked( false );
 	m_showGridAction = new TDEToggleAction( i18n( "Show Grid" ), "view_grid", this, TQ_SLOT( showGrid() ), actionCollection(), "view_show_grid" );
-#if KDE_IS_VERSION(3,2,90)
 	m_showGridAction->setCheckedState(i18n("Hide Grid"));
-#endif
 	m_showGridAction->setToolTip( i18n( "Shows or hides grid." ) );
 	//m_showGridAction->setChecked( true );
 	m_snapGridAction = new TDEToggleAction( i18n( "Snap to Grid" ), 0, this, TQ_SLOT( snapToGrid() ), actionCollection(), "view_snap_to_grid" );
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 4a7363741..939acea0c 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -893,10 +893,8 @@ void KexiMainWindowImpl::initActions()
 #ifndef KEXI_NO_CTXT_HELP
 	d->action_show_helper = new TDEToggleAction(i18n("Show Context Help"), "", TQt::CTRL + TQt::Key_H,
 	 actionCollection(), "options_show_contexthelp");
-#if KDE_IS_VERSION(3,2,90)
 	d->action_show_helper->setCheckedState(i18n("Hide Context Help"));
 #endif
-#endif
 
 #ifdef KEXI_FORMS_SUPPORT
 	slotOptionsEnableForms(true, true);
@@ -2072,13 +2070,8 @@ KexiMainWindowImpl::restoreSettings()
 //		int restoredWidth, restoredHeight;
     	int scnum = TQApplication::desktop()->screenNumber(parentWidget());
 		TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
-//#if KDE_IS_VERSION(3,1,90)
 //		restoredWidth = TDEGlobalSettings::screenGeometry(scnum).width();
 	//	restoredHeight = TDEGlobalSettings::screenGeometry(scnum).height();
-//#else
-//		restoredWidth = TQApplication::desktop()->width();
-//		restoredHeight = TQApplication::desktop()->height();
-//#endif
 /*		if (restoredWidth > 1100) {// very big desktop ?
 			restoredWidth = 1000;
 			restoredHeight = 800;
@@ -2190,7 +2183,7 @@ KexiMainWindowImpl::storeWindowConfiguration(TDEConfig *config)
 	config->setGroup("MainWindow");
 	TQString dockGrp;
 
-#if KDE_IS_VERSION(3,1,9) && !defined(TQ_WS_WIN)
+#if !defined(TQ_WS_WIN)
 	if (tdeApp->sessionSaving())
 		dockGrp=config->group()+"-Docking";
 	else
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 3aed5172a..c3efa6e87 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -32,9 +32,7 @@
 
 KexiNewStuff::KexiNewStuff(TQWidget *parent)
  : TDENewStuff( "kexi template"
-#if KDE_IS_VERSION(3,3,0)
 	, "https://www.trinitydesktop.org/ocs/providers.xml"
-#endif
 	, parent)
 {
 	// Prevent GHNS to deny downloading a second time. If GHNS
diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h
index 05f2d5682..aee69081c 100644
--- a/kexi/main/ksplitter.h
+++ b/kexi/main/ksplitter.h
@@ -77,28 +77,12 @@ public:
    * Return the separator position in percent (%), so the range is [0..100]
    * @return separator position in percent
    */
-  int separatorPosInPercent()
-#if KDE_IS_VERSION(3,4,89)
-	;
-#else
-	{
-//		kdDebug() << "^^^^^^^^^^^^^^^^^^^^^ separatorPosInPercent() " << separatorPos() / (factor/100) << " " << separatorPos() / 100 << endl;
-		return separatorPos() / 100;
-	}
-#endif
+  int separatorPosInPercent();
   /**
    * Set the separator position in percent (%), so the range must be [0..100]
    * @param percent separator position in percent
    */
-  void setSeparatorPosInPercent(int percent)
-#if KDE_IS_VERSION(3,4,89)
-	;
-#else
-	{
-//		kdDebug() << "^^^^^^^^^^^^^^^^^^^^^ setSeparatorPosInPercent() " << percent << " " << separatorPos() / 100 << endl;
-		setSeparatorPos( percent * 100, false );
-	}
-#endif
+  void setSeparatorPosInPercent(int percent);
 
   /**
    * Return the separator position in the range [0..100000]
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 83db3bbdb..f038bb3a8 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -370,11 +370,6 @@ KexiSimplePrintingPageSetup::KexiSimplePrintingPageSetup( KexiMainWindow *mainWi
 
 	TQWhatsThis::add(m_contents->saveSetupLink, i18n("Saves settings for this setup as default."));
 	connect(m_contents->saveSetupLink, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(slotSaveSetup()));
-#if !KDE_IS_VERSION(3,5,1) && !defined(TQ_WS_WIN)
-	//a fix for problems with focusable KUrlLabel on KDElibs<=3.5.0
-	m_contents->openDataLink->setFocusPolicy(NoFocus);
-	m_contents->saveSetupLink->setFocusPolicy(NoFocus);
-#endif
 
 	TQWhatsThis::add(m_contents->addDateTimeCheckbox, i18n("Adds date and time to the header."));
 	TQWhatsThis::add(m_contents->addPageNumbersCheckbox, i18n("Adds page numbers to the footer."));
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index e97532b33..ae437f8f8 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -97,9 +97,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector");
 //	lv_types = new TDEListView(m_prjtype_sel, "types listview");
 //	m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
-#if KDE_IS_VERSION(3,3,9)
 	m_prjtype_sel->lv_types->setShadeSortColumn(false);
-#endif
 	m_prjtype_sel->lv_types->header()->hide();
 	m_prjtype_sel->lv_types->setSorting(-1);
 	m_prjtype_sel->lv_types->setAlternateBackground(TQColor()); //disable altering
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index fb78ca043..2d80563a1 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -57,7 +57,7 @@ KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent)
 void
 KexiDSWelcome::setUseWizard(bool use)
 {
-#if KDE_IS_VERSION(3,1,9) && !defined(TQ_WS_WIN)
+#if !defined(TQ_WS_WIN)
 	bool useIcons = TDEGlobalSettings::showIconsOnPushButtons();
 #else
 	bool useIcons = true;
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 747ea11ea..988839c8c 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -210,7 +210,7 @@ LoadIconDialog::changeIconSize(int index)
 		//case 1: size = TDEIcon::SizeSmallMedium; break;
 		case 1: size = TDEIcon::SizeMedium; break;
 		case 2: size = TDEIcon::SizeLarge; break;
-#if !defined(TQ_WS_WIN) && KDE_IS_VERSION(3,1,9)
+#if !defined(TQ_WS_WIN)
 		case 3: size = TDEIcon::SizeHuge; break;
 #endif
 		default:;
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index fa1a2ff1f..a5aaefa68 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -483,22 +483,16 @@ void KivioView::setupActions()
 
   showPageMargins = new TDEToggleAction( i18n("Show Page Margins"), "view_margins", 0, actionCollection(), "showPageMargins" );
   connect( showPageMargins, TQ_SIGNAL(toggled(bool)), TQ_SLOT(togglePageMargins(bool)));
-#if KDE_IS_VERSION(3,2,90)
   showPageMargins->setCheckedState(i18n("Hide Page Margins"));
-#endif
 
   showRulers = new TDEToggleAction( i18n("Show Rulers"), "view_ruler", 0, actionCollection(), "showRulers" );
   connect( showRulers, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleShowRulers(bool)));
-#if KDE_IS_VERSION(3,2,90)
   showRulers->setCheckedState(i18n("Hide Rulers"));
-#endif
 
   // Grid actions
   showGrid = new TDEToggleAction( i18n("Show Grid"), "view_grid", 0, actionCollection(), "showGrid" );
   connect( showGrid, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleShowGrid(bool)));
-#if KDE_IS_VERSION(3,2,90)
   showGrid->setCheckedState(i18n("Hide Grid"));
-#endif
 
   TDEToggleAction* snapGrid = new TDEToggleAction( i18n("Snap Grid"), "view_grid", 0, actionCollection(), "snapGrid" );
   connect( snapGrid, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleSnapGrid(bool)));
@@ -1706,11 +1700,7 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x,
     pStencil->setPosition( x, y );
 
     // Use default properties if we held ctrl down
-#if KDE_IS_VERSION(3, 4, 0)
     if(tdeApp->keyboardMouseState() & TQt::ControlButton) {
-#else
-    if(TDEApplication::keyboardModifiers() & TDEApplication::ControlModifier) {
-#endif
       pStencil->setFGColor(m_setFGColor->color());
       pStencil->setBGColor(m_setBGColor->color());
       TQFont f = m_setFontFamily->font();
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
index 8bb14b763..869bf1698 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
@@ -60,9 +60,7 @@ namespace Kivio {
         m_stencilSetLView->ensureItemVisible(tmp);
       }
     }
-#if KDE_IS_VERSION(3,4,0)
     m_stencilSetLView-> setShadeSortColumn(false);
-#endif
   }
   
   
diff --git a/kplato/kptdoublelistviewbase.cpp b/kplato/kptdoublelistviewbase.cpp
index 6df157ad9..b49caa476 100644
--- a/kplato/kptdoublelistviewbase.cpp
+++ b/kplato/kptdoublelistviewbase.cpp
@@ -355,9 +355,7 @@ DoubleListViewBase::DoubleListViewBase(TQWidget *parent, bool description)
     m_masterList->setSelectionMode(TQListView::NoSelection);
     m_masterList->setItemMargin(2);
     m_masterList->setRootIsDecorated(true);
-#if KDE_IS_VERSION(3,3,9)
     m_masterList->setShadeSortColumn(false);
-#endif
     m_masterList->setSortColumn(-1); // Disable sort!!
     m_masterList->addColumn(i18n("Name"));
     m_masterList->addColumn(i18n("Total"));
diff --git a/kplato/kptreportview.cpp b/kplato/kptreportview.cpp
index fa6fb101b..203472295 100644
--- a/kplato/kptreportview.cpp
+++ b/kplato/kptreportview.cpp
@@ -177,9 +177,7 @@ ReportView::ReportView(View *view, TQWidget *parent)
 {
     //kdDebug()<<k_funcinfo<<endl;
     m_reportList = new TDEListView(this);
-#if KDE_IS_VERSION(3,3,9)
     m_reportList->setShadeSortColumn(false);
-#endif
     m_reportList->addColumn(i18n("Report Template"));
     m_reportList->header()->setStretchEnabled(true, 0);
     m_reportList->header()->setSortIndicator(0);
diff --git a/kplato/kptresourceview.cpp b/kplato/kptresourceview.cpp
index d30d302fd..ba1de1a9c 100644
--- a/kplato/kptresourceview.cpp
+++ b/kplato/kptresourceview.cpp
@@ -376,9 +376,7 @@ ResourceView::ResourceView(View *view, TQWidget *parent)
 
     resList = new ResListView(this, "Resource list");
     resList->setItemMargin(2);
-#if KDE_IS_VERSION(3,3,9)
     resList->setShadeSortColumn(false);
-#endif
     resList->setRootIsDecorated(true);
     resList->addColumn(i18n("Name"));
     resList->setColumnAlignment(1, AlignHCenter);
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index 91f01c7a1..ad7d6961b 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -523,11 +523,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T
         // NOTE: make all multiplications before any division
         double w = _origSize.width();
         w *= ext.width();
-#if KDE_IS_VERSION(3,1,90)
         TQRect desk = TDEGlobalSettings::desktopGeometry(tdeApp->activeWindow());
-#else
-        TQRect desk = TQApplication::desktop()->screenGeometry();
-#endif
         w /= desk.width();
         double h = _origSize.height();
         h *= ext.height();
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 050b08b60..4ea5112bd 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -1010,11 +1010,7 @@ void KPrConfigurePathPage::apply()
         {
             config->setGroup( "Kpresenter Path" );
             m_pView->kPresenterDoc()->setBackupPath( res );
-#if KDE_IS_VERSION(3,1,3)
             config->writePathEntry( "backup path",res );
-#else
-            config->writeEntry( "backup path",res );
-#endif
         }
     }
     item = m_pPathView->findItem(i18n("Picture Path"), 0);
@@ -1025,11 +1021,7 @@ void KPrConfigurePathPage::apply()
         {
             config->setGroup( "Kpresenter Path" );
             m_pView->kPresenterDoc()->setPicturePath( res );
-#if KDE_IS_VERSION(3,1,3)
             config->writePathEntry( "picture path",res );
-#else
-            config->writeEntry( "picture path",res );
-#endif
         }
     }
 }
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index b160fd527..ebe4c0a90 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -1488,13 +1488,11 @@ void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length
                                (expose.top()+expose.bottom()) / 2,
                                (expose.right()-expose.left()) / 2,  // margin = half-width of the rect
                                (expose.bottom()-expose.top()) / 2);
-#if KDE_IS_VERSION(3,1,90)
         if ( dialog ) {
             TQRect globalRect( expose );
             globalRect.moveTopLeft( canvas->mapToGlobal( globalRect.topLeft() ) );
             KDialog::avoidArea( dialog, globalRect );
         }
-#endif
     }
 }
 
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index d76e208b0..025ce37b5 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -249,11 +249,7 @@ void KPrWebPresentation::saveConfig()
     cfg.writeEntry( "BackColor", backColor );
     cfg.writeEntry( "TitleColor", titleColor );
     cfg.writeEntry( "TextColor", textColor );
-#if KDE_IS_VERSION(3,1,3)
     cfg.writePathEntry( "Path", path );
-#else
-    cfg.writeEntry( "Path", path );
-#endif
     cfg.writeEntry( "XML", xml );
     cfg.writeEntry( "WriteHeader", m_bWriteHeader );
     cfg.writeEntry( "WriteFooter", m_bWriteFooter );
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index 66f0b57ce..841e58cb7 100644
--- a/kword/KWPartFrameSet.cpp
+++ b/kword/KWPartFrameSet.cpp
@@ -350,13 +350,7 @@ KoDocument* KWDocumentChild::hitTest( const TQPoint& p, const TQWMatrix& _matrix
         return 0;
     }
 
-#if KDE_IS_VERSION( 3, 4, 0 )
     int keyState = tdeApp->keyboardMouseState();
-#else
-    int keyState = 0;
-    if ( tdeApp->keyboardModifiers() & TDEApplication::ControlModifier )
-        keyState = TQt::ControlButton;
-#endif
 
     // Only activate when it's already selected, and when not clicking on the border.
     // KWFrameView and the part frame policy have that logic already.
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index feab944f1..56caa68ae 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -90,9 +90,7 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance,
   m_previewLabel->installEventFilter(this);
   m_documentList->installEventFilter(this);
   setFocusProxy(m_documentList);
-#if KDE_IS_VERSION(3,4,0)
   m_documentList->setShadeSortColumn(false);
-#endif
 
   KGuiItem openGItem(i18n("Use This Template"));
   m_openButton->setGuiItem(openGItem);
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 97775dd2e..7a9f5f0d5 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -102,9 +102,7 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString&
 
   m_sectionList->header()->hide();
   m_sectionList->setSorting(0);
-#if KDE_IS_VERSION(3,4,0)
   m_sectionList->setShadeSortColumn(false);
-#endif
   connect(m_sectionList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
           this, TQ_SLOT(selectionChanged(TQListViewItem*)));
   connect(m_sectionList, TQ_SIGNAL(pressed(TQListViewItem*)),
diff --git a/lib/kofficecore/KoPictureClipart.cpp b/lib/kofficecore/KoPictureClipart.cpp
index 12a867110..dbb925110 100644
--- a/lib/kofficecore/KoPictureClipart.cpp
+++ b/lib/kofficecore/KoPictureClipart.cpp
@@ -26,9 +26,6 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#if ! KDE_IS_VERSION( 3,1,90 )
-#include <kdebugclasses.h>
-#endif
 
 #include "KoPictureKey.h"
 #include "KoPictureBase.h"
diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp
index e2bc567c3..4e501b2c2 100644
--- a/lib/kofficecore/KoPictureEps.cpp
+++ b/lib/kofficecore/KoPictureEps.cpp
@@ -35,9 +35,6 @@
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#if ! KDE_IS_VERSION( 3,1,90 )
-#include <kdebugclasses.h>
-#endif
 #include <tdetempfile.h>
 #include <tdeprocess.h>
 
diff --git a/lib/kofficecore/KoPictureWmf.cpp b/lib/kofficecore/KoPictureWmf.cpp
index 3f2d0a7e0..ec751865f 100644
--- a/lib/kofficecore/KoPictureWmf.cpp
+++ b/lib/kofficecore/KoPictureWmf.cpp
@@ -26,9 +26,6 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#if ! KDE_IS_VERSION( 3,1,90 )
-#include <kdebugclasses.h>
-#endif
 
 #include <kowmfpaint.h>
 #include "KoPictureKey.h"
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 5c7d09e8c..26a37b030 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -611,10 +611,7 @@ void KoView::slotAutoScroll(  )
 
     if ( actuallyDoScroll )
     {
-        int state=0;
-#if KDE_IS_VERSION(3,4,0)
-        state = tdeApp->keyboardMouseState();
-#endif
+        int state = tdeApp->keyboardMouseState();
 
         pos = canvas()->mapFrom(this, pos);
         TQMouseEvent * event = new TQMouseEvent(TQEvent::MouseMove, pos, 0, state);
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 1e63f54fc..eb1cfb04f 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -152,9 +152,7 @@ Editor::Editor(TQWidget *parent, bool autoSync, const char *name)
 	setColumnWidthMode(0, TQListView::Maximum);
 	setFullWidth(true);
 	setShowSortIndicator(false);
-#if KDE_IS_VERSION(3,3,9)
 	setShadeSortColumn(false);
-#endif
 	setTooltipColumn(0);
 	setSorting(0);
 	setItemMargin(KPROPEDITOR_ITEM_MARGIN);
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 7abb6efb8..eb698c65c 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -35,25 +35,16 @@
 #include <tdestandarddirs.h>
 #include <tdetoolbar.h>
 
-#if KDE_IS_VERSION(3, 4, 0)
-  // The TDENewStuffSecure we use internaly for the GetHotNewStuff-functionality
-  // was introduced with KDE 3.4.
-  #define KROSS_SUPPORT_NEWSTUFF
-#endif
-
-#ifdef KROSS_SUPPORT_NEWSTUFF
-  #include <tdenewstuff/provider.h>
-  #include <tdenewstuff/engine.h>
-  #include <tdenewstuff/downloaddialog.h>
-  #include <tdenewstuff/knewstuffsecure.h>
-#endif
+#include <tdenewstuff/provider.h>
+#include <tdenewstuff/engine.h>
+#include <tdenewstuff/downloaddialog.h>
+#include <tdenewstuff/knewstuffsecure.h>
 
 #include "scriptguiclient.h"
 #include "scriptaction.h"
 
 namespace Kross { namespace Api {
 
-#ifdef KROSS_SUPPORT_NEWSTUFF
 class ScriptNewStuff : public TDENewStuffSecure
 {
     public:
@@ -65,7 +56,6 @@ class ScriptNewStuff : public TDENewStuffSecure
         ScriptGUIClient* m_scripguiclient;
         virtual void installResource() { m_scripguiclient->installScriptPackage( m_tarName ); }
 };
-#endif
 
 class ListItem : public TQListViewItem
 {
@@ -108,9 +98,7 @@ class WdgScriptsManagerPrivate
     friend class WdgScriptsManager;
     ScriptGUIClient* m_scripguiclient;
     ToolTip* m_tooltip;
-#ifdef KROSS_SUPPORT_NEWSTUFF
     ScriptNewStuff* newstuff;
-#endif
     //enum { LoadBtn = 0, UnloadBtn, InstallBtn, UninstallBtn, ExecBtn, NewStuffBtn };
 };
 
@@ -120,9 +108,7 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
 {
     d->m_scripguiclient = scr;
     d->m_tooltip = new ToolTip(scriptsList);
-#ifdef KROSS_SUPPORT_NEWSTUFF
     d->newstuff = 0;
-#endif
 
     scriptsList->header()->hide();
     //scriptsList->header()->setClickEnabled(false);
@@ -147,10 +133,8 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
     connect(btnInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript()));
     btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 ));
     connect(btnUninstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript()));
-#ifdef KROSS_SUPPORT_NEWSTUFF
     btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 ));
     connect(btnNewStuff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript()));
-#endif
 /*
     toolBar->setIconText( TDEToolBar::IconTextRight );
 
@@ -166,11 +150,9 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
     toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript()));
     toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UninstallBtn, false, i18n("Uninstall"));
     toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript()));
-#ifdef KROSS_SUPPORT_NEWSTUFF
     toolBar->insertLineSeparator();
     toolBar->insertButton("knewstuff", WdgScriptsManagerPrivate::NewStuffBtn, true, i18n("Get More Scripts"));
     toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript()));
-#endif
 */
     connect(scr, TQ_SIGNAL( collectionChanged(ScriptActionCollection*) ),
             this, TQ_SLOT( slotFillScriptsList() ));
@@ -319,7 +301,6 @@ void WdgScriptsManager::slotUnloadScript()
 
 void WdgScriptsManager::slotGetNewScript()
 {
-#ifdef KROSS_SUPPORT_NEWSTUFF
     const TQString appname = tdeApp->name();
     const TQString type = TQString("%1 1.x script").arg(appname);
 
@@ -338,7 +319,6 @@ void WdgScriptsManager::slotGetNewScript()
 
     p->load(type, "https://www.trinitydesktop.org/ocs/providers.xml");
     d->exec();
-#endif
 }
 
 void WdgScriptsManager::slotResourceInstalled()
diff --git a/lib/store/KoZipStore.cpp b/lib/store/KoZipStore.cpp
index b58829c09..734f9135b 100644
--- a/lib/store/KoZipStore.cpp
+++ b/lib/store/KoZipStore.cpp
@@ -26,10 +26,6 @@
 #include <tdeversion.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
-#if ! KDE_IS_VERSION( 3, 4, 1 )
-#include <tqdir.h>
-#include <tqfileinfo.h>
-#endif
 
 KoZipStore::KoZipStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification )
 {
@@ -38,23 +34,7 @@ KoZipStore::KoZipStore( const TQString & _filename, Mode _mode, const TQCString
                     << " mimetype = " << appIdentification << endl;
 
     m_pZip = new KZip( _filename );
-
-#if ! KDE_IS_VERSION( 3, 4, 1 )
-    // Workaround for KZip KSaveFile double deletion in tdelibs-3.4,
-    // when trying to write to a non-writable directory.
-    TQDir dir( TQFileInfo( _filename ).dir() );
-    if (_mode == Write && !TQFileInfo( dir.path() ).isWritable()  )
-    {
-        kdWarning(s_area) << dir.path() << " isn't writable" << endl;
-        m_bGood = false;
-        m_currentDir = 0;
-        KoStore::init( _mode );
-    }
-    else
-#endif
-    {
-        m_bGood = init( _mode, appIdentification ); // open the zip file and init some vars
-    }
+    m_bGood = init( _mode, appIdentification ); // open the zip file and init some vars
 }
 
 KoZipStore::KoZipStore( TQIODevice *dev, Mode mode, const TQCString & appIdentification )