7 files changed, 5 insertions, 27 deletions
diff --git a/src/projects/kostore/CMakeLists.txt b/src/projects/kostore/CMakeLists.txt
index 9ac7377..bc35875 100644
--- a/src/projects/kostore/CMakeLists.txt
+++ b/src/projects/kostore/CMakeLists.txt
@@ -16,5 +16,5 @@ link_directories(
 ##### kostore (static) ##########################
 
 tde_add_library( kostore STATIC_PIC AUTOMOC
-  SOURCES koStore.cc koZipStore.cc koStoreBase.cc
+  SOURCES koStore.cpp koZipStore.cpp koStoreBase.cpp
 )
diff --git a/src/projects/kostore/Makefile.am b/src/projects/kostore/Makefile.am
deleted file mode 100644
index 65de5e7..0000000
--- a/src/projects/kostore/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-
-KDE_CXXFLAGS = $(USE_RTTI)
-noinst_LTLIBRARIES = libkostore.la
-INCLUDES = $(all_includes)
-
-####### Files
-
-libkostore_la_LIBADD = $(LIB_TDEIO)
-libkostore_la_SOURCES = koStore.cc koZipStore.cc koStoreBase.cc
-#libkostore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 $(KDE_LDFLAGS) -no-undefined
-#include_HEADERS = koStore.h
diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cpp
index 655263f..c59ab0f 100644
--- a/src/projects/kostore/koStore.cc
+++ b/src/projects/kostore/koStore.cpp
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
 /* This file is part of the KDE project
    Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
    Copyright (C) 2000-2002 David Faure <faure@kde.org>, Werner Trobin <trobin@kde.org>
@@ -70,7 +69,7 @@ KoStore* KoStore::createStore( const TQString& fileName, Mode mode, const TQCStr
       {
         TQFile file( fileName );
         if ( file.open( IO_ReadOnly ) )
-          backend = determineBackend( TQT_TQIODEVICE(&file) );
+          backend = determineBackend( &file );
         else
           backend = DefaultFormat; // will create a "bad" store (bad()==true)
       }
@@ -144,7 +143,7 @@ KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, con
       TQFile file( tmpFile );
       if ( file.open( IO_ReadOnly ) )
       {
-        backend = determineBackend( TQT_TQIODEVICE(&file) );
+        backend = determineBackend( &file );
         file.close();
       }
     }
diff --git a/src/projects/kostore/koStore.h b/src/projects/kostore/koStore.h
index 331bc8b..cc48221 100644
--- a/src/projects/kostore/koStore.h
+++ b/src/projects/kostore/koStore.h
@@ -1,4 +1,3 @@
-// -*- c-basic-offset: 2 -*-
 /* This file is part of the KDE project
    Copyright (C) 1998, 1999 David Faure <faure@kde.org>
 
@@ -26,9 +25,9 @@
 #include <tqiodevice.h>
 #include <tqvaluestack.h>
 //#include <koffice_export.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
 
-#define KOSTORE_EXPORT KDE_EXPORT
+#define KOSTORE_EXPORT TDE_EXPORT
 
 class TQWidget;
 
diff --git a/src/projects/kostore/koStoreBase.cc b/src/projects/kostore/koStoreBase.cpp
index a9cc63e..a9cc63e 100644
--- a/src/projects/kostore/koStoreBase.cc
+++ b/src/projects/kostore/koStoreBase.cpp
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
diff --git a/src/projects/kostore/koZipStore.cc b/src/projects/kostore/koZipStore.cpp
index 0bbecdc..0bbecdc 100644
--- a/src/projects/kostore/koZipStore.cc
+++ b/src/projects/kostore/koZipStore.cpp