diff options
Diffstat (limited to 'tdeio')
-rw-r--r-- | tdeio/tdefile/kacleditwidget.h | 4 | ||||
-rw-r--r-- | tdeio/tdefile/kacleditwidget_p.h | 4 | ||||
-rw-r--r-- | tdeio/tdeio/kautomount.h | 4 | ||||
-rw-r--r-- | tdeio/tdeio/kdirlister.cpp | 1 | ||||
-rw-r--r-- | tdeio/tdeio/kfilterdev.cpp | 4 | ||||
-rw-r--r-- | tdeio/tdeio/kfilterdev.h | 4 | ||||
-rw-r--r-- | tdeio/tdeio/klimitediodevice.h | 4 |
7 files changed, 0 insertions, 25 deletions
diff --git a/tdeio/tdefile/kacleditwidget.h b/tdeio/tdefile/kacleditwidget.h index 6604c4503..9cbbe1385 100644 --- a/tdeio/tdefile/kacleditwidget.h +++ b/tdeio/tdefile/kacleditwidget.h @@ -24,10 +24,6 @@ #include <config.h> #endif -#ifdef Q_MOC_RUN -#define USE_POSIX_ACL -#endif // Q_MOC_RUN - #ifdef USE_POSIX_ACL #include <tdelistview.h> diff --git a/tdeio/tdefile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h index 042efc1b5..dcbc10de6 100644 --- a/tdeio/tdefile/kacleditwidget_p.h +++ b/tdeio/tdefile/kacleditwidget_p.h @@ -24,10 +24,6 @@ #include <config.h> #endif -#ifdef Q_MOC_RUN -#define USE_POSIX_ACL -#endif // Q_MOC_RUN - #ifdef USE_POSIX_ACL #include <tdelistview.h> #include <sys/acl.h> diff --git a/tdeio/tdeio/kautomount.h b/tdeio/tdeio/kautomount.h index d61395439..9c56c56ec 100644 --- a/tdeio/tdeio/kautomount.h +++ b/tdeio/tdeio/kautomount.h @@ -24,10 +24,6 @@ #include <tdelibs_export.h> -#ifdef Q_MOC_RUN -#define Q_OS_UNIX -#endif // Q_MOC_RUN - #ifdef Q_OS_UNIX namespace TDEIO { diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp index a6fe0ba4f..a0c31578f 100644 --- a/tdeio/tdeio/kdirlister.cpp +++ b/tdeio/tdeio/kdirlister.cpp @@ -2398,7 +2398,6 @@ void KDirLister::addNewItems( const KFileItemList& items ) // TODO: make this faster - test if we have a filter at all first // DF: was this profiled? The matchesFoo() functions should be fast, w/o filters... // Of course if there is no filter and we can do a range-insertion instead of a loop, that might be good. - // But that's for Qt4, not possible with TQPtrList. for ( KFileItemListIterator kit( items ); kit.current(); ++kit ) { addNewItem( *kit ); } diff --git a/tdeio/tdeio/kfilterdev.cpp b/tdeio/tdeio/kfilterdev.cpp index b4e024031..37e3dcde3 100644 --- a/tdeio/tdeio/kfilterdev.cpp +++ b/tdeio/tdeio/kfilterdev.cpp @@ -169,11 +169,7 @@ void KFilterDev::flush() // Hmm, might not be enough... } -#ifdef USE_QT4 -qint64 KFilterDev::size() const -#else // USE_QT4 TQIODevice::Offset KFilterDev::size() const -#endif // USE_QT4 { // Well, hmm, Houston, we have a problem. // We can't know the size of the uncompressed data diff --git a/tdeio/tdeio/kfilterdev.h b/tdeio/tdeio/kfilterdev.h index 8dd0999a9..7599f342e 100644 --- a/tdeio/tdeio/kfilterdev.h +++ b/tdeio/tdeio/kfilterdev.h @@ -82,11 +82,7 @@ public: // Not implemented #ifdef qdoc #else -#ifdef USE_QT4 - virtual qint64 size() const; -#else // USE_QT4 virtual TQIODevice::Offset size() const; -#endif // USE_QT4 #endif virtual TQIODevice::Offset at() const; diff --git a/tdeio/tdeio/klimitediodevice.h b/tdeio/tdeio/klimitediodevice.h index 3dc6c80f3..570b647d7 100644 --- a/tdeio/tdeio/klimitediodevice.h +++ b/tdeio/tdeio/klimitediodevice.h @@ -67,11 +67,7 @@ public: virtual void close() {} virtual void flush() {} -#ifdef USE_QT4 - virtual qint64 size() const { return m_length; } -#else // USE_QT4 virtual Offset size() const { return m_length; } -#endif // USE_QT4 virtual TQT_TQIO_LONG tqreadBlock ( char * data, TQT_TQIO_ULONG maxlen ) { |