summaryrefslogtreecommitdiffstats
path: root/kstyles/kthemestyle/kthemebase.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:13 -0600
commit56160bf4dfe503631ef6373367b281f081bab2b4 (patch)
tree7fcea2ffd9c3420af999c3dcad0ed032eef93956 /kstyles/kthemestyle/kthemebase.h
parent13281e2856a2ef43bbab78c5528470309c23aa77 (diff)
downloadtdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.tar.gz
tdelibs-56160bf4dfe503631ef6373367b281f081bab2b4.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
Diffstat (limited to 'kstyles/kthemestyle/kthemebase.h')
-rw-r--r--kstyles/kthemestyle/kthemebase.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h
index 63126337f..96faf57d5 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/kstyles/kthemestyle/kthemebase.h
@@ -36,7 +36,7 @@ Copyright (C) 1998, 1999, 2000 KDE Team
#include <tqstring.h>
#include <kstyle.h>
#include <tqsettings.h>
-#include <palette.h> // for QColorGroup
+#include <tqpalette.h> // for QColorGroup
#include "kstyledirs.h"
#include <tqmap.h>
@@ -300,12 +300,12 @@ public:
* If a color group is set in the theme configuration
* that is used, otherwise defaultColor is returned.
*
- * @param defaultGroup The colorGroup to set if one is available.
+ * @param defaultGroup The tqcolorGroup to set if one is available.
*
* @param widget The widget whose color group to retrieve.
*
*/
- const TQColorGroup* colorGroup( const TQColorGroup &defaultGroup,
+ const TQColorGroup* tqcolorGroup( const TQColorGroup &defaultGroup,
WidgetType widget ) const;
TQBrush pixmapBrush( const TQColorGroup &group, TQColorGroup::ColorRole role,
@@ -508,9 +508,9 @@ protected:
/**
These are included for fuuture extension purposes..
*/
- virtual int pixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const
+ virtual int tqpixelMetric ( PixelMetric metric, const TQWidget * widget = 0 ) const
{
- return KStyle::pixelMetric( metric, widget );
+ return KStyle::tqpixelMetric( metric, widget );
}
virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRect & r, const TQColorGroup & cg,
@@ -522,7 +522,7 @@ protected:
}
- virtual void drawControl( TQ_ControlElement element,
+ virtual void tqdrawControl( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -530,21 +530,21 @@ protected:
SFlags how = Style_Default,
const TQStyleOption& opt = TQStyleOption::Default ) const
{
- KStyle::drawControl( element, p, widget,
+ KStyle::tqdrawControl( element, p, widget,
r, cg, how, opt );
}
- virtual void drawControlMask( TQ_ControlElement element,
+ virtual void tqdrawControlMask( TQ_ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& opt = TQStyleOption::Default ) const
{
- KStyle::drawControlMask( element, p, widget, r, opt );
+ KStyle::tqdrawControlMask( element, p, widget, r, opt );
}
- virtual void drawComplexControl( TQ_ComplexControl control,
+ virtual void tqdrawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget* widget,
const TQRect &r,
@@ -554,7 +554,7 @@ protected:
SCFlags active = SC_None,
const TQStyleOption& opt = TQStyleOption::Default ) const
{
- KStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
+ KStyle::tqdrawComplexControl( control, p, widget, r, cg, flags, controls, active, opt );
}
@@ -572,12 +572,12 @@ protected:
}
- virtual int styleHint( StyleHint sh,
+ virtual int tqstyleHint( StyleHint sh,
const TQWidget *widget = 0,
const TQStyleOption& opt = TQStyleOption::Default,
TQStyleHintReturn* returnData = 0 ) const
{
- return KStyle::styleHint( sh,
+ return KStyle::tqstyleHint( sh,
widget,
opt,
returnData );
@@ -731,7 +731,7 @@ inline TQBrush KThemeBase::pixmapBrush( const TQColorGroup &group,
return ( group.color( role ) );
}
-inline const TQColorGroup* KThemeBase::colorGroup( const TQColorGroup &defaultGroup,
+inline const TQColorGroup* KThemeBase::tqcolorGroup( const TQColorGroup &defaultGroup,
WidgetType widget ) const
{
return ( ( colors[ widget ] ) ? colors[ widget ] : &defaultGroup );