Initial TQt4 port of Rosegarden

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 20 insertions, 19 deletions

diff --git a/src/gui/kdeext/klearlook.h b/src/gui/kdeext/klearlook.h
index 26775c5..fc666f3 100644
--- a/src/gui/kdeext/klearlook.h
+++ b/src/gui/kdeext/klearlook.h
@@ -7,7 +7,7 @@
  
 ----
  
-  Based upon QtCurve (C) Craig Drummond, 2003 [email protected]
+  Based upon TQtCurve (C) Craig Drummond, 2003 [email protected]
       Bernhard Rosenkränzer <bero@r?dh?t.com>
       Preston Brown <pbrown@r?dh?t.com>
       Than Ngo <than@r?dh?t.com>
@@ -43,10 +43,10 @@
 #include <tqcolor.h>
 #include <tqpoint.h>
 
-#define QTC_CHECK_SIZE   13
-#define QTC_RADIO_SIZE   13
-#define QTC_MIN_BTN_SIZE 10
-#define QTC_LV_SIZE(X)   LV_EXP_ARR==(X) ? 7 : 5
+#define TQTC_CHECK_SIZE   13
+#define TQTC_RADIO_SIZE   13
+#define TQTC_MIN_BTN_SIZE 10
+#define TQTC_LV_SIZE(X)   LV_EXP_ARR==(X) ? 7 : 5
 
 #define NUM_SHADES 7
 
@@ -57,7 +57,7 @@
 #define SHADE_GRADIENT_DARK        1.05
 
 /* 3d effect - i.e. buttons, etc */
-#define QTC_SHADES \
+#define TQTC_SHADES \
     double shades[2][11][NUM_SHADES]=\
     { \
         { \
@@ -88,7 +88,7 @@
         } \
     };
 
-#define QTC_SHADE(a, c, s) \
+#define TQTC_SHADE(a, c, s) \
     (c>10 || c<0 || s>=NUM_SHADES || s<0 ? 1.0 : shades[APPEARANCE_LIGHT_GRADIENT!=(a) ? 0 : 1][c][s])
 
 /* Shades used when gradient effect is selected */
@@ -186,6 +186,7 @@ extern "C" {
 
 class KlearlookStyle : public KStyle {
         Q_OBJECT
+  TQ_OBJECT
 
     public:
 
@@ -251,32 +252,32 @@ class KlearlookStyle : public KStyle {
                              const TQColor &fill, const TQColor *custom = NULL, bool light = false ) const;
         void drawLightBevelButton( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags, bool useGrad, ERound round,
                                    const TQColor &fill, const TQColor *custom = NULL, bool light = false ) const;
-        void drawArrow( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags, TQStyle::PrimitiveElement pe,
+        void drawArrow( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags, TQStyle::TQ_PrimitiveElement pe,
                         bool small = false, bool checkActive = false ) const;
-        void drawPrimitive( PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
+        void tqdrawPrimitive( TQ_PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
                             const TQStyleOption & = TQStyleOption::Default ) const;
-        void drawPrimitiveMenu( PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
+        void tqdrawPrimitiveMenu( TQ_PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
                                 const TQStyleOption & = TQStyleOption::Default ) const;
         void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r,
                                   const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt ) const;
-        void drawControl( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
+        void tqdrawControl( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
                           SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const;
-        void drawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+        void tqdrawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &,
                               const TQStyleOption & = TQStyleOption::Default ) const;
-        void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r,
+        void tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r,
                                      const TQStyleOption &data ) const;
         TQRect subRect( SubRect, const TQWidget * ) const;
-        void drawComplexControl( ComplexControl, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
+        void tqdrawComplexControl( ComplexControl, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
                                  SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None,
                                  const TQStyleOption & = TQStyleOption::Default ) const;
-        TQRect querySubControlMetrics( ComplexControl, const TQWidget *, SubControl,
+        TQRect querySubControlMetrics( TQ_ComplexControl, const TQWidget *, SubControl,
                                       const TQStyleOption & = TQStyleOption::Default ) const;
-        int pixelMetric( PixelMetric, const TQWidget *widget = 0 ) const;
+        int tqpixelMetric( PixelMetric, const TQWidget *widget = 0 ) const;
         int kPixelMetric( KStylePixelMetric kpm, const TQWidget *widget ) const;
-        TQSize sizeFromContents( ContentsType, const TQWidget *, const TQSize &,
+        TQSize tqsizeFromContents( ContentsType, const TQWidget *, const TQSize &,
                                 const TQStyleOption & = TQStyleOption::Default ) const;
-        int styleHint( StyleHint, const TQWidget *widget = 0, const TQStyleOption & = TQStyleOption::Default,
-                       QStyleHintReturn *returnData = 0 ) const;
+        int tqstyleHint( StyleHint, const TQWidget *widget = 0, const TQStyleOption & = TQStyleOption::Default,
+                       TQStyleHintReturn *returnData = 0 ) const;
 
     protected: