this commit is too big

This commit is contained in:
fourtf
2018-08-02 14:23:27 +02:00
parent 3b3c5d8d75
commit c2e2dfb577
186 changed files with 3626 additions and 2656 deletions
@@ -11,6 +11,7 @@
#include "providers/twitch/TwitchServer.hpp"
#include "singletons/Paths.hpp"
#include "singletons/Settings.hpp"
#include "util/CombinePath.hpp"
#include "widgets/dialogs/LogsPopup.hpp"
#include <QApplication>
@@ -44,15 +45,14 @@ CommandController::CommandController()
this->items.itemRemoved.connect(addFirstMatchToMap);
}
void CommandController::initialize(Application &app)
void CommandController::initialize(Settings &, Paths &paths)
{
this->load();
this->load(paths);
}
void CommandController::load()
void CommandController::load(Paths &paths)
{
auto app = getApp();
this->filePath_ = app->paths->settingsDirectory + "/commands.txt";
this->filePath_ = combinePath(paths.settingsDirectory, "commands.txt");
QFile textFile(this->filePath_);
if (!textFile.open(QIODevice::ReadOnly)) {