From 81f00aa8b81f950b108a56795638ca221cb78674 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Mon, 9 Apr 2007 18:30:03 +0000
Subject: [PATCH] KWindowInfo

svn path=/trunk/KDE/kdebase/workspace/; revision=651965
---
 kcmkwin/kwinrules/detectwidget.h  | 6 +++---
 kcmkwin/kwinrules/main.cpp        | 2 +-
 kcmkwin/kwinrules/ruleswidget.cpp | 6 +++---
 kcmkwin/kwinrules/ruleswidget.h   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kcmkwin/kwinrules/detectwidget.h b/kcmkwin/kwinrules/detectwidget.h
index 6b68d272b4..f844288656 100644
--- a/kcmkwin/kwinrules/detectwidget.h
+++ b/kcmkwin/kwinrules/detectwidget.h
@@ -65,7 +65,7 @@ class DetectDialog
         QString selectedTitle() const;
         Rules::StringMatch titleMatch() const;
         QByteArray selectedMachine() const;
-        const KWM::WindowInfo& windowInfo() const;
+        const KWindowInfo& windowInfo() const;
     signals:
         void detectionDone( bool );
     protected:
@@ -84,11 +84,11 @@ class DetectDialog
         QByteArray machine;
         DetectWidget* widget;
         QDialog* grabber;
-        KWM::WindowInfo info;
+        KWindowInfo info;
     };
 
 inline
-const KWM::WindowInfo& DetectDialog::windowInfo() const
+const KWindowInfo& DetectDialog::windowInfo() const
     {
     return info;
     }
diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp
index 4814697d98..3cc98a478b 100644
--- a/kcmkwin/kwinrules/main.cpp
+++ b/kcmkwin/kwinrules/main.cpp
@@ -69,7 +69,7 @@ static void saveRules( const QList< Rules* >& rules )
 
 static Rules* findRule( const QList< Rules* >& rules, Window wid, bool whole_app )
     {
-    KWM::WindowInfo info = KWM::windowInfo( wid,
+    KWindowInfo info = KWM::windowInfo( wid,
         NET::WMName | NET::WMWindowType,
         NET::WM2WindowClass | NET::WM2WindowRole | NET::WM2ClientMachine );
     if( !info.valid()) // shouldn't really happen
diff --git a/kcmkwin/kwinrules/ruleswidget.cpp b/kcmkwin/kwinrules/ruleswidget.cpp
index 96b9372f3a..f6d2a47129 100644
--- a/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kcmkwin/kwinrules/ruleswidget.cpp
@@ -588,7 +588,7 @@ void RulesWidget::detected( bool ok )
         machine_match->setCurrentIndex( Rules::UnimportantMatch );
         machineMatchChanged();
         // prefill values from to window to settings which already set
-        const KWM::WindowInfo& info = detect_dlg->windowInfo();
+        const KWindowInfo& info = detect_dlg->windowInfo();
         prefillUnusedValues( info );
         }
     delete detect_dlg;
@@ -606,7 +606,7 @@ void RulesWidget::detected( bool ok )
 #define LINEEDIT_PREFILL( var, func, info ) GENERIC_PREFILL( var, func, info, setText )
 #define COMBOBOX_PREFILL( var, func, info ) GENERIC_PREFILL( var, func, info, setCurrentIndex )
 
-void RulesWidget::prefillUnusedValues( const KWM::WindowInfo& info )
+void RulesWidget::prefillUnusedValues( const KWindowInfo& info )
     {
     LINEEDIT_PREFILL( position, positionToStr, info.frameGeometry().topLeft() );
     LINEEDIT_PREFILL( size, sizeToStr, info.frameGeometry().size() );
@@ -673,7 +673,7 @@ bool RulesWidget::finalCheck()
 void RulesWidget::prepareWindowSpecific( WId window )
     {
     tabs->setCurrentIndex( 2 ); // geometry tab, skip tabs for window identification
-    KWM::WindowInfo info( window, -1U, -1U ); // read everything
+    KWindowInfo info( window, -1U, -1U ); // read everything
     prefillUnusedValues( info );
     }
 
diff --git a/kcmkwin/kwinrules/ruleswidget.h b/kcmkwin/kwinrules/ruleswidget.h
index 1deac81815..56b1eae048 100644
--- a/kcmkwin/kwinrules/ruleswidget.h
+++ b/kcmkwin/kwinrules/ruleswidget.h
@@ -89,7 +89,7 @@ class RulesWidget
     private:
         int desktopToCombo( int d ) const;
         int comboToDesktop( int val ) const;
-        void prefillUnusedValues( const KWM::WindowInfo& info );
+        void prefillUnusedValues( const KWindowInfo& info );
         DetectDialog* detect_dlg;
         bool detect_dlg_ok;
     };