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, 26 insertions, 25 deletions

diff --git a/kspread/kspread_map.h b/kspread/kspread_map.h
index dfc268d2..d2a07627 100644
--- a/kspread/kspread_map.h
+++ b/kspread/kspread_map.h
@@ -20,13 +20,13 @@
 #ifndef __kspread_map_h__
 #define __kspread_map_h__
 
-#include <qcstring.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qintdict.h>
-#include <qobject.h>
-#include <qdict.h>
+#include <tqcstring.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqintdict.h>
+#include <tqobject.h>
+#include <tqdict.h>
 
 #include <koffice_export.h>
 
@@ -36,8 +36,8 @@ class KoOasisStyles;
 
 class DCOPObject;
 
-class QDomElement;
-class QDomDocument;
+class TQDomElement;
+class TQDomDocument;
 class KoXmlWriter;
 class KoGenStyles;
 class KoOasisSettings;
@@ -55,9 +55,10 @@ class Style;
   A map is a simple container for all sheets. Usually a complete map
   is saved in one file.
  */
-class KSPREAD_EXPORT Map : public QObject
+class KSPREAD_EXPORT Map : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Created an empty map.
@@ -70,36 +71,36 @@ public:
 
   Doc* doc() const;
 
-  QDomElement save( QDomDocument& doc );
+  TQDomElement save( TQDomDocument& doc );
 
     void saveOasisSettings( KoXmlWriter &settingsWriter );
     void loadOasisSettings( KoOasisSettings &settings );
 
     bool saveOasis( KoXmlWriter & xmlWriter, KoGenStyles & mainStyles, KoStore *store, KoXmlWriter* manifestWriter, int &_indexObj, int &_partIndexObj );
 
-  bool loadOasis( const QDomElement& mymap, KoOasisLoadingContext& oasisContext );
-  bool loadXML( const QDomElement& mymap );
+  bool loadOasis( const TQDomElement& mymap, KoOasisLoadingContext& oasisContext );
+  bool loadXML( const TQDomElement& mymap );
   bool loadChildren( KoStore* _store );
 
   bool saveChildren( KoStore* _store );
 
-  void password( QCString & passwd ) const { passwd = m_strPassword; }
+  void password( TQCString & passwd ) const { passwd = m_strPassword; }
   bool isProtected() const { return !m_strPassword.isNull(); }
-  void setProtected( QCString const & passwd );
-  bool checkPassword( QCString const & passwd ) const { return ( passwd == m_strPassword ); }
+  void setProtected( TQCString const & passwd );
+  bool checkPassword( TQCString const & passwd ) const { return ( passwd == m_strPassword ); }
 
   /**
    * The sheet named @p _from is being moved to the sheet @p _to.
    * If @p  _before is true @p _from is inserted before (after otherwise)   
    * @p  _to.
    */
-  void moveSheet( const QString & _from, const QString & _to, bool _before = true );
+  void moveSheet( const TQString & _from, const TQString & _to, bool _before = true );
 
   /**
    * searches for a sheet named @p _name
    * @return a pointer to the searched sheet, @c 0 if nothing was found
    */
-  Sheet* findSheet( const QString & _name );
+  Sheet* findSheet( const TQString & _name );
   Sheet* nextSheet( Sheet* );
   Sheet* previousSheet( Sheet* );
 
@@ -145,7 +146,7 @@ public:
    */
   Sheet* nextSheet() { return m_lstSheets.next();  }
 
-  QPtrList<Sheet>& sheetList() { return m_lstSheets; }
+  TQPtrList<Sheet>& sheetList() { return m_lstSheets; }
 
   /**
    * @return amount of sheets in this map.
@@ -157,7 +158,7 @@ public:
   /**
    * Needed for the printing Extension KOffice::Print
    */
-    // void draw( QPaintDevice* _dev, long int _width, long int _height,
+    // void draw( TQPaintDevice* _dev, long int _width, long int _height,
     // float _scale );
 
   virtual DCOPObject* dcopObject();
@@ -165,8 +166,8 @@ public:
   void takeSheet( Sheet * sheet );
   void insertSheet( Sheet * sheet );
 
-  QStringList visibleSheets() const;
-  QStringList hiddenSheets() const;
+  TQStringList visibleSheets() const;
+  TQStringList hiddenSheets() const;
 
     static bool respectCase;
 
@@ -183,13 +184,13 @@ private:
   /**
    * List of all sheets in this map. The list has autodelete turned on.
    */
-  QPtrList<Sheet> m_lstSheets;
-  QPtrList<Sheet> m_lstDeletedSheets;
+  TQPtrList<Sheet> m_lstSheets;
+  TQPtrList<Sheet> m_lstDeletedSheets;
 
   /**
    * Password to protect the map from being changed.
    */
-  QCString m_strPassword;
+  TQCString m_strPassword;
   /**
    * Set from the XML
    */