summaryrefslogtreecommitdiffstats
path: root/src/projects/kostore
diff options
context:
space:
mode:
Diffstat (limited to 'src/projects/kostore')
-rw-r--r--src/projects/kostore/Makefile.am11
-rw-r--r--src/projects/kostore/koStore.cpp4
-rw-r--r--src/projects/kostore/koStore.h4
-rw-r--r--src/projects/kostore/koStoreDevice.h9
4 files changed, 4 insertions, 24 deletions
diff --git a/src/projects/kostore/Makefile.am b/src/projects/kostore/Makefile.am
deleted file mode 100644
index e87beeb..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.cpp koZipStore.cpp koStoreBase.cpp
-#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.cpp b/src/projects/kostore/koStore.cpp
index 24fc737..c59ab0f 100644
--- a/src/projects/kostore/koStore.cpp
+++ b/src/projects/kostore/koStore.cpp
@@ -69,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)
}
@@ -143,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 b43ec42..cc48221 100644
--- a/src/projects/kostore/koStore.h
+++ b/src/projects/kostore/koStore.h
@@ -25,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/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