Make Client hold a non-const reference to the Catalogue

Since the entire catalogue is no longer loaded at once, it needs to be
non-const so things can be loaded on the fly.

diff --git a/source/network/client.cpp b/source/network/client.cpp
index 41cd28e900a712a5f5cc5693777bec615381e4f7..ec8e408582a657f2f1a3b07576c56735c5fb0c12 100644 (file)
--- a/source/network/client.cpp
+++ b/source/network/client.cpp
@@ -6,7 +6,7 @@ using namespace Msp;
 
 namespace R2C2 {
 
 
 namespace R2C2 {
 

-Client::Client(const Catalogue &c):
+Client::Client(Catalogue &c):

        catalogue(c),
        socket(0),
        comm(0),
        catalogue(c),
        socket(0),
        comm(0),

diff --git a/source/network/client.h b/source/network/client.h
index a8f043e575e0fde9996adaec7f314a3a8983488d..02931e553d69a9efc1a8afed0d4714da924654f2 100644 (file)
--- a/source/network/client.h
+++ b/source/network/client.h
@@ -28,7 +28,7 @@ public:
        sigc::signal<void, const std::string &> signal_error;
 
 private:
        sigc::signal<void, const std::string &> signal_error;
 
 private:

-       const Catalogue &catalogue;
+       Catalogue &catalogue;

        Protocol proto;
        Msp::Net::StreamSocket *socket;
        Msp::Net::Communicator *comm;
        Protocol proto;
        Msp::Net::StreamSocket *socket;
        Msp::Net::Communicator *comm;


@@ -39,7 +39,7 @@ private:
        std::map<unsigned, NetTrain *> trains;
 
 public:
        std::map<unsigned, NetTrain *> trains;
 
 public:

-       Client(const Catalogue &);
+       Client(Catalogue &);

        ~Client();
 
        void use_event_dispatcher(Msp::IO::EventDispatcher &);
        ~Client();
 
        void use_event_dispatcher(Msp::IO::EventDispatcher &);


@@ -49,7 +49,7 @@ public:
        void send(const P &pkt)
        { if(comm) comm->send(pkt); }
 
        void send(const P &pkt)
        { if(comm) comm->send(pkt); }
 

-       const Catalogue &get_catalogue() const { return catalogue; }
+       Catalogue &get_catalogue() const { return catalogue; }

        const std::list<std::string> &get_routes() const { return routes; }
        void set_power(bool);
        void set_halt(bool);
        const std::list<std::string> &get_routes() const { return routes; }
        void set_power(bool);
        void set_halt(bool);