move around files

chatterino.pro

@@ -14,6 +14,9 @@ include(lib/libcommuni/src/src.pri)
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
+# Include ourself
+INCLUDEPATH += src/
+
 TARGET   = chatterino
 TEMPLATE = app
 
@@ -22,10 +25,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # Define warning flags for Chatterino
 win32-msvc* {
     QMAKE_CXXFLAGS_WARN_ON = -W4
-# 4714 - function marked as __forceinline not inlined
+    # 4714 - function marked as __forceinline not inlined
-# 4996 - occurs when the compiler encounters a function or variable that is marked as deprecated.
+    # 4996 - occurs when the compiler encounters a function or variable that is marked as deprecated.
-#        These functions may have a different preferred name, may be insecure or have
+    #        These functions may have a different preferred name, may be insecure or have
-#        a more secure variant, or may be obsolete.
+    #        a more secure variant, or may be obsolete.
     QMAKE_CXXFLAGS_WARN_ON += /wd4714
     QMAKE_CXXFLAGS_WARN_ON += /wd4996
 } else {
@@ -42,115 +45,116 @@ win32 {
 
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-SOURCES += main.cpp\
+SOURCES += \
-    channel.cpp \
+    src/main.cpp \
-    colorscheme.cpp \
+    src/channel.cpp \
-    emojis.cpp \
+    src/colorscheme.cpp \
-    ircmanager.cpp \
+    src/emojis.cpp \
-    messages/lazyloadedimage.cpp \
+    src/ircmanager.cpp \
-    messages/link.cpp \
+    src/messages/lazyloadedimage.cpp \
-    messages/message.cpp \
+    src/messages/link.cpp \
-    messages/word.cpp \
+    src/messages/message.cpp \
-    messages/wordpart.cpp \
+    src/messages/word.cpp \
-    resources.cpp \
+    src/messages/wordpart.cpp \
-    widgets/chatwidget.cpp \
+    src/resources.cpp \
-    widgets/chatwidgetheader.cpp \
+    src/widgets/chatwidget.cpp \
-    widgets/chatwidgetheaderbutton.cpp \
+    src/widgets/chatwidgetheader.cpp \
-    widgets/chatwidgetinput.cpp \
+    src/widgets/chatwidgetheaderbutton.cpp \
-    widgets/chatwidgetview.cpp \
+    src/widgets/chatwidgetinput.cpp \
-    widgets/mainwindow.cpp \
+    src/widgets/chatwidgetview.cpp \
-    widgets/notebook.cpp \
+    src/widgets/mainwindow.cpp \
-    widgets/notebookbutton.cpp \
+    src/widgets/notebook.cpp \
-    widgets/notebookpage.cpp \
+    src/widgets/notebookbutton.cpp \
-    widgets/notebookpagedroppreview.cpp \
+    src/widgets/notebookpage.cpp \
-    widgets/notebooktab.cpp \
+    src/widgets/notebookpagedroppreview.cpp \
-    widgets/scrollbar.cpp \
+    src/widgets/notebooktab.cpp \
-    widgets/scrollbarhighlight.cpp \
+    src/widgets/scrollbar.cpp \
-    widgets/settingsdialog.cpp \
+    src/widgets/scrollbarhighlight.cpp \
-    widgets/settingsdialogtab.cpp \
+    src/widgets/settingsdialog.cpp \
-    widgets/textinputdialog.cpp \
+    src/widgets/settingsdialogtab.cpp \
-    messages/messageref.cpp \
+    src/widgets/textinputdialog.cpp \
-    logging/loggingmanager.cpp \
+    src/messages/messageref.cpp \
-    logging/loggingchannel.cpp \
+    src/logging/loggingmanager.cpp \
-    windowmanager.cpp \
+    src/logging/loggingchannel.cpp \
-    channelmanager.cpp \
+    src/windowmanager.cpp \
-    fontmanager.cpp \
+    src/channelmanager.cpp \
-    settingsmanager.cpp \
+    src/fontmanager.cpp \
-    emotemanager.cpp \
+    src/settingsmanager.cpp \
-    messages/messagebuilder.cpp \
+    src/emotemanager.cpp \
-    twitch/twitchmessagebuilder.cpp \
+    src/messages/messagebuilder.cpp \
-    twitch/twitchparsemessage.cpp \
+    src/twitch/twitchmessagebuilder.cpp \
-    widgets/fancybutton.cpp \
+    src/twitch/twitchparsemessage.cpp \
-    widgets/titlebar.cpp \
+    src/widgets/fancybutton.cpp \
-    appdatapath.cpp \
+    src/widgets/titlebar.cpp \
-    accountmanager.cpp \
+    src/appdatapath.cpp \
-    twitch/twitchuser.cpp \
+    src/accountmanager.cpp \
-    ircaccount.cpp \
+    src/twitch/twitchuser.cpp \
-    widgets/accountpopup.cpp
+    src/ircaccount.cpp \
+    src/widgets/accountpopup.cpp
 
 HEADERS  += \
-    asyncexec.h \
+    src/asyncexec.h \
-    channel.h \
+    src/channel.h \
-    colorscheme.h \
+    src/colorscheme.h \
-    common.h \
+    src/common.h \
-    concurrentmap.h \
+    src/concurrentmap.h \
-    emojis.h \
+    src/emojis.h \
-    ircmanager.h \
+    src/ircmanager.h \
-    messages/lazyloadedimage.h \
+    src/messages/lazyloadedimage.h \
-    messages/link.h \
+    src/messages/link.h \
-    messages/message.h \
+    src/messages/message.h \
-    messages/word.h \
+    src/messages/word.h \
-    messages/wordpart.h \
+    src/messages/wordpart.h \
-    resources.h \
+    src/resources.h \
-    setting.h \
+    src/setting.h \
-    twitch/emotevalue.h \
+    src/twitch/emotevalue.h \
-    widgets/chatwidget.h \
+    src/widgets/chatwidget.h \
-    widgets/chatwidgetheader.h \
+    src/widgets/chatwidgetheader.h \
-    widgets/chatwidgetheaderbutton.h \
+    src/widgets/chatwidgetheaderbutton.h \
-    widgets/chatwidgetinput.h \
+    src/widgets/chatwidgetinput.h \
-    widgets/chatwidgetview.h \
+    src/widgets/chatwidgetview.h \
-    widgets/mainwindow.h \
+    src/widgets/mainwindow.h \
-    widgets/notebook.h \
+    src/widgets/notebook.h \
-    widgets/notebookbutton.h \
+    src/widgets/notebookbutton.h \
-    widgets/notebookpage.h \
+    src/widgets/notebookpage.h \
-    widgets/notebookpagedroppreview.h \
+    src/widgets/notebookpagedroppreview.h \
-    widgets/notebooktab.h \
+    src/widgets/notebooktab.h \
-    widgets/scrollbar.h \
+    src/widgets/scrollbar.h \
-    widgets/scrollbarhighlight.h \
+    src/widgets/scrollbarhighlight.h \
-    widgets/settingsdialog.h \
+    src/widgets/settingsdialog.h \
-    widgets/settingsdialogtab.h \
+    src/widgets/settingsdialogtab.h \
-    widgets/signallabel.h \
+    src/widgets/signallabel.h \
-    widgets/textinputdialog.h \
+    src/widgets/textinputdialog.h \
-    widgets/resizingtextedit.h \
+    src/widgets/resizingtextedit.h \
-    settingssnapshot.h \
+    src/settingssnapshot.h \
-    messages/limitedqueue.h \
+    src/messages/limitedqueue.h \
-    messages/limitedqueuesnapshot.h \
+    src/messages/limitedqueuesnapshot.h \
-    messages/messageref.h \
+    src/messages/messageref.h \
-    logging/loggingmanager.h \
+    src/logging/loggingmanager.h \
-    logging/loggingchannel.h \
+    src/logging/loggingchannel.h \
-    channelmanager.h \
+    src/channelmanager.h \
-    windowmanager.h \
+    src/windowmanager.h \
-    settingsmanager.h \
+    src/settingsmanager.h \
-    fontmanager.h \
+    src/fontmanager.h \
-    emotemanager.h \
+    src/emotemanager.h \
-    util/urlfetch.h \
+    src/util/urlfetch.h \
-    messages/messageparseargs.h \
+    src/messages/messageparseargs.h \
-    messages/messagebuilder.h \
+    src/messages/messagebuilder.h \
-    twitch/twitchmessagebuilder.h \
+    src/twitch/twitchmessagebuilder.h \
-    twitch/twitchparsemessage.h \
+    src/twitch/twitchparsemessage.h \
-    widgets/fancybutton.h \
+    src/widgets/fancybutton.h \
-    widgets/titlebar.h \
+    src/widgets/titlebar.h \
-    appdatapath.h \
+    src/appdatapath.h \
-    accountmanager.h \
+    src/accountmanager.h \
-    twitch/twitchuser.h \
+    src/twitch/twitchuser.h \
-    ircaccount.h \
+    src/ircaccount.h \
-    widgets/accountpopup.h \
+    src/widgets/accountpopup.h \
-    util/distancebetweenpoints.h
+    src/util/distancebetweenpoints.h
 
 PRECOMPILED_HEADER =
 
 RESOURCES += \
-    resources.qrc
+    resources/resources.qrc
 
 DISTFILES +=
 

lib/README.md

@@ -0,0 +1,3 @@
+Third party libraries are stored here
+
+Fetched via `git submodule update --init --recursive`