From 5f4bc1a6f31d713c97b8382b6e2acd12a7f9bfd6 Mon Sep 17 00:00:00 2001 From: sandman Date: Sun, 08 Dec 2002 23:12:16 +0000 Subject: removed some clumsy workarounds for old (unpatched) libqte's --- (limited to 'noncore/styles') 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 @@ -168,11 +168,6 @@ bool TransMenuHandler::eventFilter(QObject *obj, QEvent *ev) } -static int qt_version ( ) -{ - const char *qver = qVersion ( ); - return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' ); -} LiquidStyle::LiquidStyle() @@ -180,7 +175,6 @@ LiquidStyle::LiquidStyle() { setName ( "LiquidStyle" ); - oldqte = ( qt_version ( ) < 234 ); flatTBButtons = false; currentHeader = 0; @@ -707,10 +701,8 @@ void LiquidStyle::polish(QPalette &appPal) // 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); @@ -761,8 +753,7 @@ void LiquidStyle::polish(QPalette &appPal) // 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); -- cgit v0.9.0.2