summaryrefslogtreecommitdiffstats
path: root/kdefx
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-23 05:12:43 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-23 05:12:43 +0000
commita20928b6bfae18a41bb42b85e10f73fb63548ccc (patch)
treee0cdc70ad0064256ebf5c3e8a91d84048176ef99 /kdefx
parent865c5ed0c595c95574e4f8f34b578c46f10aa0ff (diff)
downloadtdelibs-a20928b6bfae18a41bb42b85e10f73fb63548ccc.tar.gz
tdelibs-a20928b6bfae18a41bb42b85e10f73fb63548ccc.zip
Styles are now mostly functional under Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1216403 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdefx')
-rw-r--r--kdefx/kstyle.cpp10
-rw-r--r--kdefx/kstyle.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/kdefx/kstyle.cpp b/kdefx/kstyle.cpp
index e6398add8..9e0546a87 100644
--- a/kdefx/kstyle.cpp
+++ b/kdefx/kstyle.cpp
@@ -535,7 +535,7 @@ int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) c
// #ifdef USE_QT4 // kdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
-//void KStyle::tqdrawPrimitive( ControlElement pe,
+//void KStyle::tqdrawPrimitive( TQ_ControlElement pe,
// TQPainter* p,
// const TQRect &r,
// const TQColorGroup &cg,
@@ -646,7 +646,7 @@ void KStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
-void KStyle::tqdrawControl( ControlElement element,
+void KStyle::tqdrawControl( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -1096,7 +1096,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling;
}
-void KStyle::tqdrawComplexControl( ComplexControl control,
+void KStyle::tqdrawComplexControl( TQ_ComplexControl control,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -1392,7 +1392,7 @@ void KStyle::tqdrawComplexControl( ComplexControl control,
}
-TQStyle::SubControl KStyle::querySubControl( ComplexControl control,
+TQStyle::SubControl KStyle::querySubControl( TQ_ComplexControl control,
const TQWidget* widget,
const TQPoint &pos,
const TQStyleOption &opt ) const
@@ -1408,7 +1408,7 @@ TQStyle::SubControl KStyle::querySubControl( ComplexControl control,
}
-TQRect KStyle::querySubControlMetrics( ComplexControl control,
+TQRect KStyle::querySubControlMetrics( TQ_ComplexControl control,
const TQWidget* widget,
SubControl sc,
const TQStyleOption &opt ) const
diff --git a/kdefx/kstyle.h b/kdefx/kstyle.h
index a50ab721e..c39e5e53f 100644
--- a/kdefx/kstyle.h
+++ b/kdefx/kstyle.h
@@ -284,7 +284,7 @@ class KDEFX_EXPORT KStyle: public TQCommonStyle
// #ifdef USE_QT4 // kdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
-// void tqdrawPrimitive( ControlElement pe,
+// void tqdrawPrimitive( TQ_ControlElement pe,
// TQPainter* p,
// const TQRect &r,
// const TQColorGroup &cg,
@@ -293,7 +293,7 @@ class KDEFX_EXPORT KStyle: public TQCommonStyle
// #endif // USE_QT4
- void tqdrawControl( ControlElement element,
+ void tqdrawControl( TQ_ControlElement element,
TQPainter* p,
const TQWidget* widget,
const TQRect &r,
@@ -301,7 +301,7 @@ class KDEFX_EXPORT KStyle: public TQCommonStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
- void tqdrawComplexControl( ComplexControl control,
+ void tqdrawComplexControl( TQ_ComplexControl control,
TQPainter *p,
const TQWidget* widget,
const TQRect &r,
@@ -311,12 +311,12 @@ class KDEFX_EXPORT KStyle: public TQCommonStyle
SCFlags active = SC_None,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
- SubControl querySubControl( ComplexControl control,
+ SubControl querySubControl( TQ_ComplexControl control,
const TQWidget* widget,
const TQPoint &pos,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
- TQRect querySubControlMetrics( ComplexControl control,
+ TQRect querySubControlMetrics( TQ_ComplexControl control,
const TQWidget* widget,
SubControl sc,
const TQStyleOption& = TQStyleOption::SO_Default ) const;