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

List:       kde-commits
Subject:    KDE/kdegames/kpat/libkcardgame
From:       Parker Coates <parker.coates () kdemail ! net>
Date:       2010-09-03 21:38:49
Message-ID: 20100903213849.81CFBAC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1171448 by coates:

Add a getId function to KStandardCardDeck.

 M  +7 -1      kstandardcarddeck.cpp  
 M  +1 -0      kstandardcarddeck.h  


--- trunk/KDE/kdegames/kpat/libkcardgame/kstandardcarddeck.cpp #1171447:1171448
@@ -77,7 +77,7 @@
     for ( int i = 0; i < copies; ++i )
         foreach ( const KStandardCardDeck::Rank & r, ranks )
             foreach ( const KStandardCardDeck::Suit & s, suits )
-                ids << ( s << 4 ) + r;
+                ids << getId( s, r );
 
     Q_ASSERT( ids.size() == copies * ranks.size() * suits.size() );
 
@@ -151,3 +151,9 @@
     return s == KStandardCardDeck::Hearts || s == KStandardCardDeck::Diamonds;
 }
 
+
+quint32 getId( KStandardCardDeck::Suit suit, KStandardCardDeck::Rank rank )
+{
+    return ( suit << 4 ) | ( rank & 0xf );
+}
+
--- trunk/KDE/kdegames/kpat/libkcardgame/kstandardcarddeck.h #1171447:1171448
@@ -71,5 +71,6 @@
 LIBKCARDGAME_EXPORT KStandardCardDeck::Suit getSuit( const KCard * card );
 LIBKCARDGAME_EXPORT KStandardCardDeck::Rank getRank( const KCard * card );
 LIBKCARDGAME_EXPORT bool getIsRed( const KCard * card );
+LIBKCARDGAME_EXPORT quint32 getId( KStandardCardDeck::Suit suit, KStandardCardDeck::Rank rank );
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]