renamed "user" to "account"

accountmanager.cpp

@@ -1,4 +1,4 @@
-#include "usermanager.h"
+#include "accountmanager.h"
 
 namespace chatterino {
 

accountmanager.h

@@ -1,7 +1,7 @@
 #ifndef ACCOUNTMANAGER_H
 #define ACCOUNTMANAGER_H
 
-#include "twitch/twitchuser.h"
+#include "twitch/twitchaccount.h"
 
 #include <mutex>
 #include <vector>

chatterino.pro

@@ -61,16 +61,16 @@ SOURCES += main.cpp\
     fontmanager.cpp \
     settingsmanager.cpp \
     emotemanager.cpp \
-    usermanager.cpp \
-    twitch/twitchuser.cpp \
     messages/messagebuilder.cpp \
     twitch/twitchmessagebuilder.cpp \
-    ircuser2.cpp \
     twitch/twitchparsemessage.cpp \
     widgets/fancybutton.cpp \
     widgets/titlebar.cpp \
-    widgets/userpopupwidget.cpp \
-    appdatapath.cpp
+    appdatapath.cpp \
+    accountmanager.cpp \
+    twitch/twitchaccount.cpp \
+    ircaccount.cpp \
+    widgets/accountpopup.cpp
 
 HEADERS  += \
     asyncexec.h \
@@ -118,17 +118,17 @@ HEADERS  += \
     fontmanager.h \
     emotemanager.h \
     util/urlfetch.h \
-    usermanager.h \
-    twitch/twitchuser.h \
     messages/messageparseargs.h \
     messages/messagebuilder.h \
     twitch/twitchmessagebuilder.h \
-    ircuser2.h \
     twitch/twitchparsemessage.h \
     widgets/fancybutton.h \
     widgets/titlebar.h \
-    widgets/userpopupwidget.h \
-    appdatapath.h
+    appdatapath.h \
+    accountmanager.h \
+    twitch/twitchaccount.h \
+    ircaccount.h \
+    widgets/accountpopup.h
 
 PRECOMPILED_HEADER =
 
@@ -164,4 +164,4 @@ macx {
 }
 
 FORMS += \
-    forms/userpopup.ui
+    forms/accountpopupform.ui

ircaccount.cpp

@@ -1,4 +1,4 @@
-#include "ircuser2.h"
+#include "ircaccount.h"
 
 namespace chatterino {
 

ircmanager.cpp

@@ -5,8 +5,8 @@
 #include "messages/messageparseargs.h"
 #include "twitch/twitchmessagebuilder.h"
 #include "twitch/twitchparsemessage.h"
-#include "twitch/twitchuser.h"
-#include "usermanager.h"
+#include "twitch/twitchaccount.h"
+#include "accountmanager.h"
 
 #include <irccommand.h>
 #include <ircconnection.h>

ircmanager.h

@@ -4,7 +4,7 @@
 #define TWITCH_MAX_MESSAGELENGTH 500
 
 #include "messages/message.h"
-#include "twitch/twitchuser.h"
+#include "twitch/twitchaccount.h"
 
 #include <IrcMessage>
 #include <QMap>

qt.conf

@@ -1,4 +0,0 @@
-[Platforms]
-# 1 - for System DPI Aware
-# 2 - for Per Monitor DPI Aware
-WindowsArguments = dpiawareness=2

twitch/twitchaccount.cpp

@@ -1,4 +1,4 @@
-#include "twitchuser.h"
+#include "twitchaccount.h"
 
 namespace chatterino {
 namespace twitch {

twitch/twitchaccount.h

@@ -1,7 +1,7 @@
 #ifndef ACCOUNT_H
 #define ACCOUNT_H
 
-#include "ircuser2.h"
+#include "ircaccount.h"
 
 #include <QString>
 

widgets/accountpopup.cpp

@@ -1,4 +1,4 @@
-#include "widgets/userpopupwidget.h"
+#include "widgets/accountpopup.h"
 #include "channel.h"
 #include "ui_userpopup.h"
 

widgets/chatwidgetview.h

@@ -6,7 +6,7 @@
 #include "messages/messageref.h"
 #include "messages/word.h"
 #include "widgets/scrollbar.h"
-#include "widgets/userpopupwidget.h"
+#include "widgets/accountpopup.h"
 
 #include <QPaintEvent>
 #include <QScroller>

widgets/settingsdialog.cpp

@@ -1,6 +1,6 @@
 #include "widgets/settingsdialog.h"
-#include "twitch/twitchuser.h"
-#include "usermanager.h"
+#include "twitch/twitchaccount.h"
+#include "accountmanager.h"
 #include "widgets/settingsdialogtab.h"
 #include "windowmanager.h"