diff options
Diffstat (limited to 'src/projects')
| -rw-r--r-- | src/projects/k3bdatafileview.cpp | 4 | ||||
| -rw-r--r-- | src/projects/kostore/koZipStore.cpp | 22 |
2 files changed, 1 insertions, 25 deletions
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 ) |