summaryrefslogtreecommitdiffstats
path: root/kstyles/highcolor/highcolor.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-03 23:01:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-03 23:01:18 -0600
commitaa3abfa2a78cccfcb1f91d808753c79295d618e9 (patch)
treefe00218b08a670818d7ee67e677d1f6b5ded6eed /kstyles/highcolor/highcolor.h
parente92a4e05c504978308b2dd83082d2727b74bea8f (diff)
downloadtdelibs-aa3abfa2a78cccfcb1f91d808753c79295d618e9.tar.gz
tdelibs-aa3abfa2a78cccfcb1f91d808753c79295d618e9.zip
Rename KStyle to TDEStyle to avoid conflicts with KDE4
Diffstat (limited to 'kstyles/highcolor/highcolor.h')
-rw-r--r--kstyles/highcolor/highcolor.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h
index 5f58b3f9c..33ded2d17 100644
--- a/kstyles/highcolor/highcolor.h
+++ b/kstyles/highcolor/highcolor.h
@@ -55,7 +55,7 @@ class GradientSet
class TQPopupMenu;
-class HighColorStyle : public KStyle
+class HighColorStyle : public TDEStyle
{
Q_OBJECT
@@ -71,7 +71,7 @@ class HighColorStyle : public KStyle
void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg,
const TQPopupMenu* popup ) const;
- void drawKStylePrimitive( KStylePrimitive kpe,
+ void drawTDEStylePrimitive( TDEStylePrimitive kpe,
TQPainter* p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,