diff options
author | Slávek Banko <[email protected]> | 2016-03-25 20:03:28 +0100 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2016-03-25 20:03:28 +0100 |
commit | 2ee99ab520931c5efe91123c85ba10064a45e95d (patch) | |
tree | a367666e410de28d0f258aed77b11e17cafb28e4 /style/polish.cpp | |
parent | cfa36e1a95e82492c17225ff376911abb3688f62 (diff) | |
download | tde-style-baghira-2ee99ab520931c5efe91123c85ba10064a45e95d.tar.gz tde-style-baghira-2ee99ab520931c5efe91123c85ba10064a45e95d.zip |
Initial TQt conversion
Signed-off-by: Slávek Banko <[email protected]>
Diffstat (limited to 'style/polish.cpp')
-rw-r--r-- | style/polish.cpp | 510 |
1 files changed, 255 insertions, 255 deletions
diff --git a/style/polish.cpp b/style/polish.cpp index f845d2b..2f4bbeb 100644 --- a/style/polish.cpp +++ b/style/polish.cpp @@ -1,35 +1,35 @@ -//#include <qdir.h> +//#include <tqdir.h> #include "baghira.h" #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> -#include <qapplication.h> -#include <qbrush.h> -#include <qcolor.h> -#include <qcombobox.h> -#include <qcursor.h> -#include <qdialog.h> -#include <qframe.h> -#include <qfile.h> -#include <qheader.h> -#include <qgroupbox.h> -//#include <qiconview.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlistbox.h> +#include <tqapplication.h> +#include <tqbrush.h> +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqcursor.h> +#include <tqdialog.h> +#include <tqframe.h> +#include <tqfile.h> +#include <tqheader.h> +#include <tqgroupbox.h> +//#include <tqiconview.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlistbox.h> #include <klistview.h> #include <kmenubar.h> -#include <qpalette.h> -#include <qpainter.h> -#include <qpopupmenu.h> -#include <qpushbutton.h> -#include <qscrollbar.h> -#include <qscrollview.h> -#include <qsizepolicy.h> -#include <qslider.h> -#include <qtabbar.h> -#include <qtoolbar.h> -#include <qtoolbutton.h> +#include <tqpalette.h> +#include <tqpainter.h> +#include <tqpopupmenu.h> +#include <tqpushbutton.h> +#include <tqscrollbar.h> +#include <tqscrollview.h> +#include <tqsizepolicy.h> +#include <tqslider.h> +#include <tqtabbar.h> +#include <tqtoolbar.h> +#include <tqtoolbutton.h> #include <kdeversion.h> #include <kpixmapeffect.h> #include <kglobalsettings.h> @@ -49,7 +49,7 @@ x #endif -void LiquidStyle::polish( QPalette &pal ) +void LiquidStyle::polish( TQPalette &pal ) { if ( inExitPolish ) return ; @@ -67,12 +67,12 @@ void LiquidStyle::polish( QPalette &pal ) btnDict.clear(); btnShadowedDict.clear(); // reset brushes - pagerHoverBrush = QBrush(); - pagerBrush = QBrush(); + pagerHoverBrush = TQBrush(); + pagerBrush = TQBrush(); bool newPalette = false; struct stat buffer; - if ( stat( QFile::encodeName( QDir::homeDirPath() + "/.qt/qtrc" ), &buffer ) == 0 ) + if ( stat( TQFile::encodeName( TQDir::homeDirPath() + "/.qt/qtrc" ), &buffer ) == 0 ) { unsigned int lastModTime = ( unsigned int ) buffer.st_mtime; if ( lastModTime > qtrcModificationTime ) @@ -91,57 +91,57 @@ void LiquidStyle::polish( QPalette &pal ) return ; } - originalBgColor = pal.color(QPalette::Active, QColorGroup::Background); + originalBgColor = pal.color(TQPalette::Active, TQColorGroup::Background); if (optionHandler->style() == Brushed) - pal.setColor(QColorGroup::Background, brushedMetalColor(optionHandler->BrushTint())); + pal.setColor(TQColorGroup::Background, brushedMetalColor(optionHandler->BrushTint())); if (isOOO) - pal.setColor( QColorGroup::Button, pal.active().background() ); + pal.setColor( TQColorGroup::Button, pal.active().background() ); else if (optionHandler->custCols[0] != -1) { - pal.setColor(QColorGroup::Background, QColor(optionHandler->custCols[0])); - pal.setColor(QColorGroup::Button, QColor(optionHandler->custCols[1])); - pal.setColor(QColorGroup::Base, QColor(optionHandler->custCols[2])); - pal.setColor(QPalette::Active, QColorGroup::Text, QColor(optionHandler->custCols[3])); - pal.setColor(QPalette::Active, QColorGroup::Foreground, QColor(optionHandler->custCols[3])); - pal.setColor(QColorGroup::Highlight, QColor(optionHandler->custCols[4])); - pal.setColor(QPalette::Active, QColorGroup::HighlightedText, QColor(optionHandler->custCols[5])); - pal.setColor(QPalette::Active, QColorGroup::ButtonText, QColor(optionHandler->custCols[6])); - pal.setColor(QColorGroup::Mid, QColor((qRed(optionHandler->custCols[2])+qRed(optionHandler->custCols[3]))/2,(qGreen(optionHandler->custCols[2])+qGreen(optionHandler->custCols[3]))/2,(qBlue(optionHandler->custCols[2])+qBlue(optionHandler->custCols[3]))/2)); + pal.setColor(TQColorGroup::Background, TQColor(optionHandler->custCols[0])); + pal.setColor(TQColorGroup::Button, TQColor(optionHandler->custCols[1])); + pal.setColor(TQColorGroup::Base, TQColor(optionHandler->custCols[2])); + pal.setColor(TQPalette::Active, TQColorGroup::Text, TQColor(optionHandler->custCols[3])); + pal.setColor(TQPalette::Active, TQColorGroup::Foreground, TQColor(optionHandler->custCols[3])); + pal.setColor(TQColorGroup::Highlight, TQColor(optionHandler->custCols[4])); + pal.setColor(TQPalette::Active, TQColorGroup::HighlightedText, TQColor(optionHandler->custCols[5])); + pal.setColor(TQPalette::Active, TQColorGroup::ButtonText, TQColor(optionHandler->custCols[6])); + pal.setColor(TQColorGroup::Mid, TQColor((tqRed(optionHandler->custCols[2])+tqRed(optionHandler->custCols[3]))/2,(tqGreen(optionHandler->custCols[2])+tqGreen(optionHandler->custCols[3]))/2,(tqBlue(optionHandler->custCols[2])+tqBlue(optionHandler->custCols[3]))/2)); - pal.setColor(QPalette::Inactive, QColorGroup::Text, QColor(optionHandler->custCols[3])); - pal.setColor(QPalette::Inactive, QColorGroup::HighlightedText, QColor(optionHandler->custCols[5])); - pal.setColor(QPalette::Inactive, QColorGroup::ButtonText, QColor(optionHandler->custCols[6])); + pal.setColor(TQPalette::Inactive, TQColorGroup::Text, TQColor(optionHandler->custCols[3])); + pal.setColor(TQPalette::Inactive, TQColorGroup::HighlightedText, TQColor(optionHandler->custCols[5])); + pal.setColor(TQPalette::Inactive, TQColorGroup::ButtonText, TQColor(optionHandler->custCols[6])); } else - pal.setColor( QColorGroup::Button, optionHandler->CustomButtonColor() ); + pal.setColor( TQColorGroup::Button, optionHandler->CustomButtonColor() ); #if 0 if ( isKicker ) { - origPanelBrush = pal.brush( QPalette::Active, QColorGroup::Background ); + origPanelBrush = pal.brush( TQPalette::Active, TQColorGroup::Background ); origPanelPalette = pal; - QColor c( pal.active().background() ); + TQColor c( pal.active().background() ); if ( optionHandler->usePanelCustomColor() && optionHandler->panelCustomColor().isValid() ) c = optionHandler->panelCustomColor(); kickerColor = c; - pal.setColor( QColorGroup::Mid, optionHandler->CustomButtonColor().dark( 110 ) ); - pal.setColor( QColorGroup::Dark, optionHandler->CustomButtonColor().dark( 130 ) ); - pal.setColor( QColorGroup::Midlight, optionHandler->CustomButtonColor().light( 110 ) ); - pal.setColor( QColorGroup::Light, optionHandler->CustomButtonColor().light( 115 ) ); - pal.setColor( QColorGroup::Button, optionHandler->CustomButtonColor()); + pal.setColor( TQColorGroup::Mid, optionHandler->CustomButtonColor().dark( 110 ) ); + pal.setColor( TQColorGroup::Dark, optionHandler->CustomButtonColor().dark( 130 ) ); + pal.setColor( TQColorGroup::Midlight, optionHandler->CustomButtonColor().light( 110 ) ); + pal.setColor( TQColorGroup::Light, optionHandler->CustomButtonColor().light( 115 ) ); + pal.setColor( TQColorGroup::Button, optionHandler->CustomButtonColor()); if (optionHandler->style() == Brushed) { - QBrush brush( c, gradBrush ); - pal.setBrush( QColorGroup::Background, brush ); + TQBrush brush( c, gradBrush ); + pal.setBrush( TQColorGroup::Background, brush ); } else if ( optionHandler->usePanelStipple() ) { - QPixmap stipple( 64, 64 ); + TQPixmap stipple( 64, 64 ); stipple.fill( c.rgb() ); - QPainter p( &stipple ); + TQPainter p( &stipple ); p.setPen( c.dark( 100 + (int)(optionHandler->stippleContrast()/4) ) ); for ( int i = 1; i < 64; i += 4 ) { @@ -152,25 +152,25 @@ void LiquidStyle::polish( QPalette &pal ) for ( int i = 2; i < 63; i += 4 ) p.drawLine( 0, i, 63, i ); p.end(); - QBrush brush( c, stipple ); - pal.setBrush( QColorGroup::Background, brush ); + TQBrush brush( c, stipple ); + pal.setBrush( TQColorGroup::Background, brush ); } else - pal.setBrush( QColorGroup::Background, c ); + pal.setBrush( TQColorGroup::Background, c ); } #endif /*else*/ if (optionHandler->style() == Brushed) { - QColor c( pal.active().background() ); - QBrush brush( c, gradBrush ); - pal.setBrush( QColorGroup::Background, brush ); + TQColor c( pal.active().background() ); + TQBrush brush( c, gradBrush ); + pal.setBrush( TQColorGroup::Background, brush ); } else if ( !isPlain() ) { - QColor c( pal.active().background() ); - QPixmap stipple( 64, 64 ); + TQColor c( pal.active().background() ); + TQPixmap stipple( 64, 64 ); stipple.fill( c.rgb() ); - QPainter p; + TQPainter p; p.begin( &stipple ); p.setPen( c.dark( 100 + (int)(optionHandler->stippleContrast()/2) ) ); for ( i = 1; i < 64; i += 4 ) @@ -182,41 +182,41 @@ void LiquidStyle::polish( QPalette &pal ) for ( i = 2; i < 63; i += 4 ) p.drawLine( 0, i, 63, i ); p.end(); - QBrush brush( c, stipple ); - pal.setBrush( QColorGroup::Background, brush ); + TQBrush brush( c, stipple ); + pal.setBrush( TQColorGroup::Background, brush ); } if (optionHandler->bevelHighlights()) { - QColor c(pal.active().highlight()); - QColor c2(c.light(140)); - QPixmap pix2 = QPixmap(48,48); - QPainter coolPainter(&pix2); - KPixmap pix = QPixmap(48,24); + TQColor c(pal.active().highlight()); + TQColor c2(c.light(140)); + TQPixmap pix2 = TQPixmap(48,48); + TQPainter coolPainter(&pix2); + KPixmap pix = TQPixmap(48,24); KPixmapEffect::gradient(pix,c,c2,KPixmapEffect::VerticalGradient,0); coolPainter.drawPixmap(0,0,pix); KPixmapEffect::gradient(pix,c2,c,KPixmapEffect::VerticalGradient,0); coolPainter.drawPixmap(0,24,pix); - QBrush brush(c, pix2); - pal.setBrush(QColorGroup::Highlight, brush); + TQBrush brush(c, pix2); + pal.setBrush(TQColorGroup::Highlight, brush); } polishedPalette = pal; optionHandler->reset(); } -void LiquidStyle::unPolish( QApplication *app ) +void LiquidStyle::unPolish( TQApplication *app ) { popupBack.resize(0,0); - QPalette pal( app->palette() ); + TQPalette pal( app->palette() ); inExitPolish = true; if ( !isPlain() ) { // reset any stipples - if ( pal.brush( QPalette::Active, QColorGroup::Background ).pixmap() ) - pal.setBrush( QColorGroup::Background, pal.active().background() ); - if ( pal.brush( QPalette::Active, QColorGroup::Button ).pixmap() ) - pal.setBrush( QColorGroup::Button, pal.active().button() ); + if ( pal.brush( TQPalette::Active, TQColorGroup::Background ).pixmap() ) + pal.setBrush( TQColorGroup::Background, pal.active().background() ); + if ( pal.brush( TQPalette::Active, TQColorGroup::Button ).pixmap() ) + pal.setBrush( TQColorGroup::Button, pal.active().button() ); // app->blockSignals( TRUE ); app->setPalette( pal ); // app->blockSignals( FALSE ); @@ -225,14 +225,14 @@ void LiquidStyle::unPolish( QApplication *app ) inExitPolish = false; } -Atom baghira_deco_design = XInternAtom(qt_xdisplay(), "BAGHIRA_DECO_DESIGN", False); +Atom baghira_deco_design = XInternAtom(tqt_xdisplay(), "BAGHIRA_DECO_DESIGN", False); -void LiquidStyle::polish( QWidget *w ) +void LiquidStyle::polish( TQWidget *w ) { // bool testWidget = w->inherits("Splash"); // int testInt = 0; -// if (w->sizePolicy().horData() == QSizePolicy::Minimum || w->sizePolicy().horData() == QSizePolicy::MinimumExpanding) -// qWarning("%s, \"%s\"",w->className(), w->name()); +// if (w->sizePolicy().horData() == TQSizePolicy::Minimum || w->sizePolicy().horData() == TQSizePolicy::MinimumExpanding) +// tqWarning("%s, \"%s\"",w->className(), w->name()); // w->installEventFilter(this); bool tmpBool = false; @@ -244,12 +244,12 @@ void LiquidStyle::polish( QWidget *w ) if (w->isTopLevel()) { - if ( ::qt_cast<QPopupMenu*>(w)) // popup menu designs + if ( ::tqt_cast<TQPopupMenu*>(w)) // popup menu designs { switch (optionHandler->MenuBackground()) { case Plain: - w->setBackgroundMode( QWidget::PaletteBackground ); + w->setBackgroundMode( TQWidget::PaletteBackground ); if (optionHandler->UseCustomMenuColor()) w->setPaletteBackgroundColor(optionHandler->Color()); else if (optionHandler->MenuColorButton()) @@ -259,24 +259,24 @@ void LiquidStyle::polish( QWidget *w ) break; case Stipples: { - QColor c; + TQColor c; if (optionHandler->UseCustomMenuColor()) - c = QColor( optionHandler->Color() ); + c = TQColor( optionHandler->Color() ); else if (optionHandler->MenuColorButton()) - c = QColor( optionHandler->buttonColor() ); + c = TQColor( optionHandler->buttonColor() ); else - c = QColor( originalBgColor ); + c = TQColor( originalBgColor ); if (popupBack.isNull()) { - popupBack = QPixmap(64,64); - QPixmap *stipple = &popupBack; + popupBack = TQPixmap(64,64); + TQPixmap *stipple = &popupBack; stipple->fill( c.rgb() ); - QPainter p; + TQPainter p; p.begin( stipple ); if (optionHandler->UseCustomMenuColor()) { - QColor c2 = QColor( optionHandler->Color2() ); - p.setPen(QColor((3*c.red()+c2.red())/4, + TQColor c2 = TQColor( optionHandler->Color2() ); + p.setPen(TQColor((3*c.red()+c2.red())/4, (3*c.green()+c2.green())/4, (3*c.blue()+c2.blue())/4)); for ( int i = 1; i < 64; i += 4 ) @@ -306,24 +306,24 @@ void LiquidStyle::polish( QWidget *w ) } p.end(); } - w->setBackgroundMode( QWidget::NoBackground ); + w->setBackgroundMode( TQWidget::NoBackground ); break; } case Gradient: { - w->setBackgroundMode( QWidget::PaletteBackground ); - KPixmap tmpPix = QPixmap(w->width(), 32); + w->setBackgroundMode( TQWidget::PaletteBackground ); + KPixmap tmpPix = TQPixmap(w->width(), 32); w->setPaletteBackgroundPixmap(KPixmapEffect::unbalancedGradient(tmpPix, optionHandler->Color(), optionHandler->Color2(),KPixmapEffect::HorizontalGradient, 100, 100, 16)); w->installEventFilter( this ); break; } default: - w->setBackgroundMode( QWidget::PaletteBackground ); + w->setBackgroundMode( TQWidget::PaletteBackground ); break; } //set popup menu opacity for them as they bypass the windowmanager unsigned long opacity = optionHandler->MenuOpacity()/100.0*OPAQUE; - XChangeProperty(qt_xdisplay(), w->winId(), XInternAtom(qt_xdisplay(), OPACITY, False), XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &opacity, 1L); + XChangeProperty(tqt_xdisplay(), w->winId(), XInternAtom(tqt_xdisplay(), OPACITY, False), XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &opacity, 1L); goto kstpolish; } else @@ -334,14 +334,14 @@ void LiquidStyle::polish( QWidget *w ) Atom actual; int format, result; unsigned long n, left; - result = XGetWindowProperty(qt_xdisplay(), w->winId(), baghira_deco_design, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, &data); + result = XGetWindowProperty(tqt_xdisplay(), w->winId(), baghira_deco_design, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, &data); if (result != Success || data == None) // not found set design { int tmp = optionHandler->wmDesign != Tiger ? optionHandler->wmDesign : Panther; - XChangeProperty(qt_xdisplay(), w->winId(), baghira_deco_design, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &(tmp), 1L); + XChangeProperty(tqt_xdisplay(), w->winId(), baghira_deco_design, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &(tmp), 1L); } } - if ((optionHandler->style() == Brushed) && !( ::qt_cast<QPopupMenu*>(w) || ::qt_cast<QMenuBar*>(w) || w->isDesktop() || ::qt_cast<QListBox*>(w) || w->inherits("QTipLabel") || w->inherits("AlphaWidget") || w->inherits("ScrollWidget") || w->inherits("PlayerWidget"))) + if ((optionHandler->style() == Brushed) && !( ::tqt_cast<TQPopupMenu*>(w) || ::tqt_cast<TQMenuBar*>(w) || w->isDesktop() || ::tqt_cast<TQListBox*>(w) || w->inherits("TQTipLabel") || w->inherits("AlphaWidget") || w->inherits("ScrollWidget") || w->inherits("PlayerWidget"))) // install resize event filter, allowing us to update the b/m gradient on horizontal resizes. some widgets must be excluded though { if (!isKicker) @@ -353,8 +353,8 @@ void LiquidStyle::polish( QWidget *w ) if (w->inherits("KURLBar")/*ListBox*/) { - w->setPaletteBackgroundColor(qApp->palette().color(QPalette::Active, QColorGroup::Base)); -// ((QListBox*)w)->viewport()->setPaletteBackgroundColor(qApp->palette().color(QPalette::Active, QColorGroup::Base)); + w->setPaletteBackgroundColor(tqApp->palette().color(TQPalette::Active, TQColorGroup::Base)); +// ((TQListBox*)w)->viewport()->setPaletteBackgroundColor(tqApp->palette().color(TQPalette::Active, TQColorGroup::Base)); goto kstpolish; } @@ -379,138 +379,138 @@ void LiquidStyle::polish( QWidget *w ) if (qstrcmp( w->name(), "kde toolbar widget" ) == 0 ) w->installEventFilter( this ); - if (::qt_cast<QButton*>(w)) + if (::tqt_cast<TQButton*>(w)) { - w->setBackgroundOrigin(QWidget::WindowOrigin); - if (::qt_cast<QPushButton*>(w)) + w->setBackgroundOrigin(TQWidget::WindowOrigin); + if (::tqt_cast<TQPushButton*>(w)) { if (w->inherits("KKeyButton")) { - w->setBackgroundMode( QWidget::PaletteBackground); - QPalette pal( w->palette() ); - pal.setBrush( QColorGroup::Background, qApp->palette().active().background() ); + w->setBackgroundMode( TQWidget::PaletteBackground); + TQPalette pal( w->palette() ); + pal.setBrush( TQColorGroup::Background, tqApp->palette().active().background() ); w->setPalette( pal ); } else if (w->inherits("KCalcButton")) { - w->setBackgroundMode( QWidget::PaletteBackground); - QPalette pal( w->palette() ); - pal.setBrush( QColorGroup::Background, qApp->palette().brush(QPalette::Active, QColorGroup::Background)); + w->setBackgroundMode( TQWidget::PaletteBackground); + TQPalette pal( w->palette() ); + pal.setBrush( TQColorGroup::Background, tqApp->palette().brush(TQPalette::Active, TQColorGroup::Background)); w->setPalette( pal ); } else #if !KDE_IS_VERSION(3,4,3) if (!(w->parent() && w->parent()->inherits("MiniBar"))) #endif - w->setBackgroundMode( QWidget::NoBackground); + w->setBackgroundMode( TQWidget::NoBackground); w->installEventFilter( this ); goto kstpolish; } - else if (w->inherits( "QRadioButton" ) || w->inherits( "QCheckBox" )) + else if (w->inherits( "TQRadioButton" ) || w->inherits( "TQCheckBox" )) { - w->setBackgroundOrigin(QWidget::WindowOrigin); + w->setBackgroundOrigin(TQWidget::WindowOrigin); w->installEventFilter( this ); goto kstpolish; } } - if ( ::qt_cast<QToolBar*>(w)) + if ( ::tqt_cast<TQToolBar*>(w)) { if (optionHandler->useToolButtonFrame() && w->inherits("KToolBar")) - ((QToolBar*)w)->boxLayout()->setSpacing( 0 ); - ((QToolBar*)w)->setMargin( 4 ); + ((TQToolBar*)w)->boxLayout()->setSpacing( 0 ); + ((TQToolBar*)w)->setMargin( 4 ); w->setBackgroundMode(PaletteBackground); - w->setBackgroundOrigin(QWidget::WindowOrigin); + w->setBackgroundOrigin(TQWidget::WindowOrigin); if (optionHandler->style() > Panther) { w->installEventFilter( this ); if (optionHandler->wmDesign == Tiger) { - XChangeProperty(qt_xdisplay(), w->topLevelWidget()->winId(), baghira_deco_design, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &(optionHandler->wmDesign), 1L); + XChangeProperty(tqt_xdisplay(), w->topLevelWidget()->winId(), baghira_deco_design, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &(optionHandler->wmDesign), 1L); } } goto kstpolish ; } - //if (testWidget) qWarning("testwidget stage %d",testInt++); + //if (testWidget) tqWarning("testwidget stage %d",testInt++); - if (tmpBool = ::qt_cast<QToolButton*>(w) || w->inherits( "QToolBarSeparator" ) || w->inherits( "KToolBarSeparator" ) ) + if (tmpBool = ::tqt_cast<TQToolButton*>(w) || w->inherits( "TQToolBarSeparator" ) || w->inherits( "KToolBarSeparator" ) ) { - if (tmpBool && w->parentWidget() && ::qt_cast<QToolBar*>(w->parentWidget()) ) + if (tmpBool && w->parentWidget() && ::tqt_cast<TQToolBar*>(w->parentWidget()) ) { - w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + w->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); } - w->setBackgroundMode( QWidget::PaletteBackground ); - w->setBackgroundOrigin(QWidget::WindowOrigin); + w->setBackgroundMode( TQWidget::PaletteBackground ); + w->setBackgroundOrigin(TQWidget::WindowOrigin); w->installEventFilter( this ); goto kstpolish; } - if (::qt_cast<QComboBox*>(w)) + if (::tqt_cast<TQComboBox*>(w)) { w->setBackgroundMode(NoBackground); w->installEventFilter( this ); - w->setBackgroundOrigin(QWidget::WindowOrigin); + w->setBackgroundOrigin(TQWidget::WindowOrigin); goto kstpolish; } if (w->inherits("TaskBar")) { - w->setBackgroundOrigin(QWidget::WidgetOrigin); + w->setBackgroundOrigin(TQWidget::WidgetOrigin); goto kstpolish; } - if (w->inherits("QSpinWidget") || w->inherits("KDockWidgetAbstractHeaderDrag")){ + if (w->inherits("TQSpinWidget") || w->inherits("KDockWidgetAbstractHeaderDrag")){ w->installEventFilter( this ); goto kstpolish; } - if ( !isPlain () && (w->inherits( "KonqIconViewWidget" ) || w->inherits( "khtml")/* || w->inherits( "QtVisionView")*/)) + if ( !isPlain () && (w->inherits( "KonqIconViewWidget" ) || w->inherits( "khtml")/* || w->inherits( "TQtVisionView")*/)) { // if you want custom backgrounds in konqueror, you have to reset pixmap, since Konq animation can't handle it // original liquid did this on khtml, too (at speed loss) so we'll see, if we get errors from this... - QPalette pal( w->palette() ); - pal.setBrush( QColorGroup::Background, pal.active().background() ); + TQPalette pal( w->palette() ); + pal.setBrush( TQColorGroup::Background, pal.active().background() ); w->setPalette( pal ); } - if (::qt_cast<QSlider*>(w)) + if (::tqt_cast<TQSlider*>(w)) { //avoid flicker - w->setBackgroundMode( QWidget::NoBackground ); + w->setBackgroundMode( TQWidget::NoBackground ); goto kstpolish; } - if ((::qt_cast<QScrollView*>(w) || w->inherits("KateView") || w->inherits("TEWidget") || w->inherits("CHexViewWidget")) && !(w->isA("KOAgenda"))) + if ((::tqt_cast<TQScrollView*>(w) || w->inherits("KateView") || w->inherits("TEWidget") || w->inherits("CHexViewWidget")) && !(w->isA("KOAgenda"))) { - if (::qt_cast<KListView*>(w) && optionHandler->custCols[7] != -1 && ((KListView*)w)->alternateBackground() == KGlobalSettings::alternateBackgroundColor()) + if (::tqt_cast<KListView*>(w) && optionHandler->custCols[7] != -1 && ((KListView*)w)->alternateBackground() == KGlobalSettings::alternateBackgroundColor()) { - ((KListView*)w)->setAlternateBackground(QColor(optionHandler->custCols[7])); + ((KListView*)w)->setAlternateBackground(TQColor(optionHandler->custCols[7])); } #if _FORCE_SCROLLBARS_ - if (::qt_cast<QScrollView*>(w) && !w->inherits( "KActiveLabel" )) + if (::tqt_cast<TQScrollView*>(w) && !w->inherits( "KActiveLabel" )) { - ((QScrollView*)w)->setVScrollBarMode(QScrollView::AlwaysOn); + ((TQScrollView*)w)->setVScrollBarMode(TQScrollView::AlwaysOn); } #endif - if (::qt_cast<QListBox*>(w) && w->isTopLevel()) + if (::tqt_cast<TQListBox*>(w) && w->isTopLevel()) //set opacity for them as they bypass the windowmanager { uint opacity = 0.8*OPAQUE; - XChangeProperty(qt_xdisplay(), w->winId(), XInternAtom(qt_xdisplay(), OPACITY, False), XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &opacity, 1L); + XChangeProperty(tqt_xdisplay(), w->winId(), XInternAtom(tqt_xdisplay(), OPACITY, False), XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &opacity, 1L); } #if 0 // doesn't work properly - best would be to have the items drawn via style() - int height = ((QListBox*)w)->itemHeight(); + int height = ((TQListBox*)w)->itemHeight(); if (height > 0) { - QPalette pal = w->palette(); - QColor c(pal.active().highlight()); - QColor c2(c.light(140)); - KPixmap pix = QPixmap(48,height); + TQPalette pal = w->palette(); + TQColor c(pal.active().highlight()); + TQColor c2(c.light(140)); + KPixmap pix = TQPixmap(48,height); KPixmapEffect::gradient(pix,c2,c,KPixmapEffect::VerticalGradient,0); - QBrush brush(c, pix); - pal.setBrush(QColorGroup::Highlight, brush); + TQBrush brush(c, pix); + pal.setBrush(TQColorGroup::Highlight, brush); w->setPalette(pal); } #endif @@ -520,20 +520,20 @@ void LiquidStyle::polish( QWidget *w ) goto kstpolish; } - if (w->inherits("QStatusBar")) + if (w->inherits("TQStatusBar")) { - w->setBackgroundOrigin(QWidget::WindowOrigin); + w->setBackgroundOrigin(TQWidget::WindowOrigin); if ( qstrcmp( w->name(), "KonquerorFrameStatusBar" ) == 0 ) - // konqueror resets the statusbars background to Qt::White as soon as you open a new tab - our eventfilter will block this + // konqueror resets the statusbars background to TQt::White as soon as you open a new tab - our eventfilter will block this { w->installEventFilter( this ); } goto kstpolish; } - if (w->inherits( "QLineEdit" ) || w->inherits("QSplitterHandle") || w->isA( "AppletHandleDrag" ) || w->inherits( "KMiniPagerButton" )) + if (w->inherits( "TQLineEdit" ) || w->inherits("TQSplitterHandle") || w->isA( "AppletHandleDrag" ) || w->inherits( "KMiniPagerButton" )) { - w->setBackgroundOrigin(QWidget::WindowOrigin); + w->setBackgroundOrigin(TQWidget::WindowOrigin); w->installEventFilter( this ); goto kstpolish; } @@ -545,10 +545,10 @@ void LiquidStyle::polish( QWidget *w ) } if (w->inherits( "KickerTip" )) - // kickers new tooltip uses backgroundColor() instead of paletteBackgroundColor() - causing Qt::black + // kickers new tooltip uses backgroundColor() instead of paletteBackgroundColor() - causing TQt::black { - w->setPaletteBackgroundColor(qApp->palette().color(QPalette::Active, QColorGroup::Button)); - w->setBackgroundMode( QWidget::NoBackground ); + w->setPaletteBackgroundColor(tqApp->palette().color(TQPalette::Active, TQColorGroup::Button)); + w->setBackgroundMode( TQWidget::NoBackground ); goto kstpolish; } @@ -556,7 +556,7 @@ void LiquidStyle::polish( QWidget *w ) { if ( !isViewport && w->parent() && qstrcmp( w->parent() ->name(), "proxyview" ) == 0 ) { - w->setBackgroundOrigin( QWidget::WindowOrigin ); + w->setBackgroundOrigin( TQWidget::WindowOrigin ); goto kstpolish ; } @@ -564,22 +564,22 @@ void LiquidStyle::polish( QWidget *w ) goto kstpolish ; if ( !isKicker&& !isViewport && !isViewportChild && !w->testWFlags( WType_Popup ) && !w->inherits( "KDesktop" ) && !w->inherits( "PasswordDlg" )) { - if ( w->backgroundMode() == QWidget::PaletteBackground || w->backgroundMode() == QWidget::PaletteButton ) + if ( w->backgroundMode() == TQWidget::PaletteBackground || w->backgroundMode() == TQWidget::PaletteButton ) { - w->setBackgroundOrigin( QWidget::WindowOrigin ); + w->setBackgroundOrigin( TQWidget::WindowOrigin ); } } } - if ( ::qt_cast<QPushButton*>(w) || ::qt_cast<QComboBox*>(w)) goto kstpolish; - if ( ::qt_cast<QMenuBar*>(w)) + if ( ::tqt_cast<TQPushButton*>(w) || ::tqt_cast<TQComboBox*>(w)) goto kstpolish; + if ( ::tqt_cast<TQMenuBar*>(w)) { // if (optionHandler->SupportAppleBar() && w->isTopLevel()){ -// // QPalette pal(w->palette()); -// qWarning("resetting erase pixmap"); -// QColor c( w->palette().active().background() ); -// QPixmap stipple( 64, 64 ); +// // TQPalette pal(w->palette()); +// tqWarning("resetting erase pixmap"); +// TQColor c( w->palette().active().background() ); +// TQPixmap stipple( 64, 64 ); // stipple.fill( c.rgb() ); -// QPainter p; +// TQPainter p; // p.begin( &stipple ); // p.setPen( c.dark( 100 + (int)(optionHandler->stippleContrast()/2) ) ); // for (int i = 1; i < 64; i += 4 ) { @@ -591,23 +591,23 @@ void LiquidStyle::polish( QWidget *w ) // p.drawLine( 0, i, 63, i ); // } // p.end(); -// // QBrush brush( c, stipple ); -// // pal.setBrush( QColorGroup::Background, brush ); +// // TQBrush brush( c, stipple ); +// // pal.setBrush( TQColorGroup::Background, brush ); // // w->setPalette( pal ); // w->setErasePixmap(stipple); // } - w->setBackgroundMode( QWidget::PaletteBackground ); + w->setBackgroundMode( TQWidget::PaletteBackground ); if (optionHandler->UseCustomMenuColor()) { - QPalette pal( w->palette() ); - pal.setBrush( QColorGroup::Highlight, optionHandler->menuColorHigh() ); - pal.setBrush( QColorGroup::HighlightedText, optionHandler->textColorHigh() ); + TQPalette pal( w->palette() ); + pal.setBrush( TQColorGroup::Highlight, optionHandler->menuColorHigh() ); + pal.setBrush( TQColorGroup::HighlightedText, optionHandler->textColorHigh() ); w->setPalette( pal ); } - w->setBackgroundOrigin(QWidget::WindowOrigin); + w->setBackgroundOrigin(TQWidget::WindowOrigin); w->installEventFilter( this ); #if 0 - if (!::qt_cast<KMenuBar*>(w)) + if (!::tqt_cast<KMenuBar*>(w)) { bool bold = w->font().bold(); bool italic = w->font().italic(); @@ -615,142 +615,142 @@ void LiquidStyle::polish( QWidget *w ) bool overline = w->font().overline(); w->setFont(KGlobalSettings::menuFont()); if (bold) - (const_cast<QFont*>(&w->font()))->setBold(true); + (const_cast<TQFont*>(&w->font()))->setBold(true); if (italic) - (const_cast<QFont*>(&w->font()))->setItalic(true); + (const_cast<TQFont*>(&w->font()))->setItalic(true); if (underline) - (const_cast<QFont*>(&w->font()))->setUnderline(true); + (const_cast<TQFont*>(&w->font()))->setUnderline(true); if (overline) - (const_cast<QFont*>(&w->font()))->setOverline(true); + (const_cast<TQFont*>(&w->font()))->setOverline(true); } #endif goto kstpolish ; } - if (::qt_cast<QFrame*>(w)) + if (::tqt_cast<TQFrame*>(w)) { - w->setBackgroundOrigin(QWidget::WindowOrigin); - if ( ::qt_cast<QLabel*>(w)) + w->setBackgroundOrigin(TQWidget::WindowOrigin); + if ( ::tqt_cast<TQLabel*>(w)) { if (w->parentWidget() && w->parentWidget()->inherits("Kontact::Splash")) goto kstpolish; - else if ( !isPlain() && !(w->inherits( "QTipLabel" ) || w->inherits( "KSystemTray" ))) + else if ( !isPlain() && !(w->inherits( "TQTipLabel" ) || w->inherits( "KSystemTray" ))) { - w->setBackgroundMode( QWidget::PaletteBackground ); + w->setBackgroundMode( TQWidget::PaletteBackground ); } - else if ( w->inherits( "QTipLabel" ) ) + else if ( w->inherits( "TQTipLabel" ) ) { w->setPalette( tooltipPalette ); - w->setBackgroundOrigin(QWidget::WidgetOrigin); + w->setBackgroundOrigin(TQWidget::WidgetOrigin); w->installEventFilter( this ); } } if (qstrcmp( w->name(), "backdrop" ) == 0) //kscd { - ((QFrame *)w)->setFrameShape(QFrame::LineEditPanel); - ((QFrame *)w)->setFrameShadow(QFrame::Sunken); + ((TQFrame *)w)->setFrameShape(TQFrame::LineEditPanel); + ((TQFrame *)w)->setFrameShadow(TQFrame::Sunken); goto kstpolish; } if (w->inherits( "KWinInternal::TabBox" )) { uint opacity = 0.8*OPAQUE; - XChangeProperty(qt_xdisplay(), w->winId(), XInternAtom(qt_xdisplay(), OPACITY, False), XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &opacity, 1L); + XChangeProperty(tqt_xdisplay(), w->winId(), XInternAtom(tqt_xdisplay(), OPACITY, False), XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &opacity, 1L); goto kstpolish; } else if (w->inherits( "KAnimWidget" )) { - ((QFrame *)w)->setFrameShape(QFrame::NoFrame); + ((TQFrame *)w)->setFrameShape(TQFrame::NoFrame); w->installEventFilter( this ); // the widget resets it's frameshape on mouseevents - looks crap! goto kstpolish ; } - else if (((QFrame *)w)->frameShape() >= QFrame::Box && ((QFrame *)w)->frameShape() <= QFrame::WinPanel){ - ((QFrame *)w)->setFrameShape(QFrame::StyledPanel); + else if (((TQFrame *)w)->frameShape() >= TQFrame::Box && ((TQFrame *)w)->frameShape() <= TQFrame::WinPanel){ + ((TQFrame *)w)->setFrameShape(TQFrame::StyledPanel); goto kstpolish ; } } - //if (testWidget) qWarning("testwidget stage %d",testInt++); + //if (testWidget) tqWarning("testwidget stage %d",testInt++); - if ( w->parentWidget() && ( ( ::qt_cast<QListBox*>(w) && ::qt_cast<QPushButton*>(w->parentWidget())) || w->inherits( "KCompletionBox" ) ) ) { - QListBox* listbox = (QListBox*) w; + if ( w->parentWidget() && ( ( ::tqt_cast<TQListBox*>(w) && ::tqt_cast<TQPushButton*>(w->parentWidget())) || w->inherits( "KCompletionBox" ) ) ) { + TQListBox* listbox = (TQListBox*) w; listbox->setBackgroundMode( NoBackground ); w->installEventFilter( this ); goto kstpolish; } - //if (testWidget) qWarning("testwidget stage %d",testInt++); + //if (testWidget) tqWarning("testwidget stage %d",testInt++); - if (::qt_cast<QHeader*>(w)){ -// if (::qt_cast<QListView*>(w->parentWidget())) -// headerSortID = ((QListView*)w->parentWidget())->sortColumn(); -// if (w->parentWidget()) qWarning(w->parentWidget()->className()); + if (::tqt_cast<TQHeader*>(w)){ +// if (::tqt_cast<TQListView*>(w->parentWidget())) +// headerSortID = ((TQListView*)w->parentWidget())->sortColumn(); +// if (w->parentWidget()) tqWarning(w->parentWidget()->className()); w->setBackgroundMode( NoBackground ); w->installEventFilter( this ); goto kstpolish; } - //if (testWidget) qWarning("testwidget stage %d",testInt++); + //if (testWidget) tqWarning("testwidget stage %d",testInt++); - if (::qt_cast<QTabBar*>(w)){ -// qWarning("installing tab event"); + if (::tqt_cast<TQTabBar*>(w)){ +// tqWarning("installing tab event"); w->setMouseTracking( true ); w->installEventFilter( this ); - w->setBackgroundOrigin(QWidget::WindowOrigin); + w->setBackgroundOrigin(TQWidget::WindowOrigin); goto kstpolish; } - if (::qt_cast<QGroupBox*>(w) && ((QGroupBox*)w)->frameShape() == QFrame::GroupBoxPanel && !((QGroupBox*)w)->isFlat()) + if (::tqt_cast<TQGroupBox*>(w) && ((TQGroupBox*)w)->frameShape() == TQFrame::GroupBoxPanel && !((TQGroupBox*)w)->isFlat()) { if ( optionHandler->drawGroupBoxShadow() ) { w->setPaletteBackgroundPixmap ( *groupShadow ); - if (((QGroupBox*)w)->isCheckable()) + if (((TQGroupBox*)w)->isCheckable()) { - QWidget *cb = (QWidget*)w->child("qt_groupbox_checkbox",0,false); - cb->setPalette(w->parentWidget() ? w->parentWidget()->palette() : qApp->palette()); - QFont font( cb->font() ); + TQWidget *cb = (TQWidget*)w->child("qt_groupbox_checkbox",0,false); + cb->setPalette(w->parentWidget() ? w->parentWidget()->palette() : tqApp->palette()); + TQFont font( cb->font() ); font.setBold( true ); cb->setFont( font ); } } - w->setBackgroundOrigin(QWidget::WindowOrigin); + w->setBackgroundOrigin(TQWidget::WindowOrigin); w->installEventFilter(this); } - //if (testWidget) qWarning("testwidget stage %d",testInt++); + //if (testWidget) tqWarning("testwidget stage %d",testInt++); - if (w->inherits("QProgressBar")) + if (w->inherits("TQProgressBar")) { w->setBackgroundMode( NoBackground ); w->installEventFilter(this); - connect(w, SIGNAL(destroyed(QObject*)), this, SLOT(progressBarDestroyed(QObject*))); + connect(w, SIGNAL(destroyed(TQObject*)), this, SLOT(progressBarDestroyed(TQObject*))); goto kstpolish; } - if ( w->inherits( "QDockWindow" ) ) { - w->setBackgroundMode( QWidget::PaletteBackground ); - w->setBackgroundOrigin(QWidget::WindowOrigin); + if ( w->inherits( "TQDockWindow" ) ) { + w->setBackgroundMode( TQWidget::PaletteBackground ); + w->setBackgroundOrigin(TQWidget::WindowOrigin); w->installEventFilter( this ); goto kstpolish ; } - if ( ::qt_cast<QScrollBar*>(w)) { - QCursor tmpCursor(Qt::PointingHandCursor); + if ( ::tqt_cast<TQScrollBar*>(w)) { + TQCursor tmpCursor(TQt::PointingHandCursor); w->setCursor(tmpCursor); w->installEventFilter( this ); - w->setBackgroundMode( QWidget::NoBackground ); + w->setBackgroundMode( TQWidget::NoBackground ); goto kstpolish ; } if ( w->inherits( "KdetvView")) { - w->setBackgroundMode( QWidget::NoBackground ); + w->setBackgroundMode( TQWidget::NoBackground ); } - //if (testWidget) qWarning("testwidget stage %d",testInt++); + //if (testWidget) tqWarning("testwidget stage %d",testInt++); kstpolish: KStyle::polish( w ); // nothing of all above? do default kde stuff } -void LiquidStyle::unPolish( QWidget *w ) { +void LiquidStyle::unPolish( TQWidget *w ) { bool isViewport; bool isViewportChild; @@ -763,20 +763,20 @@ void LiquidStyle::unPolish( QWidget *w ) { goto kstunpolish; } - if ( w->inherits("QToolBar") || qstrcmp( w->name(), "kde toolbar widget" ) == 0 ) { - w->setBackgroundOrigin( QWidget::WidgetOrigin ); + if ( w->inherits("TQToolBar") || qstrcmp( w->name(), "kde toolbar widget" ) == 0 ) { + w->setBackgroundOrigin( TQWidget::WidgetOrigin ); // w->unsetPalette(); goto kstunpolish; } - if ( w->inherits( "QPopupMenu" ) ) { + if ( w->inherits( "TQPopupMenu" ) ) { w->unsetPalette(); - w->setBackgroundMode( QWidget::PaletteButton ); + w->setBackgroundMode( TQWidget::PaletteButton ); w->removeEventFilter( this ); - XDeleteProperty (qt_xdisplay(), w->winId(), XInternAtom(qt_xdisplay(), OPACITY, False)); + XDeleteProperty (tqt_xdisplay(), w->winId(), XInternAtom(tqt_xdisplay(), OPACITY, False)); goto kstunpolish; } - if (::qt_cast<QListBox*>(w) && w->isTopLevel()){ - XDeleteProperty (qt_xdisplay(), w->winId(), XInternAtom(qt_xdisplay(), OPACITY, False)); + if (::tqt_cast<TQListBox*>(w) && w->isTopLevel()){ + XDeleteProperty (tqt_xdisplay(), w->winId(), XInternAtom(tqt_xdisplay(), OPACITY, False)); goto kstunpolish; } if ( !isPlain () && w->inherits( "KonqIconViewWidget" ) || @@ -789,11 +789,11 @@ void LiquidStyle::unPolish( QWidget *w ) { goto kstunpolish; } - if (w->isA( "QViewportWidget" ) || w->inherits( "QClipperWidget" ) ) + if (w->isA( "TQViewportWidget" ) || w->inherits( "TQClipperWidget" ) ) goto kstunpolish; if ( !isPlain() ) { - if ( w->inherits( "KActiveLabel" ) || w->inherits( "QTipLabel" ) ) { + if ( w->inherits( "KActiveLabel" ) || w->inherits( "TQTipLabel" ) ) { w->unsetPalette(); goto kstunpolish; } @@ -803,18 +803,18 @@ void LiquidStyle::unPolish( QWidget *w ) { return; }*/ } - else if ( w->inherits( "QMenuBar" ) ) { - w->setBackgroundMode( QWidget::PaletteButton ); + else if ( w->inherits( "TQMenuBar" ) ) { + w->setBackgroundMode( TQWidget::PaletteButton ); if ( !isPlain() ) - w->setBackgroundOrigin( QWidget::WidgetOrigin ); + w->setBackgroundOrigin( TQWidget::WidgetOrigin ); goto kstunpolish; - }else if ( w->inherits( "QDockWindow" ) ) { - w->setBackgroundMode( QWidget::PaletteButton ); + }else if ( w->inherits( "TQDockWindow" ) ) { + w->setBackgroundMode( TQWidget::PaletteButton ); if ( !isPlain() ) - w->setBackgroundOrigin( QWidget::WidgetOrigin ); + w->setBackgroundOrigin( TQWidget::WidgetOrigin ); goto kstunpolish; - } else if ( w->inherits( "QComboBox" ) || w->inherits( "QPushButton" ) ) { - if (w->inherits( "QPushButton" )) + } else if ( w->inherits( "TQComboBox" ) || w->inherits( "TQPushButton" ) ) { + if (w->inherits( "TQPushButton" )) { ButtonFadeInfo *bfi_ = bfi[w->winId()]; if (bfi_){ @@ -824,20 +824,20 @@ void LiquidStyle::unPolish( QWidget *w ) { bfi.remove(w->winId()); } } - w->setBackgroundMode( QWidget::PaletteButton ); - } else if ( w->inherits( "QScrollBar" ) ) { + w->setBackgroundMode( TQWidget::PaletteButton ); + } else if ( w->inherits( "TQScrollBar" ) ) { // if (!w->isEnabled()) w->setEnabled(true); - w->setBackgroundMode( QWidget::PaletteBackground ); + w->setBackgroundMode( TQWidget::PaletteBackground ); goto kstunpolish; - } else if ( w->inherits( "QHeader" ) ) { + } else if ( w->inherits( "TQHeader" ) ) { w->setMouseTracking( false ); } - if ( w->inherits( "QToolButton" ) ) { + if ( w->inherits( "TQToolButton" ) ) { // w->unsetPalette(); - w->setBackgroundMode( QWidget::PaletteButton ); + w->setBackgroundMode( TQWidget::PaletteButton ); if ( !isPlain() ) - w->setBackgroundOrigin( QWidget::WidgetOrigin ); + w->setBackgroundOrigin( TQWidget::WidgetOrigin ); goto kstunpolish; } @@ -848,9 +848,9 @@ void LiquidStyle::unPolish( QWidget *w ) { ( qstrcmp( w->parent() ->name(), "qt_clipped_viewport" ) == 0 ) ); if ( isViewportChild ) { - if ( w->inherits( "QRadioButton" ) || w->inherits( "QComboBox" ) || w->inherits( "QPushButton" ) ) { + if ( w->inherits( "TQRadioButton" ) || w->inherits( "TQComboBox" ) || w->inherits( "TQPushButton" ) ) { if ( isHTMLWidget( w ) ) { - w->setBackgroundMode( QWidget::PaletteBackground ); + w->setBackgroundMode( TQWidget::PaletteBackground ); goto kstunpolish; } } @@ -858,10 +858,10 @@ void LiquidStyle::unPolish( QWidget *w ) { if ( !isPlain() ) { if ( !isViewport && w->parent() && qstrcmp( w->parent() ->name(), "proxyview" ) == 0 ) { - w->setBackgroundOrigin( QWidget::WidgetOrigin ); + w->setBackgroundOrigin( TQWidget::WidgetOrigin ); goto kstunpolish; } - if ( w->ownPalette() && !w->inherits( "QButton" ) && !w->inherits( "QComboBox" ) ) + if ( w->ownPalette() && !w->inherits( "TQButton" ) && !w->inherits( "TQComboBox" ) ) goto kstunpolish; if ( w->inherits( "PanelButtonBase" ) ) goto kstunpolish; @@ -869,8 +869,8 @@ void LiquidStyle::unPolish( QWidget *w ) { if ( !isViewport && !isViewportChild && !w->testWFlags( WType_Popup ) && !w->inherits( "KDesktop" ) && !w->inherits( "PasswordDlg" ) ) { - if ( w->backgroundOrigin() == QWidget::WindowOrigin ) - w->setBackgroundOrigin( QWidget::WidgetOrigin ); + if ( w->backgroundOrigin() == TQWidget::WindowOrigin ) + w->setBackgroundOrigin( TQWidget::WidgetOrigin ); goto kstunpolish; } } |