From 77ad361b74e6bda59916cc01c13c0b44306d730e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 3 Feb 2013 22:57:16 -0600 Subject: [PATCH] Rename KStyle to TDEStyle to avoid conflicts with KDE4 --- doc/classref/allclasses.html | 2 +- .../tdefx/{KStyle.html => TDEStyle.html} | 38 +++++++++---------- doc/classref/tdefx/index.html | 4 +- examples/pytde-sampler/qt_widgets/CONTRIB | 2 +- sip/tdecore/kapplication.sip | 2 +- sip/tdecore/kdestyle.sip | 2 +- sip/tdefx/kstyle.sip | 30 +++++++-------- sip/tdeui/kthemebase.sip | 2 +- 8 files changed, 41 insertions(+), 41 deletions(-) rename doc/classref/tdefx/{KStyle.html => TDEStyle.html} (87%) diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html index 98869a7..7c97797 100644 --- a/doc/classref/allclasses.html +++ b/doc/classref/allclasses.html @@ -709,7 +709,7 @@ KStdGuiItem KStringHandler KStringListValidator -KStyle +TDEStyle KSycoca KSycocaEntry KSycocaFactory diff --git a/doc/classref/tdefx/KStyle.html b/doc/classref/tdefx/TDEStyle.html similarity index 87% rename from doc/classref/tdefx/KStyle.html rename to doc/classref/tdefx/TDEStyle.html index 42ee8e7..b79f3d7 100644 --- a/doc/classref/tdefx/KStyle.html +++ b/doc/classref/tdefx/TDEStyle.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KStyle + class TDEStyle @@ -12,7 +12,7 @@
-

class KStyle

+

class TDEStyle

 @@ -28,30 +28,30 @@ - +
tdefx
ClassKStyleTDEStyle
Inherits TQCommonStyle

enums

    -
  • KStyleOption = {Default, AllowMenuTransparency, FilledFrameWorkaround -}
  • KStylePixelMetric = {KPM_MenuItemSeparatorHeight, KPM_MenuItemHMargin, KPM_MenuItemVMargin, KPM_MenuItemHFrame, KPM_MenuItemVFrame, KPM_MenuItemCheckMarkHMargin, KPM_MenuItemArrowHMargin, KPM_MenuItemTabSpacing, KPM_ListViewBranchThickness -}
  • KStylePrimitive = {KPE_DockWindowHandle, KPE_ToolBarHandle, KPE_GeneralHandle, KPE_SliderGroove, KPE_SliderHandle, KPE_ListViewExpander, KPE_ListViewBranch -}
  • KStyleScrollBarType = {WindowsStyleScrollBar, PlatinumStyleScrollBar, ThreeButtonScrollBar, NextStyleScrollBar +
  • TDEStyleOption = {Default, AllowMenuTransparency, FilledFrameWorkaround +}
  • TDEStylePixelMetric = {KPM_MenuItemSeparatorHeight, KPM_MenuItemHMargin, KPM_MenuItemVMargin, KPM_MenuItemHFrame, KPM_MenuItemVFrame, KPM_MenuItemCheckMarkHMargin, KPM_MenuItemArrowHMargin, KPM_MenuItemTabSpacing, KPM_ListViewBranchThickness +}
  • TDEStylePrimitive = {KPE_DockWindowHandle, KPE_ToolBarHandle, KPE_GeneralHandle, KPE_SliderGroove, KPE_SliderHandle, KPE_ListViewExpander, KPE_ListViewBranch +}
  • TDEStyleScrollBarType = {WindowsStyleScrollBar, PlatinumStyleScrollBar, ThreeButtonScrollBar, NextStyleScrollBar }

methods

    -
  • KStyle (flags = KStyle .Default, sbtype = KStyle .WindowsStyleScrollBar) -
    +
  • TDEStyle (flags = TDEStyle .Default, sbtype = TDEStyle .WindowsStyleScrollBar) +
    • returns a KStyle instance
    returns a TDEStyle instance
    - - + +
    ArgumentTypeDefault
    flagsKStyle.KStyleFlagsKStyle .Default
    sbtypeKStyle.KStyleScrollBarTypeKStyle .WindowsStyleScrollBar
    flagsTDEStyle.TDEStyleFlagsTDEStyle .Default
    sbtypeTDEStyle.TDEStyleScrollBarTypeTDEStyle .WindowsStyleScrollBar
    -
  • KStyle (a0) -
    +
  • TDEStyle (a0) +
    • returns a KStyle instance
    returns a TDEStyle instance
    - +
    ArgumentTypeDefault
    a0KStyle
    a0TDEStyle
  • defaultStyle () @@ -85,10 +85,10 @@
    • a0TQStyleOptionTQStyleOption (TQStyleOption .Default )
    • -
  • drawKStylePrimitive (kpe, p, widget, r, cg, flags = Style_Default, a0 = TQStyleOption (TQStyleOption .Default )) +
  • drawTDEStylePrimitive (kpe, p, widget, r, cg, flags = Style_Default, a0 = TQStyleOption (TQStyleOption .Default ))
    returns nothing
    - + @@ -118,7 +118,7 @@
  • kPixelMetric (kpm, widget = 0)
    • ArgumentTypeDefault
    kpeKStyle.KStylePrimitive
    kpeTDEStyle.TDEStylePrimitive
    pTQPainter
    widgetTQWidget
    rTQRect
    returns (int)
    - +
    ArgumentTypeDefault
    kpmKStyle.KStylePixelMetric
    kpmTDEStyle.TDEStylePixelMetric
    widgetTQWidget0
    @@ -170,11 +170,11 @@
  • setScrollBarType (sbtype)
    returns nothing
    - +
    ArgumentTypeDefault
    sbtypeKStyle.KStyleScrollBarType
    sbtypeTDEStyle.TDEStyleScrollBarType
  • styleFlags () -
    +
    returns (KStyle.KStyleFlags)
    returns (TDEStyle.TDEStyleFlags)
  • styleHint (sh, w = 0, opt = TQStyleOption (TQStyleOption .Default ), shr = 0)
    diff --git a/doc/classref/tdefx/index.html b/doc/classref/tdefx/index.html index 32e2b5e..9c236fd 100644 --- a/doc/classref/tdefx/index.html +++ b/doc/classref/tdefx/index.html @@ -33,9 +33,9 @@
    returns (int)
    KPixmap
    KPixmapEffect
    		 - + - +
    KPixmapSplitter - KStyle
    KPixmapSplitter - TDEStyle
    KPixmapSplitter
    KStyle
    TDEStyle
    diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB index f552225..59209d8 100644 --- a/examples/pytde-sampler/qt_widgets/CONTRIB +++ b/examples/pytde-sampler/qt_widgets/CONTRIB @@ -136,7 +136,7 @@ tdefx,KImageEffect,,, tdefx,KPixmap,,, tdefx,KPixmapEffect,,, tdefx,KPixmapSplitter,,, -tdefx,KStyle,,, +tdefx,TDEStyle,,, tdefx,kColorBitmaps,,, tdefx,kDrawBeButton,,, tdefx,kDrawNextButton,,, 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 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 @@ -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