summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-09-25 16:25:44 +0200
committerStanislaw Halik <sthalik@misaki.pl>2017-09-25 16:30:14 +0200
commita48349deb6a70631ae95e9e0505930949f1e8dac (patch)
tree5bdae16bb7f6446cd9591fb4022b6b07c6c690c8
parentfe2a58edc267ff643e50b412f893e15cbafab6b5 (diff)
logic: remove camel case
-rw-r--r--logic/selected-libraries.cpp2
-rw-r--r--logic/selected-libraries.hpp8
-rw-r--r--logic/tracker.cpp2
-rw-r--r--logic/tracker.h4
-rw-r--r--logic/work.cpp2
-rw-r--r--logic/work.hpp2
6 files changed, 9 insertions, 11 deletions
diff --git a/logic/selected-libraries.cpp b/logic/selected-libraries.cpp
index 1fc3da86..fbe30fef 100644
--- a/logic/selected-libraries.cpp
+++ b/logic/selected-libraries.cpp
@@ -20,7 +20,7 @@ static constexpr struct event_type_mapping
{ &IExtension::process_finished, ext_mask::on_finished, ext_ord::ev_finished, },
};
-SelectedLibraries::SelectedLibraries(QFrame* frame, dylibptr t, dylibptr p, dylibptr f) :
+runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dylibptr f) :
pTracker(nullptr),
pFilter(nullptr),
pProtocol(nullptr),
diff --git a/logic/selected-libraries.hpp b/logic/selected-libraries.hpp
index 041c77e5..586f7a57 100644
--- a/logic/selected-libraries.hpp
+++ b/logic/selected-libraries.hpp
@@ -16,8 +16,6 @@
#include <QFrame>
-// XXX todo remove camel case in identifier
-
struct runtime_event_handler
{
using ext_event_ordinal = IExtension::event_ordinal;
@@ -31,7 +29,7 @@ struct runtime_event_handler
void run_events(ext_event_ordinal k, Pose& pose);
};
-struct OTR_LOGIC_EXPORT SelectedLibraries : runtime_event_handler
+struct OTR_LOGIC_EXPORT runtime_libraries : runtime_event_handler
{
using dylibptr = std::shared_ptr<dylib>;
@@ -39,8 +37,8 @@ struct OTR_LOGIC_EXPORT SelectedLibraries : runtime_event_handler
std::shared_ptr<IFilter> pFilter;
std::shared_ptr<IProtocol> pProtocol;
- SelectedLibraries(QFrame* frame, dylibptr t, dylibptr p, dylibptr f);
- SelectedLibraries() : pTracker(nullptr), pFilter(nullptr), pProtocol(nullptr), correct(false) {}
+ runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dylibptr f);
+ runtime_libraries() : pTracker(nullptr), pFilter(nullptr), pProtocol(nullptr), correct(false) {}
bool correct;
};
diff --git a/logic/tracker.cpp b/logic/tracker.cpp
index c1459286..798b2cac 100644
--- a/logic/tracker.cpp
+++ b/logic/tracker.cpp
@@ -33,7 +33,7 @@ using namespace time_units;
constexpr double Tracker::r2d;
constexpr double Tracker::d2r;
-Tracker::Tracker(Mappings& m, SelectedLibraries& libs, TrackLogger& logger) :
+Tracker::Tracker(Mappings& m, runtime_libraries& libs, TrackLogger& logger) :
m(m),
libs(libs),
logger(logger),
diff --git a/logic/tracker.h b/logic/tracker.h
index ab0cc323..1151d16b 100644
--- a/logic/tracker.h
+++ b/logic/tracker.h
@@ -63,7 +63,7 @@ private:
Pose output_pose, raw_6dof, last_mapped, last_raw;
Pose newpose;
- SelectedLibraries const& libs;
+ runtime_libraries const& libs;
// The owner of the reference is the main window.
// This design might be usefull if we decide later on to swap out
// the logger while the tracker is running.
@@ -98,7 +98,7 @@ private:
static constexpr double c_mult = 16;
static constexpr double c_div = 1./c_mult;
public:
- Tracker(Mappings& m, SelectedLibraries& libs, TrackLogger& logger);
+ Tracker(Mappings& m, runtime_libraries& libs, TrackLogger& logger);
~Tracker();
void raw_and_mapped_pose(double* mapped, double* raw) const;
diff --git a/logic/work.cpp b/logic/work.cpp
index 6829e62b..62c15403 100644
--- a/logic/work.cpp
+++ b/logic/work.cpp
@@ -103,5 +103,5 @@ Work::~Work()
// order matters, otherwise use-after-free -sh
sc = nullptr;
tracker = nullptr;
- libs = SelectedLibraries();
+ libs = runtime_libraries();
}
diff --git a/logic/work.hpp b/logic/work.hpp
index dc32536c..fa0e5c90 100644
--- a/logic/work.hpp
+++ b/logic/work.hpp
@@ -29,7 +29,7 @@ struct OTR_LOGIC_EXPORT Work
using fn_t = std::function<void(bool)>;
using key_tuple = std::tuple<key_opts&, fn_t, bool>;
main_settings s; // tracker needs settings, so settings must come before it
- SelectedLibraries libs; // idem
+ runtime_libraries libs; // idem
std::shared_ptr<TrackLogger> logger; // must come before tracker, since tracker depends on it
std::shared_ptr<Tracker> tracker;
std::shared_ptr<Shortcuts> sc;