changed application data path from %appdata%/chatterino to

%appdata%/chatterino2

appdatapath.cpp

@@ -0,0 +1,30 @@
+#include "appdatapath.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QStandardPaths>
+
+QString Path::appdataPath;
+std::mutex Path::appdataPathMutex;
+
+const QString &Path::getAppdataPath()
+{
+    std::lock_guard<std::mutex> lock(appdataPathMutex);
+
+    if (appdataPath.isEmpty()) {
+#ifdef PORTABLE
+        QString path = QCoreApplication::applicationDirPath();
+#else
+        QString path =
+            QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/Chatterino2/";
+#endif
+
+        QDir(QDir::root()).mkdir(path);
+
+        appdataPath = path;
+    }
+
+    qDebug() << "memes: " << appdataPath;
+
+    return appdataPath;
+}

appdatapath.h

@@ -0,0 +1,18 @@
+#ifndef APPDATAPATH_H
+#define APPDATAPATH_H
+
+#include <QString>
+#include <atomic>
+#include <mutex>
+
+class Path
+{
+public:
+    static const QString &getAppdataPath();
+
+private:
+    static QString appdataPath;
+    static std::mutex appdataPathMutex;
+};
+
+#endif  // APPDATAPATH_H

channel.cpp

@@ -27,7 +27,7 @@ Channel::Channel(const QString &channel)
     , _subLink("https://www.twitch.tv/" + _name + "/subscribe?ref=in_chat_subscriber_link")
     , _channelLink("https://twitch.tv/" + _name)
     , _popoutPlayerLink("https://player.twitch.tv/?channel=" + _name)
-//, _loggingChannel(logging::get(_name))
+//    , _loggingChannel(logging::get(_name))
 {
     reloadChannelEmotes();
 }

chatterino.pro

@@ -64,7 +64,8 @@ SOURCES += main.cpp\
     twitch/twitchparsemessage.cpp \
     widgets/fancybutton.cpp \
     widgets/titlebar.cpp \
-    widgets/userpopupwidget.cpp
+    widgets/userpopupwidget.cpp \
+    appdatapath.cpp
 
 HEADERS  += \
     asyncexec.h \
@@ -121,7 +122,8 @@ HEADERS  += \
     twitch/twitchparsemessage.h \
     widgets/fancybutton.h \
     widgets/titlebar.h \
-    widgets/userpopupwidget.h
+    widgets/userpopupwidget.h \
+    appdatapath.h
 
 PRECOMPILED_HEADER =
 

common.h

@@ -1,3 +1,5 @@
+#include <QString>
+
 #ifndef COMMON_H
 #define COMMON_H
 

main.cpp

@@ -1,5 +1,6 @@
 #include "channelmanager.h"
 #include "colorscheme.h"
+#include "common.h"
 #include "emojis.h"
 #include "emotemanager.h"
 #include "ircmanager.h"
@@ -11,13 +12,14 @@
 
 #include <QApplication>
 #include <QClipboard>
+#include <QDir>
+#include <QStandardPaths>
 #include <boost/signals2.hpp>
 
 using namespace chatterino;
 using namespace chatterino::widgets;
 
-int
+int main(int argc, char *argv[])
-main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
 

settingsmanager.cpp

@@ -1,4 +1,5 @@
 #include "settingsmanager.h"
+#include "appdatapath.h"
 
 #include <QDebug>
 #include <QDir>
@@ -11,10 +12,7 @@ namespace chatterino {
 SettingsManager SettingsManager::instance;
 
 SettingsManager::SettingsManager()
-    : _settings(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) +
+    : _settings(Path::getAppdataPath() + "settings.ini", QSettings::IniFormat)
-                    "/Chatterino/newsettings.ini",
-                QSettings::IniFormat)
-    , _portable(false)
     , _wordTypeMask(Word::Default)
     , theme(_settingsItems, "theme", "dark")
     , themeHue(_settingsItems, "themeHue", 0)
@@ -87,16 +85,6 @@ bool SettingsManager::isIgnoredEmote(const QString &)
     return false;
 }
 
-bool SettingsManager::getPortable()
-{
-    return _portable;
-}
-
-void SettingsManager::setPortable(bool value)
-{
-    _portable = value;
-}
-
 QSettings &SettingsManager::getQSettings()
 {
     return _settings;

settingsmanager.h

@@ -52,8 +52,6 @@ public:
 
     messages::Word::Type getWordTypeMask();
     bool isIgnoredEmote(const QString &emote);
-    bool getPortable();
-    void setPortable(bool value);
     QSettings &getQSettings();
     SettingsSnapshot createSnapshot();
 
@@ -66,7 +64,6 @@ private:
     // variables
     QSettings _settings;
     std::vector<std::reference_wrapper<BaseSetting>> _settingsItems;
-    bool _portable;
     messages::Word::Type _wordTypeMask;
 
     // methods

windowmanager.cpp

@@ -1,4 +1,5 @@
 #include "windowmanager.h"
+#include "appdatapath.h"
 
 #include <QDebug>
 #include <QStandardPaths>
@@ -9,9 +10,7 @@ namespace chatterino {
 
 static const std::string &getSettingsPath()
 {
-    static std::string path =
+    static std::string path = (Path::getAppdataPath() + "uilayout.json").toStdString();
-        (QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/windows.json")
-            .toStdString();
 
     return path;
 }