diff options
Diffstat (limited to 'kstyles')
| -rw-r--r-- | kstyles/asteroid/asteroid.cpp | 2 | ||||
| -rw-r--r-- | kstyles/keramik/keramik.cpp | 2 | ||||
| -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 | ||||
| -rw-r--r-- | kstyles/plastik/plastik.cpp | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp index 76a5c0d6c..35e6f3b7a 100644 --- a/kstyles/asteroid/asteroid.cpp +++ b/kstyles/asteroid/asteroid.cpp @@ -355,7 +355,7 @@ void AsteroidStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, case PE_Splitter: { - QPen oldPen = p->pen(); + TQPen oldPen = p->pen(); p->setPen(cg.background()); p->drawRect(r); p->setPen( cg.light() ); diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index b18cdc192..c29aaa90e 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -956,7 +956,7 @@ void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, if (kickerMode) { if (p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(static_cast<TQWidget*>(static_cast<QWidget*>(static_cast<QPaintDevice*>(p->tqdevice())))->className()) == "FittsLawFrame" ) + TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->tqdevice()))->className()) == "FittsLawFrame" ) { int x2 = x + r.width() - 1; int y2 = y + r.height() - 1; 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, diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index 1c6f5cd6a..4dd8f9cd1 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -886,7 +886,7 @@ void PlastikStyle::renderPanel(TQPainter *p, if (kickerMode && p->tqdevice() && p->tqdevice()->devType() == TQInternal::Widget && - TQCString(static_cast<TQWidget*>(static_cast<QWidget*>(static_cast<QPaintDevice*>(p->tqdevice())))->className()) == "FittsLawFrame") { + TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->tqdevice()))->className()) == "FittsLawFrame") { // Stolen wholesale from Keramik. I don't like it, but oh well. if (sunken) { const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; @@ -1819,7 +1819,7 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, // -------------- case PE_Splitter: { // highlight on mouse over - TQColor color = (static_cast<QPaintDevice*>(static_cast<QWidget*>(hoverWidget)) == static_cast<QPaintDevice*>(p->tqdevice()))?TQColor(cg.background().light(100+_contrast)):cg.background(); + TQColor color = (static_cast<TQPaintDevice*>(static_cast<TQWidget*>(hoverWidget)) == static_cast<TQPaintDevice*>(p->tqdevice()))?TQColor(cg.background().light(100+_contrast)):cg.background(); p->fillRect(r, color); if (w > h) { if (h > 4) { |