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, 38 insertions, 37 deletions

diff --git a/kivio/kiviopart/kivio_doc.h b/kivio/kiviopart/kivio_doc.h
index 46288bf1..441e8376 100644
--- a/kivio/kiviopart/kivio_doc.h
+++ b/kivio/kiviopart/kivio_doc.h
@@ -21,8 +21,8 @@
 
 #include "kivio_grid_data.h"
 
-#include <qptrlist.h>
-#include <qobject.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
 
 #include <KoDocument.h>
 #include <KoMainWindow.h>
@@ -48,15 +48,15 @@ namespace Kivio {
 }
 
 class KoStore;
-class QDomDocument;
+class TQDomDocument;
 class DCOPObject;
 class KoCommandHistory;
 
-class QPainter;
+class TQPainter;
 class KPrinter;
 class KCommand;
 class KoZoomHandler;
-class QFont;
+class TQFont;
 
 #define MIME_TYPE "application/x-kivio"
 
@@ -65,22 +65,23 @@ using namespace Kivio;
 class KIVIO_EXPORT KivioDoc : public KoDocument
 {
   Q_OBJECT
+  TQ_OBJECT
   friend class KivioPage;
   public:
-    KivioDoc( QWidget *parentWidget = 0, const char* widgetName = 0, QObject* parent = 0, const char* name = 0, bool singleViewMode = false );
+    KivioDoc( TQWidget *tqparentWidget = 0, const char* widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
     ~KivioDoc();
 
     virtual DCOPObject* dcopObject();
 
-    virtual QDomDocument saveXML();
+    virtual TQDomDocument saveXML();
     virtual bool saveOasis(KoStore* store, KoXmlWriter* manifestWriter);
 
-    virtual bool loadXML( QIODevice *, const QDomDocument& doc );
-    virtual bool loadOasis( const QDomDocument& doc, KoOasisStyles& oasisStyles, const QDomDocument& settings, KoStore* );
+    virtual bool loadXML( TQIODevice *, const TQDomDocument& doc );
+    virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* );
 
-    virtual bool initDoc(InitDocFlags flags, QWidget* parentWidget=0);
+    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
 
-    virtual QCString mimeType() const { return MIME_TYPE; }
+    virtual TQCString mimeType() const { return MIME_TYPE; }
 
     /**
     * @return a pointer to a new KivioPage. The KivioPage is not added to the map nor added to the GUI.
@@ -100,14 +101,14 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     * Adds a KivioStencilSpawnerSet to the list of spawner sets and make it active.
     *
     */
-    void addSpawnerSet( const QString& );
-    void addSpawnerSetDuringLoad(const QString& dirName, bool hidden);
+    void addSpawnerSet( const TQString& );
+    void addSpawnerSetDuringLoad(const TQString& dirName, bool hidden);
     bool removeSpawnerSet( KivioStencilSpawnerSet * );
 
-    QPtrList<KivioStencilSpawnerSet> *spawnerSets()const { return m_pLstSpawnerSets; }
+    TQPtrList<KivioStencilSpawnerSet> *spawnerSets()const { return m_pLstSpawnerSets; }
 
-    KivioStencilSpawner *findStencilSpawner( const QString& setId, const QString& stencilId );
-    KivioStencilSpawner *findInternalStencilSpawner( const QString& title );
+    KivioStencilSpawner *findStencilSpawner( const TQString& setId, const TQString& stencilId );
+    KivioStencilSpawner *findInternalStencilSpawner( const TQString& title );
 
     void addInternalStencilSpawner(KivioStencilSpawner* spawner);
     KivioStencilSpawnerSet* internalSpawnerSet() { return m_pInternalSet; }
@@ -119,13 +120,13 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     */
     bool isLoading()const { return m_bLoading; }
 
-    virtual void paintContent( QPainter& painter, const QRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
-    void paintContent(KivioPainter& painter, const QRect& rect, bool transparent, KivioPage* page,
-                      QPoint, KoZoomHandler*, bool, bool);
+    virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
+    void paintContent(KivioPainter& painter, const TQRect& rect, bool transparent, KivioPage* page,
+                      TQPoint, KoZoomHandler*, bool, bool);
 
     void printContent( KPrinter& prn );
 
-    static QPtrList<KivioDoc>& documents();
+    static TQPtrList<KivioDoc>& documents();
 
     KivioGridData grid() { return Kivio::Config::grid(); }
 
@@ -143,15 +144,15 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     void resetLayerPanel();
     void updateProtectPanelCheckBox();
 
-    QFont defaultFont() const { return m_font; }
+    TQFont defaultFont() const { return m_font; }
 
   public slots:
     void updateView(KivioPage*);
 
-    void slotDeleteStencilSet( DragBarButton *, QWidget *, KivioStackBar * );
+    void slotDeleteStencilSet( DragBarButton *, TQWidget *, KivioStackBar * );
     void slotSelectionChanged();
 
-    void setDefaultFont(const QFont& f) { m_font = f; }
+    void setDefaultFont(const TQFont& f) { m_font = f; }
 
     void updateGuideLines(KoView* sender);
     void updateGuideLines(KivioPage* page);
@@ -163,16 +164,16 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     void slotCommandExecuted();
     void loadStencil();
 
-    virtual void openExistingFile( const QString& file );
-    virtual void openTemplate( const QString& file );
+    virtual void openExistingFile( const TQString& file );
+    virtual void openTemplate( const TQString& file );
 
   signals:
     void sig_selectionChanged();
     void sig_addPage(KivioPage*);
     void sig_addSpawnerSet( KivioStencilSpawnerSet * );
     void sig_updateView(KivioPage*);
-    void sig_pageNameChanged(KivioPage*, const QString&);
-    void sig_deleteStencilSet( DragBarButton*, QWidget *, KivioStackBar * );
+    void sig_pageNameChanged(KivioPage*, const TQString&);
+    void sig_deleteStencilSet( DragBarButton*, TQWidget *, KivioStackBar * );
     void sig_updateGrid();
 
     void initProgress();
@@ -184,23 +185,23 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
   protected:
     bool checkStencilsForSpawnerSet(KivioStencilSpawnerSet *);
     bool checkGroupForSpawnerSet(KivioStencil *, KivioStencilSpawnerSet *);
-    KivioStencilSpawnerSet* findSpawnerSet(const QString& dirName, const QString& name);
+    KivioStencilSpawnerSet* findSpawnerSet(const TQString& dirName, const TQString& name);
 
     void saveOasisSettings( KoXmlWriter &/*settingsWriter*/ );
-    void loadOasisSettings( const QDomDocument&settingsDoc );
+    void loadOasisSettings( const TQDomDocument&settingsDoc );
 
-    KoView* createViewInstance( QWidget* parent, const char* name );
+    KoView* createViewInstance( TQWidget* tqparent, const char* name );
 
     /**
     * List of stencil spawner sets
     */
-    QPtrList <KivioStencilSpawnerSet> *m_pLstSpawnerSets;
+    TQPtrList <KivioStencilSpawnerSet> *m_pLstSpawnerSets;
 
 
     /**
     * Loads a KivioStencilSpawnerSet based on it's id
     */
-    bool loadStencilSpawnerSet(const QString &id, bool hidden);
+    bool loadStencilSpawnerSet(const TQString &id, bool hidden);
 
     /**
     * Overloaded function of @ref KoDocument.
@@ -225,7 +226,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     *
     * @see #load
     */
-    QString m_strFileURL;
+    TQString m_strFileURL;
 
     /**
     * true if loading is in process, otherwise false.
@@ -235,7 +236,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     */
     bool m_bLoading;
 
-    static QPtrList<KivioDoc>* s_docs;
+    static TQPtrList<KivioDoc>* s_docs;
     static int s_docId;
 
     KivioStencilSpawnerSet* m_pInternalSet;
@@ -245,12 +246,12 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     DCOPObject *dcop;
     KoCommandHistory * m_commandHistory;
 
-    QFont m_font;
+    TQFont m_font;
 
-    QTimer* m_loadTimer;
+    TQTimer* m_loadTimer;
     unsigned int m_currentFile;
     KivioStencilSpawnerSet* m_currentSet;
-    QValueList<KivioStencilSpawnerSet*> m_stencilSetLoadQueue;
+    TQValueList<KivioStencilSpawnerSet*> m_stencilSetLoadQueue;
 
     bool m_docOpened; // Used to for a hack that make kivio not crash if you cancel startup dialog.
 };