Remove use of KDE_IS_VERSIONHEADmaster

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

8 files changed, 1 insertions, 50 deletions

diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp
index ad1b640..f6ac63f 100644
--- a/src/k3binteractiondialog.cpp
+++ b/src/k3binteractiondialog.cpp
@@ -142,9 +142,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
   // we only handle some of the possible settings since
   // our buttons are always to the right of the dialog
   int btl = 0;
-#if KDE_IS_VERSION(3,3,0)
   btl = TDEGlobalSettings::buttonLayout();
-#endif
   switch( btl ) {
   case 0: // KDE default
   default:
diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp
index c75f770..54192e9 100644
--- a/src/misc/k3bcdimagewritingdialog.cpp
+++ b/src/misc/k3bcdimagewritingdialog.cpp
@@ -823,11 +823,7 @@ void K3bCdImageWritingDialog::toggleAll()
 void K3bCdImageWritingDialog::setImage( const KURL& url )
 {
   d->imageForced = true;
-#if KDE_IS_VERSION(3,4,0)
   m_editImagePath->setKURL( url );
-#else
-  m_editImagePath->setURL( url.path() );
-#endif
 }
 
 
@@ -1039,11 +1035,7 @@ void K3bCdImageWritingDialog::dropEvent( TQDropEvent* e )
 {
   KURL::List urls;
   KURLDrag::decode( e, urls );
-#if KDE_IS_VERSION(3,4,0)
   m_editImagePath->setKURL( urls.first() );
-#else
-  m_editImagePath->setURL( urls.first().path() );
-#endif
 }
 
 #include "k3bcdimagewritingdialog.moc"
diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp
index c417d86..fb99906 100644
--- a/src/misc/k3bisoimagewritingdialog.cpp
+++ b/src/misc/k3bisoimagewritingdialog.cpp
@@ -425,11 +425,7 @@ void K3bIsoImageWritingDialog::slotWriterChanged()
 void K3bIsoImageWritingDialog::setImage( const KURL& url )
 {
   d->imageForced = true;
-#if KDE_IS_VERSION(3,4,0)
   m_editImagePath->setKURL( url );
-#else
-  m_editImagePath->setURL( url.path() );
-#endif
 }
 
 
@@ -570,11 +566,7 @@ void K3bIsoImageWritingDialog::dropEvent( TQDropEvent* e )
 {
   KURL::List urls;
   KURLDrag::decode( e, urls );
-#if KDE_IS_VERSION(3,4,0)
   m_editImagePath->setKURL( urls.first() );
-#else
-  m_editImagePath->setURL( urls.first().path() );
-#endif
 }
 
 #include "k3bisoimagewritingdialog.moc"
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index 683c0f6..45b1302 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -136,9 +136,7 @@ K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, TQWi
   m_programView->setAllColumnsShowFocus(true);
   m_programView->setFullWidth(true);
   m_programView->setAlternateBackground( TQColor() );
-#if KDE_IS_VERSION(3,4,0)
   m_programView->setShadeSortColumn( false );
-#endif
   m_mainTabWidget->addTab( programTab, i18n("Programs") );
 
 
diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp
index e9ee61b..c7938b3 100644
--- a/src/option/k3bpluginoptiontab.cpp
+++ b/src/option/k3bpluginoptiontab.cpp
@@ -61,9 +61,7 @@ public:
 K3bPluginOptionTab::K3bPluginOptionTab( TQWidget* parent, const char* name )
   : base_K3bPluginOptionTab( parent, name )
 {
-#if KDE_IS_VERSION(3,4,0)
   m_viewPlugins->setShadeSortColumn( false );
-#endif
   m_viewPlugins->addColumn( i18n("Name") );
   m_viewPlugins->addColumn( i18n("Author") );
   m_viewPlugins->addColumn( i18n("Version") );
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index 608a50c..bfb73e0 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -62,10 +62,7 @@ K3bThemeOptionTab::K3bThemeOptionTab(TQWidget *parent, const char *name )
   : base_K3bThemeOptionTab(parent,name)
 {
   d = new Private();
-
-#if KDE_IS_VERSION(3,4,0)
   m_viewTheme->setShadeSortColumn( false );
-#endif
 
   connect( m_viewTheme, TQ_SIGNAL(selectionChanged()),
 	   this, TQ_SLOT(selectionChanged()) );
diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp
index 69d4a2d..2526bed 100644
--- a/src/projects/k3bdatafileview.cpp
+++ b/src/projects/k3bdatafileview.cpp
@@ -454,12 +454,8 @@ void K3bDataFileView::slotOpen()
     if( item->isFile() ) {
       K3bDataFileViewItem* fvi = static_cast<K3bDataFileViewItem*>( viewItem );
       if( fvi->mimeType() &&
-#if KDE_IS_VERSION(3,3,0)
 	  !KRun::isExecutableFile( KURL::fromPathOrURL(item->localPath()), 
 				   fvi->mimeType()->name() )
-#else
-	  !TQFileInfo( item->localPath() ).isExecutable()
-#endif
 	  )
 	KRun::runURL( KURL::fromPathOrURL(item->localPath()), 
 		      fvi->mimeType()->name() );
diff --git a/src/projects/kostore/koZipStore.cpp b/src/projects/kostore/koZipStore.cpp
index 0bbecdc..5dda36d 100644
--- a/src/projects/kostore/koZipStore.cpp
+++ b/src/projects/kostore/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 )