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, 29 insertions, 28 deletions

diff --git a/kchart/kdchart/KDChartEnums.h b/kchart/kdchart/KDChartEnums.h
index 530a66ea..c506b39a 100644
--- a/kchart/kdchart/KDChartEnums.h
+++ b/kchart/kdchart/KDChartEnums.h
@@ -29,11 +29,11 @@
 #ifndef __KDCHARTENUMS_H__
 #define __KDCHARTENUMS_H__
 
-#include <qrect.h>
-#include <qpointarray.h>
+#include <tqrect.h>
+#include <tqpointarray.h>
 
 #include "KDChartGlobal.h"
-#include <qobject.h>
+#include <tqobject.h>
 
 /** \file KDChartEnums.h
   \brief Definition of global enums.
@@ -43,19 +43,20 @@
   Project global class providing some enums needed both by KDChartParams
   and by KDChartCustomBox.
   */
-class KDCHART_EXPORT KDChartEnums :public QObject
+class KDCHART_EXPORT KDChartEnums :public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     Q_ENUMS( TextLayoutPolicy )
     Q_ENUMS( AreaName )
     Q_ENUMS( PositionFlag )
 
 public:
     /**
-      Text layout policy: what to do if text that is to be drawn would
+      Text tqlayout policy: what to do if text that is to be drawn would
       cover neighboring text or neighboring areas.
 
-      \li \c LayoutJustOverwrite Just ignore the layout collision and write the text nevertheless.
+      \li \c LayoutJustOverwrite Just ignore the tqlayout collision and write the text nevertheless.
       \li \c LayoutPolicyRotate Try counter-clockwise rotation to make the text fit into the space.
       \li \c LayoutPolicyShiftVertically Shift the text baseline upwards (or downwards, resp.) and draw a connector line between the text and its anchor.
       \li \c LayoutPolicyShiftHorizontally Shift the text baseline to the left (or to the right, resp.) and draw a connector line between the text and its anchor.
@@ -70,13 +71,13 @@ public:
         LayoutPolicyShrinkFontSize };
 
     /**
-      Converts the specified text layout policy enum to a
+      Converts the specified text tqlayout policy enum to a
       string representation.
 
-      \param type the text layout policy to convert
-      \return the string representation of the text layout policy enum
+      \param type the text tqlayout policy to convert
+      \return the string representation of the text tqlayout policy enum
       */
-    static QString layoutPolicyToString( TextLayoutPolicy type ) {
+    static TQString tqlayoutPolicyToString( TextLayoutPolicy type ) {
         switch( type ) {
             case LayoutJustOverwrite:
                 return "JustOverwrite";
@@ -89,7 +90,7 @@ public:
             case LayoutPolicyShrinkFontSize:
                 return "ShrinkFontSize";
             default: // should not happen
-                qDebug( "Unknown text layout policy" );
+                qDebug( "Unknown text tqlayout policy" );
                 return "JustOverwrite";
         }
     }
@@ -115,7 +116,7 @@ public:
       \param notation the number notation to convert
       \return the string representation of the number notation enum
       */
-    static QString numberNotationToString( NumberNotation notation ) {
+    static TQString numberNotationToString( NumberNotation notation ) {
         switch( notation ) {
             case NumberNotationDecimal:
                 return "NumberNotationDecimal";
@@ -136,7 +137,7 @@ public:
       \param string the string to convert
       \return the number notation enum value
       */
-    static NumberNotation stringToNumberNotation( const QString& notation ) {
+    static NumberNotation stringToNumberNotation( const TQString& notation ) {
         if( notation ==      "NumberNotationDecimal" )
             return NumberNotationDecimal;
         else if( notation == "NumberNotationScientific" )
@@ -149,12 +150,12 @@ public:
 
 
     /**
-      Converts the specified string to a text layout policy enum value.
+      Converts the specified string to a text tqlayout policy enum value.
 
       \param string the string to convert
-      \return the text layout policy enum value
+      \return the text tqlayout policy enum value
       */
-    static TextLayoutPolicy stringToLayoutPolicy( const QString& string ) {
+    static TextLayoutPolicy stringToLayoutPolicy( const TQString& string ) {
         if( string ==      "JustOverwrite" )
             return LayoutJustOverwrite;
         else if( string == "Rotate" )
@@ -239,19 +240,19 @@ public:
       \image html "../refman_images/positions.png"
       \image latex "../refman_images/positions.png" "the PositionFlag enum" width=4in
 
-      \note The position and alignment of content to be printed at (or
+      \note The position and tqalignment of content to be printed at (or
       inside of, resp.) an area or a point -- like for printing data value texts next
       to their graphical representations (which might be a bar, line, pie slice,...) --
-      is specified by two parameters: a \c PositionFlag and a uint holding a combination of \c Qt::AlignmentFlags.
-      Remember that Qt::AlignmentFlags are used to specify <b>with which edge</b> something
+      is specified by two parameters: a \c PositionFlag and a uint holding a combination of \c TQt::AlignmentFlags.
+      Remember that TQt::AlignmentFlags are used to specify <b>with which edge</b> something
       is to be aligned to its anchor, e.g. \c AlignLeft means align with the left edge.
 
       The position of content and the way it is aligned to this
       position is shown in the following drawing, note that annotation #2 and annotation #3
-      share the same PositionFlag but have different alignment flags set:
+      share the same PositionFlag but have different tqalignment flags set:
 
-      \image html "../refman_images/alignment.png"
-      \image latex "../refman_images/alignment.png" "positioning and aligning" width=4in
+      \image html "../refman_images/tqalignment.png"
+      \image latex "../refman_images/tqalignment.png" "positioning and aligning" width=4in
 
       \sa KDChartParams::setPrintDataValues
     */
@@ -263,19 +264,19 @@ public:
     /**
       Returns the point representing a position of a rectangle.
       */
-    static QPoint positionFlagToPoint( const QRect& rect,
+    static TQPoint positionFlagToPoint( const TQRect& rect,
                                       PositionFlag pos );
 
     /**
       Returns the point representing a position of a corresponding
-      QPointArray.
+      TQPointArray.
 
       \note The array \c points <b>must</b> have at least nine elements.
       */
-    static QPoint positionFlagToPoint( const QPointArray& points,
+    static TQPoint positionFlagToPoint( const TQPointArray& points,
             PositionFlag pos )
     {
-        QPoint pt;
+        TQPoint pt;
         if( 9 <= points.size() )
             pt = points[ pos ];
         return pt;
@@ -289,7 +290,7 @@ public:
       \param type the content position to convert
       \return the string representation of the type enum
       */
-    static QString positionFlagToString( PositionFlag type );
+    static TQString positionFlagToString( PositionFlag type );
 
 
     /**
@@ -298,7 +299,7 @@ public:
       \param string the string to convert
       \return the content position enum value
       */
-    static PositionFlag stringToPositionFlag( const QString& string );
+    static PositionFlag stringToPositionFlag( const TQString& string );
 };