From b984992fc92b6dd607732d6dad1c533b36f1ba3a Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sun, 7 Jan 2018 23:28:42 +0100 Subject: Added .clang-format --- lib/settings/configuration.cpp | 54 ++++++++++++++++++++--------------------- lib/settings/configuration.h | 35 +++++++++++++------------- lib/settings/settingsdialog.cpp | 14 +++++------ lib/settings/settingsdialog.h | 3 ++- 4 files changed, 54 insertions(+), 52 deletions(-) (limited to 'lib/settings') diff --git a/lib/settings/configuration.cpp b/lib/settings/configuration.cpp index 1fa1fbf..06ee0bd 100644 --- a/lib/settings/configuration.cpp +++ b/lib/settings/configuration.cpp @@ -38,19 +38,19 @@ bool Configuration::readUserConfiguration(const std::string &path) m_userCfgPath = path; try { m_userCfg->readFile(path.c_str()); - } catch (FileIOException) { + } catch(FileIOException) { return false; - } catch (ParseException) { + } catch(ParseException) { return false; } - return true; + return true; } bool Configuration::parse(const std::string &contents) { try { m_userCfg->readString(contents); - } catch (ParseException) { + } catch(ParseException) { return false; } return true; @@ -61,7 +61,7 @@ bool Configuration::writeUserConfiguration(const std::string &path) m_userCfgPath = path; try { m_userCfg->writeFile(m_userCfgPath.c_str()); - } catch (FileIOException) { + } catch(FileIOException) { return false; } return true; @@ -71,7 +71,7 @@ bool Configuration::writeIfNeeded() { try { m_userCfg->writeFile(m_userCfgPath.c_str()); - } catch (FileIOException) { + } catch(FileIOException) { return false; } return true; @@ -81,13 +81,13 @@ bool Configuration::parseDefaultConfiguration(const std::string &contents) { try { m_defaultCfg->readString(contents); - } catch (ParseException) { + } catch(ParseException) { return false; } return true; } -std::vector Configuration::childrenSettings(const char* name) +std::vector Configuration::childrenSettings(const char *name) { std::vector groupNames; const Setting &root = m_userCfg->lookup(name); @@ -101,7 +101,7 @@ std::vector Configuration::childrenSettings(const char* name) return groupNames; } -std::vector Configuration::childrenGroups(const char* name) +std::vector Configuration::childrenGroups(const char *name) { std::vector groupNames; const Setting &root = m_userCfg->lookup(name); @@ -118,7 +118,7 @@ void Configuration::resetValue(const char *path) { if(m_userCfg->exists(path)) { Setting &v = m_userCfg->lookup(path); - switch (v.getType()) { + switch(v.getType()) { case Setting::TypeNone: break; case Setting::TypeInt: @@ -146,8 +146,8 @@ void Configuration::resetValue(const char *path) } } -template -std::optional Configuration::value(const char* path) const +template +std::optional Configuration::value(const char *path) const { // if setting doesn't exist, give back a nullopt if(!m_userCfg->exists(path)) { @@ -160,7 +160,7 @@ std::optional Configuration::value(const char* path) const // cast depending on type // type checks are done during compile time - switch (setting.getType()) { + switch(setting.getType()) { case Setting::TypeNone: r = std::nullopt; break; @@ -201,7 +201,7 @@ std::optional Configuration::value(const char* path) const case Setting::TypeString: // const char*, std::string if constexpr(std::is_same::value) { - r = std::optional(static_cast(setting)); + r = std::optional(static_cast(setting)); } else { r = std::nullopt; } @@ -235,22 +235,22 @@ std::optional Configuration::value(const char* path) const } // tell the compiler to export these functions, otherwise you get linking errors -template std::optional Configuration::value(const char* path) const; -template std::optional Configuration::value(const char* path) const; -template std::optional Configuration::value(const char* path) const; -template std::optional Configuration::value(const char* path) const; +template std::optional Configuration::value(const char *path) const; +template std::optional Configuration::value(const char *path) const; +template std::optional Configuration::value(const char *path) const; +template std::optional Configuration::value(const char *path) const; -template std::optional Configuration::value(const char* path) const; -template std::optional Configuration::value(const char* path) const; +template std::optional Configuration::value(const char *path) const; +template std::optional Configuration::value(const char *path) const; -template std::optional Configuration::value(const char* path) const; -template std::optional Configuration::value(const char* path) const; +template std::optional Configuration::value(const char *path) const; +template std::optional Configuration::value(const char *path) const; -template std::optional Configuration::value(const char* path) const; +template std::optional Configuration::value(const char *path) const; -template std::optional Configuration::value(const char* path) const; +template std::optional Configuration::value(const char *path) const; -template +template bool Configuration::setValue(std::string path, const T &val) { if(m_userCfg->exists(path)) { @@ -259,7 +259,7 @@ bool Configuration::setValue(std::string path, const T &val) if constexpr(std::is_unsigned_v && !std::is_same_v) { setting = static_cast>(val); } else if constexpr(std::is_same_v) { - switch (setting.getType()) { + switch(setting.getType()) { case Setting::TypeNone: break; @@ -279,7 +279,7 @@ bool Configuration::setValue(std::string path, const T &val) case Setting::TypeBoolean: if(static_cast(val) == "true") { setting = true; - } else if (static_cast(val) == "false") { + } else if(static_cast(val) == "false") { setting = false; } break; diff --git a/lib/settings/configuration.h b/lib/settings/configuration.h index b258cb3..4fc614e 100644 --- a/lib/settings/configuration.h +++ b/lib/settings/configuration.h @@ -10,10 +10,11 @@ #define CONFIGURATION_H #include -#include #include +#include -namespace libconfig { +namespace libconfig +{ class Config; class Setting; } @@ -34,12 +35,12 @@ public: std::vector childrenSettings(const char *name = ""); std::vector childrenGroups(const char *name = ""); - void resetValue(const char* path); + void resetValue(const char *path); - template - std::optional value(const char* path) const; + template + std::optional value(const char *path) const; - template + template bool setValue(std::string path, const T &val); private: @@ -49,26 +50,26 @@ private: }; // replace ~ with home -std::string& patchHome(std::string &path, const std::string &home); +std::string &patchHome(std::string &path, const std::string &home); // instantiate functions // this needs to be done because the implementation is in the cpp file // Settings::value<> -extern template std::optional Configuration::value(const char* path) const; -extern template std::optional Configuration::value(const char* path) const; -extern template std::optional Configuration::value(const char* path) const; -extern template std::optional Configuration::value(const char* path) const; +extern template std::optional Configuration::value(const char *path) const; +extern template std::optional Configuration::value(const char *path) const; +extern template std::optional Configuration::value(const char *path) const; +extern template std::optional Configuration::value(const char *path) const; -extern template std::optional Configuration::value(const char* path) const; -extern template std::optional Configuration::value(const char* path) const; +extern template std::optional Configuration::value(const char *path) const; +extern template std::optional Configuration::value(const char *path) const; -extern template std::optional Configuration::value(const char* path) const; -extern template std::optional Configuration::value(const char* path) const; +extern template std::optional Configuration::value(const char *path) const; +extern template std::optional Configuration::value(const char *path) const; -extern template std::optional Configuration::value(const char* path) const; +extern template std::optional Configuration::value(const char *path) const; -extern template std::optional Configuration::value(const char* path) const; +extern template std::optional Configuration::value(const char *path) const; // Settings::setValue<> extern template bool Configuration::setValue(std::string path, const int &val); diff --git a/lib/settings/settingsdialog.cpp b/lib/settings/settingsdialog.cpp index 478e372..97b5f44 100644 --- a/lib/settings/settingsdialog.cpp +++ b/lib/settings/settingsdialog.cpp @@ -7,19 +7,19 @@ */ #include "settingsdialog.h" -#include "ui_settingsdialog.h" #include "configuration.h" -#include +#include "ui_settingsdialog.h" #include +#include #include +#include #include -#include inline QHBoxLayout *createEntry(Configuration *config, const std::string &path, QWidget *widget); -SettingsDialog::SettingsDialog(std::shared_ptr &settings, QWidget *parent) : - QDialog(parent), - ui(new Ui::SettingsDialog) +SettingsDialog::SettingsDialog(std::shared_ptr &settings, QWidget *parent) + : QDialog(parent) + , ui(new Ui::SettingsDialog) { ui->setupUi(this); @@ -67,7 +67,7 @@ QWidget *widgetForGroup(std::shared_ptr &settings, const std::str return widget; } -inline QHBoxLayout *createEntry(Configuration* config, const std::string &path, QWidget *widget) +inline QHBoxLayout *createEntry(Configuration *config, const std::string &path, QWidget *widget) { QLineEdit *lineEdit = new QLineEdit(widget); lineEdit->setText(QString::fromStdString(config->value(path.c_str()).value())); diff --git a/lib/settings/settingsdialog.h b/lib/settings/settingsdialog.h index 74dd964..f77b822 100644 --- a/lib/settings/settingsdialog.h +++ b/lib/settings/settingsdialog.h @@ -12,7 +12,8 @@ #include #include -namespace Ui { +namespace Ui +{ class SettingsDialog; } -- cgit v1.2.1