| -rw-r--r-- | noncore/styles/liquid/liquid.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index 4a65952..bac882c 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp @@ -167,21 +167,15 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev) return(false); } -static int qt_version ( ) -{ - const char *qver = qVersion ( ); - return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' ); -} LiquidStyle::LiquidStyle() :QWindowsStyle() { setName ( "LiquidStyle" ); - oldqte = ( qt_version ( ) < 234 ); flatTBButtons = false; currentHeader = 0; btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); @@ -706,12 +700,10 @@ void LiquidStyle::polish(QPalette &appPal) // QPalette pal = QApplication::palette(); // button color stuff config. setGroup ( "Appearance" ); - QColor c = oldqte ? QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))) - : appPal. color ( QPalette::Active, QColorGroup::Button ); - if ( c == ( oldqte ? QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( ))) - : appPal. color ( QPalette::Active, QColorGroup::Background ))) { + QColor c = appPal. color ( QPalette::Active, QColorGroup::Button ); + if ( c == appPal. color ( QPalette::Active, QColorGroup::Background )) { // force button color to be different from background QBrush btnBrush(QColor(200, 202, 228)); appPal.setBrush(QColorGroup::Button, btnBrush); } @@ -760,10 +752,9 @@ void LiquidStyle::polish(QPalette &appPal) // pagerBrush.setColor(c); // pagerBrush.setPixmap(*pix); // background color stuff - c = oldqte ? QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( ))) - : appPal. color ( QPalette::Active, QColorGroup::Background ); + c = appPal. color ( QPalette::Active, QColorGroup::Background ); c.hsv(&bH, &bS, &bV); c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); |