summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2017-12-25 16:13:15 -0500
committerDavid Robillard <d@drobilla.net>2017-12-25 16:26:13 -0500
commitbd89362f08dc07b3444d19bc373f2b4f8bc47b2c (patch)
tree047cd2cf2779d87f1db561186410aa545f632c7b /src
parent71808f61f7db48a7ab4e16537b94ee5686749909 (diff)
downloadingen-bd89362f08dc07b3444d19bc373f2b4f8bc47b2c.tar.gz
ingen-bd89362f08dc07b3444d19bc373f2b4f8bc47b2c.tar.bz2
ingen-bd89362f08dc07b3444d19bc373f2b4f8bc47b2c.zip
Use std::move to potentially avoid copying
Diffstat (limited to 'src')
-rw-r--r--src/SocketReader.cpp2
-rw-r--r--src/SocketWriter.cpp2
-rw-r--r--src/client/PluginUI.cpp2
-rw-r--r--src/gui/ConnectWindow.cpp6
-rw-r--r--src/gui/ConnectWindow.hpp4
-rw-r--r--src/gui/GraphCanvas.cpp2
-rw-r--r--src/gui/ThreadedLoader.cpp2
-rw-r--r--src/gui/URIEntry.cpp8
-rw-r--r--src/gui/URIEntry.hpp6
-rw-r--r--src/server/ControlBindings.hpp2
-rw-r--r--src/server/Event.hpp2
-rw-r--r--src/server/ingen_lv2.cpp6
12 files changed, 22 insertions, 22 deletions
diff --git a/src/SocketReader.cpp b/src/SocketReader.cpp
index 8e0209f9..56aeeba7 100644
--- a/src/SocketReader.cpp
+++ b/src/SocketReader.cpp
@@ -37,7 +37,7 @@ SocketReader::SocketReader(Ingen::World& world,
, _iface(iface)
, _inserter(nullptr)
, _msg_node(nullptr)
- , _socket(sock)
+ , _socket(std::move(sock))
, _exit_flag(false)
, _thread(&SocketReader::run, this)
{}
diff --git a/src/SocketWriter.cpp b/src/SocketWriter.cpp
index 9c120510..9274fe57 100644
--- a/src/SocketWriter.cpp
+++ b/src/SocketWriter.cpp
@@ -32,7 +32,7 @@ SocketWriter::SocketWriter(URIMap& map,
const Raul::URI& uri,
SPtr<Raul::Socket> sock)
: TurtleWriter(map, uris, uri)
- , _socket(sock)
+ , _socket(std::move(sock))
{}
size_t
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index e523c25a..df983f7f 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -151,7 +151,7 @@ PluginUI::PluginUI(Ingen::World* world,
const LilvUI* ui,
const LilvNode* ui_type)
: _world(world)
- , _block(block)
+ , _block(std::move(block))
, _instance(nullptr)
, _uis(uis)
, _ui(ui)
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 74cba256..7cacb498 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -45,10 +45,10 @@ using namespace Ingen::Client;
namespace Ingen {
namespace GUI {
-ConnectWindow::ConnectWindow(BaseObjectType* cobject,
- const Glib::RefPtr<Gtk::Builder>& xml)
+ConnectWindow::ConnectWindow(BaseObjectType* cobject,
+ Glib::RefPtr<Gtk::Builder> xml)
: Dialog(cobject)
- , _xml(xml)
+ , _xml(std::move(xml))
, _icon(nullptr)
, _progress_bar(nullptr)
, _progress_label(nullptr)
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index b3b7473e..015a6e76 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -46,8 +46,8 @@ class App;
class ConnectWindow : public Dialog
{
public:
- ConnectWindow(BaseObjectType* cobject,
- const Glib::RefPtr<Gtk::Builder>& xml);
+ ConnectWindow(BaseObjectType* cobject,
+ Glib::RefPtr<Gtk::Builder> xml);
void set_connected_to(SPtr<Ingen::Interface> engine);
void start(App& app, Ingen::World* world);
diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp
index 2d168468..8db0ef9c 100644
--- a/src/gui/GraphCanvas.cpp
+++ b/src/gui/GraphCanvas.cpp
@@ -78,7 +78,7 @@ GraphCanvas::GraphCanvas(App& app,
int height)
: Canvas(width, height)
, _app(app)
- , _graph(graph)
+ , _graph(std::move(graph))
, _auto_position_count(0)
, _menu_x(0)
, _menu_y(0)
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 37636c42..93c97cbd 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -32,7 +32,7 @@ namespace GUI {
ThreadedLoader::ThreadedLoader(App& app, SPtr<Interface> engine)
: _app(app)
, _sem(0)
- , _engine(engine)
+ , _engine(std::move(engine))
, _exit_flag(false)
, _thread(&ThreadedLoader::run, this)
{
diff --git a/src/gui/URIEntry.cpp b/src/gui/URIEntry.cpp
index 466948e4..30e6edb2 100644
--- a/src/gui/URIEntry.cpp
+++ b/src/gui/URIEntry.cpp
@@ -23,12 +23,12 @@
namespace Ingen {
namespace GUI {
-URIEntry::URIEntry(App* app,
- const std::set<Raul::URI>& types,
- const std::string& value)
+URIEntry::URIEntry(App* app,
+ std::set<Raul::URI> types,
+ const std::string& value)
: Gtk::HBox(false, 4)
, _app(app)
- , _types(types)
+ , _types(std::move(types))
, _menu_button(Gtk::manage(new Gtk::Button("≡")))
, _entry(Gtk::manage(new Gtk::Entry()))
{
diff --git a/src/gui/URIEntry.hpp b/src/gui/URIEntry.hpp
index f49f5b0d..90df2160 100644
--- a/src/gui/URIEntry.hpp
+++ b/src/gui/URIEntry.hpp
@@ -36,9 +36,9 @@ public:
* If `types` is given, then a menu button will be shown which pops up a
* enu for easily choosing known values with valid types.
*/
- URIEntry(App* app,
- const std::set<Raul::URI>& types,
- const std::string& value);
+ URIEntry(App* app,
+ std::set<Raul::URI> types,
+ const std::string& value);
std::string get_text() { return _entry->get_text(); }
Glib::SignalProxy0<void> signal_changed() { return _entry->signal_changed(); }
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index aed1b607..756ddd66 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -67,7 +67,7 @@ public:
/** One binding of a controller to a port. */
struct Binding : public boost::intrusive::set_base_hook<>,
public Raul::Maid::Disposable {
- Binding(Key k=Key(), PortImpl* p=nullptr) : key(k), port(p) {}
+ Binding(Key k=Key(), PortImpl* p=nullptr) : key(std::move(k)), port(p) {}
inline bool operator<(const Binding& rhs) const { return key < rhs.key; }
diff --git a/src/server/Event.hpp b/src/server/Event.hpp
index 09018163..48c9580d 100644
--- a/src/server/Event.hpp
+++ b/src/server/Event.hpp
@@ -108,7 +108,7 @@ protected:
Event(Engine& engine, SPtr<Interface> client, int32_t id, FrameTime time)
: _engine(engine)
, _next(nullptr)
- , _request_client(client)
+ , _request_client(std::move(client))
, _request_id(id)
, _time(time)
, _status(Status::NOT_PREPARED)
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 2ad2a1f1..92cb52b0 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -60,7 +60,7 @@ namespace Ingen {
/** Record of a graph in this bundle. */
struct LV2Graph : public Parser::ResourceRecord {
- LV2Graph(const Parser::ResourceRecord& record);
+ LV2Graph(Parser::ResourceRecord record);
LV2_Descriptor descriptor;
};
@@ -791,8 +791,8 @@ ingen_extension_data(const char* uri)
return nullptr;
}
-LV2Graph::LV2Graph(const Parser::ResourceRecord& record)
- : Parser::ResourceRecord(record)
+LV2Graph::LV2Graph(Parser::ResourceRecord record)
+ : Parser::ResourceRecord(std::move(record))
{
descriptor.URI = uri.c_str();
descriptor.instantiate = ingen_instantiate;