[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bknights=5D_src=3A_Move_colorName=28=29_and_pieceTyp?=
From:       Miha Čančula <miha.cancula () gmail ! com>
Date:       2011-03-06 20:17:30
Message-ID: 20110306201730.3C11DA60CB () git ! kde ! org
[Download RAW message or body]

Git commit 58d0f5aa778661c66985c69b0ebe14e6b798f3d8 by Miha Čančula.
Committed on 06/03/2011 at 18:39.
Pushed by mihac into branch 'master'.

Move colorName() and pieceTypeName() from KnightsView to Piece

M  +28   -6    src/core/piece.cpp     
M  +1    -0    src/core/piece.h     
M  +0    -34   src/knightsview.cpp     
M  +0    -3    src/knightsview.h     

http://commits.kde.org/knights/58d0f5aa778661c66985c69b0ebe14e6b798f3d8

diff --git a/src/core/piece.cpp b/src/core/piece.cpp
index 2dc6869..df73cea 100644
--- a/src/core/piece.cpp
+++ b/src/core/piece.cpp
@@ -144,19 +144,41 @@ namespace Knights
                 return color;
         }
     }
-
-QString colorName(Color color)
-{
+    
+    
+    QString colorName ( Color color )
+    {
         switch ( color )
         {
             case White:
-                return i18n("White");
+                return i18n ( "White" );
             case Black:
-                return i18n("Black");
+                return i18n ( "Black" );
             default:
                 return QString();
         }
-}
+    }
+    
+    QString pieceTypeName ( PieceType type )
+    {
+        switch ( type )
+        {
+            case Pawn:
+                return i18n ( "Pawn" );
+            case Rook:
+                return i18n ( "Rook" );
+            case Knight:
+                return i18n ( "Knight" );
+            case Bishop:
+                return i18n ( "Bishop" );
+            case Queen:
+                return i18n ( "Queen" );
+            case King:
+                return i18n ( "King" );
+            default:
+                return QString();
+        }
+    }
 
 
     Color Piece::color()
diff --git a/src/core/piece.h b/src/core/piece.h
index bea61ce..10ffee3 100644
--- a/src/core/piece.h
+++ b/src/core/piece.h
@@ -48,6 +48,7 @@ namespace Knights
     Q_DECLARE_OPERATORS_FOR_FLAGS(Colors)
     Color oppositeColor ( Color color );
     QString colorName ( Color color );
+    QString pieceTypeName ( PieceType type );
 
     class Piece : public Item
     {
diff --git a/src/knightsview.cpp b/src/knightsview.cpp
index 029aef1..7cff552 100644
--- a/src/knightsview.cpp
+++ b/src/knightsview.cpp
@@ -153,40 +153,6 @@ void KnightsView::setPaused ( bool paused )
     m_board->setPaused ( paused );
 }
 
-QString KnightsView::colorName ( Color color )
-{
-    switch ( color )
-    {
-        case White:
-            return i18n ( "White" );
-        case Black:
-            return i18n ( "Black" );
-        default:
-            return QString();
-    }
-}
-
-QString KnightsView::pieceTypeName ( PieceType type )
-{
-    switch ( type )
-    {
-        case Pawn:
-            return i18n ( "Pawn" );
-        case Rook:
-            return i18n ( "Rook" );
-        case Knight:
-            return i18n ( "Knight" );
-        case Bishop:
-            return i18n ( "Bishop" );
-        case Queen:
-            return i18n ( "Queen" );
-        case King:
-            return i18n ( "King" );
-        default:
-            return QString();
-    }
-}
-
 void KnightsView::centerView ( const QPointF& center )
 {
     if ( ui->canvas )
diff --git a/src/knightsview.h b/src/knightsview.h
index 253254e..7f079d3 100644
--- a/src/knightsview.h
+++ b/src/knightsview.h
@@ -70,9 +70,6 @@ struct Offer;
             bool m_allOffers;
             QList<OfferWidget*> m_offerWidgets;
 
-            static QString pieceTypeName ( PieceType );
-            static QString colorName ( Color );
-
         signals:
             /**
              * Use this signal to change the content of the statusbar


[prev in list] [next in list] [prev in thread] [next in thread]