ran clang-format on all files

This commit is contained in:
fourtf
2018-06-26 17:20:03 +02:00
parent 6ee1fc303e
commit 08e552f5f6
63 changed files with 175 additions and 200 deletions
@@ -2,10 +2,10 @@
#include <QObject>
#include "common/SignalVector2.hpp"
#include "controllers/accounts/Account.hpp"
#include "providers/twitch/TwitchAccountManager.hpp"
#include "util/SharedPtrElementLess.hpp"
#include "common/SignalVector2.hpp"
namespace chatterino {
@@ -23,8 +23,7 @@ public:
TwitchAccountManager twitch;
private:
SortedSignalVector<std::shared_ptr<Account>, SharedPtrElementLess<Account>>
accounts;
SortedSignalVector<std::shared_ptr<Account>, SharedPtrElementLess<Account>> accounts;
};
} // namespace chatterino
+1 -1
View File
@@ -1,8 +1,8 @@
#pragma once
#include "common/SignalVectorModel.hpp"
#include "controllers/accounts/Account.hpp"
#include "util/QstringHash.hpp"
#include "common/SignalVectorModel.hpp"
#include <unordered_map>
@@ -4,13 +4,12 @@
#include <memory>
#include <mutex>
#include "controllers/commands/Command.hpp"
#include "common/SignalVector2.hpp"
#include "controllers/commands/Command.hpp"
namespace chatterino {
class Channel;
class CommandModel;
class CommandController
+1 -1
View File
@@ -2,8 +2,8 @@
#include <QObject>
#include "controllers/commands/Command.hpp"
#include "common/SignalVectorModel.hpp"
#include "controllers/commands/Command.hpp"
namespace chatterino {
@@ -2,8 +2,8 @@
#include <QObject>
#include "controllers/highlights/HighlightPhrase.hpp"
#include "common/SignalVectorModel.hpp"
#include "controllers/highlights/HighlightPhrase.hpp"
namespace chatterino {
@@ -1,7 +1,7 @@
#pragma once
#include "util/RapidjsonHelpers.hpp"
#include "common/SerializeCustom.hpp"
#include "util/RapidjsonHelpers.hpp"
#include <QRegularExpression>
#include <QString>
@@ -94,8 +94,7 @@ struct Deserialize<chatterino::HighlightPhrase> {
static chatterino::HighlightPhrase get(const rapidjson::Value &value)
{
if (!value.IsObject()) {
return chatterino::HighlightPhrase(QString(), true, false,
false);
return chatterino::HighlightPhrase(QString(), true, false, false);
}
QString _pattern;
@@ -108,8 +107,7 @@ struct Deserialize<chatterino::HighlightPhrase> {
chatterino::rj::getSafe(value, "sound", _sound);
chatterino::rj::getSafe(value, "regex", _isRegex);
return chatterino::HighlightPhrase(_pattern, _alert, _sound,
_isRegex);
return chatterino::HighlightPhrase(_pattern, _alert, _sound, _isRegex);
}
};
+2 -3
View File
@@ -1,8 +1,8 @@
#pragma once
#include "common/SignalVector2.hpp"
#include "controllers/ignores/IgnorePhrase.hpp"
#include "singletons/SettingsManager.hpp"
#include "common/SignalVector2.hpp"
namespace chatterino {
@@ -20,8 +20,7 @@ public:
private:
bool initialized = false;
chatterino::ChatterinoSetting<std::vector<IgnorePhrase>> ignoresSetting = {
"/ignore/phrases"};
chatterino::ChatterinoSetting<std::vector<IgnorePhrase>> ignoresSetting = {"/ignore/phrases"};
};
} // namespace chatterino
+1 -1
View File
@@ -2,8 +2,8 @@
#include <QObject>
#include "controllers/ignores/IgnorePhrase.hpp"
#include "common/SignalVectorModel.hpp"
#include "controllers/ignores/IgnorePhrase.hpp"
namespace chatterino {
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
#include "util/RapidjsonHelpers.hpp"
#include "common/SerializeCustom.hpp"
#include "util/RapidjsonHelpers.hpp"
#include <QRegularExpression>
#include <QString>
@@ -1,7 +1,7 @@
#pragma once
#include "controllers/taggedusers/TaggedUser.hpp"
#include "common/SignalVector2.hpp"
#include "controllers/taggedusers/TaggedUser.hpp"
namespace chatterino {
@@ -1,7 +1,7 @@
#pragma once
#include "controllers/taggedusers/TaggedUser.hpp"
#include "common/SignalVectorModel.hpp"
#include "controllers/taggedusers/TaggedUser.hpp"
namespace chatterino {