TQt4 port k3b

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 14 insertions, 13 deletions

diff --git a/kfile-plugins/k3bproject/Makefile.am b/kfile-plugins/k3bproject/Makefile.am
index d229c41..2586e19 100644
--- a/kfile-plugins/k3bproject/Makefile.am
+++ b/kfile-plugins/k3bproject/Makefile.am
@@ -14,7 +14,7 @@ noinst_HEADERS   = kfile_k3bprojectfileplugin.h
 kde_module_LTLIBRARIES = kfile_k3b.la
 
 kfile_k3b_la_SOURCES = kfile_k3bprojectfileplugin.cpp
-kfile_k3b_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kfile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -module $(KDE_PLUGIN)
 kfile_k3b_la_LIBADD = $(LIB_KIO) ../../libk3b/libk3b.la ../../src/projects/kostore/libkostore.la
 
 # let automoc handle all of the meta source files (moc)
diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp
index b868c94..197d9e5 100644
--- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp
+++ b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp
@@ -24,24 +24,24 @@
 
 #include <kgenericfactory.h>
 
-#include <qtextstream.h>
-#include <qdom.h>
-#include <qfile.h>
+#include <tqtextstream.h>
+#include <tqdom.h>
+#include <tqfile.h>
 
 
 
 K_EXPORT_COMPONENT_FACTORY(kfile_k3b, KGenericFactory<K3bProjectFilePlugin>("kfile_k3b"))
 
 
-K3bProjectFilePlugin::K3bProjectFilePlugin( QObject *parent, const char *name,
-					    const QStringList &args)
-  : KFilePlugin(parent, name, args)
+K3bProjectFilePlugin::K3bProjectFilePlugin( TQObject *tqparent, const char *name,
+					    const TQStringList &args)
+  : KFilePlugin(tqparent, name, args)
 {
   KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-k3b" );
 
   KFileMimeTypeInfo::GroupInfo* group = addGroupInfo( info, "General", i18n("General") );
 
-  addItemInfo( group, "documenttype", i18n("Document Type"), QVariant::String );
+  addItemInfo( group, "documenttype", i18n("Document Type"), TQVariant::String );
 }
 
 
@@ -54,12 +54,12 @@ bool K3bProjectFilePlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 
   // open the file
   bool success = false;
-  QDomDocument xmlDoc;
+  TQDomDocument xmlDoc;
 
   // try opening a store
   KoStore* store = KoStore::createStore( info.url().path(), KoStore::Read );
   if( store && !store->bad() && store->open( "maindata.xml" ) ) {
-    QIODevice* dev = store->device();
+    TQIODevice* dev = store->device();
     dev->open( IO_ReadOnly );
     if( xmlDoc.setContent( dev ) )
       success = true;
@@ -93,7 +93,7 @@ bool K3bProjectFilePlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
       success = false;
     }
 
-    QString stringType;
+    TQString stringType;
     switch( type ) {
     case K3bDoc::AUDIO:
       stringType = i18n("Audio CD");
diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h
index c90b678..a8b2b13 100644
--- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h
+++ b/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h
@@ -21,14 +21,15 @@
  */
 #include <kfilemetainfo.h>
 
-class QStringList;
+class TQStringList;
 
 class K3bProjectFilePlugin: public KFilePlugin
 {
   Q_OBJECT
+  TQ_OBJECT
     
  public:
-  K3bProjectFilePlugin( QObject *parent, const char *name, const QStringList& args );
+  K3bProjectFilePlugin( TQObject *tqparent, const char *name, const TQStringList& args );
   
   virtual bool readInfo( KFileMetaInfo& info, uint what);
 };