author | sandman <sandman> | 2002-12-08 23:12:16 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-08 23:12:16 (UTC) |
commit | 5f4bc1a6f31d713c97b8382b6e2acd12a7f9bfd6 (patch) (unidiff) | |
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) | |||
170 | 170 | ||
171 | static int qt_version ( ) | ||
172 | { | ||
173 | const char *qver = qVersion ( ); | ||
174 | return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' ); | ||
175 | } | ||
176 | 171 | ||
@@ -182,3 +177,2 @@ LiquidStyle::LiquidStyle() | |||
182 | 177 | ||
183 | oldqte = ( qt_version ( ) < 234 ); | ||
184 | flatTBButtons = false; | 178 | flatTBButtons = false; |
@@ -709,6 +703,4 @@ void LiquidStyle::polish(QPalette &appPal) | |||
709 | config. setGroup ( "Appearance" ); | 703 | config. setGroup ( "Appearance" ); |
710 | QColor c = oldqte ? QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))) | 704 | QColor c = appPal. color ( QPalette::Active, QColorGroup::Button ); |
711 | : appPal. color ( QPalette::Active, QColorGroup::Button ); | 705 | if ( c == appPal. color ( QPalette::Active, QColorGroup::Background )) { |
712 | if ( c == ( oldqte ? QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( ))) | ||
713 | : appPal. color ( QPalette::Active, QColorGroup::Background ))) { | ||
714 | // force button color to be different from background | 706 | // force button color to be different from background |
@@ -763,4 +755,3 @@ void LiquidStyle::polish(QPalette &appPal) | |||
763 | // background color stuff | 755 | // background color stuff |
764 | c = oldqte ? QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( ))) | 756 | c = appPal. color ( QPalette::Active, QColorGroup::Background ); |
765 | : appPal. color ( QPalette::Active, QColorGroup::Background ); | ||
766 | 757 | ||