removed namespaces

src/controllers/highlights/HighlightController.cpp

@@ -32,9 +32,9 @@ HighlightModel *HighlightController::createModel(QObject *parent)
     return model;
 }
 
-void HighlightController::addHighlight(const messages::MessagePtr &msg)
+void HighlightController::addHighlight(const chatterino::MessagePtr &msg)
 {
-    //    static widgets::NotificationPopup popup;
+    //    static NotificationPopup popup;
 
     //    popup.updatePosition();
     //    popup.addMessage(msg);

src/controllers/highlights/HighlightController.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
+#include "common/SignalVector2.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "messages/Message.hpp"
 #include "singletons/SettingsManager.hpp"
-#include "common/SignalVector2.hpp"
 
 namespace chatterino {
 
@@ -16,16 +16,16 @@ public:
 
     void initialize();
 
-    util::UnsortedSignalVector<HighlightPhrase> phrases;
+    UnsortedSignalVector<HighlightPhrase> phrases;
 
     HighlightModel *createModel(QObject *parent);
 
-    void addHighlight(const messages::MessagePtr &msg);
+    void addHighlight(const chatterino::MessagePtr &msg);
 
 private:
     bool initialized = false;
 
-    singletons::ChatterinoSetting<std::vector<highlights::HighlightPhrase>> highlightsSetting = {
+    chatterino::ChatterinoSetting<std::vector<HighlightPhrase>> highlightsSetting = {
         "/highlighting/highlights"};
 };
 

src/controllers/highlights/HighlightModel.cpp

@@ -8,7 +8,7 @@ namespace chatterino {
 
 // commandmodel
 HighlightModel::HighlightModel(QObject *parent)
-    : util::SignalVectorModel<HighlightPhrase>(4, parent)
+    : SignalVectorModel<HighlightPhrase>(4, parent)
 {
 }
 
@@ -26,19 +26,19 @@ HighlightPhrase HighlightModel::getItemFromRow(std::vector<QStandardItem *> &row
 // turns a row in the model into a vector item
 void HighlightModel::getRowFromItem(const HighlightPhrase &item, std::vector<QStandardItem *> &row)
 {
-    util::setStringItem(row[0], item.getPattern());
-    util::setBoolItem(row[1], item.getAlert());
-    util::setBoolItem(row[2], item.getSound());
-    util::setBoolItem(row[3], item.isRegex());
+    setStringItem(row[0], item.getPattern());
+    setBoolItem(row[1], item.getAlert());
+    setBoolItem(row[2], item.getSound());
+    setBoolItem(row[3], item.isRegex());
 }
 
 void HighlightModel::afterInit()
 {
     std::vector<QStandardItem *> row = this->createRow();
-    util::setBoolItem(row[0], getApp()->settings->enableHighlightsSelf.getValue(), true, false);
+    setBoolItem(row[0], getApp()->settings->enableHighlightsSelf.getValue(), true, false);
     row[0]->setData("Your username (automatic)", Qt::DisplayRole);
-    util::setBoolItem(row[1], getApp()->settings->enableHighlightTaskbar.getValue(), true, false);
-    util::setBoolItem(row[2], getApp()->settings->enableHighlightSound.getValue(), true, false);
+    setBoolItem(row[1], getApp()->settings->enableHighlightTaskbar.getValue(), true, false);
+    setBoolItem(row[2], getApp()->settings->enableHighlightSound.getValue(), true, false);
     row[3]->setFlags(0);
     this->insertCustomRow(row, 0);
 }

src/controllers/highlights/HighlightModel.hpp

@@ -9,7 +9,7 @@ namespace chatterino {
 
 class HighlightController;
 
-class HighlightModel : public util::SignalVectorModel<HighlightPhrase>
+class HighlightModel : public SignalVectorModel<HighlightPhrase>
 {
     explicit HighlightModel(QObject *parent);
 

src/controllers/highlights/HighlightPhrase.hpp

@@ -74,8 +74,8 @@ namespace pajlada {
 namespace Settings {
 
 template <>
-struct Serialize<chatterino::controllers::highlights::HighlightPhrase> {
-    static rapidjson::Value get(const chatterino::controllers::highlights::HighlightPhrase &value,
+struct Serialize<chatterino::HighlightPhrase> {
+    static rapidjson::Value get(const chatterino::HighlightPhrase &value,
                                 rapidjson::Document::AllocatorType &a)
     {
         rapidjson::Value ret(rapidjson::kObjectType);
@@ -90,11 +90,11 @@ struct Serialize<chatterino::controllers::highlights::HighlightPhrase> {
 };
 
 template <>
-struct Deserialize<chatterino::controllers::highlights::HighlightPhrase> {
-    static chatterino::controllers::highlights::HighlightPhrase get(const rapidjson::Value &value)
+struct Deserialize<chatterino::HighlightPhrase> {
+    static chatterino::HighlightPhrase get(const rapidjson::Value &value)
     {
         if (!value.IsObject()) {
-            return chatterino::controllers::highlights::HighlightPhrase(QString(), true, false,
+            return chatterino::HighlightPhrase(QString(), true, false,
                                                                         false);
         }
 
@@ -108,7 +108,7 @@ struct Deserialize<chatterino::controllers::highlights::HighlightPhrase> {
         chatterino::rj::getSafe(value, "sound", _sound);
         chatterino::rj::getSafe(value, "regex", _isRegex);
 
-        return chatterino::controllers::highlights::HighlightPhrase(_pattern, _alert, _sound,
+        return chatterino::HighlightPhrase(_pattern, _alert, _sound,
                                                                     _isRegex);
     }
 };