summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Szmigin <smidge@xsco.net>2019-08-26 22:35:05 +0100
committerAdam Szmigin <smidge@xsco.net>2019-08-26 22:35:05 +0100
commitf5fd1b72a4d650ab13db8df9c08a4b2a3572c44d (patch)
tree2bb645f0973838d74fcc4a23482ba46241fc23b6
parent1283369dccfe904bb1c42941c37434864792e23e (diff)
Clang-format applied
-rw-r--r--include/djinterop/crate.hpp2
-rw-r--r--include/djinterop/database.hpp2
-rw-r--r--include/djinterop/enginelibrary.hpp5
-rw-r--r--include/djinterop/exceptions.hpp7
-rw-r--r--src/djinterop/enginelibrary/el_database_impl.hpp2
-rw-r--r--src/djinterop/enginelibrary/el_storage.hpp2
-rw-r--r--src/djinterop/impl/crate_impl.hpp2
-rw-r--r--src/djinterop/impl/database_impl.hpp4
8 files changed, 12 insertions, 14 deletions
diff --git a/include/djinterop/crate.hpp b/include/djinterop/crate.hpp
index 94f73b8..8b197e7 100644
--- a/include/djinterop/crate.hpp
+++ b/include/djinterop/crate.hpp
@@ -131,7 +131,7 @@ public:
///
/// If no such crate is found, then `nullopt` is returned.
std::experimental::optional<crate> sub_crate_by_name(
- const std::string& name) const;
+ const std::string& name) const;
/// Returns the crate's contained tracks
std::vector<track> tracks() const;
diff --git a/include/djinterop/database.hpp b/include/djinterop/database.hpp
index f52f9d0..d94769f 100644
--- a/include/djinterop/database.hpp
+++ b/include/djinterop/database.hpp
@@ -122,7 +122,7 @@ public:
///
/// If no such crate exists, then `nullopt` is returned.
std::experimental::optional<crate> root_crate_by_name(
- const std::string& name) const;
+ const std::string& name) const;
/// Returns all root crates contained in the database
///
diff --git a/include/djinterop/enginelibrary.hpp b/include/djinterop/enginelibrary.hpp
index 6b63901..831c59d 100644
--- a/include/djinterop/enginelibrary.hpp
+++ b/include/djinterop/enginelibrary.hpp
@@ -70,9 +70,8 @@ database create_database(
/// database is returned. The boolean reference parameter `created` can be used
/// to determine whether the database was created or merely loaded.
database create_or_load_database(
- std::string directory,
- const semantic_version& schema_version,
- bool &created);
+ std::string directory, const semantic_version& schema_version,
+ bool& created);
/// Returns a boolean indicating whether an Engine Library already exists in a
/// given directory.
diff --git a/include/djinterop/exceptions.hpp b/include/djinterop/exceptions.hpp
index 4386dc4..ff62315 100644
--- a/include/djinterop/exceptions.hpp
+++ b/include/djinterop/exceptions.hpp
@@ -109,10 +109,9 @@ class crate_invalid_name : public std::runtime_error
{
public:
/// Construct the exception for a given crate name
- explicit crate_invalid_name(
- const std::string& what_arg, std::string name) noexcept
- : runtime_error{what_arg.c_str()},
- name_{name}
+ explicit crate_invalid_name(const std::string& what_arg, std::string name)
+ noexcept : runtime_error{what_arg.c_str()},
+ name_{name}
{
}
diff --git a/src/djinterop/enginelibrary/el_database_impl.hpp b/src/djinterop/enginelibrary/el_database_impl.hpp
index 535ef20..9e16314 100644
--- a/src/djinterop/enginelibrary/el_database_impl.hpp
+++ b/src/djinterop/enginelibrary/el_database_impl.hpp
@@ -46,7 +46,7 @@ public:
void remove_track(djinterop::track tr) override;
std::vector<djinterop::crate> root_crates() override;
boost::optional<djinterop::crate> root_crate_by_name(
- const std::string& name) override;
+ const std::string& name) override;
boost::optional<djinterop::track> track_by_id(int64_t id) override;
std::vector<djinterop::track> tracks() override;
std::vector<djinterop::track> tracks_by_relative_path(
diff --git a/src/djinterop/enginelibrary/el_storage.hpp b/src/djinterop/enginelibrary/el_storage.hpp
index d0b9500..7e08a4e 100644
--- a/src/djinterop/enginelibrary/el_storage.hpp
+++ b/src/djinterop/enginelibrary/el_storage.hpp
@@ -19,8 +19,8 @@
#include <string>
-#include <djinterop/semantic_version.hpp>
#include <sqlite_modern_cpp.h>
+#include <djinterop/semantic_version.hpp>
namespace djinterop
{
diff --git a/src/djinterop/impl/crate_impl.hpp b/src/djinterop/impl/crate_impl.hpp
index 8dd4f9d..4399090 100644
--- a/src/djinterop/impl/crate_impl.hpp
+++ b/src/djinterop/impl/crate_impl.hpp
@@ -49,7 +49,7 @@ public:
virtual boost::optional<crate> parent() = 0;
virtual void remove_track(track tr) = 0;
virtual boost::optional<crate> sub_crate_by_name(
- const std::string& name) = 0;
+ const std::string& name) = 0;
virtual void set_name(std::string name) = 0;
virtual void set_parent(boost::optional<crate> parent) = 0;
virtual std::vector<track> tracks() = 0;
diff --git a/src/djinterop/impl/database_impl.hpp b/src/djinterop/impl/database_impl.hpp
index 304b5bd..ec4a518 100644
--- a/src/djinterop/impl/database_impl.hpp
+++ b/src/djinterop/impl/database_impl.hpp
@@ -47,11 +47,11 @@ public:
virtual void remove_track(track tr) = 0;
virtual std::vector<crate> root_crates() = 0;
virtual boost::optional<crate> root_crate_by_name(
- const std::string& name) = 0;
+ const std::string& name) = 0;
virtual boost::optional<track> track_by_id(int64_t id) = 0;
virtual std::vector<track> tracks() = 0;
virtual std::vector<track> tracks_by_relative_path(
- const std::string& relative_path) = 0;
+ const std::string& relative_path) = 0;
virtual std::string uuid() = 0;
virtual semantic_version version() = 0;
};