$OpenBSD: patch-src_mainwin_cpp,v 1.1 2017/10/07 10:24:46 espie Exp $

Index: src/mainwin.cpp
--- src/mainwin.cpp.orig
+++ src/mainwin.cpp
@@ -68,35 +68,35 @@ ClientWindow::ClientWindow(QMainWindow *parent, const 
 {
 
 
-	prefsIcon= QPixmap::QPixmap(qembed_findImage("package_settings"));//QPixmap(ICON_PREFS);
+	prefsIcon= QPixmap(qembed_findImage("package_settings"));//QPixmap(ICON_PREFS);
 //	infoIcon= QPixmap(ICON_GAMEINFO);
-	exitIcon =  QPixmap::QPixmap(qembed_findImage("exit"));//QPixmap(ICON_EXIT);
-	fileNewboardIcon = QPixmap::QPixmap(qembed_findImage("newboard"));//QPixmap(ICON_FILENEWBOARD);
-	fileNewIcon = QPixmap::QPixmap(qembed_findImage("filenew"));//QPixmap(ICON_FILENEW);
-	fileOpenIcon = QPixmap::QPixmap(qembed_findImage("fileopen"));//QPixmap(ICON_FILEOPEN);
+	exitIcon =  QPixmap(qembed_findImage("exit"));//QPixmap(ICON_EXIT);
+	fileNewboardIcon = QPixmap(qembed_findImage("newboard"));//QPixmap(ICON_FILENEWBOARD);
+	fileNewIcon = QPixmap(qembed_findImage("filenew"));//QPixmap(ICON_FILENEW);
+	fileOpenIcon = QPixmap(qembed_findImage("fileopen"));//QPixmap(ICON_FILEOPEN);
 //	fileSaveIcon = QPixmap(ICON_FILESAVE);
 //	fileSaveAsIcon = QPixmap(ICON_FILESAVEAS);
 //	transformIcon = QPixmap(ICON_TRANSFORM);
 //	charIcon = QPixmap(ICON_CHARSET);
-	manualIcon = QPixmap::QPixmap(qembed_findImage("help"));//QPixmap(ICON_MANUAL);
+	manualIcon = QPixmap(qembed_findImage("help"));//QPixmap(ICON_MANUAL);
 //	autoplayIcon = QPixmap(ICON_AUTOPLAY);
-	connectedIcon = QPixmap::QPixmap(qembed_findImage("connected"));//QPixmap(ICON_CONNECTED);             
-	disconnectedIcon = QPixmap::QPixmap(qembed_findImage("connect_no"));//QPixmap(ICON_DISCONNECTED);       
-	OpenIcon = QPixmap::QPixmap(qembed_findImage("open"));//QPixmap(ICON_OPEN);              
-	LookingIcon = QPixmap::QPixmap(qembed_findImage("looking"));//QPixmap(ICON_LOOKING);
-	QuietIcon= QPixmap::QPixmap(qembed_findImage("quiet"));//QPixmap(ICON_QUIET);
-	NotOpenIcon = QPixmap::QPixmap(qembed_findImage("not_open"));//QPixmap(ICON_NOT_OPEN);
-	NotLookingIcon = QPixmap::QPixmap(qembed_findImage("not_looking"));//QPixmap(ICON_NOT_LOOKING);
-	NotQuietIcon= QPixmap::QPixmap(qembed_findImage("not_quiet"));//QPixmap(ICON_NOT_QUIET);       
-	RefreshPlayersIcon = QPixmap::QPixmap(qembed_findImage("refresh_players"));//QPixmap(ICON_REFRESH_PLAYERS);    
-	RefreshGamesIcon = QPixmap::QPixmap(qembed_findImage("refresh_games"));//QPixmap(ICON_REFRESH_GAMES);        
-	ComputerPlayIcon = QPixmap::QPixmap(qembed_findImage("computerplay"));//QPixmap(ICON_COMPUTER_PLAY);
-	qgoIcon = QPixmap::QPixmap(qembed_findImage("Bowl"));//QPixmap(ICON_COMPUTER_PLAY);  
-	NotSeekingIcon = QPixmap::QPixmap(qembed_findImage("not_seeking"));
-	seekingIcon[0] = QPixmap::QPixmap(qembed_findImage("seeking1"));
-	seekingIcon[1] = QPixmap::QPixmap(qembed_findImage("seeking2"));
-	seekingIcon[2] = QPixmap::QPixmap(qembed_findImage("seeking3"));
-	seekingIcon[3] = QPixmap::QPixmap(qembed_findImage("seeking4"));
+	connectedIcon = QPixmap(qembed_findImage("connected"));//QPixmap(ICON_CONNECTED);             
+	disconnectedIcon = QPixmap(qembed_findImage("connect_no"));//QPixmap(ICON_DISCONNECTED);       
+	OpenIcon = QPixmap(qembed_findImage("open"));//QPixmap(ICON_OPEN);              
+	LookingIcon = QPixmap(qembed_findImage("looking"));//QPixmap(ICON_LOOKING);
+	QuietIcon= QPixmap(qembed_findImage("quiet"));//QPixmap(ICON_QUIET);
+	NotOpenIcon = QPixmap(qembed_findImage("not_open"));//QPixmap(ICON_NOT_OPEN);
+	NotLookingIcon = QPixmap(qembed_findImage("not_looking"));//QPixmap(ICON_NOT_LOOKING);
+	NotQuietIcon= QPixmap(qembed_findImage("not_quiet"));//QPixmap(ICON_NOT_QUIET);       
+	RefreshPlayersIcon = QPixmap(qembed_findImage("refresh_players"));//QPixmap(ICON_REFRESH_PLAYERS);    
+	RefreshGamesIcon = QPixmap(qembed_findImage("refresh_games"));//QPixmap(ICON_REFRESH_GAMES);        
+	ComputerPlayIcon = QPixmap(qembed_findImage("computerplay"));//QPixmap(ICON_COMPUTER_PLAY);
+	qgoIcon = QPixmap(qembed_findImage("Bowl"));//QPixmap(ICON_COMPUTER_PLAY);  
+	NotSeekingIcon = QPixmap(qembed_findImage("not_seeking"));
+	seekingIcon[0] = QPixmap(qembed_findImage("seeking1"));
+	seekingIcon[1] = QPixmap(qembed_findImage("seeking2"));
+	seekingIcon[2] = QPixmap(qembed_findImage("seeking3"));
+	seekingIcon[3] = QPixmap(qembed_findImage("seeking4"));
 
 	// init
 
@@ -576,7 +576,7 @@ void ClientWindow::timerEvent(QTimerEvent* e)
 	if (e->timerId() == seekButtonTimer)
 	{	
 		imagecounter = (imagecounter+1) % 4;
-		toolSeek->setIconSet(QIconSet::QIconSet(seekingIcon[imagecounter]));
+		toolSeek->setIconSet(QIconSet(seekingIcon[imagecounter]));
 		return;
 	}
 
@@ -2950,17 +2950,17 @@ void ClientWindow::initToolBar()
 	//tb->setProperty( "geometry", QRect(0, 0, 20, 20));
 
 	//added the icons
-	refreshPlayers->setIconSet(QIconSet::QIconSet(RefreshPlayersIcon));
-	refreshGames->setIconSet(QIconSet::QIconSet(RefreshGamesIcon));
-	fileNew->setIconSet(QIconSet::QIconSet(fileNewIcon));
-	fileNewBoard->setIconSet(QIconSet::QIconSet(fileNewboardIcon));
-	fileOpen->setIconSet(QIconSet::QIconSet(fileOpenIcon));
-	fileQuit->setIconSet(QIconSet::QIconSet(exitIcon));
-	computerPlay->setIconSet(QIconSet::QIconSet(ComputerPlayIcon));
-	Connect->setIconSet(QIconSet::QIconSet(connectedIcon));
-	Disconnect->setIconSet(QIconSet::QIconSet(disconnectedIcon));
-	helpManual->setIconSet(QIconSet::QIconSet(manualIcon));
-	setPreferences->setIconSet(QIconSet::QIconSet(prefsIcon));
+	refreshPlayers->setIconSet(QIconSet(RefreshPlayersIcon));
+	refreshGames->setIconSet(QIconSet(RefreshGamesIcon));
+	fileNew->setIconSet(QIconSet(fileNewIcon));
+	fileNewBoard->setIconSet(QIconSet(fileNewboardIcon));
+	fileOpen->setIconSet(QIconSet(fileOpenIcon));
+	fileQuit->setIconSet(QIconSet(exitIcon));
+	computerPlay->setIconSet(QIconSet(ComputerPlayIcon));
+	Connect->setIconSet(QIconSet(connectedIcon));
+	Disconnect->setIconSet(QIconSet(disconnectedIcon));
+	helpManual->setIconSet(QIconSet(manualIcon));
+	setPreferences->setIconSet(QIconSet(prefsIcon));
 	setIcon(qgoIcon);
 
   UserToolbar->show();
@@ -3218,7 +3218,7 @@ void ClientWindow::slot_cancelSeek()
 	toolSeek->setOn(false);
 	toolSeek->setPopup(seekMenu);
 	toolSeek->setPopupDelay(1);
-	toolSeek->setIconSet(QIconSet::QIconSet(NotSeekingIcon));
+	toolSeek->setIconSet(QIconSet(NotSeekingIcon));
 	killTimer(seekButtonTimer);
 	seekButtonTimer = 0;
 }
@@ -3308,4 +3308,4 @@ void ClientWindow::send_nmatch_range_parameters()
 	c.append(" 25-25 0 0 0-0");
 	
 	sendcommand(c, true);
-}
\ No newline at end of file
+}
