TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 23 insertions, 23 deletions

diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h
index 55ab8dbe..ff2a5100 100644
--- a/lib/kofficecore/KoQueryTrader.h
+++ b/lib/kofficecore/KoQueryTrader.h
@@ -22,11 +22,11 @@
 
 #include <kservice.h>
 #include <ksharedptr.h>
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 #include <koffice_export.h>
 
-class QObject;
-class QStringList;
+class TQObject;
+class TQStringList;
 class KoDocument;
 class KoFilter;
 class KoFilterChain;
@@ -39,7 +39,7 @@ class KOFFICECORE_EXPORT KoDocumentEntry
 {
 
 public:
-  KoDocumentEntry() { m_service = 0L; } // for QValueList
+  KoDocumentEntry() { m_service = 0L; } // for TQValueList
   KoDocumentEntry( KService::Ptr service );
   ~KoDocumentEntry() { }
 
@@ -53,24 +53,24 @@ public:
   /**
    * @return name of the associated service
    */
-  QString name() const { return m_service->name(); }
+  TQString name() const { return m_service->name(); }
 
   /**
    *  Mimetypes (and other service types) which this document can handle.
    */
-  QStringList mimeTypes() const { return m_service->serviceTypes(); }
+  TQStringList mimeTypes() const { return m_service->serviceTypes(); }
 
   /**
    *  @return TRUE if the document can handle the requested mimetype.
    */
-  bool supportsMimeType( const QString & _mimetype ) const
-  { return mimeTypes().contains( _mimetype ); }
+  bool supportsMimeType( const TQString & _mimetype ) const
+  { return mimeTypes().tqcontains( _mimetype ); }
 
   /**
    *  Uses the factory of the component to create
    *  a document. If that is not possible, 0 is returned.
    */
-  KoDocument* createDoc( KoDocument* parent = 0, const char* name = 0 ) const;
+  KoDocument* createDoc( KoDocument* tqparent = 0, const char* name = 0 ) const;
 
   /**
    *  This function will query ksycoca to find all available components.
@@ -80,7 +80,7 @@ public:
    *                 You can use it to set additional restrictions on the available
    *                 components.
    */
-  static QValueList<KoDocumentEntry> query( const QString &  _constr = QString::null );
+  static TQValueList<KoDocumentEntry> query( const TQString &  _constr = TQString() );
 
   /**
    *  This function will query the system to find all available filters.
@@ -94,9 +94,9 @@ public:
    *                 components.
    */
   // ### TODO: MERGE WITH ABOVE METHODE WHEN BIC+SIC CHANGES ARE ALLOWED
-  static QValueList<KoDocumentEntry> query( bool _onlyDocEmb,const QString& _constr);
+  static TQValueList<KoDocumentEntry> query( bool _onlyDocEmb,const TQString& _constr);
   /* this is how the signature should be looking after merging
-  static QValueList<KoDocumentEntry> query( bool _onlyDocEmb =true, const QString& _constr = QString::null );
+  static TQValueList<KoDocumentEntry> query( bool _onlyDocEmb =true, const TQString& _constr = TQString() );
   or better: use an enum for the first arg.
   */
 
@@ -107,7 +107,7 @@ public:
    *  @return a document entry for the KOffice component that supports
    *          the requested mimetype and fits the user best.
    */
-  static KoDocumentEntry queryByMimeType( const QString & mimetype );
+  static KoDocumentEntry queryByMimeType( const TQString & mimetype );
 
 private:
   KService::Ptr m_service;
@@ -122,21 +122,21 @@ class KoFilterEntry : public KShared
 public:
   typedef KSharedPtr<KoFilterEntry> Ptr;
 
-  KoFilterEntry() : weight( 0 ) { m_service = 0L; } // for QValueList
+  KoFilterEntry() : weight( 0 ) { m_service = 0L; } // for TQValueList
   KoFilterEntry( KService::Ptr service );
   ~KoFilterEntry() { }
 
-  KoFilter* createFilter( KoFilterChain* chain, QObject* parent = 0, const char* name = 0 );
+  KoFilter* createFilter( KoFilterChain* chain, TQObject* tqparent = 0, const char* name = 0 );
 
   /**
    *  The imported mimetype(s).
    */
-  QStringList import;
+  TQStringList import;
 
   /**
    *  The exported mimetype(s).
    */
-  QStringList export_;
+  TQStringList export_;
 
   /**
    *  The "weight" of this filter path. Has to be > 0 to be valid.
@@ -146,19 +146,19 @@ public:
   /**
    *  Do we have to check during runtime?
    */
-  QString available;
+  TQString available;
 
   /**
    *  @return TRUE if the filter can import the requested mimetype.
    */
-  bool imports( const QString& _mimetype ) const
-  { return ( import.contains( _mimetype ) ); }
+  bool imports( const TQString& _mimetype ) const
+  { return ( import.tqcontains( _mimetype ) ); }
 
   /**
    *  @return TRUE if the filter can export the requested mimetype.
    */
-  bool exports( const QString& _m ) const
-  { return ( export_.contains( _m ) ); }
+  bool exports( const TQString& _m ) const
+  { return ( export_.tqcontains( _m ) ); }
 
   /**
    *  This function will query KDED to find all available filters.
@@ -167,7 +167,7 @@ public:
    *                 You can use it to set additional restrictions on the available
    *                 components.
    */
-  static QValueList<KoFilterEntry::Ptr> query( const QString& _constr = QString::null );
+  static TQValueList<KoFilterEntry::Ptr> query( const TQString& _constr = TQString() );
 
   KService::Ptr service() const { return m_service; }