From c44c82c42550decfcd10236a0a69e1577d5dbfc5 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 3 Aug 2011 19:18:42 +0000
Subject: 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
---
 kstyles/kthemestyle/kthemebase.h    | 2 +-
 kstyles/kthemestyle/kthemestyle.cpp | 4 ++--
 kstyles/kthemestyle/kthemestyle.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kstyles/kthemestyle')

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;
-- 
cgit v1.2.1