author | sandman <sandman> | 2002-12-08 23:12:16 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-08 23:12:16 (UTC) |
commit | 5f4bc1a6f31d713c97b8382b6e2acd12a7f9bfd6 (patch) (side-by-side diff) | |
tree | 52c1fcf139914d41b8dfb03fc4e954f95e5e7aef | |
parent | 7b38c0424eca2f49a0c9a931766c816e21f1d86b (diff) | |
download | opie-5f4bc1a6f31d713c97b8382b6e2acd12a7f9bfd6.zip opie-5f4bc1a6f31d713c97b8382b6e2acd12a7f9bfd6.tar.gz opie-5f4bc1a6f31d713c97b8382b6e2acd12a7f9bfd6.tar.bz2 |
removed some clumsy workarounds for old (unpatched) libqte's
-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 @@ -170,7 +170,2 @@ 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' ); -} @@ -182,3 +177,2 @@ LiquidStyle::LiquidStyle() - oldqte = ( qt_version ( ) < 234 ); flatTBButtons = false; @@ -709,6 +703,4 @@ void LiquidStyle::polish(QPalette &appPal) 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 @@ -763,4 +755,3 @@ void LiquidStyle::polish(QPalette &appPal) // 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 ); |