refactoring

chatterino.pro

@@ -17,17 +17,14 @@ TARGET   = chatterino
 TEMPLATE = app
 
 DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES += IRC_NAMESPACE=Communi
 
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += main.cpp\
-    account.cpp \
     channel.cpp \
-    channels.cpp \
     colorscheme.cpp \
     emojis.cpp \
-    emotes.cpp \
-    fonts.cpp \
     ircmanager.cpp \
     messages/lazyloadedimage.cpp \
     messages/link.cpp \
@@ -35,7 +32,6 @@ SOURCES += main.cpp\
     messages/word.cpp \
     messages/wordpart.cpp \
     resources.cpp \
-    settings.cpp \
     widgets/chatwidget.cpp \
     widgets/chatwidgetheader.cpp \
     widgets/chatwidgetheaderbutton.cpp \
@@ -52,21 +48,31 @@ SOURCES += main.cpp\
     widgets/settingsdialog.cpp \
     widgets/settingsdialogtab.cpp \
     widgets/textinputdialog.cpp \
-    windows.cpp \
     messages/messageref.cpp \
     logging/loggingmanager.cpp \
-    logging/loggingchannel.cpp
+    logging/loggingchannel.cpp \
+    windowmanager.cpp \
+    channelmanager.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
 
-HEADERS  += account.h \
+HEADERS  += \
     asyncexec.h \
     channel.h \
-    channels.h \
     colorscheme.h \
     common.h \
     concurrentmap.h \
     emojis.h \
-    emotes.h \
-    fonts.h \
     ircmanager.h \
     messages/lazyloadedimage.h \
     messages/link.h \
@@ -75,8 +81,7 @@ HEADERS  += account.h \
     messages/wordpart.h \
     resources.h \
     setting.h \
-    settings.h \
-    twitchemotevalue.h \
+    twitch/emotevalue.h \
     widgets/chatwidget.h \
     widgets/chatwidgetheader.h \
     widgets/chatwidgetheaderbutton.h \
@@ -94,14 +99,29 @@ HEADERS  += account.h \
     widgets/settingsdialogtab.h \
     widgets/signallabel.h \
     widgets/textinputdialog.h \
-    windows.h \
     widgets/resizingtextedit.h \
     settingssnapshot.h \
     messages/limitedqueue.h \
     messages/limitedqueuesnapshot.h \
     messages/messageref.h \
     logging/loggingmanager.h \
-    logging/loggingchannel.h
+    logging/loggingchannel.h \
+    channelmanager.h \
+    windowmanager.h \
+    settingsmanager.h \
+    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
 
 PRECOMPILED_HEADER =
 
@@ -112,9 +132,29 @@ DISTFILES +=
 
 # Include boost
 win32 {
-        INCLUDEPATH += C:\local\boost\
+    INCLUDEPATH += C:\local\boost\
+}
+
+# Optional dependency on windows sdk 7.1
+win32:exists(C:\Program Files\Microsoft SDKs\Windows\v7.1\Include\Windows.h) {
+    LIBS += -L"C:\Program Files\Microsoft SDKs\Windows\v7.1\Lib" \
+        -ldwmapi \
+        -lgdi32
+
+    SOURCES += platform/borderless/qwinwidget.cpp \
+        platform/borderless/winnativewindow.cpp \
+        platform/borderless/widget.cpp
+
+    HEADERS += platform/borderless/qwinwidget.h \
+        platform/borderless/winnativewindow.h \
+        platform/borderless/widget.h
+
+    DEFINES += "USEWINSDK"
 }
 
 macx {
     INCLUDEPATH += /usr/local/include
 }
+
+FORMS += \
+    forms/userpopup.ui