From 749734210195e1106cea5cab40639efc0a7885ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= <fredrik@kde.org>
Date: Sun, 30 Sep 2001 21:22:20 +0000
Subject: [PATCH] Made KWin compile when QT_NO_COMPAT is defined.

svn path=/trunk/kdebase/kwin/; revision=115985
---
 client.cpp    | 16 ++++++++--------
 options.cpp   |  8 ++++----
 workspace.cpp |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client.cpp b/client.cpp
index 7638073a33..3a17f051a0 100644
--- a/client.cpp
+++ b/client.cpp
@@ -2206,24 +2206,24 @@ void Client::setShade( bool s, int hus )
 	QSize s( sizeForWindowSize( QSize( windowWrapper()->width(), 0), TRUE ) );
 	windowWrapper()->hide();
 	repaint( FALSE );
-	bool wasNorthWest = testWFlags( WNorthWestGravity );
-	setWFlags( WNorthWestGravity );
+	bool wasStaticContents = testWFlags( WStaticContents );
+	setWFlags( WStaticContents );
 	int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
 	do {
 	    h -= step;
 	    resize ( s.width(), h );
 	    QApplication::syncX();
 	} while ( h > s.height() + step );
-	if ( !wasNorthWest )
-	    clearWFlags( WNorthWestGravity );
+	if ( !wasStaticContents )
+	    clearWFlags( WStaticContents );
 	resize (s );
 	if (hus)
 	    workspace()->requestFocus( NULL );
     } else {
 	int h = height();
 	QSize s( sizeForWindowSize( windowWrapper()->size(), TRUE ) );
-	bool wasNorthWest = testWFlags( WNorthWestGravity );
-	setWFlags( WNorthWestGravity );
+	bool wasStaticContents = testWFlags( WStaticContents );
+	setWFlags( WStaticContents );
 	int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
 	do {
 	    h += step;
@@ -2233,8 +2233,8 @@ void Client::setShade( bool s, int hus )
 	    repaint( 0, h - step-5, width(), step+5, TRUE);
 	    QApplication::syncX();
 	} while ( h < s.height() - step );
-	if ( !wasNorthWest )
-	    clearWFlags( WNorthWestGravity );
+	if ( !wasStaticContents )
+	    clearWFlags( WStaticContents );
 	resize ( s );
 	if (hus)
 	    setActive( TRUE );
diff --git a/options.cpp b/options.cpp
index 1a9a407df5..5c7ac34099 100644
--- a/options.cpp
+++ b/options.cpp
@@ -81,7 +81,7 @@ const QColorGroup& Options::colorGroup(ColorType type, bool active)
         return(*cg[idx]);
     cg[idx] = new QColorGroup(Qt::black, colors[idx], colors[idx].light(150),
                               colors[idx].dark(), colors[idx].dark(120),
-                              Qt::black, QApplication::palette().normal().
+                              Qt::black, QApplication::palette().active().
                               base());
     return(*cg[idx]);
 }
@@ -93,7 +93,7 @@ void Options::reload()
     config->setGroup("WM");
 
     // normal colors
-    colors[Frame] = pal.normal().background();
+    colors[Frame] = pal.active().background();
     colors[Frame] = config->readColorEntry("frame", &colors[Frame]);
     colors[Handle] = colors[Frame];
     colors[Handle] = config->readColorEntry("handle", &colors[Handle]);
@@ -105,7 +105,7 @@ void Options::reload()
         colors[ButtonBg] = colors[Frame];
     colors[ButtonBg] = config->readColorEntry("activeTitleBtnBg",
                                               &colors[Frame]);
-    colors[TitleBar] = pal.normal().highlight();
+    colors[TitleBar] = pal.active().highlight();
     colors[TitleBar] = config->readColorEntry("activeBackground",
                                               &colors[TitleBar]);
     if(QPixmap::defaultDepth() > 8)
@@ -115,7 +115,7 @@ void Options::reload()
     colors[TitleBlend] = config->readColorEntry("activeBlend",
                                                 &colors[TitleBlend]);
 
-    colors[Font] = pal.normal().highlightedText();
+    colors[Font] = pal.active().highlightedText();
     colors[Font] = config->readColorEntry("activeForeground", &colors[Font]);
 
     // inactive
diff --git a/workspace.cpp b/workspace.cpp
index e81403e7ef..d71b96bec6 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -2001,7 +2001,7 @@ bool Workspace::isNotManaged( const QString& title )
 {
     for ( QStringList::Iterator it = doNotManageList.begin(); it != doNotManageList.end(); ++it ) {
         QRegExp r( (*it) );
-        if (r.match(title) != -1) {
+        if (r.search(title) != -1) {
             doNotManageList.remove( it );
             return TRUE;
         }