From 368765820e83909cba4aa13bd7d44bb0c148ddc3 Mon Sep 17 00:00:00 2001 From: rude Date: Wed, 24 Feb 2010 21:21:45 +0100 Subject: [PATCH] Changed unnecessary pass-by-value to pass-by-reference. --- src/modules/thread/ThreadModule.h | 2 +- src/modules/thread/sdl/Thread.cpp | 24 ++++++++++++------------ src/modules/thread/sdl/Thread.h | 24 ++++++++++++------------ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/modules/thread/ThreadModule.h b/src/modules/thread/ThreadModule.h index cc26a4f1c..0c09c237b 100644 --- a/src/modules/thread/ThreadModule.h +++ b/src/modules/thread/ThreadModule.h @@ -32,7 +32,7 @@ namespace thread { public: virtual ~ThreadModule(){}; - virtual void unregister(std::string name) = 0; + virtual void unregister(const std::string & name) = 0; }; // ThreadModule } // thread diff --git a/src/modules/thread/sdl/Thread.cpp b/src/modules/thread/sdl/Thread.cpp index e18e7f4ff..6aac24605 100644 --- a/src/modules/thread/sdl/Thread.cpp +++ b/src/modules/thread/sdl/Thread.cpp @@ -138,14 +138,14 @@ namespace sdl return name; } - ThreadVariant* ThreadData::getValue(std::string name) + ThreadVariant* ThreadData::getValue(const std::string & name) { if (shared.count(name) == 0) return 0; return shared[name]; } - void ThreadData::clearValue(std::string name) + void ThreadData::clearValue(const std::string & name) { if (shared.count(name) == 0) return; @@ -153,7 +153,7 @@ namespace sdl shared.erase(name); } - void ThreadData::setValue(std::string name, ThreadVariant *v) + void ThreadData::setValue(const std::string & name, ThreadVariant *v) { if (shared.count(name) != 0) shared[name]->release(); @@ -161,7 +161,7 @@ namespace sdl shared[name] = v; } - Thread::Thread(love::thread::ThreadModule *module, std::string name, love::Data *data) + Thread::Thread(love::thread::ThreadModule *module, const std::string & name, love::Data *data) : handle(0), module(module), name(name), isThread(true) { module->retain(); @@ -174,7 +174,7 @@ namespace sdl cond = SDL_CreateCond(); } - Thread::Thread(love::thread::ThreadModule *module, std::string name) + Thread::Thread(love::thread::ThreadModule *module, const std::string & name) : handle(0), module(module), name(name), data(0), isThread(false) { module->retain(); @@ -235,7 +235,7 @@ namespace sdl return name; } - ThreadVariant *Thread::receive(std::string name) + ThreadVariant *Thread::receive(const std::string & name) { lock(); ThreadVariant *v = comm->getValue(name); @@ -243,7 +243,7 @@ namespace sdl return v; } - ThreadVariant *Thread::demand(std::string name) + ThreadVariant *Thread::demand(const std::string & name) { lock(); ThreadVariant *v = comm->getValue(name); @@ -258,14 +258,14 @@ namespace sdl return v; } - void Thread::clear(std::string name) + void Thread::clear(const std::string & name) { lock(); comm->clearValue(name); unlock(); } - void Thread::send(std::string name, ThreadVariant *v) + void Thread::send(const std::string & name, ThreadVariant *v) { lock(); comm->setValue(name, v); @@ -286,7 +286,7 @@ namespace sdl } } - Thread *ThreadModule::newThread(std::string name, love::Data *data) + Thread *ThreadModule::newThread(const std::string & name, love::Data *data) { if (threads.count(name) != 0) return 0; @@ -295,7 +295,7 @@ namespace sdl return t; } - Thread *ThreadModule::getThread(std::string name) + Thread *ThreadModule::getThread(const std::string & name) { if (threads.count(name) == 0) return 0; @@ -315,7 +315,7 @@ namespace sdl return list; } - void ThreadModule::unregister(std::string name) + void ThreadModule::unregister(const std::string & name) { if (threads.count(name) == 0) return; diff --git a/src/modules/thread/sdl/Thread.h b/src/modules/thread/sdl/Thread.h index 1fe4355a3..af1a89c4c 100644 --- a/src/modules/thread/sdl/Thread.h +++ b/src/modules/thread/sdl/Thread.h @@ -83,9 +83,9 @@ namespace sdl ~ThreadData(); const char *getCode(); const char *getName(); - ThreadVariant* getValue(std::string name); - void clearValue(std::string name); - void setValue(std::string name, ThreadVariant *v); + ThreadVariant* getValue(const std::string & name); + void clearValue(const std::string & name); + void setValue(const std::string & name, ThreadVariant *v); }; class Thread : public love::Object @@ -101,17 +101,17 @@ namespace sdl bool isThread; public: - Thread(love::thread::ThreadModule *module, std::string name, love::Data *data); - Thread(love::thread::ThreadModule *module, std::string name); + Thread(love::thread::ThreadModule *module, const std::string & name, love::Data *data); + Thread(love::thread::ThreadModule *module, const std::string & name); virtual ~Thread(); void start(); void kill(); void wait(); std::string getName(); - ThreadVariant *receive(std::string name); - ThreadVariant *demand(std::string name); - void clear(std::string name); - void send(std::string name, ThreadVariant *v); + ThreadVariant *receive(const std::string & name); + ThreadVariant *demand(const std::string & name); + void clear(const std::string & name); + void send(const std::string & name, ThreadVariant *v); void lock(); void unlock(); }; // Thread @@ -126,10 +126,10 @@ namespace sdl public: ThreadModule(); virtual ~ThreadModule(); - Thread *newThread(std::string name, love::Data *data); + Thread *newThread(const std::string & name, love::Data *data); Thread **getThreads(); - Thread *getThread(std::string name); - void unregister(std::string name); + Thread *getThread(const std::string & name); + void unregister(const std::string & name); const char *getName() const; }; // ThreadModule } // sdl