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

List:       atlantik-devel
Subject:    [atlantik-devel] CVS: kdegames/atlantik/client atlantik.cpp,1.91,1.92 main.h,1.11,1.12
From:       kde () office ! kde ! org
Date:       2002-04-30 15:04:45
[Download RAW message or body]

Update of /home/kde/kdegames/atlantik/client
In directory office:/tmp/cvs-serv13675/client

Modified Files:
	atlantik.cpp main.h 
Log Message:
finished and completed switch to KExtendedSocket and removed old QSocket ifdefs

Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- atlantik.cpp	2002/04/29 12:48:18	1.91
+++ atlantik.cpp	2002/04/30 15:04:42	1.92
@@ -14,6 +14,8 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+#include <errno.h>
+
 #include <qcolor.h>
 #include <qlineedit.h>
 #include <qscrollbar.h>
@@ -38,12 +40,6 @@
 #include <board.h>
 #include <trade_widget.h>
 
-#define USE_KDE 1
-
-#ifdef USE_KDE
-#include <errno.h>
-#endif
-
 #include "selectserver_widget.h"
 #include "selectgame_widget.h"
 #include "selectconfiguration_widget.h"
@@ -77,13 +73,8 @@
 	connect(m_atlantikNetwork, SIGNAL(msgError(QString)), this, \
SLOT(slotMsgError(QString)));  connect(m_atlantikNetwork, SIGNAL(msgChat(QString, \
QString)), this, SLOT(slotMsgChat(QString, QString)));  
-#ifndef USE_KDE
-	connect(m_atlantikNetwork, SIGNAL(connected()), this, \
                SLOT(slotNetworkConnected()));
-	connect(m_atlantikNetwork, SIGNAL(error(int)), this, SLOT(slotNetworkError(int)));
-#else
 	connect(m_atlantikNetwork, SIGNAL(connectionSuccess()), this, \
SLOT(slotNetworkConnected()));  connect(m_atlantikNetwork, \
                SIGNAL(connectionFailed(int)), this, SLOT(slotNetworkError(int)));
-#endif
 
 	connect(m_atlantikNetwork, SIGNAL(joinedGame()), this, SLOT(slotJoinedGame()));
 	connect(m_atlantikNetwork, SIGNAL(initGame()), this, SLOT(initGame()));
@@ -262,25 +253,6 @@
 {
 	QString errMsg(i18n("Error connecting: "));
 	
-#ifndef USE_KDE
-	switch(errnum)
-	{
-		case QSocket::ErrConnectionRefused:
-			errMsg.append(i18n("connection refused by host."));
-			break;
-
-		case QSocket::ErrHostNotFound:
-			errMsg.append(i18n("host not found."));
-			break;
-
-		case QSocket::ErrSocketRead:
-			errMsg.append(i18n("could not read data."));
-			break;
-
-		default:
-			errMsg.append(i18n("unknown error."));
-	}
-#else
 	switch (m_atlantikNetwork->status())
 	{
 		case IO_ConnectError:
@@ -297,7 +269,7 @@
 		default:
 			errMsg.append(i18n("unknown error."));
 	}
-#endif
+
 	serverMsgsAppend(errMsg);
 }
 

Index: main.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/main.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- main.h	2002/04/23 16:56:30	1.11
+++ main.h	2002/04/30 15:04:42	1.12
@@ -18,7 +18,7 @@
 #define ATLANTIK_MAIN_H
 
 #define	ATLANTIK_VERSION 030
-#define	ATLANTIK_VERSION_STRING "0.3.0 (CVS >= 20020330)"
+#define	ATLANTIK_VERSION_STRING "0.3.0 (CVS >= 20020430)"
 #define ATLANTIK_VERSION_MAJOR 0
 #define ATLANTIK_VERSION_MINOR 3
 #define ATLANTIK_VERSION_RELEASE 0

_______________________________________________
atlantik-devel mailing list
atlantik-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-devel


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