From 282ca40047a406f696e60127546e311453ba53f0 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 6 Mar 2026 11:58:10 +0900 Subject: Remove use of KDE_IS_VERSION Signed-off-by: Michele Calgaro --- libk3b/core/k3bglobals.cpp | 20 -------------------- src/k3binteractiondialog.cpp | 2 -- src/misc/k3bcdimagewritingdialog.cpp | 8 -------- src/misc/k3bisoimagewritingdialog.cpp | 8 -------- src/option/k3bexternalbinwidget.cpp | 2 -- src/option/k3bpluginoptiontab.cpp | 2 -- src/option/k3bthemeoptiontab.cpp | 3 --- src/projects/k3bdatafileview.cpp | 4 ---- src/projects/kostore/koZipStore.cpp | 22 +--------------------- 9 files changed, 1 insertion(+), 70 deletions(-) diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index 4bc0ff4..b1efa73 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -461,23 +461,7 @@ K3bDevice::Device* K3b::urlToDevice( const KURL& deviceUrl ) KURL K3b::convertToLocalUrl( const KURL& url ) { if( !url.isLocalFile() ) { -#if KDE_IS_VERSION(3,4,91) return TDEIO::NetAccess::mostLocalURL( url, 0 ); -#else -#ifndef UDS_LOCAL_PATH -#define UDS_LOCAL_PATH (72 | TDEIO::UDS_STRING) -#else - using namespace TDEIO; -#endif - TDEIO::UDSEntry e; - if( TDEIO::NetAccess::stat( url, e, 0 ) ) { - const TDEIO::UDSEntry::ConstIterator end = e.end(); - for( TDEIO::UDSEntry::ConstIterator it = e.begin(); it != end; ++it ) { - if( (*it).m_uds == UDS_LOCAL_PATH && !(*it).m_str.isEmpty() ) - return KURL::fromPathOrURL( (*it).m_str ); - } - } -#endif } return url; @@ -552,11 +536,9 @@ bool K3b::unmount( K3bDevice::Device* dev ) TQString mntDev = dev->blockDeviceName(); -#if KDE_IS_VERSION(3,4,0) // first try to unmount it the standard way if( TDEIO::NetAccess::synchronousRun( TDEIO::unmount( mntDev, false ), 0 ) ) return true; -#endif TQString umountBin = K3b::findExe( "umount" ); if( !umountBin.isEmpty() ) { @@ -592,11 +574,9 @@ bool K3b::mount( K3bDevice::Device* dev ) TQString mntDev = dev->blockDeviceName(); -#if KDE_IS_VERSION(3,4,0) // first try to mount it the standard way if( TDEIO::NetAccess::synchronousRun( TDEIO::mount( true, 0, mntDev, 0, false ), 0 ) ) return true; -#endif if( !K3bDevice::Connection::instance()->mount( dev ) ) return true; 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( 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 #include #include -#if ! KDE_IS_VERSION( 3, 4, 1 ) -#include -#include -#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 ) -- cgit v1.2.3