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, 33 insertions, 32 deletions

diff --git a/lib/kformula/kformulacontainer.h b/lib/kformula/kformulacontainer.h
index 4d4254ab..d87e8184 100644
--- a/lib/kformula/kformulacontainer.h
+++ b/lib/kformula/kformulacontainer.h
@@ -21,22 +21,22 @@
 #ifndef KFORMULACONTAINER_H
 #define KFORMULACONTAINER_H
 
-#include <qclipboard.h>
-#include <qdom.h>
-#include <qimage.h>
-#include <qptrlist.h>
-#include <qobject.h>
-#include <qptrstack.h>
-#include <qstring.h>
+#include <tqclipboard.h>
+#include <tqdom.h>
+#include <tqimage.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
+#include <tqptrstack.h>
+#include <tqstring.h>
 
 #include <kcommand.h>
 //#include <KoCommandHistory.h>
 #include "KoCommandHistory.h"
 #include "kformuladefs.h"
 
-class QColorGroup;
-class QKeyEvent;
-class QPainter;
+class TQColorGroup;
+class TQKeyEvent;
+class TQPainter;
 
 class KCommand;
 class KPrinter;
@@ -75,7 +75,7 @@ public:
     virtual void moveOutRight( FormulaCursor* ) {}
     virtual void moveOutAbove( FormulaCursor* ) {}
     virtual void moveOutBelow( FormulaCursor* ) {}
-    virtual void tell( const QString& /*msg*/ ) {}
+    virtual void tell( const TQString& /*msg*/ ) {}
     virtual void insertFormula( FormulaCursor* ) {}
     virtual void removeFormula( FormulaCursor* ) {}
     virtual void baseSizeChanged( int, bool ) {}
@@ -87,9 +87,10 @@ public:
  * The document. Actually only one part of the whole.
  * Provides everything to edit the formula.
  */
-class KOFORMULA_EXPORT Container : public QObject, public FormulaDocument {
+class KOFORMULA_EXPORT Container : public TQObject, public FormulaDocument {
     friend class MimeSource;
     Q_OBJECT
+  TQ_OBJECT
 
     // no copying
     Container( const Container& );
@@ -153,7 +154,7 @@ public:
     void moveOutRight( FormulaCursor* );
     void moveOutAbove( FormulaCursor* );
     void moveOutBelow( FormulaCursor* );
-    void tell( const QString& msg );
+    void tell( const TQString& msg );
     void removeFormula( FormulaCursor* );
 
     /**
@@ -170,47 +171,47 @@ public:
     /**
      * Draws the whole thing.
      */
-    void draw( QPainter& painter, const QRect& r,
-               const QColorGroup& cg, bool edit=false );
+    void draw( TQPainter& painter, const TQRect& r,
+               const TQColorGroup& cg, bool edit=false );
 
     /**
      * Draws the whole thing.
      */
-    void draw( QPainter& painter, const QRect& r, bool edit=false );
+    void draw( TQPainter& painter, const TQRect& r, bool edit=false );
 
     /**
      * Saves the data into the document.
      */
-    void save( QDomElement &root );
+    void save( TQDomElement &root );
 
     /**
      * Save formula as MathML.
      */
-    void saveMathML( QTextStream& stream, bool oasisFormat = false );
+    void saveMathML( TQTextStream& stream, bool oasisFormat = false );
 
     /**
      * Load function.
      * Load the formula from the specified file containing MathML .
      */
-    bool loadMathML( const QDomDocument &doc, bool oasisFormat = false );
+    bool loadMathML( const TQDomDocument &doc, bool oasisFormat = false );
 
     /**
      * Load function.
      * Load the formula from the specified file containing MathML .
      */
-    bool loadMathML( const QDomElement &doc, bool oasisFormat = false );
+    bool loadMathML( const TQDomElement &doc, bool oasisFormat = false );
 
     /**
      * Loads a formula from the document.
      */
-    bool load( const QDomElement &fe );
+    bool load( const TQDomElement &fe );
 
     /**
      * @returns Tex string for the formula
      */
-    QString texString();
+    TQString texString();
 
-    QString formulaString();
+    TQString formulaString();
 
     /**
      * Prints the formula.
@@ -220,7 +221,7 @@ public:
     /**
      * @returns an image that looks like out formula.
      */
-    QImage drawImage( int width, int height );
+    TQImage drawImage( int width, int height );
 
     /**
      * @returns the cursor to be used for editing.
@@ -239,12 +240,12 @@ public:
     /**
      * @returns the formula's size.
      */
-    QRect boundingRect() const;
+    TQRect boundingRect() const;
 
     /**
      * @returns the formula's size including its active cursor.
      */
-    QRect coveredRect();
+    TQRect coveredRect();
 
     double width() const;
     double height() const;
@@ -338,15 +339,15 @@ signals:
     /**
      * A message that might be a useful hint. Meant for the statusbar.
      */
-    void statusMsg( const QString& msg );
+    void statusMsg( const TQString& msg );
 
     /**
      * A message that describes an error. Meant for a message box. (?)
      */
-    void errorMsg( const QString& );
+    void errorMsg( const TQString& );
 
     /**
-     * The element is going to leave the formula with and all its children.
+     * The element is going to leave the formula with and all its tqchildren.
      */
     void elementWillVanish(BasicElement* element);
 
@@ -365,7 +366,7 @@ public:
     /**
      * General input.
      */
-    void input( QKeyEvent* event );
+    void input( TQKeyEvent* event );
 
     void performRequest( Request* request );
 
@@ -379,7 +380,7 @@ public:
     /**
      * Insert data from the document.
      */
-    void paste( const QDomDocument& document, QString desc );
+    void paste( const TQDomDocument& document, TQString desc );
 
     /**
      * Copy the current selection to the clipboard.
@@ -405,7 +406,7 @@ protected:
      */
     virtual FormulaElement* createMainSequence();
 
-    void emitErrorMsg( const QString& );
+    void emitErrorMsg( const TQString& );
 
 private: