diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-15 15:08:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-15 15:08:51 -0600 |
| commit | fb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0 (patch) | |
| tree | a01fcd88aa65a77c2b2e12ba1a55851ddfe5afcc /kstyles/kthemestyle | |
| parent | 3fbca5d9a4bd057ed5f9df138333e6c16dbdcc62 (diff) | |
| download | tdelibs-fb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0.tar.gz tdelibs-fb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0.zip | |
Fix kdelibs FTBFS on native TQt3
Diffstat (limited to 'kstyles/kthemestyle')
| -rw-r--r-- | kstyles/kthemestyle/kthemebase.cpp | 2 | ||||
| -rw-r--r-- | kstyles/kthemestyle/kthemebase.h | 2 | ||||
| -rw-r--r-- | kstyles/kthemestyle/kthemestyle.cpp | 2 | ||||
| -rw-r--r-- | kstyles/kthemestyle/kthemestyle.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index a4da66736..772dd41bc 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -231,7 +231,7 @@ union kthemeKey{ unsigned int cacheKey; }; -#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) static_cast<const TQPaintDevice*>(static_cast<const QPaintDevice*>(static_cast<const QPixmap*>(static_cast<const QBitmap*>(x)))) +#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) TQT_TQPAINTDEVICE_CONST(static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x))) void KThemeBase::generateBorderPix( int i ) { diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h index 92ecd3929..96faf57d5 100644 --- a/kstyles/kthemestyle/kthemebase.h +++ b/kstyles/kthemestyle/kthemebase.h @@ -575,7 +575,7 @@ protected: virtual int tqstyleHint( StyleHint sh, const TQWidget *widget = 0, const TQStyleOption& opt = TQStyleOption::Default, - QStyleHintReturn* returnData = 0 ) const + TQStyleHintReturn* returnData = 0 ) const { return KStyle::tqstyleHint( sh, widget, diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp index d986b0147..859165211 100644 --- a/kstyles/kthemestyle/kthemestyle.cpp +++ b/kstyles/kthemestyle/kthemestyle.cpp @@ -2185,7 +2185,7 @@ void KThemeStyle::drawBaseMask( TQPainter *p, int x, int y, int w, int h, p->fillRect( x, y, w, h, fillBrush ); } -int KThemeStyle::tqstyleHint( StyleHint sh, const TQWidget *w, const TQStyleOption &opt, QStyleHintReturn *shr ) const +int KThemeStyle::tqstyleHint( StyleHint sh, const TQWidget *w, const TQStyleOption &opt, TQStyleHintReturn *shr ) const { switch ( sh ) { diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h index 0eba9dacc..4fbde91b1 100644 --- a/kstyles/kthemestyle/kthemestyle.h +++ b/kstyles/kthemestyle/kthemestyle.h @@ -122,7 +122,7 @@ public: virtual int tqstyleHint( StyleHint sh, const TQWidget *widget = 0, const TQStyleOption& = TQStyleOption::Default, - QStyleHintReturn* returnData = 0 ) const; + TQStyleHintReturn* returnData = 0 ) const; virtual TQSize tqsizeFromContents( ContentsType contents, const TQWidget *widget, |