diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-31 06:26:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-31 06:26:14 +0000 |
| commit | f007f85c4dc9ed297291c2a209bba73663ecd37b (patch) | |
| tree | af24a01bffa79a5d2006320aed4a3aab0895a8f2 /kstyles | |
| parent | c6ea5f2c665bbc4b9c512d3d1fee3a7b58040f5d (diff) | |
| download | tdelibs-f007f85c4dc9ed297291c2a209bba73663ecd37b.tar.gz tdelibs-f007f85c4dc9ed297291c2a209bba73663ecd37b.zip | |
Convert qt_cast() to ::qt_cast<>
This should fix some random segfaults
It needs to be tested to make sure that interfaces still work,
e.g. kate/kwrite interfaces in interface/ktexteditor
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1218078 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kstyles')
| -rw-r--r-- | kstyles/light/lightstyle-v2.cpp | 4 | ||||
| -rw-r--r-- | kstyles/light/lightstyle-v2.h | 4 | ||||
| -rw-r--r-- | kstyles/light/lightstyle-v3.cpp | 4 | ||||
| -rw-r--r-- | kstyles/light/lightstyle-v3.h | 4 | ||||
| -rw-r--r-- | kstyles/plastik/plastik.cpp | 4 | ||||
| -rw-r--r-- | kstyles/plastik/plastik.h | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp index 94ba6c058..133b309d4 100644 --- a/kstyles/light/lightstyle-v2.cpp +++ b/kstyles/light/lightstyle-v2.cpp @@ -1586,10 +1586,10 @@ TQSize LightStyleV2::tqsizeFromContents( ContentsType contents, return ret; } -int LightStyleV2::tqstyleHint( StyleHint stylehint, +int LightStyleV2::tqstyleHint( TQ_StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, - QStyleHintReturn* returnData ) const + TQStyleHintReturn* returnData ) const { int ret; diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h index 83a5f46f1..9b54e5427 100644 --- a/kstyles/light/lightstyle-v2.h +++ b/kstyles/light/lightstyle-v2.h @@ -72,9 +72,9 @@ public: TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &, const TQStyleOption & = TQStyleOption::Default ) const; - int tqstyleHint(StyleHint, const TQWidget * = 0, + int tqstyleHint(TQ_StyleHint, const TQWidget * = 0, const TQStyleOption & = TQStyleOption::Default, - QStyleHintReturn * = 0 ) const; + TQStyleHintReturn * = 0 ) const; TQPixmap stylePixmap( StylePixmap stylepixmap, const TQWidget* widget = 0, diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index b05517248..98e5c555d 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -1817,10 +1817,10 @@ TQSize LightStyleV3::tqsizeFromContents( ContentsType contents, return ret; } -int LightStyleV3::tqstyleHint( StyleHint stylehint, +int LightStyleV3::tqstyleHint( TQ_StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, - QStyleHintReturn* returnData ) const + TQStyleHintReturn* returnData ) const { int ret; diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h index 2bc7b65a5..a76279bfa 100644 --- a/kstyles/light/lightstyle-v3.h +++ b/kstyles/light/lightstyle-v3.h @@ -76,9 +76,9 @@ public: TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &, const TQStyleOption & = TQStyleOption::Default ) const; - int tqstyleHint(StyleHint, const TQWidget * = 0, + int tqstyleHint(TQ_StyleHint, const TQWidget * = 0, const TQStyleOption & = TQStyleOption::Default, - QStyleHintReturn * = 0 ) const; + TQStyleHintReturn * = 0 ) const; TQPixmap stylePixmap( StylePixmap stylepixmap, const TQWidget* widget = 0, diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index dcc826819..1b5f68596 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -3433,10 +3433,10 @@ TQSize PlastikStyle::tqsizeFromContents(ContentsType t, return KStyle::tqsizeFromContents (t, widget, s, opt); } -int PlastikStyle::tqstyleHint( StyleHint stylehint, +int PlastikStyle::tqstyleHint( TQ_StyleHint stylehint, const TQWidget *widget, const TQStyleOption &option, - QStyleHintReturn* returnData ) const + TQStyleHintReturn* returnData ) const { switch (stylehint) { case SH_PopupMenu_SubMenuPopupDelay: diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h index 45e734aef..6fa325db9 100644 --- a/kstyles/plastik/plastik.h +++ b/kstyles/plastik/plastik.h @@ -123,9 +123,9 @@ public: const TQSize &s, const TQStyleOption &o) const; - int tqstyleHint(StyleHint, const TQWidget * = 0, + int tqstyleHint(TQ_StyleHint, const TQWidget * = 0, const TQStyleOption & = TQStyleOption::Default, - QStyleHintReturn * = 0 ) const; + TQStyleHintReturn * = 0 ) const; protected: enum TabPosition |