5 files changed, 0 insertions, 38 deletions
diff --git a/libk3b/tools/k3bfilesplitter.cpp b/libk3b/tools/k3bfilesplitter.cpp
index a4f0553..965d510 100644
--- a/libk3b/tools/k3bfilesplitter.cpp
+++ b/libk3b/tools/k3bfilesplitter.cpp
@@ -155,11 +155,7 @@ void K3bFileSplitter::flush()
   d->file.flush();
 }
 
-#ifdef USE_QT4
-qint64 K3bFileSplitter::size() const
-#else // USE_QT4
 TQIODevice::Offset K3bFileSplitter::size() const
-#endif // USE_QT4
 {
   // not implemented due to Offset size limitations
   return 0;
diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h
index 7aaf25e..d7e26cf 100644
--- a/libk3b/tools/k3bfilesplitter.h
+++ b/libk3b/tools/k3bfilesplitter.h
@@ -63,11 +63,6 @@ class LIBK3B_EXPORT K3bFileSplitter : public TQIODevice
 
   virtual void close();
 
-#ifdef USE_QT4
-	inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); }
-	inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); }
-#endif // USE_QT4
-
   /**
    * File descriptor to read from and write to.
    * Not implemented yet!
@@ -79,11 +74,7 @@ class LIBK3B_EXPORT K3bFileSplitter : public TQIODevice
   /**
    * Not implemented
    */
-#ifdef USE_QT4
-  virtual qint64 size() const;
-#else // USE_QT4
   virtual Offset size() const;
-#endif // USE_QT4
 
   /**
    * Not implemented
diff --git a/src/k3bdebuggingoutputfile.h b/src/k3bdebuggingoutputfile.h
index 760f097..ff072c2 100644
--- a/src/k3bdebuggingoutputfile.h
+++ b/src/k3bdebuggingoutputfile.h
@@ -19,19 +19,7 @@
 #include <tqfile.h>
 #include <tqobject.h>
 
-#ifdef Q_MOC_RUN
-#define USE_QT4
-#endif // Q_MOC_RUN
-
-// MOC_SKIP_BEGIN
-#ifdef USE_QT4
-class K3bDebuggingOutputFile : public TQFile
-#else // USE_QT4
-// MOC_SKIP_END
 class K3bDebuggingOutputFile : public TQObject, public TQFile
-// MOC_SKIP_BEGIN
-#endif // USE_QT4
-// MOC_SKIP_END
 {
   TQ_OBJECT
   
diff --git a/src/projects/k3bmusicbrainzjob.h b/src/projects/k3bmusicbrainzjob.h
index 6975680..f69266a 100644
--- a/src/projects/k3bmusicbrainzjob.h
+++ b/src/projects/k3bmusicbrainzjob.h
@@ -20,10 +20,6 @@
 #include <config.h>
 #endif
 
-#ifdef Q_MOC_RUN
-#define HAVE_MUSICBRAINZ
-#endif // Q_MOC_RUN
-
 #ifdef HAVE_MUSICBRAINZ
 
 #include <k3bjob.h>
diff --git a/src/projects/kostore/koStoreDevice.h b/src/projects/kostore/koStoreDevice.h
index df8cebf..2684cb6 100644
--- a/src/projects/kostore/koStoreDevice.h
+++ b/src/projects/kostore/koStoreDevice.h
@@ -46,16 +46,7 @@ public:
   void close() { }
   void flush() { }
 
-#ifdef USE_QT4
-  inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); }
-  inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); }
-#endif // USE_QT4
-
-#ifdef USE_QT4
-  qint64 size() const {
-#else // USE_QT4
   Offset size() const {
-#endif // USE_QT4
     if ( m_store->mode() == KoStore::Read )
       return m_store->size();
     else