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/KoPageLayout.h b/lib/kofficecore/KoPageLayout.h
index f9f98fc6..4d4dc6cc 100644
--- a/lib/kofficecore/KoPageLayout.h
+++ b/lib/kofficecore/KoPageLayout.h
@@ -23,15 +23,15 @@
 #define KOPAGELAYOUT_H
 
 #include <KoGenStyles.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
 #include <koffice_export.h>
-class QDomElement;
+class TQDomElement;
 
 /**
  * @brief Represents the paper format a document shall be printed on.
  *
  * For compatibility reasons, and because of screen and custom,
- * this enum doesn't map to QPrinter::PageSize but KoPageFormat::printerPageSize
+ * this enum doesn't map to TQPrinter::PageSize but KoPageFormat::printerPageSize
  * does the conversion.
  *
  * @todo convert DIN to ISO in the names
@@ -108,13 +108,13 @@ namespace KoPageFormat
      * Returns the internal name of the given page format.
      * Use for saving.
      */
-    KOFFICECORE_EXPORT QString formatString( KoFormat format );
+    KOFFICECORE_EXPORT TQString formatString( KoFormat format );
 
     /**
      * Convert a format string (internal name) to a page format value.
      * Use for loading.
      */
-    KOFFICECORE_EXPORT KoFormat formatFromString( const QString & string );
+    KOFFICECORE_EXPORT KoFormat formatFromString( const TQString & string );
 
     /**
      * Returns the default format (based on the KControl settings)
@@ -125,12 +125,12 @@ namespace KoPageFormat
      * Returns the translated name of the given page format.
      * Use for showing the user.
      */
-    KOFFICECORE_EXPORT QString name( KoFormat format );
+    KOFFICECORE_EXPORT TQString name( KoFormat format );
 
     /**
      * Lists the translated names of all the available formats
      */
-    KOFFICECORE_EXPORT QStringList allFormats();
+    KOFFICECORE_EXPORT TQStringList allFormats();
 
     /**
      * Try to find the paper format for the given width and height (in mm).
@@ -154,7 +154,7 @@ enum KoHFType {
 };
 
 /**
- * This structure defines the page layout, including
+ * This structure defines the page tqlayout, including
  * its size in pt, its format (e.g. A4), orientation, unit, margins etc.
  */
 struct KoPageLayout
@@ -194,17 +194,17 @@ struct KoPageLayout
     }
 
     /**
-     * Save this page layout to OASIS.
+     * Save this page tqlayout to OASIS.
      */
     KOFFICECORE_EXPORT KoGenStyle saveOasis() const;
 
     /**
-     * Load this page layout from OASIS
+     * Load this page tqlayout from OASIS
      */
-    KOFFICECORE_EXPORT void loadOasis(const QDomElement &style);
+    KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style);
 
     /**
-     * @return a page layout with the default page size depending on the locale settings,
+     * @return a page tqlayout with the default page size depending on the locale settings,
      * default margins (2 cm), and portrait orientation.
      * @since 1.4
      */
@@ -214,12 +214,12 @@ struct KoPageLayout
 /** structure for header-footer */
 struct KoHeadFoot
 {
-    QString headLeft;
-    QString headMid;
-    QString headRight;
-    QString footLeft;
-    QString footMid;
-    QString footRight;
+    TQString headLeft;
+    TQString headMid;
+    TQString headRight;
+    TQString footLeft;
+    TQString footMid;
+    TQString footRight;
 };
 
 /** structure for columns */
@@ -229,11 +229,11 @@ struct KoColumns
     double ptColumnSpacing;
     bool operator==( const KoColumns& rhs ) const {
         return columns == rhs.columns &&
-               QABS(ptColumnSpacing - rhs.ptColumnSpacing) <= 1E-10;
+               TQABS(ptColumnSpacing - rhs.ptColumnSpacing) <= 1E-10;
     }
     bool operator!=( const KoColumns& rhs ) const {
         return columns != rhs.columns ||
-               QABS(ptColumnSpacing - rhs.ptColumnSpacing) > 1E-10;
+               TQABS(ptColumnSpacing - rhs.ptColumnSpacing) > 1E-10;
     }
 };
 
@@ -247,9 +247,9 @@ struct KoKWHeaderFooter
     double ptFootNoteBodySpacing;
     bool operator==( const KoKWHeaderFooter& rhs ) const {
         return header == rhs.header && footer == rhs.footer &&
-               QABS(ptHeaderBodySpacing - rhs.ptHeaderBodySpacing) <= 1E-10 &&
-               QABS(ptFooterBodySpacing - rhs.ptFooterBodySpacing) <= 1E-10 &&
-               QABS(ptFootNoteBodySpacing - rhs.ptFootNoteBodySpacing) <= 1E-10;
+               TQABS(ptHeaderBodySpacing - rhs.ptHeaderBodySpacing) <= 1E-10 &&
+               TQABS(ptFooterBodySpacing - rhs.ptFooterBodySpacing) <= 1E-10 &&
+               TQABS(ptFootNoteBodySpacing - rhs.ptFootNoteBodySpacing) <= 1E-10;
     }
     bool operator!=( const KoKWHeaderFooter& rhs ) const {
         return !( *this == rhs );