diff options
-rw-r--r-- | doc/classref/allclasses.html | 2 | ||||
-rw-r--r-- | doc/classref/tdefx/TDEStyle.html (renamed from doc/classref/tdefx/KStyle.html) | 38 | ||||
-rw-r--r-- | doc/classref/tdefx/index.html | 4 | ||||
-rw-r--r-- | examples/pytde-sampler/qt_widgets/CONTRIB | 2 | ||||
-rw-r--r-- | sip/tdecore/kapplication.sip | 2 | ||||
-rw-r--r-- | sip/tdecore/kdestyle.sip | 2 | ||||
-rw-r--r-- | sip/tdefx/kstyle.sip | 30 | ||||
-rw-r--r-- | sip/tdeui/kthemebase.sip | 2 |
8 files changed, 41 insertions, 41 deletions
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 @@ <tr ><td><a href="tdeui/KStdGuiItem.html">KStdGuiItem</A></td></tr> <tr ><td><a href="tdecore/KStringHandler.html">KStringHandler</A></td></tr> <tr ><td><a href="tdeui/KStringListValidator.html">KStringListValidator</A></td></tr> -<tr ><td><a href="tdefx/KStyle.html">KStyle</A></td></tr> +<tr ><td><a href="tdefx/TDEStyle.html">TDEStyle</A></td></tr> <tr ><td><a href="tdeio/KSycoca.html">KSycoca</A></td></tr> <tr ><td><a href="tdeio/KSycocaEntry.html"><i>KSycocaEntry</i></A></td></tr> <tr ><td><a href="tdeio/KSycocaFactory.html"><i>KSycocaFactory</i></A></td></tr> diff --git a/doc/classref/tdefx/KStyle.html b/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""> <html> <head> - <title>class KStyle</title> + <title>class TDEStyle</title> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <meta name="GENERATOR" content="wabbit dumphtml"> </head> @@ -12,7 +12,7 @@ <hr> <table width="100%"><tr> <td width ="70%"> - <h1>class KStyle</h1><hr> + <h1>class TDEStyle</h1><hr> </td> <td width="30%" valign="top" align="right"> <table> @@ -28,30 +28,30 @@ <td width="30%" align=left>tdefx</td> </tr> <tr><td>Class</td> - <td>KStyle</td> + <td>TDEStyle</td> </tr> <tr><td>Inherits</td> <td>TQCommonStyle </td> </tr> </table> <h3>enums</h3><ul> -<li><b>KStyleOption</b> = {Default, AllowMenuTransparency, FilledFrameWorkaround -}<li><b>KStylePixelMetric</b> = {KPM_MenuItemSeparatorHeight, KPM_MenuItemHMargin, KPM_MenuItemVMargin, KPM_MenuItemHFrame, KPM_MenuItemVFrame, KPM_MenuItemCheckMarkHMargin, KPM_MenuItemArrowHMargin, KPM_MenuItemTabSpacing, KPM_ListViewBranchThickness -}<li><b>KStylePrimitive</b> = {KPE_DockWindowHandle, KPE_ToolBarHandle, KPE_GeneralHandle, KPE_SliderGroove, KPE_SliderHandle, KPE_ListViewExpander, KPE_ListViewBranch -}<li><b>KStyleScrollBarType</b> = {WindowsStyleScrollBar, PlatinumStyleScrollBar, ThreeButtonScrollBar, NextStyleScrollBar +<li><b>TDEStyleOption</b> = {Default, AllowMenuTransparency, FilledFrameWorkaround +}<li><b>TDEStylePixelMetric</b> = {KPM_MenuItemSeparatorHeight, KPM_MenuItemHMargin, KPM_MenuItemVMargin, KPM_MenuItemHFrame, KPM_MenuItemVFrame, KPM_MenuItemCheckMarkHMargin, KPM_MenuItemArrowHMargin, KPM_MenuItemTabSpacing, KPM_ListViewBranchThickness +}<li><b>TDEStylePrimitive</b> = {KPE_DockWindowHandle, KPE_ToolBarHandle, KPE_GeneralHandle, KPE_SliderGroove, KPE_SliderHandle, KPE_ListViewExpander, KPE_ListViewBranch +}<li><b>TDEStyleScrollBarType</b> = {WindowsStyleScrollBar, PlatinumStyleScrollBar, ThreeButtonScrollBar, NextStyleScrollBar }</ul> <h3>methods</h3><ul> -<li><b>KStyle</b> (flags = KStyle .Default, sbtype = KStyle .WindowsStyleScrollBar) -<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KStyle instance</i></td></tr> +<li><b>TDEStyle</b> (flags = TDEStyle .Default, sbtype = TDEStyle .WindowsStyleScrollBar) +<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a TDEStyle instance</i></td></tr> </table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr> -<tr><td>flags</td><td>KStyle.KStyleFlags</td><td>KStyle .Default</td></tr> -<tr><td>sbtype</td><td>KStyle.KStyleScrollBarType</td><td>KStyle .WindowsStyleScrollBar</td></tr> +<tr><td>flags</td><td>TDEStyle.TDEStyleFlags</td><td>TDEStyle .Default</td></tr> +<tr><td>sbtype</td><td>TDEStyle.TDEStyleScrollBarType</td><td>TDEStyle .WindowsStyleScrollBar</td></tr> </table> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> -<li><b>KStyle</b> (a0) -<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KStyle instance</i></td></tr> +<li><b>TDEStyle</b> (a0) +<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a TDEStyle instance</i></td></tr> </table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr> -<tr><td>a0</td><td>KStyle</td><td></td></tr> +<tr><td>a0</td><td>TDEStyle</td><td></td></tr> </table> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> <li><b>defaultStyle</b> () @@ -85,10 +85,10 @@ <tr><td>a0</td><td>TQStyleOption</td><td>TQStyleOption (TQStyleOption .Default )</td></tr> </table> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> -<li><b>drawKStylePrimitive</b> (kpe, p, widget, r, cg, flags = Style_Default, a0 = TQStyleOption (TQStyleOption .Default )) +<li><b>drawTDEStylePrimitive</b> (kpe, p, widget, r, cg, flags = Style_Default, a0 = TQStyleOption (TQStyleOption .Default )) <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr> </table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr> -<tr><td>kpe</td><td>KStyle.KStylePrimitive</td><td></td></tr> +<tr><td>kpe</td><td>TDEStyle.TDEStylePrimitive</td><td></td></tr> <tr><td>p</td><td>TQPainter</td><td></td></tr> <tr><td>widget</td><td>TQWidget</td><td></td></tr> <tr><td>r</td><td>TQRect</td><td></td></tr> @@ -118,7 +118,7 @@ <li><b>kPixelMetric</b> (kpm, widget = 0) <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(int)</i></td></tr> </table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr> -<tr><td>kpm</td><td>KStyle.KStylePixelMetric</td><td></td></tr> +<tr><td>kpm</td><td>TDEStyle.TDEStylePixelMetric</td><td></td></tr> <tr><td>widget</td><td>TQWidget</td><td>0</td></tr> </table> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> @@ -170,11 +170,11 @@ <li><b>setScrollBarType</b> (sbtype) <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr> </table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr> -<tr><td>sbtype</td><td>KStyle.KStyleScrollBarType</td><td></td></tr> +<tr><td>sbtype</td><td>TDEStyle.TDEStyleScrollBarType</td><td></td></tr> </table> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> <li><b>styleFlags</b> () -<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KStyle.KStyleFlags)</i></td></tr> +<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDEStyle.TDEStyleFlags)</i></td></tr> </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> <li><b>styleHint</b> (sh, w = 0, opt = TQStyleOption (TQStyleOption .Default ), shr = 0) <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(int)</i></td></tr> 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 @@ <tr ><td><a href="KPixmap.html">KPixmap</a></td></tr> <tr ><td><a href="KPixmapEffect.html">KPixmapEffect</a></td></tr> </table></td><td valign="top"><table border="0"> -<tr bgcolor="#fff0ff"><th>KPixmapSplitter - KStyle</th></tr> +<tr bgcolor="#fff0ff"><th>KPixmapSplitter - TDEStyle</th></tr> <tr ><td><a href="KPixmapSplitter.html">KPixmapSplitter</a></td></tr> -<tr ><td><a href="KStyle.html">KStyle</a></td></tr> +<tr ><td><a href="TDEStyle.html">TDEStyle</a></td></tr> </table></td></tr></table> </body> </html> 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 <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> |