diff --git a/chatterino.pro b/chatterino.pro index 73f86d4f1..b1aae5cfe 100644 --- a/chatterino.pro +++ b/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 -# 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 -# a more secure variant, or may be obsolete. + # 4714 - function marked as __forceinline not inlined + # 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 + # 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\ - channel.cpp \ - colorscheme.cpp \ - emojis.cpp \ - ircmanager.cpp \ - messages/lazyloadedimage.cpp \ - messages/link.cpp \ - messages/message.cpp \ - messages/word.cpp \ - messages/wordpart.cpp \ - resources.cpp \ - widgets/chatwidget.cpp \ - widgets/chatwidgetheader.cpp \ - widgets/chatwidgetheaderbutton.cpp \ - widgets/chatwidgetinput.cpp \ - widgets/chatwidgetview.cpp \ - widgets/mainwindow.cpp \ - widgets/notebook.cpp \ - widgets/notebookbutton.cpp \ - widgets/notebookpage.cpp \ - widgets/notebookpagedroppreview.cpp \ - widgets/notebooktab.cpp \ - widgets/scrollbar.cpp \ - widgets/scrollbarhighlight.cpp \ - widgets/settingsdialog.cpp \ - widgets/settingsdialogtab.cpp \ - widgets/textinputdialog.cpp \ - messages/messageref.cpp \ - logging/loggingmanager.cpp \ - logging/loggingchannel.cpp \ - windowmanager.cpp \ - channelmanager.cpp \ - fontmanager.cpp \ - settingsmanager.cpp \ - emotemanager.cpp \ - messages/messagebuilder.cpp \ - twitch/twitchmessagebuilder.cpp \ - twitch/twitchparsemessage.cpp \ - widgets/fancybutton.cpp \ - widgets/titlebar.cpp \ - appdatapath.cpp \ - accountmanager.cpp \ - twitch/twitchuser.cpp \ - ircaccount.cpp \ - widgets/accountpopup.cpp +SOURCES += \ + src/main.cpp \ + src/channel.cpp \ + src/colorscheme.cpp \ + src/emojis.cpp \ + src/ircmanager.cpp \ + src/messages/lazyloadedimage.cpp \ + src/messages/link.cpp \ + src/messages/message.cpp \ + src/messages/word.cpp \ + src/messages/wordpart.cpp \ + src/resources.cpp \ + src/widgets/chatwidget.cpp \ + src/widgets/chatwidgetheader.cpp \ + src/widgets/chatwidgetheaderbutton.cpp \ + src/widgets/chatwidgetinput.cpp \ + src/widgets/chatwidgetview.cpp \ + src/widgets/mainwindow.cpp \ + src/widgets/notebook.cpp \ + src/widgets/notebookbutton.cpp \ + src/widgets/notebookpage.cpp \ + src/widgets/notebookpagedroppreview.cpp \ + src/widgets/notebooktab.cpp \ + src/widgets/scrollbar.cpp \ + src/widgets/scrollbarhighlight.cpp \ + src/widgets/settingsdialog.cpp \ + src/widgets/settingsdialogtab.cpp \ + src/widgets/textinputdialog.cpp \ + src/messages/messageref.cpp \ + src/logging/loggingmanager.cpp \ + src/logging/loggingchannel.cpp \ + src/windowmanager.cpp \ + src/channelmanager.cpp \ + src/fontmanager.cpp \ + src/settingsmanager.cpp \ + src/emotemanager.cpp \ + src/messages/messagebuilder.cpp \ + src/twitch/twitchmessagebuilder.cpp \ + src/twitch/twitchparsemessage.cpp \ + src/widgets/fancybutton.cpp \ + src/widgets/titlebar.cpp \ + src/appdatapath.cpp \ + src/accountmanager.cpp \ + src/twitch/twitchuser.cpp \ + src/ircaccount.cpp \ + src/widgets/accountpopup.cpp HEADERS += \ - asyncexec.h \ - channel.h \ - colorscheme.h \ - common.h \ - concurrentmap.h \ - emojis.h \ - ircmanager.h \ - messages/lazyloadedimage.h \ - messages/link.h \ - messages/message.h \ - messages/word.h \ - messages/wordpart.h \ - resources.h \ - setting.h \ - twitch/emotevalue.h \ - widgets/chatwidget.h \ - widgets/chatwidgetheader.h \ - widgets/chatwidgetheaderbutton.h \ - widgets/chatwidgetinput.h \ - widgets/chatwidgetview.h \ - widgets/mainwindow.h \ - widgets/notebook.h \ - widgets/notebookbutton.h \ - widgets/notebookpage.h \ - widgets/notebookpagedroppreview.h \ - widgets/notebooktab.h \ - widgets/scrollbar.h \ - widgets/scrollbarhighlight.h \ - widgets/settingsdialog.h \ - widgets/settingsdialogtab.h \ - widgets/signallabel.h \ - widgets/textinputdialog.h \ - widgets/resizingtextedit.h \ - settingssnapshot.h \ - messages/limitedqueue.h \ - messages/limitedqueuesnapshot.h \ - messages/messageref.h \ - logging/loggingmanager.h \ - logging/loggingchannel.h \ - channelmanager.h \ - windowmanager.h \ - settingsmanager.h \ - fontmanager.h \ - emotemanager.h \ - util/urlfetch.h \ - messages/messageparseargs.h \ - messages/messagebuilder.h \ - twitch/twitchmessagebuilder.h \ - twitch/twitchparsemessage.h \ - widgets/fancybutton.h \ - widgets/titlebar.h \ - appdatapath.h \ - accountmanager.h \ - twitch/twitchuser.h \ - ircaccount.h \ - widgets/accountpopup.h \ - util/distancebetweenpoints.h + src/asyncexec.h \ + src/channel.h \ + src/colorscheme.h \ + src/common.h \ + src/concurrentmap.h \ + src/emojis.h \ + src/ircmanager.h \ + src/messages/lazyloadedimage.h \ + src/messages/link.h \ + src/messages/message.h \ + src/messages/word.h \ + src/messages/wordpart.h \ + src/resources.h \ + src/setting.h \ + src/twitch/emotevalue.h \ + src/widgets/chatwidget.h \ + src/widgets/chatwidgetheader.h \ + src/widgets/chatwidgetheaderbutton.h \ + src/widgets/chatwidgetinput.h \ + src/widgets/chatwidgetview.h \ + src/widgets/mainwindow.h \ + src/widgets/notebook.h \ + src/widgets/notebookbutton.h \ + src/widgets/notebookpage.h \ + src/widgets/notebookpagedroppreview.h \ + src/widgets/notebooktab.h \ + src/widgets/scrollbar.h \ + src/widgets/scrollbarhighlight.h \ + src/widgets/settingsdialog.h \ + src/widgets/settingsdialogtab.h \ + src/widgets/signallabel.h \ + src/widgets/textinputdialog.h \ + src/widgets/resizingtextedit.h \ + src/settingssnapshot.h \ + src/messages/limitedqueue.h \ + src/messages/limitedqueuesnapshot.h \ + src/messages/messageref.h \ + src/logging/loggingmanager.h \ + src/logging/loggingchannel.h \ + src/channelmanager.h \ + src/windowmanager.h \ + src/settingsmanager.h \ + src/fontmanager.h \ + src/emotemanager.h \ + src/util/urlfetch.h \ + src/messages/messageparseargs.h \ + src/messages/messagebuilder.h \ + src/twitch/twitchmessagebuilder.h \ + src/twitch/twitchparsemessage.h \ + src/widgets/fancybutton.h \ + src/widgets/titlebar.h \ + src/appdatapath.h \ + src/accountmanager.h \ + src/twitch/twitchuser.h \ + src/ircaccount.h \ + src/widgets/accountpopup.h \ + src/util/distancebetweenpoints.h PRECOMPILED_HEADER = RESOURCES += \ - resources.qrc + resources/resources.qrc DISTFILES += diff --git a/lib/README.md b/lib/README.md new file mode 100644 index 000000000..40d2acf17 --- /dev/null +++ b/lib/README.md @@ -0,0 +1,3 @@ +Third party libraries are stored here + +Fetched via `git submodule update --init --recursive` diff --git a/emojidata.txt b/resources/emojidata.txt similarity index 100% rename from emojidata.txt rename to resources/emojidata.txt diff --git a/images/AppearanceEditorPart_16x.png b/resources/images/AppearanceEditorPart_16x.png similarity index 100% rename from images/AppearanceEditorPart_16x.png rename to resources/images/AppearanceEditorPart_16x.png diff --git a/images/BrowserLink_16x.png b/resources/images/BrowserLink_16x.png similarity index 100% rename from images/BrowserLink_16x.png rename to resources/images/BrowserLink_16x.png diff --git a/images/CopyLongTextToClipboard_16x.png b/resources/images/CopyLongTextToClipboard_16x.png similarity index 100% rename from images/CopyLongTextToClipboard_16x.png rename to resources/images/CopyLongTextToClipboard_16x.png diff --git a/images/CustomActionEditor_16x.png b/resources/images/CustomActionEditor_16x.png similarity index 100% rename from images/CustomActionEditor_16x.png rename to resources/images/CustomActionEditor_16x.png diff --git a/images/Emoji_Color_1F60A_19.png b/resources/images/Emoji_Color_1F60A_19.png similarity index 100% rename from images/Emoji_Color_1F60A_19.png rename to resources/images/Emoji_Color_1F60A_19.png diff --git a/images/Filter_16x.png b/resources/images/Filter_16x.png similarity index 100% rename from images/Filter_16x.png rename to resources/images/Filter_16x.png diff --git a/images/Message_16xLG.png b/resources/images/Message_16xLG.png similarity index 100% rename from images/Message_16xLG.png rename to resources/images/Message_16xLG.png diff --git a/images/StatusAnnotations_Blocked_16xLG_color.png b/resources/images/StatusAnnotations_Blocked_16xLG_color.png similarity index 100% rename from images/StatusAnnotations_Blocked_16xLG_color.png rename to resources/images/StatusAnnotations_Blocked_16xLG_color.png diff --git a/images/UserProfile_22x.png b/resources/images/UserProfile_22x.png similarity index 100% rename from images/UserProfile_22x.png rename to resources/images/UserProfile_22x.png diff --git a/images/VSO_Link_blue_16x.png b/resources/images/VSO_Link_blue_16x.png similarity index 100% rename from images/VSO_Link_blue_16x.png rename to resources/images/VSO_Link_blue_16x.png diff --git a/images/admin_bg.png b/resources/images/admin_bg.png similarity index 100% rename from images/admin_bg.png rename to resources/images/admin_bg.png diff --git a/images/broadcaster_bg.png b/resources/images/broadcaster_bg.png similarity index 100% rename from images/broadcaster_bg.png rename to resources/images/broadcaster_bg.png diff --git a/images/button_ban.png b/resources/images/button_ban.png similarity index 100% rename from images/button_ban.png rename to resources/images/button_ban.png diff --git a/images/button_timeout.png b/resources/images/button_timeout.png similarity index 100% rename from images/button_timeout.png rename to resources/images/button_timeout.png diff --git a/images/cheer1.png b/resources/images/cheer1.png similarity index 100% rename from images/cheer1.png rename to resources/images/cheer1.png diff --git a/images/cheer100.png b/resources/images/cheer100.png similarity index 100% rename from images/cheer100.png rename to resources/images/cheer100.png diff --git a/images/cheer1000.png b/resources/images/cheer1000.png similarity index 100% rename from images/cheer1000.png rename to resources/images/cheer1000.png diff --git a/images/cheer10000.png b/resources/images/cheer10000.png similarity index 100% rename from images/cheer10000.png rename to resources/images/cheer10000.png diff --git a/images/cheer100000.png b/resources/images/cheer100000.png similarity index 100% rename from images/cheer100000.png rename to resources/images/cheer100000.png diff --git a/images/cheer5000.png b/resources/images/cheer5000.png similarity index 100% rename from images/cheer5000.png rename to resources/images/cheer5000.png diff --git a/images/format_Bold_16xLG.png b/resources/images/format_Bold_16xLG.png similarity index 100% rename from images/format_Bold_16xLG.png rename to resources/images/format_Bold_16xLG.png diff --git a/images/globalmod_bg.png b/resources/images/globalmod_bg.png similarity index 100% rename from images/globalmod_bg.png rename to resources/images/globalmod_bg.png diff --git a/images/moderator_bg.png b/resources/images/moderator_bg.png similarity index 100% rename from images/moderator_bg.png rename to resources/images/moderator_bg.png diff --git a/images/settings.png b/resources/images/settings.png similarity index 100% rename from images/settings.png rename to resources/images/settings.png diff --git a/images/staff_bg.png b/resources/images/staff_bg.png similarity index 100% rename from images/staff_bg.png rename to resources/images/staff_bg.png diff --git a/images/tool_moreCollapser_off16.png b/resources/images/tool_moreCollapser_off16.png similarity index 100% rename from images/tool_moreCollapser_off16.png rename to resources/images/tool_moreCollapser_off16.png diff --git a/images/turbo_bg.png b/resources/images/turbo_bg.png similarity index 100% rename from images/turbo_bg.png rename to resources/images/turbo_bg.png diff --git a/images/twitchprime_bg.png b/resources/images/twitchprime_bg.png similarity index 100% rename from images/twitchprime_bg.png rename to resources/images/twitchprime_bg.png diff --git a/qss/settings.qss b/resources/qss/settings.qss similarity index 100% rename from qss/settings.qss rename to resources/qss/settings.qss diff --git a/resources.qrc b/resources/resources.qrc similarity index 100% rename from resources.qrc rename to resources/resources.qrc diff --git a/messages/.clang-format b/src/.clang-format similarity index 100% rename from messages/.clang-format rename to src/.clang-format diff --git a/accountmanager.cpp b/src/accountmanager.cpp similarity index 100% rename from accountmanager.cpp rename to src/accountmanager.cpp diff --git a/accountmanager.h b/src/accountmanager.h similarity index 100% rename from accountmanager.h rename to src/accountmanager.h diff --git a/appdatapath.cpp b/src/appdatapath.cpp similarity index 100% rename from appdatapath.cpp rename to src/appdatapath.cpp diff --git a/appdatapath.h b/src/appdatapath.h similarity index 100% rename from appdatapath.h rename to src/appdatapath.h diff --git a/asyncexec.h b/src/asyncexec.h similarity index 100% rename from asyncexec.h rename to src/asyncexec.h diff --git a/channel.cpp b/src/channel.cpp similarity index 100% rename from channel.cpp rename to src/channel.cpp diff --git a/channel.h b/src/channel.h similarity index 100% rename from channel.h rename to src/channel.h diff --git a/channelmanager.cpp b/src/channelmanager.cpp similarity index 100% rename from channelmanager.cpp rename to src/channelmanager.cpp diff --git a/channelmanager.h b/src/channelmanager.h similarity index 100% rename from channelmanager.h rename to src/channelmanager.h diff --git a/colorscheme.cpp b/src/colorscheme.cpp similarity index 100% rename from colorscheme.cpp rename to src/colorscheme.cpp diff --git a/colorscheme.h b/src/colorscheme.h similarity index 100% rename from colorscheme.h rename to src/colorscheme.h diff --git a/common.h b/src/common.h similarity index 100% rename from common.h rename to src/common.h diff --git a/common.h.cpp b/src/common.h.cpp similarity index 100% rename from common.h.cpp rename to src/common.h.cpp diff --git a/concurrentmap.h b/src/concurrentmap.h similarity index 100% rename from concurrentmap.h rename to src/concurrentmap.h diff --git a/emojis.cpp b/src/emojis.cpp similarity index 100% rename from emojis.cpp rename to src/emojis.cpp diff --git a/emojis.h b/src/emojis.h similarity index 100% rename from emojis.h rename to src/emojis.h diff --git a/emotemanager.cpp b/src/emotemanager.cpp similarity index 100% rename from emotemanager.cpp rename to src/emotemanager.cpp diff --git a/emotemanager.h b/src/emotemanager.h similarity index 100% rename from emotemanager.h rename to src/emotemanager.h diff --git a/fontmanager.cpp b/src/fontmanager.cpp similarity index 100% rename from fontmanager.cpp rename to src/fontmanager.cpp diff --git a/fontmanager.h b/src/fontmanager.h similarity index 100% rename from fontmanager.h rename to src/fontmanager.h diff --git a/ircaccount.cpp b/src/ircaccount.cpp similarity index 100% rename from ircaccount.cpp rename to src/ircaccount.cpp diff --git a/ircaccount.h b/src/ircaccount.h similarity index 100% rename from ircaccount.h rename to src/ircaccount.h diff --git a/ircmanager.cpp b/src/ircmanager.cpp similarity index 100% rename from ircmanager.cpp rename to src/ircmanager.cpp diff --git a/ircmanager.h b/src/ircmanager.h similarity index 100% rename from ircmanager.h rename to src/ircmanager.h diff --git a/logging/loggingchannel.cpp b/src/logging/loggingchannel.cpp similarity index 100% rename from logging/loggingchannel.cpp rename to src/logging/loggingchannel.cpp diff --git a/logging/loggingchannel.h b/src/logging/loggingchannel.h similarity index 100% rename from logging/loggingchannel.h rename to src/logging/loggingchannel.h diff --git a/logging/loggingmanager.cpp b/src/logging/loggingmanager.cpp similarity index 100% rename from logging/loggingmanager.cpp rename to src/logging/loggingmanager.cpp diff --git a/logging/loggingmanager.h b/src/logging/loggingmanager.h similarity index 100% rename from logging/loggingmanager.h rename to src/logging/loggingmanager.h diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/twitch/.clang-format b/src/messages/.clang-format similarity index 100% rename from twitch/.clang-format rename to src/messages/.clang-format diff --git a/messages/lazyloadedimage.cpp b/src/messages/lazyloadedimage.cpp similarity index 100% rename from messages/lazyloadedimage.cpp rename to src/messages/lazyloadedimage.cpp diff --git a/messages/lazyloadedimage.h b/src/messages/lazyloadedimage.h similarity index 100% rename from messages/lazyloadedimage.h rename to src/messages/lazyloadedimage.h diff --git a/messages/limitedqueue.h b/src/messages/limitedqueue.h similarity index 100% rename from messages/limitedqueue.h rename to src/messages/limitedqueue.h diff --git a/messages/limitedqueuesnapshot.h b/src/messages/limitedqueuesnapshot.h similarity index 100% rename from messages/limitedqueuesnapshot.h rename to src/messages/limitedqueuesnapshot.h diff --git a/messages/link.cpp b/src/messages/link.cpp similarity index 100% rename from messages/link.cpp rename to src/messages/link.cpp diff --git a/messages/link.h b/src/messages/link.h similarity index 100% rename from messages/link.h rename to src/messages/link.h diff --git a/messages/message.cpp b/src/messages/message.cpp similarity index 100% rename from messages/message.cpp rename to src/messages/message.cpp diff --git a/messages/message.h b/src/messages/message.h similarity index 100% rename from messages/message.h rename to src/messages/message.h diff --git a/messages/messagebuilder.cpp b/src/messages/messagebuilder.cpp similarity index 100% rename from messages/messagebuilder.cpp rename to src/messages/messagebuilder.cpp diff --git a/messages/messagebuilder.h b/src/messages/messagebuilder.h similarity index 100% rename from messages/messagebuilder.h rename to src/messages/messagebuilder.h diff --git a/messages/messageparseargs.h b/src/messages/messageparseargs.h similarity index 100% rename from messages/messageparseargs.h rename to src/messages/messageparseargs.h diff --git a/messages/messageref.cpp b/src/messages/messageref.cpp similarity index 100% rename from messages/messageref.cpp rename to src/messages/messageref.cpp diff --git a/messages/messageref.h b/src/messages/messageref.h similarity index 100% rename from messages/messageref.h rename to src/messages/messageref.h diff --git a/messages/word.cpp b/src/messages/word.cpp similarity index 100% rename from messages/word.cpp rename to src/messages/word.cpp diff --git a/messages/word.h b/src/messages/word.h similarity index 100% rename from messages/word.h rename to src/messages/word.h diff --git a/messages/wordpart.cpp b/src/messages/wordpart.cpp similarity index 100% rename from messages/wordpart.cpp rename to src/messages/wordpart.cpp diff --git a/messages/wordpart.h b/src/messages/wordpart.h similarity index 100% rename from messages/wordpart.h rename to src/messages/wordpart.h diff --git a/platform/borderless/LICENSE b/src/platform/borderless/LICENSE similarity index 100% rename from platform/borderless/LICENSE rename to src/platform/borderless/LICENSE diff --git a/platform/borderless/qwinwidget.cpp b/src/platform/borderless/qwinwidget.cpp similarity index 100% rename from platform/borderless/qwinwidget.cpp rename to src/platform/borderless/qwinwidget.cpp diff --git a/platform/borderless/qwinwidget.h b/src/platform/borderless/qwinwidget.h similarity index 100% rename from platform/borderless/qwinwidget.h rename to src/platform/borderless/qwinwidget.h diff --git a/platform/borderless/widget.cpp b/src/platform/borderless/widget.cpp similarity index 100% rename from platform/borderless/widget.cpp rename to src/platform/borderless/widget.cpp diff --git a/platform/borderless/widget.h b/src/platform/borderless/widget.h similarity index 100% rename from platform/borderless/widget.h rename to src/platform/borderless/widget.h diff --git a/platform/borderless/winnativewindow.cpp b/src/platform/borderless/winnativewindow.cpp similarity index 100% rename from platform/borderless/winnativewindow.cpp rename to src/platform/borderless/winnativewindow.cpp diff --git a/platform/borderless/winnativewindow.h b/src/platform/borderless/winnativewindow.h similarity index 100% rename from platform/borderless/winnativewindow.h rename to src/platform/borderless/winnativewindow.h diff --git a/resources.cpp b/src/resources.cpp similarity index 100% rename from resources.cpp rename to src/resources.cpp diff --git a/resources.h b/src/resources.h similarity index 100% rename from resources.h rename to src/resources.h diff --git a/setting.h b/src/setting.h similarity index 100% rename from setting.h rename to src/setting.h diff --git a/settingsmanager.cpp b/src/settingsmanager.cpp similarity index 100% rename from settingsmanager.cpp rename to src/settingsmanager.cpp diff --git a/settingsmanager.h b/src/settingsmanager.h similarity index 100% rename from settingsmanager.h rename to src/settingsmanager.h diff --git a/settingssnapshot.h b/src/settingssnapshot.h similarity index 100% rename from settingssnapshot.h rename to src/settingssnapshot.h diff --git a/util/.clang-format b/src/twitch/.clang-format similarity index 100% rename from util/.clang-format rename to src/twitch/.clang-format diff --git a/twitch/emotevalue.h b/src/twitch/emotevalue.h similarity index 100% rename from twitch/emotevalue.h rename to src/twitch/emotevalue.h diff --git a/twitch/twitchmessagebuilder.cpp b/src/twitch/twitchmessagebuilder.cpp similarity index 100% rename from twitch/twitchmessagebuilder.cpp rename to src/twitch/twitchmessagebuilder.cpp diff --git a/twitch/twitchmessagebuilder.h b/src/twitch/twitchmessagebuilder.h similarity index 100% rename from twitch/twitchmessagebuilder.h rename to src/twitch/twitchmessagebuilder.h diff --git a/twitch/twitchparsemessage.cpp b/src/twitch/twitchparsemessage.cpp similarity index 100% rename from twitch/twitchparsemessage.cpp rename to src/twitch/twitchparsemessage.cpp diff --git a/twitch/twitchparsemessage.h b/src/twitch/twitchparsemessage.h similarity index 100% rename from twitch/twitchparsemessage.h rename to src/twitch/twitchparsemessage.h diff --git a/twitch/twitchuser.cpp b/src/twitch/twitchuser.cpp similarity index 100% rename from twitch/twitchuser.cpp rename to src/twitch/twitchuser.cpp diff --git a/twitch/twitchuser.h b/src/twitch/twitchuser.h similarity index 100% rename from twitch/twitchuser.h rename to src/twitch/twitchuser.h diff --git a/widgets/.clang-format b/src/util/.clang-format similarity index 100% rename from widgets/.clang-format rename to src/util/.clang-format diff --git a/util/distancebetweenpoints.h b/src/util/distancebetweenpoints.h similarity index 100% rename from util/distancebetweenpoints.h rename to src/util/distancebetweenpoints.h diff --git a/util/urlfetch.h b/src/util/urlfetch.h similarity index 100% rename from util/urlfetch.h rename to src/util/urlfetch.h diff --git a/src/widgets/.clang-format b/src/widgets/.clang-format new file mode 120000 index 000000000..7cab60ce3 --- /dev/null +++ b/src/widgets/.clang-format @@ -0,0 +1 @@ +../.clang-format \ No newline at end of file diff --git a/widgets/accountpopup.cpp b/src/widgets/accountpopup.cpp similarity index 100% rename from widgets/accountpopup.cpp rename to src/widgets/accountpopup.cpp diff --git a/widgets/accountpopup.h b/src/widgets/accountpopup.h similarity index 100% rename from widgets/accountpopup.h rename to src/widgets/accountpopup.h diff --git a/widgets/chatwidget.cpp b/src/widgets/chatwidget.cpp similarity index 100% rename from widgets/chatwidget.cpp rename to src/widgets/chatwidget.cpp diff --git a/widgets/chatwidget.h b/src/widgets/chatwidget.h similarity index 100% rename from widgets/chatwidget.h rename to src/widgets/chatwidget.h diff --git a/widgets/chatwidgetheader.cpp b/src/widgets/chatwidgetheader.cpp similarity index 100% rename from widgets/chatwidgetheader.cpp rename to src/widgets/chatwidgetheader.cpp diff --git a/widgets/chatwidgetheader.h b/src/widgets/chatwidgetheader.h similarity index 100% rename from widgets/chatwidgetheader.h rename to src/widgets/chatwidgetheader.h diff --git a/widgets/chatwidgetheaderbutton.cpp b/src/widgets/chatwidgetheaderbutton.cpp similarity index 100% rename from widgets/chatwidgetheaderbutton.cpp rename to src/widgets/chatwidgetheaderbutton.cpp diff --git a/widgets/chatwidgetheaderbutton.h b/src/widgets/chatwidgetheaderbutton.h similarity index 100% rename from widgets/chatwidgetheaderbutton.h rename to src/widgets/chatwidgetheaderbutton.h diff --git a/widgets/chatwidgetinput.cpp b/src/widgets/chatwidgetinput.cpp similarity index 100% rename from widgets/chatwidgetinput.cpp rename to src/widgets/chatwidgetinput.cpp diff --git a/widgets/chatwidgetinput.h b/src/widgets/chatwidgetinput.h similarity index 100% rename from widgets/chatwidgetinput.h rename to src/widgets/chatwidgetinput.h diff --git a/widgets/chatwidgetview.cpp b/src/widgets/chatwidgetview.cpp similarity index 100% rename from widgets/chatwidgetview.cpp rename to src/widgets/chatwidgetview.cpp diff --git a/widgets/chatwidgetview.h b/src/widgets/chatwidgetview.h similarity index 100% rename from widgets/chatwidgetview.h rename to src/widgets/chatwidgetview.h diff --git a/widgets/fancybutton.cpp b/src/widgets/fancybutton.cpp similarity index 100% rename from widgets/fancybutton.cpp rename to src/widgets/fancybutton.cpp diff --git a/widgets/fancybutton.h b/src/widgets/fancybutton.h similarity index 100% rename from widgets/fancybutton.h rename to src/widgets/fancybutton.h diff --git a/widgets/mainwindow.cpp b/src/widgets/mainwindow.cpp similarity index 100% rename from widgets/mainwindow.cpp rename to src/widgets/mainwindow.cpp diff --git a/widgets/mainwindow.h b/src/widgets/mainwindow.h similarity index 100% rename from widgets/mainwindow.h rename to src/widgets/mainwindow.h diff --git a/widgets/notebook.cpp b/src/widgets/notebook.cpp similarity index 100% rename from widgets/notebook.cpp rename to src/widgets/notebook.cpp diff --git a/widgets/notebook.h b/src/widgets/notebook.h similarity index 100% rename from widgets/notebook.h rename to src/widgets/notebook.h diff --git a/widgets/notebookbutton.cpp b/src/widgets/notebookbutton.cpp similarity index 100% rename from widgets/notebookbutton.cpp rename to src/widgets/notebookbutton.cpp diff --git a/widgets/notebookbutton.h b/src/widgets/notebookbutton.h similarity index 100% rename from widgets/notebookbutton.h rename to src/widgets/notebookbutton.h diff --git a/widgets/notebookpage.cpp b/src/widgets/notebookpage.cpp similarity index 100% rename from widgets/notebookpage.cpp rename to src/widgets/notebookpage.cpp diff --git a/widgets/notebookpage.h b/src/widgets/notebookpage.h similarity index 100% rename from widgets/notebookpage.h rename to src/widgets/notebookpage.h diff --git a/widgets/notebookpagedroppreview.cpp b/src/widgets/notebookpagedroppreview.cpp similarity index 100% rename from widgets/notebookpagedroppreview.cpp rename to src/widgets/notebookpagedroppreview.cpp diff --git a/widgets/notebookpagedroppreview.h b/src/widgets/notebookpagedroppreview.h similarity index 100% rename from widgets/notebookpagedroppreview.h rename to src/widgets/notebookpagedroppreview.h diff --git a/widgets/notebooktab.cpp b/src/widgets/notebooktab.cpp similarity index 100% rename from widgets/notebooktab.cpp rename to src/widgets/notebooktab.cpp diff --git a/widgets/notebooktab.h b/src/widgets/notebooktab.h similarity index 100% rename from widgets/notebooktab.h rename to src/widgets/notebooktab.h diff --git a/widgets/resizingtextedit.h b/src/widgets/resizingtextedit.h similarity index 100% rename from widgets/resizingtextedit.h rename to src/widgets/resizingtextedit.h diff --git a/widgets/scrollbar.cpp b/src/widgets/scrollbar.cpp similarity index 100% rename from widgets/scrollbar.cpp rename to src/widgets/scrollbar.cpp diff --git a/widgets/scrollbar.h b/src/widgets/scrollbar.h similarity index 100% rename from widgets/scrollbar.h rename to src/widgets/scrollbar.h diff --git a/widgets/scrollbarhighlight.cpp b/src/widgets/scrollbarhighlight.cpp similarity index 100% rename from widgets/scrollbarhighlight.cpp rename to src/widgets/scrollbarhighlight.cpp diff --git a/widgets/scrollbarhighlight.h b/src/widgets/scrollbarhighlight.h similarity index 100% rename from widgets/scrollbarhighlight.h rename to src/widgets/scrollbarhighlight.h diff --git a/widgets/settingsdialog.cpp b/src/widgets/settingsdialog.cpp similarity index 100% rename from widgets/settingsdialog.cpp rename to src/widgets/settingsdialog.cpp diff --git a/widgets/settingsdialog.h b/src/widgets/settingsdialog.h similarity index 100% rename from widgets/settingsdialog.h rename to src/widgets/settingsdialog.h diff --git a/widgets/settingsdialogtab.cpp b/src/widgets/settingsdialogtab.cpp similarity index 100% rename from widgets/settingsdialogtab.cpp rename to src/widgets/settingsdialogtab.cpp diff --git a/widgets/settingsdialogtab.h b/src/widgets/settingsdialogtab.h similarity index 100% rename from widgets/settingsdialogtab.h rename to src/widgets/settingsdialogtab.h diff --git a/widgets/signallabel.h b/src/widgets/signallabel.h similarity index 100% rename from widgets/signallabel.h rename to src/widgets/signallabel.h diff --git a/widgets/textinputdialog.cpp b/src/widgets/textinputdialog.cpp similarity index 100% rename from widgets/textinputdialog.cpp rename to src/widgets/textinputdialog.cpp diff --git a/widgets/textinputdialog.h b/src/widgets/textinputdialog.h similarity index 100% rename from widgets/textinputdialog.h rename to src/widgets/textinputdialog.h diff --git a/widgets/titlebar.cpp b/src/widgets/titlebar.cpp similarity index 100% rename from widgets/titlebar.cpp rename to src/widgets/titlebar.cpp diff --git a/widgets/titlebar.h b/src/widgets/titlebar.h similarity index 100% rename from widgets/titlebar.h rename to src/widgets/titlebar.h diff --git a/windowmanager.cpp b/src/windowmanager.cpp similarity index 100% rename from windowmanager.cpp rename to src/windowmanager.cpp diff --git a/windowmanager.h b/src/windowmanager.h similarity index 100% rename from windowmanager.h rename to src/windowmanager.h