diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-03 19:18:42 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-03 19:18:42 +0000 |
commit | c44c82c42550decfcd10236a0a69e1577d5dbfc5 (patch) | |
tree | 4e478fd44c1062af90b831869c7d976592ab9751 /kstyles/kthemestyle | |
parent | 102d191fa7d143d634d35ca894945688a196361b (diff) | |
download | tdelibs-c44c82c42550decfcd10236a0a69e1577d5dbfc5.tar.gz tdelibs-c44c82c42550decfcd10236a0a69e1577d5dbfc5.zip |
Fix broken portions of the Asteroid widget style
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1244695 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kstyles/kthemestyle')
-rw-r--r-- | kstyles/kthemestyle/kthemebase.h | 2 | ||||
-rw-r--r-- | kstyles/kthemestyle/kthemestyle.cpp | 4 | ||||
-rw-r--r-- | kstyles/kthemestyle/kthemestyle.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h index b5f4ae8a9..92ecd3929 100644 --- a/kstyles/kthemestyle/kthemebase.h +++ b/kstyles/kthemestyle/kthemebase.h @@ -583,7 +583,7 @@ protected: returnData ); } - virtual TQSize sizeFromContents( ContentsType contents, + virtual TQSize tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& opt = TQStyleOption::Default ) const diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp index b23003cb5..817d078e6 100644 --- a/kstyles/kthemestyle/kthemestyle.cpp +++ b/kstyles/kthemestyle/kthemestyle.cpp @@ -212,7 +212,7 @@ void kDrawWindowsArrow ( TQPainter *p, const TQStyle* style, TQStyle::PrimitiveE -TQSize KThemeStyle::sizeFromContents( ContentsType contents, +TQSize KThemeStyle::tqsizeFromContents( ContentsType contents, const TQWidget* widget, const TQSize &contentSize, const TQStyleOption& opt ) const @@ -304,7 +304,7 @@ TQSize KThemeStyle::sizeFromContents( ContentsType contents, } default: - return KThemeBase::sizeFromContents( contents, widget, contentSize, opt ); + return KThemeBase::tqsizeFromContents( contents, widget, contentSize, opt ); } } diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h index 750031156..0eba9dacc 100644 --- a/kstyles/kthemestyle/kthemestyle.h +++ b/kstyles/kthemestyle/kthemestyle.h @@ -124,7 +124,7 @@ public: const TQStyleOption& = TQStyleOption::Default, QStyleHintReturn* returnData = 0 ) const; - virtual TQSize sizeFromContents( ContentsType contents, + virtual TQSize tqsizeFromContents( ContentsType contents, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const; |