Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 23, 2010, 6:50:22 PM (14 years ago)
Author:
landauf
Message:

moved ScopedSingletonManager to util

Location:
code/branches/consolecommands3/src/libraries
Files:
7 edited
2 moved

Legend:

Unmodified
Added
Removed

  • code/branches/consolecommands3/src/libraries/core/CMakeLists.txt

    r7202 r7207  
    3535  OrxonoxClass.cc
    3636  Resource.cc
    37   ScopedSingletonManager.cc
    3837  WindowEventListener.cc
    3938

  • code/branches/consolecommands3/src/libraries/core/Core.cc

    r7204 r7207  
    5252#include "util/Exception.h"
    5353#include "util/Scope.h"
     54#include "util/ScopedSingletonManager.h"
    5455#include "util/SignalHandler.h"
    5556#include "PathConfig.h"
    … …  
    6566#include "Language.h"
    6667#include "LuaState.h"
    67 #include "ScopedSingletonManager.h"
    6868#include "command/CommandExecutor.h"
    6969#include "command/IOConsole.h"

  • code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc

    r7204 r7207  
    3131#include "util/Debug.h"
    3232#include "util/Exception.h"
     33#include "util/ScopedSingletonManager.h"
    3334#include "core/ConfigValueIncludes.h"
    3435#include "core/CoreIncludes.h"
    3536#include "core/LuaState.h"
    36 #include "core/ScopedSingletonManager.h"
    3737#include "core/command/ConsoleCommand.h"
    3838#include "InputManager.h"

  • code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc

    r7204 r7207  
    2929#include "KeyDetector.h"
    3030
     31#include "util/ScopedSingletonManager.h"
    3132#include "core/CoreIncludes.h"
    32 #include "core/ScopedSingletonManager.h"
    3333#include "core/command/ConsoleCommand.h"
    3434#include "Button.h"

  • code/branches/consolecommands3/src/libraries/network/Client.cc

    r7163 r7207  
    4545#include "util/Clock.h"
    4646#include "util/Debug.h"
     47#include "util/ScopedSingletonManager.h"
    4748#include "synchronisable/Synchronisable.h"
    4849#include "packet/Chat.h"
    … …  
    5253#include "core/CommandLineParser.h"
    5354#include "core/Game.h"
    54 #include "core/ScopedSingletonManager.h"
    5555
    5656namespace orxonox
    … …  
    107107    return ClientConnection::closeConnection();
    108108  }
    109  
     109
    110110  void Client::setDestination(const std::string& serverAddress, unsigned int port)
    111111  {

  • code/branches/consolecommands3/src/libraries/network/LANDiscovery.cc

    r7163 r7207  
    3232#include <cstring>
    3333
     34#include "util/ScopedSingletonManager.h"
    3435#include "core/CoreIncludes.h"
    35 #include "core/ScopedSingletonManager.h"
    3636
    3737
    3838namespace orxonox
    39 { 
     39{
    4040  ManageScopedSingleton(LANDiscovery, ScopeID::Root, true);
    41  
     41
    4242  LANDiscovery::LANDiscovery()
    4343  {
    … …  
    4949    enet_host_destroy(this->host_);
    5050  }
    51  
     51
    5252  void LANDiscovery::discover()
    5353  {
    … …  
    5656    enet_address_set_host(&address, "255.255.255.255");
    5757    address.port = LAN_DISCOVERY_PORT;
    58    
     58
    5959    ENetPeer* peer;
    6060    peer = enet_host_connect(this->host_, &address, 0);
    61    
     61
    6262    ENetEvent event;
    6363    while( enet_host_service(this->host_, &event, 1000 ) )
    … …  
    9393    }
    9494  }
    95  
     95
    9696  std::string LANDiscovery::getServerListItemName(unsigned int index)
    9797  {
    … …  
    101101      return this->servers_[index].getServerName();
    102102  }
    103  
     103
    104104  std::string LANDiscovery::getServerListItemIP(unsigned int index)
    105105  {
    … …  
    109109      return this->servers_[index].getServerIP();
    110110  }
    111  
    112  
     111
     112
    113113} // namespace orxonox

  • code/branches/consolecommands3/src/libraries/util/CMakeLists.txt

    r7163 r7207  
    3131  ExprParser.cc
    3232  OutputHandler.cc
     33  ScopedSingletonManager.cc
    3334  SignalHandler.cc
    3435  Sleep.cc

  • code/branches/consolecommands3/src/libraries/util/ScopedSingletonManager.h

    r7203 r7207  
    3030#define __ScopedSingletonManager_H__
    3131
    32 #include "CorePrereqs.h"
     32#include "UtilPrereqs.h"
    3333
    3434#include <cassert>
    … …  
    4444namespace orxonox
    4545{
    46     class _CoreExport ScopedSingletonManager
     46    class OrxonoxClass;
     47
     48    class _UtilExport ScopedSingletonManager
    4749    {
    4850        public:
Note: See TracChangeset for help on using the changeset viewer.