Rename KStyle to TDEStyle to avoid conflicts with KDE4

4 files changed, 18 insertions, 18 deletions

diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/kapplication.sip
index c626d3c..d13d156 100644
--- a/sip/tdecore/kapplication.sip
+++ b/sip/tdecore/kapplication.sip
@@ -205,7 +205,7 @@ public:
 
     static int           tdeinitExecWait (const TQString&, const TQStringList&, TQString* /Out/, int*);
     TQString              caption () const;
-//ig     KStyle*              kstyle () const;
+//ig     TDEStyle*              kstyle () const;
     TQString              makeStdCaption (const TQString&, bool = 1, bool = 0) const;
     TQString              tempSaveName (const TQString&) const;
     TQString              checkRecoverFile (const TQString&, bool&) const;
diff --git a/sip/tdecore/kdestyle.sip b/sip/tdecore/kdestyle.sip
index a528ed2..a03617e 100644
--- a/sip/tdecore/kdestyle.sip
+++ b/sip/tdecore/kdestyle.sip
@@ -44,7 +44,7 @@ protected slots:
 };  // class KDEAniMenu
 
 
-class KDEStyle : KStyle
+class KDEStyle : TDEStyle
 {
 %TypeHeaderCode
 #include <kdestyle.h>
diff --git a/sip/tdefx/kstyle.sip b/sip/tdefx/kstyle.sip
index 17a03b9..bf17b89 100644
--- a/sip/tdefx/kstyle.sip
+++ b/sip/tdefx/kstyle.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KStyle : TQCommonStyle
+class TDEStyle : TQCommonStyle
 {
 %TypeHeaderCode
 #include <kstyle.h>
@@ -32,9 +32,9 @@ class KStyle : TQCommonStyle
 
 
 public:
-    typedef uint KStyleFlags;
+    typedef uint TDEStyleFlags;
 
-    enum KStyleOption
+    enum TDEStyleOption
     {
         Default, 
         AllowMenuTransparency, 
@@ -42,7 +42,7 @@ public:
     };
 
 
-    enum KStyleScrollBarType
+    enum TDEStyleScrollBarType
     {
         WindowsStyleScrollBar, 
         PlatinumStyleScrollBar, 
@@ -50,17 +50,17 @@ public:
         NextStyleScrollBar
     };
 
-                         KStyle (KStyle::KStyleFlags = KStyle ::Default , KStyle::KStyleScrollBarType = KStyle ::WindowsStyleScrollBar );
+                         TDEStyle (TDEStyle::TDEStyleFlags = TDEStyle ::Default , TDEStyle::TDEStyleScrollBarType = TDEStyle ::WindowsStyleScrollBar );
 
 %If ( KDE_3_1_0 -  )
     static TQString       defaultStyle ();
 %End
 
-    void                 setScrollBarType (KStyle::KStyleScrollBarType);
-    KStyle::KStyleFlags  styleFlags () const;
+    void                 setScrollBarType (TDEStyle::TDEStyleScrollBarType);
+    TDEStyle::TDEStyleFlags  styleFlags () const;
     virtual void         renderMenuBlendPixmap (KPixmap&, const TQColorGroup&, const TQPopupMenu*) const;
 
-    enum KStylePrimitive
+    enum TDEStylePrimitive
     {
         KPE_DockWindowHandle, 
         KPE_ToolBarHandle, 
@@ -71,9 +71,9 @@ public:
         KPE_ListViewBranch
     };
 
-    virtual void         drawKStylePrimitive (KStyle::KStylePrimitive, TQPainter*, const TQWidget*, const TQRect&, const TQColorGroup&, SFlags = Style_Default , const TQStyleOption& = TQStyleOption (TQStyleOption ::Default )) const;
+    virtual void         drawTDEStylePrimitive (TDEStyle::TDEStylePrimitive, TQPainter*, const TQWidget*, const TQRect&, const TQColorGroup&, SFlags = Style_Default , const TQStyleOption& = TQStyleOption (TQStyleOption ::Default )) const;
 
-    enum KStylePixelMetric
+    enum TDEStylePixelMetric
     {
         KPM_MenuItemSeparatorHeight, 
         KPM_MenuItemHMargin, 
@@ -86,7 +86,7 @@ public:
         KPM_ListViewBranchThickness
     };
 
-    int                  kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const;
+    int                  kPixelMetric( TDEStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const;
     void                 polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
     void                 unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
     void                 polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr );
@@ -101,13 +101,13 @@ public:
     int                  styleHint( StyleHint, TQStyleControlElementData, ControlElementFlags, const TQStyleOption& = TQStyleOption::SO_Default, TQStyleHintReturn* = 0, const TQWidget* = 0 ) const;
 
     // New API
-    virtual void drawKStylePrimitive( KStylePrimitive, TQPainter*, TQStyleControlElementData, ControlElementFlags, const TQRect&, const TQColorGroup&, SFlags = Style_Default, const TQStyleOption& = TQStyleOption::SO_Default, const TQWidget* = 0 ) const;
+    virtual void drawTDEStylePrimitive( TDEStylePrimitive, TQPainter*, TQStyleControlElementData, ControlElementFlags, const TQRect&, const TQColorGroup&, SFlags = Style_Default, const TQStyleOption& = TQStyleOption::SO_Default, const TQWidget* = 0 ) const;
 
 protected:
     bool                 eventFilter (TQObject*, TQEvent*);
 
 private:
-                         KStyle (const KStyle&);
+                         TDEStyle (const TDEStyle&);
 
 protected:
 //igx     virtual void         virtual_hook (int, void*);
@@ -118,12 +118,12 @@ protected:
     // must be sorted by name.
 
     static sipStringTypeClassMap map[] = {
-        {sipName_KStyle,                  &sipClass_KStyle},
+        {sipName_TDEStyle,                  &sipClass_TDEStyle},
     };
 
     sipClass = sipMapStringToClass(sipCpp -> className(),map,sizeof (map)/sizeof (map[0]));
 %End
 //end
 
-};  // class KStyle
+};  // class TDEStyle
 
diff --git a/sip/tdeui/kthemebase.sip b/sip/tdeui/kthemebase.sip
index 9fc652c..66cf70d 100644
--- a/sip/tdeui/kthemebase.sip
+++ b/sip/tdeui/kthemebase.sip
@@ -87,7 +87,7 @@ protected:
 };  // class KThemeCache
 
 
-class KThemeBase : KStyle
+class KThemeBase : TDEStyle
 {
 %TypeHeaderCode
 #include <kthemebase.h>