C++ fixes for GCC3: remove duplicate declarations of default arguments.

Approved by:	maintainer

12 files changed, 347 insertions, 2 deletions

diff --git a/games/eboard/files/patch-board.cc b/games/eboard/files/patch-board.cc
new file mode 100644
index 000000000000..6a017802d90c
--- /dev/null
+++ b/games/eboard/files/patch-board.cc
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- board.cc.orig	Fri Jun 28 03:33:05 2002
++++ board.cc	Sat Sep 28 23:00:58 2002
+@@ -626,7 +626,7 @@
+   queueRepaint();
+ }
+ 
+-void Board::update(bool sndflag=false) {
++void Board::update(bool sndflag) {
+   int i,j,k,rate;
+   AnimatedPiece *ap;  
+   Position rpv;
+@@ -2005,7 +2005,7 @@
+ 
+ // ------------- targets
+ 
+-DropSource::DropSource(piece p, int x1,int y1,int w,int h,bool d=true) {
++DropSource::DropSource(piece p, int x1,int y1,int w,int h,bool d) {
+   X=x1; Y=y1;
+   X2=X+w; Y2=Y+h;
+   P=p;
diff --git a/games/eboard/files/patch-chess.cc b/games/eboard/files/patch-chess.cc
new file mode 100644
index 000000000000..bc18f944ec31
--- /dev/null
+++ b/games/eboard/files/patch-chess.cc
@@ -0,0 +1,34 @@
+
+$FreeBSD$
+
+--- chess.cc.orig	Sat Jun 22 20:42:42 2002
++++ chess.cc	Sat Sep 28 23:00:58 2002
+@@ -257,7 +257,7 @@
+ 
+ void ChessGame::updatePosition(Position &p,int movenum,int blacktomove,
+ 			       int wclock,int bclock,char *infoline, 
+-			       bool sndflag=false) {
++			       bool sndflag) {
+   char z[32];
+ 
+   global.debug("ChessGame","updatePosition");
+@@ -738,7 +738,7 @@
+     pgn.set("FEN", moves.front().getFEN() );
+ }
+ 
+-bool ChessGame::savePGN(char *filename, bool append=false) {
++bool ChessGame::savePGN(char *filename, bool append) {
+   char z[512];
+   const char *cp;
+   list<Position>::iterator li;
+@@ -827,8 +827,8 @@
+ 			     char * filename,
+ 			     bool indexonly, 
+ 			     int gameid,
+-			     variant v = REGULAR,
+-			     ChessGame *updatee = NULL) {
++			     variant v,
++			     ChessGame *updatee) {
+   /* 
+      ok, now (0.4.x) we do this in a DFA-like manner
+      0  = state 0 (whitespace before movetext)
diff --git a/games/eboard/files/patch-global.cc b/games/eboard/files/patch-global.cc
new file mode 100644
index 000000000000..f9349c42cc94
--- /dev/null
+++ b/games/eboard/files/patch-global.cc
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- global.cc.orig	Wed Jun 26 03:06:59 2002
++++ global.cc	Sat Sep 28 23:00:58 2002
+@@ -260,11 +260,11 @@
+     }
+ }
+ 
+-void Global::appendGame(ChessGame *cg,bool RenumberDupes=true) {
++void Global::appendGame(ChessGame *cg,bool RenumberDupes) {
+   if (RenumberDupes) clearDupes(cg);
+   GameList.push_back(cg);
+ }
+-void Global::prependGame(ChessGame *cg, bool RenumberDupes=true) {
++void Global::prependGame(ChessGame *cg, bool RenumberDupes) {
+   if (RenumberDupes) clearDupes(cg);
+   GameList.push_front(cg);
+ }
+@@ -669,7 +669,7 @@
+     (*i)->setPasswordMode(pm);
+ }
+ 
+-void Global::debug(char *klass,char *method,char *data=0) {
++void Global::debug(char *klass,char *method,char *data) {
+   char z[256];
+   time_t now;
+   string rm;
+@@ -1068,7 +1068,7 @@
+   panes.push_back(op);
+ }
+ 
+-void ChannelSplitter::appendToChannel(int ch,char *msg,int color,Importance im=IM_NORMAL) {
++void ChannelSplitter::appendToChannel(int ch,char *msg,int color,Importance im) {
+   int i,j;
+   ensurePane(ch);
+   j=panes.size();
diff --git a/games/eboard/files/patch-mainwindow.cc b/games/eboard/files/patch-mainwindow.cc
new file mode 100644
index 000000000000..938fa901cadb
--- /dev/null
+++ b/games/eboard/files/patch-mainwindow.cc
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- mainwindow.cc.orig	Fri Jun 28 03:33:05 2002
++++ mainwindow.cc	Sat Sep 28 23:00:58 2002
+@@ -997,7 +997,7 @@
+   }
+ }
+ 
+-void MainWindow::openEngine(EngineProtocol *xpp, EngineBookmark *ebm=0) {
++void MainWindow::openEngine(EngineProtocol *xpp, EngineBookmark *ebm) {
+   int i;
+   global.debug("MainWindow","openEngine");
+   disconnect();
diff --git a/games/eboard/files/patch-movelist.cc b/games/eboard/files/patch-movelist.cc
new file mode 100644
index 000000000000..9693e29f29cc
--- /dev/null
+++ b/games/eboard/files/patch-movelist.cc
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- movelist.cc.orig	Sun Apr 28 23:04:34 2002
++++ movelist.cc	Sat Sep 28 23:00:58 2002
+@@ -95,8 +95,8 @@
+ }
+ 
+ void MoveListWindow::updateList(list<Position> &moves,
+-				int over=0,GameResult result=UNDEF,
+-				char *reason=0) {
++				int over,GameResult result,
++				char *reason) {
+   populate_clist(moves,over,result,reason);
+ }
+ 
diff --git a/games/eboard/files/patch-network.cc b/games/eboard/files/patch-network.cc
index 85f8cf6f683d..6903105da8a3 100644
--- a/games/eboard/files/patch-network.cc
+++ b/games/eboard/files/patch-network.cc
@@ -1,5 +1,8 @@
---- network.cc.orig	Wed Aug 14 00:20:32 2002
-+++ network.cc	Wed Aug 14 00:23:24 2002
+
+$FreeBSD$
+
+--- network.cc.orig	Sat Jul  6 23:05:11 2002
++++ network.cc	Sat Sep 28 23:00:20 2002
 @@ -26,6 +26,7 @@
  
  
@@ -8,3 +11,12 @@
  #include <time.h>
  #include <sys/time.h>
  #include <sys/types.h>
+@@ -135,7 +136,7 @@
+   return(strstr(dump,match)!=0);
+ }
+ 
+-int BufferedConnection::consume(int handle, int amount=128) {
++int BufferedConnection::consume(int handle, int amount) {
+   int i,j;
+   char sm[2048];
+   if (amount>2048) amount=2048;
diff --git a/games/eboard/files/patch-notebook.cc b/games/eboard/files/patch-notebook.cc
new file mode 100644
index 000000000000..4da431dd7eb2
--- /dev/null
+++ b/games/eboard/files/patch-notebook.cc
@@ -0,0 +1,41 @@
+
+$FreeBSD$
+
+--- notebook.cc.orig	Wed Jun 26 03:06:59 2002
++++ notebook.cc	Sat Sep 28 23:00:58 2002
+@@ -48,7 +48,7 @@
+   gtk_widget_show(label);
+ }
+ 
+-Page::Page(int _number,GtkWidget *_content, char *_title, bool _removable=false) {
++Page::Page(int _number,GtkWidget *_content, char *_title, bool _removable) {
+   
+   GtkWidget *b,*p;
+ 
+@@ -166,7 +166,7 @@
+ 		     (gpointer)this);
+ }
+ 
+-void Notebook::addPage(GtkWidget *what,char *title,int id,bool removable=false) {
++void Notebook::addPage(GtkWidget *what,char *title,int id,bool removable) {
+   Page *pg;
+   global.debug("Notebook","addPage",title);
+   pg=new Page(id,what,title,removable);
+@@ -205,7 +205,7 @@
+   return( pages[i]->number );
+ }
+ 
+-void Notebook::setTabColor(int pageid,int color,Importance imp=IM_TOP) {
++void Notebook::setTabColor(int pageid,int color,Importance imp) {
+   vector<Page *>::iterator pi;
+   int i;
+   global.debug("Notebook","setTabColor","1");
+@@ -217,7 +217,7 @@
+ }
+ 
+ void Notebook::setTabColor(int page_num,int color,int poly,
+-			   Importance imp=IM_TOP) {
++			   Importance imp) {
+   vector<Page *>::iterator pi;
+   GdkColor nc;
+   GtkStyle *style;
diff --git a/games/eboard/files/patch-pieces.cc b/games/eboard/files/patch-pieces.cc
new file mode 100644
index 000000000000..f6a2eb263ebd
--- /dev/null
+++ b/games/eboard/files/patch-pieces.cc
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- pieces.cc.orig	Mon Jun 17 05:24:31 2002
++++ pieces.cc	Sat Sep 28 23:00:58 2002
+@@ -1198,7 +1198,7 @@
+   global.destroy("VectorPieces");
+ }
+ 
+-void VectorPieces::drawSquares(GdkPixmap *dest,GdkGC *gc,int sqside, int dx=0, int dy=0) {
++void VectorPieces::drawSquares(GdkPixmap *dest,GdkGC *gc,int sqside, int dx, int dy) {
+   int i,j;
+   for(i=0;i<8;i++)
+     for(j=0;j<8;j++) {      
diff --git a/games/eboard/files/patch-position.cc b/games/eboard/files/patch-position.cc
new file mode 100644
index 000000000000..14412363e86e
--- /dev/null
+++ b/games/eboard/files/patch-position.cc
@@ -0,0 +1,88 @@
+
+$FreeBSD$
+
+--- position.cc.orig	Fri Jun 14 19:32:57 2002
++++ position.cc	Sat Sep 28 23:00:58 2002
+@@ -257,7 +257,7 @@
+   return(LastMove);
+ }
+ 
+-void Position::moveAnyNotation(char *m,piece color,variant Vr=REGULAR) {
++void Position::moveAnyNotation(char *m,piece color,variant Vr) {
+   int i,x,y,ml;
+   piece pr;
+   char xlate[12];
+@@ -317,7 +317,7 @@
+     }
+ }
+ 
+-void Position::moveStdNotation(char *m,piece color,variant Vr=REGULAR) {
++void Position::moveStdNotation(char *m,piece color,variant Vr) {
+   int from[2],to[2];
+   int istake, isdrop;
+   piece what, prom;
+@@ -449,7 +449,7 @@
+ }
+ 
+ void Position::locate(piece p,int *src,int *dest,int istake,
+-		      variant Vr=REGULAR) {
++		      variant Vr) {
+   int minx,maxx,miny,maxy;
+   int i,j,dc,dr,m,n;
+   piece kind,color;
+@@ -563,8 +563,8 @@
+ }
+ 
+ void Position::moveCartesian(int x1,int y1,int x2,int y2,
+-			     variant Vr=REGULAR, 
+-			     bool resolvepromotion=false)
++			     variant Vr,
++			     bool resolvepromotion)
+ {
+   piece color;
+ 
+@@ -664,7 +664,7 @@
+   stdNotationForMove(x1,y1,x2,y2,prom,dest);
+ }
+ 
+-void Position::stdNotationForMove(int x1,int y1,int x2,int y2,piece prom,char *m,variant Vr=REGULAR) {
++void Position::stdNotationForMove(int x1,int y1,int x2,int y2,piece prom,char *m,variant Vr) {
+   Position after;
+   stdNotationForMoveInternal(x1,y1,x2,y2,m);
+   switch(prom) {
+@@ -1003,7 +1003,7 @@
+   return(HouseString);
+ }
+ 
+-string & Position::getMaterialString(variant Vr=REGULAR) {
++string & Position::getMaterialString(variant Vr) {
+   int w=0,b=0,i,j,v;
+   char tmp[64];
+ 
+@@ -1179,7 +1179,7 @@
+ }
+ 
+ // dc = defender color
+-bool Position::isSquareInCheck(int x,int y,piece dc,variant Vr=REGULAR) {
++bool Position::isSquareInCheck(int x,int y,piece dc,variant Vr) {
+   int i,j;
+ 
+   //  cerr << "is square in check " << (char)('a'+x) << (y+1) << " ";
+@@ -1208,7 +1208,7 @@
+   return false;
+ }
+ 
+-bool Position::isInCheck(piece c,variant Vr=REGULAR) {
++bool Position::isInCheck(piece c,variant Vr) {
+   int i,j,kx,ky;
+ 
+   // FIXME: check rules for giveaway and losers variants
+@@ -1228,7 +1228,7 @@
+   return(isSquareInCheck(kx,ky,c,Vr));
+ }
+ 
+-bool Position::isMate(piece c,variant Vr=REGULAR) {
++bool Position::isMate(piece c,variant Vr) {
+   int i,j,m,n;
+   Position after;
+ 
diff --git a/games/eboard/files/patch-proto__xboard.cc b/games/eboard/files/patch-proto__xboard.cc
new file mode 100644
index 000000000000..84af93e2fa84
--- /dev/null
+++ b/games/eboard/files/patch-proto__xboard.cc
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- proto_xboard.cc.orig	Mon Jun 17 05:24:31 2002
++++ proto_xboard.cc	Sat Sep 28 23:00:58 2002
+@@ -267,7 +267,7 @@
+ }
+ 
+ void XBoardProtocol::gameOver(ExtPatternMatcher &pm,GameResult gr,
+-                                    int hasreason=1)
++                                    int hasreason)
+ {
+   char reason[64];
+   ChessGame *refgame;  
diff --git a/games/eboard/files/patch-text.cc b/games/eboard/files/patch-text.cc
new file mode 100644
index 000000000000..c97b92484b9f
--- /dev/null
+++ b/games/eboard/files/patch-text.cc
@@ -0,0 +1,38 @@
+
+$FreeBSD$
+
+--- text.cc.orig	Sun Apr 28 23:04:34 2002
++++ text.cc	Sat Sep 28 23:00:58 2002
+@@ -198,14 +198,14 @@
+   gtk_widget_show(widget);
+ }
+ 
+-void Text::append(char *msg,int color,Importance imp=IM_NORMAL) {
++void Text::append(char *msg,int color,Importance imp) {
+   if (Filter.accept(msg)) {
+     pushLevel(imp);
+     gtk_ftext_append(GTK_FTEXT(text),msg,-1,color);
+   }
+ }
+ 
+-void Text::append(char *msg,char *msg2,int color, Importance imp=IM_NORMAL) {
++void Text::append(char *msg,char *msg2,int color, Importance imp) {
+   char *d;
+   d=(char *)g_malloc0(strlen(msg)+strlen(msg2)+1);
+   strcpy(d,msg);
+@@ -253,13 +253,13 @@
+     }
+ }
+ 
+-void TextSet::append(char *msg,int color,Importance imp=IM_NORMAL) {
++void TextSet::append(char *msg,int color,Importance imp) {
+   list<Text *>::iterator ti;
+   for(ti=targets.begin();ti!=targets.end();ti++)
+     (*ti)->append(msg,color,imp);
+ }
+ 
+-void TextSet::append(char *msg,char *msg2,int color,Importance imp=IM_NORMAL) {
++void TextSet::append(char *msg,char *msg2,int color,Importance imp) {
+   list<Text *>::iterator ti;
+   for(ti=targets.begin();ti!=targets.end();ti++)
+     (*ti)->append(msg,msg2,color,imp);
diff --git a/games/eboard/files/patch-tstring.cc b/games/eboard/files/patch-tstring.cc
new file mode 100644
index 000000000000..18ad2d60d1d2
--- /dev/null
+++ b/games/eboard/files/patch-tstring.cc
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tstring.cc.orig	Wed Apr 24 03:16:33 2002
++++ tstring.cc	Sat Sep 28 23:00:58 2002
+@@ -72,7 +72,7 @@
+   return(&ptoken);
+ }
+ 
+-int tstring::tokenvalue(char *t, int base=10) {
++int tstring::tokenvalue(char *t, int base) {
+   string *v;
+   int n;
+   v=token(t);