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

List:       kde-commits
Subject:    KDE/kdegames/kpat
From:       Parker Coates <parker.coates () kdemail ! net>
Date:       2012-02-15 4:45:36
Message-ID: 20120215044536.7710FAC896 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1280177 by coates:

Swap the argument order in KCardPile::insert() to match QList::insert().

 M  +2 -2      dealer.cpp  
 M  +2 -2      libkcardgame/kcardpile.cpp  
 M  +1 -1      libkcardgame/kcardpile.h  


--- trunk/KDE/kdegames/kpat/dealer.cpp #1280176:1280177
@@ -576,7 +576,7 @@
                 else if ( xml.attributes().value("turn") == "face-down" )
                     card->setFaceUp( false );
                 
-                pile->insert( card, index );
+                pile->insert( index, card );
 
                 ++index;
                 xml.skipCurrentElement();
@@ -1268,7 +1268,7 @@
                 d->cardStates.insert( c, destState );
 
                 c->setFaceUp( destState.faceUp );
-                destState.pile->insert( c, destState.index );
+                destState.pile->insert( destState.index, c );
 
                 if ( notDroppable )
                     d->cardsNotToDrop.insert( c );
--- trunk/KDE/kdegames/kpat/libkcardgame/kcardpile.cpp #1280176:1280177
@@ -418,11 +418,11 @@
 
 void KCardPile::add( KCard * card )
 {
-    insert( card, d->cards.size() );
+    insert( d->cards.size(), card );
 }
 
 
-void KCardPile::insert( KCard * card, int index )
+void KCardPile::insert( int index, KCard * card )
 {
     if ( card->scene() != scene() )
         scene()->addItem( card );
--- trunk/KDE/kdegames/kpat/libkcardgame/kcardpile.h #1280176:1280177
@@ -130,7 +130,7 @@
     bool isHighlighted() const;
 
     void add( KCard * card );
-    virtual void insert( KCard * card, int index );
+    virtual void insert( int index, KCard * card );
     virtual void remove( KCard * card );
     void clear();
     void swapCards( int index1, int index2 );
[prev in list] [next in list] [prev in thread] [next in thread]