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

List:       kde-commits
Subject:    branches/KDE/3.5/kdegames
From:       Dirk Mueller <mueller () kde ! org>
Date:       2005-10-20 21:34:28
Message-ID: 1129844068.972696.20111.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 472483 by mueller:

the usual "daily unbreak compilation"


 M  +1 -20     atlantik/libatlantic/trade.h  
 M  +1 -1      kbounce/Makefile.am  


--- branches/KDE/3.5/kdegames/atlantik/libatlantic/trade.h #472482:472483
@@ -22,6 +22,7 @@
 #include <qptrlist.h>
 
 #include "libatlantic_export.h"
+#include "player.h"
 
 class Player;
 class Trade;
@@ -113,26 +114,6 @@
 
 	bool isRejected() { return m_rejected; }
 	
-	/**
-	 * select the Trade of the given template type, with the given
-	 * from and to
-	 **/
-	template <class Type> Type *select(Player *from, Player *to)
-	{
-		for (QPtrListIterator<Player> i(mPlayers); *i; ++i)
-		{
-			if (
-					i.current()->from()==from
-					&& i.current()->to()==to
-					&& dynamic_cast<Player*>(*i)
-				)
-			{
-				return *i;
-			}
-		}
-	
-	}
-
 private slots:	
 	/**
 	 * tell someone that this changed
--- branches/KDE/3.5/kdegames/kbounce/Makefile.am #472482:472483
@@ -7,7 +7,7 @@
 bin_PROGRAMS = kbounce
 kbounce_SOURCES = main.cpp kbounce.cpp game.cpp highscores.cpp
 kbounce_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_USE_PIE)
-kbounce_LDADD = $(LIB_KDEGAMES) $(LIB_KFILE) $(LIB_ARTS) 
+kbounce_LDADD = $(LIB_KDEGAMES) $(LIB_KFILE) $(LIB_ARTS) -lartskde
 kbounce_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
 
 xdg_apps_DATA = kbounce.desktop
[prev in list] [next in list] [prev in thread] [next in thread]