From 70acd11ecbc842f6b30ef2137f63113c6875acd6 Mon Sep 17 00:00:00 2001
From: Christoph Feck <christoph@maxiom.de>
Date: Sun, 25 Apr 2010 23:37:38 +0000
Subject: [PATCH] SVN_SILENT --warnings

svn path=/trunk/KDE/kdebase/workspace/; revision=1118827
---
 tile.cpp                        | 4 ++--
 tiling.cpp                      | 2 +-
 tilinglayout.cpp                | 7 ++++---
 tilinglayout.h                  | 4 +++-
 tilinglayouts/spiral/spiral.cpp | 2 +-
 workspace.cpp                   | 2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tile.cpp b/tile.cpp
index 337055a96d..a7df9f0797 100644
--- a/tile.cpp
+++ b/tile.cpp
@@ -51,8 +51,8 @@ Tile::Tile( Client *c, const QRect& area)
  */
 Tile::Tile( const Tile& orig )
     : m_client( orig.client() ),
-      m_floating( orig.floating() ),
-      m_prevGeom( orig.m_prevGeom )
+      m_prevGeom( orig.m_prevGeom ),
+      m_floating( orig.floating() )
     {
     setGeometry( orig.geometry() );
     }
diff --git a/tiling.cpp b/tiling.cpp
index cb6367f5e5..37d6c716e6 100644
--- a/tiling.cpp
+++ b/tiling.cpp
@@ -270,7 +270,7 @@ void Workspace::notifyWindowActivated( Client *c )
 
         foreach( Tile *t, tiles )
             {
-              kDebug(1212) << t->client() << t->floating();
+              kDebug(1212) << static_cast<Toplevel *>(t->client()) << t->floating();
             if( t->floating() == raise_floating && t != tile_to_raise )
                 raiseClient( t->client() );
             }
diff --git a/tilinglayout.cpp b/tilinglayout.cpp
index 38b5035421..8909fa1728 100644
--- a/tilinglayout.cpp
+++ b/tilinglayout.cpp
@@ -38,9 +38,9 @@ TilingLayout::~TilingLayout()
     {
     }
 
-unsigned int TilingLayout::findTilePos( Client *c ) const
+int TilingLayout::findTilePos( Client *c ) const
     {
-    unsigned int i = 0;
+    int i = 0;
     foreach( Tile *t, m_tiles )
         {
         if( t->client() == c )
@@ -52,7 +52,7 @@ unsigned int TilingLayout::findTilePos( Client *c ) const
 
 Tile* TilingLayout::findTile( Client *c ) const
     {
-    unsigned int i = findTilePos( c );
+    int i = findTilePos( c );
     if( i != -1 )
         return m_tiles[ i ];
     return NULL;
@@ -138,6 +138,7 @@ void TilingLayout::addTile( Tile *t )
 
 void TilingLayout::addTile( Client *c )
     {
+    Q_UNUSED( c )
     }
 
 void TilingLayout::removeTileNoArrange( Tile * t )
diff --git a/tilinglayout.h b/tilinglayout.h
index 48c988c016..3a4ee16a32 100644
--- a/tilinglayout.h
+++ b/tilinglayout.h
@@ -68,7 +68,7 @@ class TilingLayout
         virtual void preRemoveTile( Tile *t );
         
     private:
-        unsigned int findTilePos( Client *c ) const;
+        int findTilePos( Client *c ) const;
         virtual void arrange( QRect wgeom ) = 0;
 
         void addTileNoArrange( Tile *t );
@@ -107,10 +107,12 @@ inline Workspace* TilingLayout::workspace() const
 
 inline void TilingLayout::postAddTile( Tile *t )
     {
+    Q_UNUSED( t )
     }
 
 inline void TilingLayout::preRemoveTile( Tile *t )
     {
+    Q_UNUSED( t )
     }
 
 } // end namespace
diff --git a/tilinglayouts/spiral/spiral.cpp b/tilinglayouts/spiral/spiral.cpp
index d7596cb8f2..cd21d5d3f8 100644
--- a/tilinglayouts/spiral/spiral.cpp
+++ b/tilinglayouts/spiral/spiral.cpp
@@ -70,7 +70,7 @@ void Spiral::arrange( QRect wgeom )
 
         if( i % 4 == 1 && i != 1 )
             wgeom.moveTop( wgeom.y() - wgeom.height() );
-        else if( i % 2 == 1 && i != 1 
+        else if( ( i % 2 == 1 && i != 1 )
                 || ( i % 4 == 0 && i < n ) )
             wgeom.moveTop( wgeom.y() + wgeom.height() );
 
diff --git a/workspace.cpp b/workspace.cpp
index dfcd65c337..7656a4a9bc 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -96,6 +96,7 @@ Workspace::Workspace( bool restore )
     , desktopGrid_( new int[2] )
     , currentDesktop_( 0 )
     , desktopLayoutDynamicity_( false )
+    , tilingMode_( false )
     // Unsorted
     , active_popup( NULL )
     , active_popup_client( NULL )
@@ -153,7 +154,6 @@ Workspace::Workspace( bool restore )
     , transSlider( NULL )
     , transButton( NULL )
     , forceUnredirectCheck( true )
-    , tilingMode_( false )
     {
     (void) new KWinAdaptor( this );