Changeset 9869 in orxonox.OLD for trunk/src/lib/network/proxy

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/lib/network/proxy

Files:

• network_settings.cc (modified) (3 diffs)
• network_settings.h (modified) (1 diff)
• proxy_control.cc (modified) (4 diffs)
• proxy_control.h (modified) (1 diff)

trunk/src/lib/network/proxy/network_settings.cc

@@ -21 +21 @@
 #include "shared_network_data.h"
 
+#include "loading/load_param.h"
 #include "loading/resource_manager.h"
-#include "loading/load_param.h"
-
 #include "debug.h"
 
 
+ObjectListDefinition(NetworkSettings);
 
 NetworkSettings* NetworkSettings::singletonRef = NULL;
@@ -36 +36 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_SETTINGS, "NetworkSettings");
+  this->registerObject(this, NetworkSettings::_objectList);
 
   // suggest a good standard max players value
@@ -64 +64 @@
 void NetworkSettings::loadData()
 {
-  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  std::string fileName = Resources::ResourceManager::getInstance()->mainGlobalPath().name();
   fileName += "configs/network_settings.conf";
 

trunk/src/lib/network/proxy/network_settings.h

@@ -24 +24 @@
 class NetworkSettings : public BaseObject
 {
-
+  ObjectListDeclaration(NetworkSettings);
   public:
     inline static NetworkSettings* getInstance() { if (!NetworkSettings::singletonRef) NetworkSettings::singletonRef = new NetworkSettings();

trunk/src/lib/network/proxy/proxy_control.cc

@@ -15 +15 @@
 #include "proxy_control.h"
 
-#include "class_list.h"
 #include "shell_command.h"
 
@@ -28 +27 @@
 #include "converter.h"
 
-#include "preferences.h"
+#include "parser/preferences/preferences.h"
 
 #include "debug.h"
@@ -41 +40 @@
 
 SHELL_COMMAND(forceReconnect, ProxyControl, forceReconnectionShell);
+ObjectListDefinition(ProxyControl);
 
 /**
@@ -47 +47 @@
 ProxyControl::ProxyControl()
 {
-  this->setClassID( CL_PROXY_CONTROL, "ProxyControl" );
+  this->registerObject(this, ProxyControl::_objectList);
 
   this->setSynchronized(false);

trunk/src/lib/network/proxy/proxy_control.h

@@ -30 +30 @@
 class ProxyControl : public Synchronizeable
 {
-
+  ObjectListDeclaration(ProxyControl);
   public:
     inline static ProxyControl* getInstance() { if (!ProxyControl::singletonRef) ProxyControl::singletonRef = new ProxyControl();