Menu
▾
▴
[Qcell-commitlogs] SF.net SVN: qcell: [18] trunk/qcell
|
From: <le...@us...> - 2006-11-29 12:02:36
|
Revision: 18
http://svn.sourceforge.net/qcell/?rev=18&view=rev
Author: lessm
Date: 2006-11-29 04:02:27 -0800 (Wed, 29 Nov 2006)
Log Message:
-----------
- Neighbourhood class add
- New methods in Client class and MasterServer class for future use
Modified Paths:
--------------
trunk/qcell/baseheaders/Client.h
trunk/qcell/baseheaders/MasterServer.h
trunk/qcell/basesources/Client.cpp
trunk/qcell/basesources/MasterServer.cpp
trunk/qcell/client/GeneratedFiles/Debug/moc_Client.cpp
trunk/qcell/messages/GeneratedFiles/Debug/moc_MasterServerInterface.cpp
trunk/qcell/messages/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp
trunk/qcell/messages/GeneratedFiles/Debug/moc_messages.cpp
trunk/qcell/requests/GeneratedFiles/Debug/moc_MasterServerInterface.cpp
trunk/qcell/requests/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp
trunk/qcell/requests/GeneratedFiles/Debug/moc_requests.cpp
trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServer.cpp
trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServerInterface.cpp
trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp
trunk/qcell/server/main.cpp
Added Paths:
-----------
trunk/qcell/baseheaders/Neighbourhood.h
trunk/qcell/basesources/Neighbourhood.cpp
Modified: trunk/qcell/baseheaders/Client.h
===================================================================
--- trunk/qcell/baseheaders/Client.h 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/baseheaders/Client.h 2006-11-29 12:02:27 UTC (rev 18)
@@ -17,10 +17,6 @@
#include <iostream>
-//#define REGISTER_TIME_WAIT 1000
-//#define MAX_REGISTER_FAIL 10
-//#define MAX_PING_FAIL 5
-
class Client : public QThread
{
Q_OBJECT
@@ -39,6 +35,7 @@
bool reportToServer(void);
void parseServerMessage(QByteArray message);
bool loadClientConfig(QString file);
+ bool parseClientConfig(QDomElement *xmlConfig);
public:
Client();
Modified: trunk/qcell/baseheaders/MasterServer.h
===================================================================
--- trunk/qcell/baseheaders/MasterServer.h 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/baseheaders/MasterServer.h 2006-11-29 12:02:27 UTC (rev 18)
@@ -52,6 +52,7 @@
MasterServerPlugin *loadPlugin(QString listFileName);
void killClients();
bool loadServerConfig(QString file);
+ bool parseServerConfig(QDomElement *xmlConfig);
protected slots:
@@ -65,6 +66,7 @@
~MasterServer();
bool initServer(QString file="./ServerConfig.xml");
+ bool initServer(QDomElement *xmlConfig);
bool initServer(short listeningPort);
bool initServer(QHostAddress serverAdress, short listeningPort);
bool registerClient(ClientInfo client);
Added: trunk/qcell/baseheaders/Neighbourhood.h
===================================================================
--- trunk/qcell/baseheaders/Neighbourhood.h (rev 0)
+++ trunk/qcell/baseheaders/Neighbourhood.h 2006-11-29 12:02:27 UTC (rev 18)
@@ -0,0 +1,54 @@
+#ifndef _NEIGHBOURHOOD_H
+#define _NEIGHBOURHOOD_H
+
+#include <QString>
+#include <QVector>
+#include <QDomElement>
+#include <QDomDocument>
+
+struct NContainer
+{
+ int x, y, z, t;
+ double dValue;
+ int iValue;
+ bool bValue;
+};
+
+
+class Neighbourhood
+{
+private:
+ int dimension;
+ QVector<NContainer> neighbourVector;
+
+protected:
+public:
+ Neighbourhood();
+ ~Neighbourhood();
+
+ void addNeighbour(int x);
+ void addNeighbour(int x, int y);
+ void addNeighbour(int x, int y, int z);
+ void addNeighbour(int x, int y, int z, int t);
+
+ void setNeighbourAt(int index, int x);
+ void setNeighbourAt(int index, int x, int y);
+ void setNeighbourAt(int index, int x, int y, int z);
+ void setNeighbourAt(int index, int x, int y, int z, int t);
+
+ void clearNeighbourhood(void);
+ int getDimension(void);
+
+ bool fromXmlString(QString *xmlString);
+ bool fromDomElement(QDomElement *xmlElement);
+ QString toXmlString();
+ int getNeighbourNumber(void);
+ bool getBoolValueOf(int index);
+ int getInValueOf(int index);
+ double getDoubleValueOf(int index);
+
+};
+
+
+
+#endif
\ No newline at end of file
Modified: trunk/qcell/basesources/Client.cpp
===================================================================
--- trunk/qcell/basesources/Client.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/basesources/Client.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -86,6 +86,7 @@
{
xmlData.setContent(&configFile);
root = xmlData.documentElement();
+ /*
if(root.tagName()=="ClientConfiguration")
{
xmlNode = root.firstChild();
@@ -123,12 +124,58 @@
xmlNode = xmlNode.nextSibling();
}
}
- return 1;
+ return 1;*/
+ return parseClientConfig(&root);
}
addErrorToLog("Can't load configuration");
return 0;
}
+bool Client::parseClientConfig(QDomElement *xmlConfig)
+{
+ QDomElement xmlElement, extendedAtributes;
+ QDomNode xmlNode, extendedNode;
+ if(xmlConfig->tagName()=="ClientConfiguration")
+ {
+ xmlNode = xmlConfig->firstChild();
+ while(!xmlNode.isNull())
+ {
+ xmlElement = xmlNode.toElement();
+ if(xmlElement.tagName()=="ClientSetings")
+ {
+ setClientAddress(xmlElement.attribute("Address"));
+ setClientPort(xmlElement.attribute("Port").toInt());
+ setClientType(xmlElement.attribute("Type"));
+ extendedNode = xmlElement.firstChild();
+ while(!extendedNode.isNull())
+ {
+ extendedAtributes = extendedNode.toElement();
+ registerWaitTime = extendedAtributes.attribute("RegisterWaitTime").toInt();
+ maxRegisterTry = extendedAtributes.attribute("MaxRegisterTry").toInt();
+ maxPingTry = extendedAtributes.attribute("MaxPingTry").toInt();
+ extendedNode = extendedNode.nextSibling();
+
+ }
+ }
+ else
+ {
+ if(xmlElement.tagName()=="ServerSetings")
+ {
+ setMasterServerAddress(xmlElement.attribute("Address"));
+ setMasterServerPort(xmlElement.attribute("Port").toInt());
+ }
+ else
+ {
+ customClientConfig(&xmlElement);
+ }
+ }
+ xmlNode = xmlNode.nextSibling();
+ }
+ return 1;
+ }
+ return 0;
+}
+
// public
Client::Client()
{
Modified: trunk/qcell/basesources/MasterServer.cpp
===================================================================
--- trunk/qcell/basesources/MasterServer.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/basesources/MasterServer.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -90,69 +90,79 @@
{
xmlData.setContent(&configFile);
root = xmlData.documentElement();
- if(root.tagName()=="ServerConfiguration")
+ return parseServerConfig(&root);
+ }
+ serverInterface->addErrorToLog("Can't find configuration file");
+ return 0;
+}
+
+bool MasterServer::parseServerConfig(QDomElement *xmlConfig)
+{
+ QDomElement xmlElement;
+ QDomNode xmlNode;
+ QHostAddress serverAddress;
+
+ if(xmlConfig->tagName()=="ServerConfiguration")
+ {
+ xmlNode = xmlConfig->firstChild();
+ while(!xmlNode.isNull())
{
- xmlNode = root.firstChild();
- while(!xmlNode.isNull())
+ xmlElement = xmlNode.toElement();
+ if(xmlElement.tagName()=="UDPSetings")
{
- xmlElement = xmlNode.toElement();
- if(xmlElement.tagName()=="UDPSetings")
+ if(xmlElement.hasAttribute("Address"))
{
- if(xmlElement.hasAttribute("Address"))
+ serverAddress.setAddress(xmlElement.attribute("Address"));
+ if(!initServer(serverAddress, xmlElement.attribute("Port").toInt()))
{
- serverAddress.setAddress(xmlElement.attribute("Address"));
- if(!initServer(serverAddress, xmlElement.attribute("Port").toInt()))
- {
- serverInterface->addErrorToLog("Can't listen on port" + xmlElement.attribute("Port"));
- return 0;
- }
+ serverInterface->addErrorToLog("Can't listen on port" + xmlElement.attribute("Port"));
+ return 0;
}
- else
- if(!initServer(xmlElement.attribute("Port").toInt()))
- {
- serverInterface->addErrorToLog("Can't listen on port" + xmlElement.attribute("Port"));
- return 0;
- }
- serverInterface->addInfoToLog("Server start listen: " + serverAddress.toString() + ":" + xmlElement.attribute("Port"));
- if(xmlElement.hasAttribute("RepingTime"))
+ }
+ else
+ if(!initServer(xmlElement.attribute("Port").toInt()))
{
- serverPingTime = xmlElement.attribute("RepingTime").toInt();
+ serverInterface->addErrorToLog("Can't listen on port" + xmlElement.attribute("Port"));
+ return 0;
}
+ serverInterface->addInfoToLog("Server start listen: " + serverAddress.toString() + ":" + xmlElement.attribute("Port"));
+ if(xmlElement.hasAttribute("RepingTime"))
+ {
+ serverPingTime = xmlElement.attribute("RepingTime").toInt();
}
- if(xmlElement.tagName()=="TCPSetings")
+ }
+ if(xmlElement.tagName()=="TCPSetings")
+ {
+ if(xmlElement.hasAttribute("Address"))
{
- if(xmlElement.hasAttribute("Address"))
+ serverAddress.setAddress(xmlElement.attribute("Address"));
+ if(!tcpServer->listen(serverAddress, xmlElement.attribute("Port").toInt()))
{
- serverAddress.setAddress(xmlElement.attribute("Address"));
- if(!tcpServer->listen(serverAddress, xmlElement.attribute("Port").toInt()))
- {
- serverInterface->addErrorToLog("Can't establish TCP server");
- return 0;
- }
+ serverInterface->addErrorToLog("Can't establish TCP server");
+ return 0;
}
- else
+ }
+ else
+ {
+ if(!tcpServer->listen(QHostAddress::Any, xmlElement.attribute("Port").toInt()))
{
- if(!tcpServer->listen(QHostAddress::Any, xmlElement.attribute("Port").toInt()))
- {
- serverInterface->addErrorToLog("Can't establish TCP server");
- return 0;
- }
+ serverInterface->addErrorToLog("Can't establish TCP server");
+ return 0;
}
- connect(tcpServer, SIGNAL(newConnection()), SLOT(TcpConnection()));
- serverInterface->addInfoToLog("Tcp server established: " + tcpServer->serverAddress().toString() + ":" + xmlElement.attribute("Port"));
-
}
- if(xmlElement.tagName()=="PluginList")
- {
- initPlugins(xmlElement);
- }
+ connect(tcpServer, SIGNAL(newConnection()), SLOT(TcpConnection()));
+ serverInterface->addInfoToLog("Tcp server established: " + tcpServer->serverAddress().toString() + ":" + xmlElement.attribute("Port"));
+
+ }
+ if(xmlElement.tagName()=="PluginList")
+ {
+ initPlugins(xmlElement);
+ }
- xmlNode = xmlNode.nextSibling();
- }
+ xmlNode = xmlNode.nextSibling();
}
return 1;
}
- serverInterface->addErrorToLog("Can't find configuration file");
return 0;
}
@@ -297,12 +307,26 @@
bool MasterServer::initServer(QString file)
{
- bool out = loadServerConfig(file);
- pingTimer.setInterval(serverPingTime);
- pingTimer.start();
- return out;
+ if(loadServerConfig(file))
+ {
+ pingTimer.setInterval(serverPingTime);
+ pingTimer.start();
+ return 1;
+ }
+ return 0;
}
+bool MasterServer::initServer(QDomElement *xmlConfig)
+{
+ if(parseServerConfig(xmlConfig))
+ {
+ pingTimer.setInterval(serverPingTime);
+ pingTimer.start();
+ return 1;
+ }
+ return 0;
+}
+
bool MasterServer::initServer(short listeningPort)
{
if(serverRecive->bind(listeningPort))
Added: trunk/qcell/basesources/Neighbourhood.cpp
===================================================================
--- trunk/qcell/basesources/Neighbourhood.cpp (rev 0)
+++ trunk/qcell/basesources/Neighbourhood.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -0,0 +1,228 @@
+#include "../baseheaders/Neighbourhood.h"
+
+Neighbourhood::Neighbourhood()
+{
+ dimension = 666;
+}
+
+Neighbourhood::~Neighbourhood()
+{
+
+}
+
+void Neighbourhood::addNeighbour(int x)
+{
+ NContainer temp;
+ temp.x = x;
+ neighbourVector << temp;
+ dimension = 1;
+}
+
+void Neighbourhood::addNeighbour(int x, int y)
+{
+ NContainer temp;
+ temp.x = x;
+ temp.y = y;
+ neighbourVector << temp;
+ if(dimension>2)
+ dimension = 2;
+}
+void Neighbourhood::addNeighbour(int x, int y, int z)
+{
+ NContainer temp;
+ temp.x = x;
+ temp.y = y;
+ temp.z = z;
+ neighbourVector << temp;
+ if(dimension>3)
+ dimension = 3;
+}
+
+void Neighbourhood::addNeighbour(int x, int y, int z, int t)
+{
+ NContainer temp;
+ temp.x = x;
+ temp.y = y;
+ temp.z = z;
+ temp.t = t;
+ neighbourVector << temp;
+ if(dimension>4)
+ dimension = 4;
+}
+
+void Neighbourhood::setNeighbourAt(int index, int x)
+{
+ if(neighbourVector.size()>index)
+ neighbourVector[index].x = x;
+}
+
+void Neighbourhood::setNeighbourAt(int index, int x, int y)
+{
+ if(neighbourVector.size()>index)
+ {
+ neighbourVector[index].x = x;
+ neighbourVector[index].y = y;
+ }
+}
+
+void Neighbourhood::setNeighbourAt(int index, int x, int y, int z)
+{
+ if(neighbourVector.size()>index)
+ {
+ neighbourVector[index].x = x;
+ neighbourVector[index].y = y;
+ neighbourVector[index].z = z;
+ }
+}
+
+void Neighbourhood::setNeighbourAt(int index, int x, int y, int z, int t)
+{
+ if(neighbourVector.size()>index)
+ {
+ neighbourVector[index].x = x;
+ neighbourVector[index].y = y;
+ neighbourVector[index].z = z;
+ neighbourVector[index].t = t;
+ }
+}
+
+void Neighbourhood::clearNeighbourhood(void)
+{
+ dimension = 666;
+ neighbourVector.clear();
+}
+
+int Neighbourhood::getDimension(void)
+{
+ return dimension;
+}
+
+bool Neighbourhood::fromXmlString(QString *xmlString)
+{
+ QDomDocument doc;
+ QDomElement root;
+ doc.setContent(*xmlString);
+ root = doc.documentElement();
+ return fromDomElement(&root);
+}
+
+bool Neighbourhood::fromDomElement(QDomElement *xmlElement)
+{
+ QDomNode node;
+ QDomElement element;
+ NContainer container;
+ if(xmlElement->tagName()=="Neighbourhood")
+ {
+ node = xmlElement->firstChild();
+ if(!node.isNull())
+ {
+ clearNeighbourhood();
+ while(!node.isNull())
+ {
+ element = node.toElement();
+ if(element.tagName()=="Neighbour")
+ {
+ if(element.hasAttribute("t"))
+ {
+ container.x = element.attribute("x").toInt();
+ container.y = element.attribute("y").toInt();
+ container.z = element.attribute("z").toInt();
+ container.t = element.attribute("t").toInt();
+ if(dimension>4)
+ dimension = 4;
+ }
+ else
+ {
+ if(element.hasAttribute("z"))
+ {
+ container.x = element.attribute("x").toInt();
+ container.y = element.attribute("y").toInt();
+ container.z = element.attribute("z").toInt();
+ if(dimension>3)
+ dimension = 3;
+ }
+ else
+ {
+ if(element.hasAttribute("y"))
+ {
+ container.x = element.attribute("x").toInt();
+ container.y = element.attribute("y").toInt();
+ if(dimension>2)
+ dimension = 2;
+
+ }
+ else
+ {
+ if(element.hasAttribute("x"))
+ {
+ container.x = element.attribute("x").toInt();
+ dimension = 1;
+ }
+ }
+ }
+ }
+ neighbourVector<<container;
+ }
+ node = node.nextSibling();
+ }
+ return 1;
+ }
+ }
+ return 0;
+}
+
+QString Neighbourhood::toXmlString()
+{
+ QDomDocument doc;
+ QDomElement root, element;
+ NContainer temp;
+ root = doc.createElement("Neighbourhood");
+ doc.appendChild(root);
+ foreach(temp, neighbourVector)
+ {
+ element = doc.createElement("Neighbour");
+ switch(dimension)
+ {
+ case 1:
+ element.setAttribute("x", temp.x);
+ break;
+ case 2:
+ element.setAttribute("x", temp.x);
+ element.setAttribute("y", temp.y);
+ break;
+ case 3:
+ element.setAttribute("x", temp.x);
+ element.setAttribute("y", temp.y);
+ element.setAttribute("z", temp.z);
+ break;
+ case 4:
+ element.setAttribute("x", temp.x);
+ element.setAttribute("y", temp.y);
+ element.setAttribute("z", temp.z);
+ element.setAttribute("t", temp.t);
+ break;
+ }
+ root.appendChild(element);
+ }
+ return doc.toString();
+}
+
+int Neighbourhood::getNeighbourNumber(void)
+{
+ return neighbourVector.size();
+}
+
+bool Neighbourhood::getBoolValueOf(int index)
+{
+ return neighbourVector[index].bValue;
+}
+
+int Neighbourhood::getInValueOf(int index)
+{
+ return neighbourVector[index].iValue;
+}
+
+double Neighbourhood::getDoubleValueOf(int index)
+{
+ return neighbourVector[index].dValue;
+}
\ No newline at end of file
Modified: trunk/qcell/client/GeneratedFiles/Debug/moc_Client.cpp
===================================================================
--- trunk/qcell/client/GeneratedFiles/Debug/moc_Client.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/client/GeneratedFiles/Debug/moc_Client.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,13 +1,13 @@
/****************************************************************************
** Meta object code from reading C++ file 'Client.h'
**
-** Created: Thu 26. Oct 20:23:39 2006
+** Created: Sun 29. Oct 11:57:31 2006
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../headers/Client.h"
+#include "../../../baseheaders/Client.h"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'Client.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59
Modified: trunk/qcell/messages/GeneratedFiles/Debug/moc_MasterServerInterface.cpp
===================================================================
--- trunk/qcell/messages/GeneratedFiles/Debug/moc_MasterServerInterface.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/messages/GeneratedFiles/Debug/moc_MasterServerInterface.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,13 +1,13 @@
/****************************************************************************
** Meta object code from reading C++ file 'MasterServerInterface.h'
**
-** Created: Thu 26. Oct 20:23:42 2006
+** Created: Sun 29. Oct 11:57:33 2006
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../headers/MasterServerInterface.h"
+#include "../../../baseheaders/MasterServerInterface.h"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'MasterServerInterface.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59
Modified: trunk/qcell/messages/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp
===================================================================
--- trunk/qcell/messages/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/messages/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,13 +1,13 @@
/****************************************************************************
** Meta object code from reading C++ file 'MasterServerPlugin.h'
**
-** Created: Thu 26. Oct 20:23:42 2006
+** Created: Sun 29. Oct 11:57:33 2006
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../headers/MasterServerPlugin.h"
+#include "../../../baseheaders/MasterServerPlugin.h"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'MasterServerPlugin.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59
Modified: trunk/qcell/messages/GeneratedFiles/Debug/moc_messages.cpp
===================================================================
--- trunk/qcell/messages/GeneratedFiles/Debug/moc_messages.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/messages/GeneratedFiles/Debug/moc_messages.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'messages.h'
**
-** Created: Thu 26. Oct 20:23:41 2006
+** Created: Sun 29. Oct 11:57:33 2006
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/qcell/requests/GeneratedFiles/Debug/moc_MasterServerInterface.cpp
===================================================================
--- trunk/qcell/requests/GeneratedFiles/Debug/moc_MasterServerInterface.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/requests/GeneratedFiles/Debug/moc_MasterServerInterface.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,13 +1,13 @@
/****************************************************************************
** Meta object code from reading C++ file 'MasterServerInterface.h'
**
-** Created: Thu 26. Oct 20:23:50 2006
+** Created: Sun 29. Oct 11:57:29 2006
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../headers/MasterServerInterface.h"
+#include "../../../baseheaders/MasterServerInterface.h"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'MasterServerInterface.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59
Modified: trunk/qcell/requests/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp
===================================================================
--- trunk/qcell/requests/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/requests/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,13 +1,13 @@
/****************************************************************************
** Meta object code from reading C++ file 'MasterServerPlugin.h'
**
-** Created: Thu 26. Oct 20:23:50 2006
+** Created: Sun 29. Oct 11:57:29 2006
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../headers/MasterServerPlugin.h"
+#include "../../../baseheaders/MasterServerPlugin.h"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'MasterServerPlugin.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59
Modified: trunk/qcell/requests/GeneratedFiles/Debug/moc_requests.cpp
===================================================================
--- trunk/qcell/requests/GeneratedFiles/Debug/moc_requests.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/requests/GeneratedFiles/Debug/moc_requests.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'requests.h'
**
-** Created: Thu 26. Oct 20:23:49 2006
+** Created: Sun 29. Oct 11:57:28 2006
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
Modified: trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServer.cpp
===================================================================
--- trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServer.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServer.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,13 +1,13 @@
/****************************************************************************
** Meta object code from reading C++ file 'MasterServer.h'
**
-** Created: Thu 26. Oct 20:23:45 2006
+** Created: Sun 29. Oct 11:57:35 2006
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../headers/MasterServer.h"
+#include "../../../baseheaders/MasterServer.h"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'MasterServer.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59
Modified: trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServerInterface.cpp
===================================================================
--- trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServerInterface.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServerInterface.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,13 +1,13 @@
/****************************************************************************
** Meta object code from reading C++ file 'MasterServerInterface.h'
**
-** Created: Thu 26. Oct 20:23:45 2006
+** Created: Sun 29. Oct 11:57:35 2006
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../headers/MasterServerInterface.h"
+#include "../../../baseheaders/MasterServerInterface.h"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'MasterServerInterface.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59
Modified: trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp
===================================================================
--- trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/server/GeneratedFiles/Debug/moc_MasterServerPlugin.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,13 +1,13 @@
/****************************************************************************
** Meta object code from reading C++ file 'MasterServerPlugin.h'
**
-** Created: Thu 26. Oct 20:23:45 2006
+** Created: Sun 29. Oct 11:57:35 2006
** by: The Qt Meta Object Compiler version 59 (Qt 4.2.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
-#include "../../../headers/MasterServerPlugin.h"
+#include "../../../baseheaders/MasterServerPlugin.h"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'MasterServerPlugin.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 59
Modified: trunk/qcell/server/main.cpp
===================================================================
--- trunk/qcell/server/main.cpp 2006-11-28 20:58:14 UTC (rev 17)
+++ trunk/qcell/server/main.cpp 2006-11-29 12:02:27 UTC (rev 18)
@@ -1,10 +1,8 @@
-//#include <QtCore/QCoreApplication>
#include <QApplication>
#include "../baseheaders/MasterServer.h"
int main(int argc, char *argv[])
{
- //QCoreApplication a(argc, argv);
QApplication a(argc, argv);
MasterServer m;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
