From 1c6ff37e76979aeb0363646aaa5708559cffa313 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 11 Jun 2017 09:31:45 +0200 Subject: [PATCH] rename header files from *.h to *.hpp --- chatterino.pro | 112 +++++++++--------- src/accountmanager.cpp | 2 +- src/{accountmanager.h => accountmanager.hpp} | 2 +- src/appdatapath.cpp | 56 ++++----- src/{appdatapath.h => appdatapath.hpp} | 30 ++--- src/{asyncexec.h => asyncexec.hpp} | 0 src/channel.cpp | 14 +-- src/{channel.h => channel.hpp} | 8 +- src/channelmanager.cpp | 4 +- src/{channelmanager.h => channelmanager.hpp} | 2 +- src/colorscheme.cpp | 6 +- src/{colorscheme.h => colorscheme.hpp} | 0 src/common.h.cpp | 2 +- src/{concurrentmap.h => concurrentmap.hpp} | 0 src/emojis.cpp | 4 +- src/{emojis.h => emojis.hpp} | 4 +- src/emotemanager.cpp | 4 +- src/{emotemanager.h => emotemanager.hpp} | 8 +- src/fontmanager.cpp | 2 +- src/{fontmanager.h => fontmanager.hpp} | 0 src/ircaccount.cpp | 2 +- src/{ircaccount.h => ircaccount.hpp} | 0 src/ircmanager.cpp | 18 +-- src/{ircmanager.h => ircmanager.hpp} | 4 +- src/logging/.clang-format | 1 + src/logging/loggingchannel.cpp | 4 +- .../{loggingchannel.h => loggingchannel.hpp} | 2 +- src/logging/loggingmanager.cpp | 2 +- .../{loggingmanager.h => loggingmanager.hpp} | 2 +- src/main.cpp | 20 ++-- src/messages/lazyloadedimage.cpp | 12 +- ...{lazyloadedimage.h => lazyloadedimage.hpp} | 0 .../{limitedqueue.h => limitedqueue.hpp} | 2 +- ...euesnapshot.h => limitedqueuesnapshot.hpp} | 0 src/messages/link.cpp | 2 +- src/messages/{link.h => link.hpp} | 0 src/messages/message.cpp | 22 ++-- src/messages/{message.h => message.hpp} | 8 +- src/messages/messagebuilder.cpp | 8 +- .../{messagebuilder.h => messagebuilder.hpp} | 2 +- ...essageparseargs.h => messageparseargs.hpp} | 0 src/messages/messageref.cpp | 6 +- src/messages/{messageref.h => messageref.hpp} | 2 +- src/messages/word.cpp | 2 +- src/messages/{word.h => word.hpp} | 6 +- src/messages/wordpart.cpp | 4 +- src/messages/{wordpart.h => wordpart.hpp} | 0 src/resources.cpp | 2 +- src/{resources.h => resources.hpp} | 2 +- src/{setting.h => setting.hpp} | 0 src/settingsmanager.cpp | 4 +- ...{settingsmanager.h => settingsmanager.hpp} | 6 +- ...ettingssnapshot.h => settingssnapshot.hpp} | 2 +- src/twitch/{emotevalue.h => emotevalue.hpp} | 0 src/twitch/twitchmessagebuilder.cpp | 12 +- ...sagebuilder.h => twitchmessagebuilder.hpp} | 4 +- src/twitch/twitchparsemessage.cpp | 14 +-- ...hparsemessage.h => twitchparsemessage.hpp} | 6 +- src/twitch/twitchuser.cpp | 2 +- src/twitch/{twitchuser.h => twitchuser.hpp} | 2 +- ...weenpoints.h => distancebetweenpoints.hpp} | 0 src/util/{urlfetch.h => urlfetch.hpp} | 0 src/widgets/accountpopup.cpp | 4 +- .../{accountpopup.h => accountpopup.hpp} | 0 src/widgets/chatwidget.cpp | 12 +- src/widgets/{chatwidget.h => chatwidget.hpp} | 16 +-- src/widgets/chatwidgetheader.cpp | 8 +- ...hatwidgetheader.h => chatwidgetheader.hpp} | 4 +- src/widgets/chatwidgetheaderbutton.cpp | 4 +- ...derbutton.h => chatwidgetheaderbutton.hpp} | 2 +- src/widgets/chatwidgetinput.cpp | 10 +- ...{chatwidgetinput.h => chatwidgetinput.hpp} | 4 +- src/widgets/chatwidgetview.cpp | 16 +-- .../{chatwidgetview.h => chatwidgetview.hpp} | 12 +- src/widgets/fancybutton.cpp | 2 +- .../{fancybutton.h => fancybutton.hpp} | 0 src/widgets/mainwindow.cpp | 14 +-- src/widgets/{mainwindow.h => mainwindow.hpp} | 4 +- src/widgets/notebook.cpp | 12 +- src/widgets/{notebook.h => notebook.hpp} | 6 +- src/widgets/notebookbutton.cpp | 6 +- .../{notebookbutton.h => notebookbutton.hpp} | 2 +- src/widgets/notebookpage.cpp | 8 +- .../{notebookpage.h => notebookpage.hpp} | 8 +- src/widgets/notebookpagedroppreview.cpp | 4 +- ...ppreview.h => notebookpagedroppreview.hpp} | 0 src/widgets/notebooktab.cpp | 8 +- .../{notebooktab.h => notebooktab.hpp} | 0 ...esizingtextedit.h => resizingtextedit.hpp} | 0 src/widgets/scrollbar.cpp | 4 +- src/widgets/{scrollbar.h => scrollbar.hpp} | 2 +- src/widgets/scrollbarhighlight.cpp | 4 +- ...lbarhighlight.h => scrollbarhighlight.hpp} | 0 src/widgets/settingsdialog.cpp | 10 +- .../{settingsdialog.h => settingsdialog.hpp} | 6 +- src/widgets/settingsdialogtab.cpp | 4 +- ...tingsdialogtab.h => settingsdialogtab.hpp} | 0 .../{signallabel.h => signallabel.hpp} | 0 src/widgets/textinputdialog.cpp | 2 +- ...{textinputdialog.h => textinputdialog.hpp} | 0 src/widgets/titlebar.cpp | 2 +- src/widgets/{titlebar.h => titlebar.hpp} | 0 src/windowmanager.cpp | 4 +- src/{windowmanager.h => windowmanager.hpp} | 2 +- 104 files changed, 327 insertions(+), 326 deletions(-) rename src/{accountmanager.h => accountmanager.hpp} (95%) rename src/{appdatapath.h => appdatapath.hpp} (93%) rename src/{asyncexec.h => asyncexec.hpp} (100%) rename src/{channel.h => channel.hpp} (92%) rename src/{channelmanager.h => channelmanager.hpp} (96%) rename src/{colorscheme.h => colorscheme.hpp} (100%) rename src/{concurrentmap.h => concurrentmap.hpp} (100%) rename src/{emojis.h => emojis.hpp} (92%) rename src/{emotemanager.h => emotemanager.hpp} (95%) rename src/{fontmanager.h => fontmanager.hpp} (100%) rename src/{ircaccount.h => ircaccount.hpp} (100%) rename src/{ircmanager.h => ircmanager.hpp} (96%) create mode 120000 src/logging/.clang-format rename src/logging/{loggingchannel.h => loggingchannel.hpp} (95%) rename src/logging/{loggingmanager.h => loggingmanager.hpp} (87%) rename src/messages/{lazyloadedimage.h => lazyloadedimage.hpp} (100%) rename src/messages/{limitedqueue.h => limitedqueue.hpp} (98%) rename src/messages/{limitedqueuesnapshot.h => limitedqueuesnapshot.hpp} (100%) rename src/messages/{link.h => link.hpp} (100%) rename src/messages/{message.h => message.hpp} (91%) rename src/messages/{messagebuilder.h => messagebuilder.hpp} (94%) rename src/messages/{messageparseargs.h => messageparseargs.hpp} (100%) rename src/messages/{messageref.h => messageref.hpp} (96%) rename src/messages/{word.h => word.hpp} (97%) rename src/messages/{wordpart.h => wordpart.hpp} (100%) rename src/{resources.h => resources.hpp} (98%) rename src/{setting.h => setting.hpp} (100%) rename src/{settingsmanager.h => settingsmanager.hpp} (95%) rename src/{settingssnapshot.h => settingssnapshot.hpp} (96%) rename src/twitch/{emotevalue.h => emotevalue.hpp} (100%) rename src/twitch/{twitchmessagebuilder.h => twitchmessagebuilder.hpp} (91%) rename src/twitch/{twitchparsemessage.h => twitchparsemessage.hpp} (53%) rename src/twitch/{twitchuser.h => twitchuser.hpp} (94%) rename src/util/{distancebetweenpoints.h => distancebetweenpoints.hpp} (100%) rename src/util/{urlfetch.h => urlfetch.hpp} (100%) rename src/widgets/{accountpopup.h => accountpopup.hpp} (100%) rename src/widgets/{chatwidget.h => chatwidget.hpp} (90%) rename src/widgets/{chatwidgetheader.h => chatwidgetheader.hpp} (94%) rename src/widgets/{chatwidgetheaderbutton.h => chatwidgetheaderbutton.hpp} (96%) rename src/widgets/{chatwidgetinput.h => chatwidgetinput.hpp} (92%) rename src/widgets/{chatwidgetview.h => chatwidgetview.hpp} (88%) rename src/widgets/{fancybutton.h => fancybutton.hpp} (100%) rename src/widgets/{mainwindow.h => mainwindow.hpp} (92%) rename src/widgets/{notebook.h => notebook.hpp} (91%) rename src/widgets/{notebookbutton.h => notebookbutton.hpp} (95%) rename src/widgets/{notebookpage.h => notebookpage.hpp} (92%) rename src/widgets/{notebookpagedroppreview.h => notebookpagedroppreview.hpp} (100%) rename src/widgets/{notebooktab.h => notebooktab.hpp} (100%) rename src/widgets/{resizingtextedit.h => resizingtextedit.hpp} (100%) rename src/widgets/{scrollbar.h => scrollbar.hpp} (97%) rename src/widgets/{scrollbarhighlight.h => scrollbarhighlight.hpp} (100%) rename src/widgets/{settingsdialog.h => settingsdialog.hpp} (90%) rename src/widgets/{settingsdialogtab.h => settingsdialogtab.hpp} (100%) rename src/widgets/{signallabel.h => signallabel.hpp} (100%) rename src/widgets/{textinputdialog.h => textinputdialog.hpp} (100%) rename src/widgets/{titlebar.h => titlebar.hpp} (100%) rename src/{windowmanager.h => windowmanager.hpp} (94%) diff --git a/chatterino.pro b/chatterino.pro index 536856f2e..bef51843f 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -93,62 +93,62 @@ SOURCES += \ src/widgets/accountpopup.cpp HEADERS += \ - src/asyncexec.h \ - src/channel.h \ - src/colorscheme.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 + src/asyncexec.hpp \ + src/channel.hpp \ + src/colorscheme.hpp \ + src/concurrentmap.hpp \ + src/emojis.hpp \ + src/ircmanager.hpp \ + src/messages/lazyloadedimage.hpp \ + src/messages/link.hpp \ + src/messages/message.hpp \ + src/messages/word.hpp \ + src/messages/wordpart.hpp \ + src/resources.hpp \ + src/setting.hpp \ + src/twitch/emotevalue.hpp \ + src/widgets/chatwidget.hpp \ + src/widgets/chatwidgetheader.hpp \ + src/widgets/chatwidgetheaderbutton.hpp \ + src/widgets/chatwidgetinput.hpp \ + src/widgets/chatwidgetview.hpp \ + src/widgets/mainwindow.hpp \ + src/widgets/notebook.hpp \ + src/widgets/notebookbutton.hpp \ + src/widgets/notebookpage.hpp \ + src/widgets/notebookpagedroppreview.hpp \ + src/widgets/notebooktab.hpp \ + src/widgets/scrollbar.hpp \ + src/widgets/scrollbarhighlight.hpp \ + src/widgets/settingsdialog.hpp \ + src/widgets/settingsdialogtab.hpp \ + src/widgets/signallabel.hpp \ + src/widgets/textinputdialog.hpp \ + src/widgets/resizingtextedit.hpp \ + src/settingssnapshot.hpp \ + src/messages/limitedqueue.hpp \ + src/messages/limitedqueuesnapshot.hpp \ + src/messages/messageref.hpp \ + src/logging/loggingmanager.hpp \ + src/logging/loggingchannel.hpp \ + src/channelmanager.hpp \ + src/windowmanager.hpp \ + src/settingsmanager.hpp \ + src/fontmanager.hpp \ + src/emotemanager.hpp \ + src/util/urlfetch.hpp \ + src/messages/messageparseargs.hpp \ + src/messages/messagebuilder.hpp \ + src/twitch/twitchmessagebuilder.hpp \ + src/twitch/twitchparsemessage.hpp \ + src/widgets/fancybutton.hpp \ + src/widgets/titlebar.hpp \ + src/appdatapath.hpp \ + src/accountmanager.hpp \ + src/twitch/twitchuser.hpp \ + src/ircaccount.hpp \ + src/widgets/accountpopup.hpp \ + src/util/distancebetweenpoints.hpp PRECOMPILED_HEADER = diff --git a/src/accountmanager.cpp b/src/accountmanager.cpp index c3873e791..2a2f68338 100644 --- a/src/accountmanager.cpp +++ b/src/accountmanager.cpp @@ -1,4 +1,4 @@ -#include "accountmanager.h" +#include "accountmanager.hpp" namespace chatterino { diff --git a/src/accountmanager.h b/src/accountmanager.hpp similarity index 95% rename from src/accountmanager.h rename to src/accountmanager.hpp index ec8e578a4..2270c271a 100644 --- a/src/accountmanager.h +++ b/src/accountmanager.hpp @@ -1,6 +1,6 @@ #pragma once -#include "twitch/twitchuser.h" +#include "twitch/twitchuser.hpp" #include #include diff --git a/src/appdatapath.cpp b/src/appdatapath.cpp index 0b1622115..3efb693b0 100644 --- a/src/appdatapath.cpp +++ b/src/appdatapath.cpp @@ -1,28 +1,28 @@ -#include "appdatapath.h" - -#include -#include -#include - -QString Path::appdataPath; -std::mutex Path::appdataPathMutex; - -const QString &Path::getAppdataPath() -{ - std::lock_guard 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; - } - - return appdataPath; -} +#include "appdatapath.hpp" + +#include +#include +#include + +QString Path::appdataPath; +std::mutex Path::appdataPathMutex; + +const QString &Path::getAppdataPath() +{ + std::lock_guard 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; + } + + return appdataPath; +} diff --git a/src/appdatapath.h b/src/appdatapath.hpp similarity index 93% rename from src/appdatapath.h rename to src/appdatapath.hpp index 0a56fc120..b7296fc00 100644 --- a/src/appdatapath.h +++ b/src/appdatapath.hpp @@ -1,15 +1,15 @@ -#pragma once - -#include - -#include - -class Path -{ -public: - static const QString &getAppdataPath(); - -private: - static QString appdataPath; - static std::mutex appdataPathMutex; -}; +#pragma once + +#include + +#include + +class Path +{ +public: + static const QString &getAppdataPath(); + +private: + static QString appdataPath; + static std::mutex appdataPathMutex; +}; diff --git a/src/asyncexec.h b/src/asyncexec.hpp similarity index 100% rename from src/asyncexec.h rename to src/asyncexec.hpp diff --git a/src/channel.cpp b/src/channel.cpp index 211213782..3e81974eb 100644 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -1,10 +1,10 @@ -#include "channel.h" -#include "emotemanager.h" -#include "ircmanager.h" -#include "logging/loggingmanager.h" -#include "messages/message.h" -#include "util/urlfetch.h" -#include "windowmanager.h" +#include "channel.hpp" +#include "emotemanager.hpp" +#include "ircmanager.hpp" +#include "logging/loggingmanager.hpp" +#include "messages/message.hpp" +#include "util/urlfetch.hpp" +#include "windowmanager.hpp" #include #include diff --git a/src/channel.h b/src/channel.hpp similarity index 92% rename from src/channel.h rename to src/channel.hpp index b364485be..5adacd148 100644 --- a/src/channel.h +++ b/src/channel.hpp @@ -1,9 +1,9 @@ #pragma once -#include "concurrentmap.h" -#include "logging/loggingchannel.h" -#include "messages/lazyloadedimage.h" -#include "messages/limitedqueue.h" +#include "concurrentmap.hpp" +#include "logging/loggingchannel.hpp" +#include "messages/lazyloadedimage.hpp" +#include "messages/limitedqueue.hpp" #include #include diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp index 04515a76b..be9c12ad9 100644 --- a/src/channelmanager.cpp +++ b/src/channelmanager.cpp @@ -1,5 +1,5 @@ -#include "channelmanager.h" -#include "ircmanager.h" +#include "channelmanager.hpp" +#include "ircmanager.hpp" namespace chatterino { diff --git a/src/channelmanager.h b/src/channelmanager.hpp similarity index 96% rename from src/channelmanager.h rename to src/channelmanager.hpp index 8b1048dbf..462a02551 100644 --- a/src/channelmanager.h +++ b/src/channelmanager.hpp @@ -1,6 +1,6 @@ #pragma once -#include "channel.h" +#include "channel.hpp" namespace chatterino { diff --git a/src/colorscheme.cpp b/src/colorscheme.cpp index 7e631db76..4bb4c13d5 100644 --- a/src/colorscheme.cpp +++ b/src/colorscheme.cpp @@ -1,8 +1,8 @@ #define LOOKUP_COLOR_COUNT 360 -#include "colorscheme.h" -#include "settingsmanager.h" -#include "windowmanager.h" +#include "colorscheme.hpp" +#include "settingsmanager.hpp" +#include "windowmanager.hpp" #include diff --git a/src/colorscheme.h b/src/colorscheme.hpp similarity index 100% rename from src/colorscheme.h rename to src/colorscheme.hpp diff --git a/src/common.h.cpp b/src/common.h.cpp index 702ad8b37..ad249c58d 100644 --- a/src/common.h.cpp +++ b/src/common.h.cpp @@ -13,4 +13,4 @@ * * WARNING: All changes made in this file will be lost. --------------------------------------------------------------------*/ -#include "common.h" +#include "common.hpp" diff --git a/src/concurrentmap.h b/src/concurrentmap.hpp similarity index 100% rename from src/concurrentmap.h rename to src/concurrentmap.hpp diff --git a/src/emojis.cpp b/src/emojis.cpp index 954b43aec..329e57177 100644 --- a/src/emojis.cpp +++ b/src/emojis.cpp @@ -1,5 +1,5 @@ -#include "emojis.h" -#include "emotemanager.h" +#include "emojis.hpp" +#include "emotemanager.hpp" #include #include diff --git a/src/emojis.h b/src/emojis.hpp similarity index 92% rename from src/emojis.h rename to src/emojis.hpp index c5551a102..7fe7ea8a1 100644 --- a/src/emojis.h +++ b/src/emojis.hpp @@ -1,7 +1,7 @@ #pragma once -#include "concurrentmap.h" -#include "messages/lazyloadedimage.h" +#include "concurrentmap.hpp" +#include "messages/lazyloadedimage.hpp" #include #include diff --git a/src/emotemanager.cpp b/src/emotemanager.cpp index 6a43fa5ec..3672a6cfe 100644 --- a/src/emotemanager.cpp +++ b/src/emotemanager.cpp @@ -1,5 +1,5 @@ -#include "emotemanager.h" -#include "resources.h" +#include "emotemanager.hpp" +#include "resources.hpp" #include #include diff --git a/src/emotemanager.h b/src/emotemanager.hpp similarity index 95% rename from src/emotemanager.h rename to src/emotemanager.hpp index 4302c6f22..d9da5cc99 100644 --- a/src/emotemanager.h +++ b/src/emotemanager.hpp @@ -2,10 +2,10 @@ #define GIF_FRAME_LENGTH 33 -#include "concurrentmap.h" -#include "messages/lazyloadedimage.h" -#include "twitch/emotevalue.h" -#include "windowmanager.h" +#include "concurrentmap.hpp" +#include "messages/lazyloadedimage.hpp" +#include "twitch/emotevalue.hpp" +#include "windowmanager.hpp" #include #include diff --git a/src/fontmanager.cpp b/src/fontmanager.cpp index 932cab3e1..6c060c698 100644 --- a/src/fontmanager.cpp +++ b/src/fontmanager.cpp @@ -1,4 +1,4 @@ -#include "fontmanager.h" +#include "fontmanager.hpp" #define DEFAULT_FONT "Arial" diff --git a/src/fontmanager.h b/src/fontmanager.hpp similarity index 100% rename from src/fontmanager.h rename to src/fontmanager.hpp diff --git a/src/ircaccount.cpp b/src/ircaccount.cpp index e2222219e..a84596c49 100644 --- a/src/ircaccount.cpp +++ b/src/ircaccount.cpp @@ -1,4 +1,4 @@ -#include "ircaccount.h" +#include "ircaccount.hpp" namespace chatterino { diff --git a/src/ircaccount.h b/src/ircaccount.hpp similarity index 100% rename from src/ircaccount.h rename to src/ircaccount.hpp diff --git a/src/ircmanager.cpp b/src/ircmanager.cpp index 73ee7bc1a..c39a4dab4 100644 --- a/src/ircmanager.cpp +++ b/src/ircmanager.cpp @@ -1,12 +1,12 @@ -#include "ircmanager.h" -#include "accountmanager.h" -#include "asyncexec.h" -#include "channel.h" -#include "channelmanager.h" -#include "messages/messageparseargs.h" -#include "twitch/twitchmessagebuilder.h" -#include "twitch/twitchparsemessage.h" -#include "twitch/twitchuser.h" +#include "ircmanager.hpp" +#include "accountmanager.hpp" +#include "asyncexec.hpp" +#include "channel.hpp" +#include "channelmanager.hpp" +#include "messages/messageparseargs.hpp" +#include "twitch/twitchmessagebuilder.hpp" +#include "twitch/twitchparsemessage.hpp" +#include "twitch/twitchuser.hpp" #include #include diff --git a/src/ircmanager.h b/src/ircmanager.hpp similarity index 96% rename from src/ircmanager.h rename to src/ircmanager.hpp index 744f6bc4c..d701b8ec8 100644 --- a/src/ircmanager.h +++ b/src/ircmanager.hpp @@ -2,8 +2,8 @@ #define TWITCH_MAX_MESSAGELENGTH 500 -#include "messages/message.h" -#include "twitch/twitchuser.h" +#include "messages/message.hpp" +#include "twitch/twitchuser.hpp" #include #include diff --git a/src/logging/.clang-format b/src/logging/.clang-format new file mode 120000 index 000000000..7cab60ce3 --- /dev/null +++ b/src/logging/.clang-format @@ -0,0 +1 @@ +../.clang-format \ No newline at end of file diff --git a/src/logging/loggingchannel.cpp b/src/logging/loggingchannel.cpp index 8c0f3748a..b38deb6c3 100644 --- a/src/logging/loggingchannel.cpp +++ b/src/logging/loggingchannel.cpp @@ -1,5 +1,5 @@ -#include "loggingchannel.h" -#include "loggingmanager.h" +#include "loggingchannel.hpp" +#include "loggingmanager.hpp" #include diff --git a/src/logging/loggingchannel.h b/src/logging/loggingchannel.hpp similarity index 95% rename from src/logging/loggingchannel.h rename to src/logging/loggingchannel.hpp index a422a6d13..836015f7c 100644 --- a/src/logging/loggingchannel.h +++ b/src/logging/loggingchannel.hpp @@ -1,6 +1,6 @@ #pragma once -#include "messages/message.h" +#include "messages/message.hpp" #include #include diff --git a/src/logging/loggingmanager.cpp b/src/logging/loggingmanager.cpp index 750b10384..65bc27cfc 100644 --- a/src/logging/loggingmanager.cpp +++ b/src/logging/loggingmanager.cpp @@ -1,4 +1,4 @@ -#include "loggingmanager.h" +#include "loggingmanager.hpp" #include #include diff --git a/src/logging/loggingmanager.h b/src/logging/loggingmanager.hpp similarity index 87% rename from src/logging/loggingmanager.h rename to src/logging/loggingmanager.hpp index 438a9c36b..9080a0dd9 100644 --- a/src/logging/loggingmanager.h +++ b/src/logging/loggingmanager.hpp @@ -1,6 +1,6 @@ #pragma once -#include "loggingchannel.h" +#include "loggingchannel.hpp" #include diff --git a/src/main.cpp b/src/main.cpp index 8f6b5e107..bf6af7c59 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,13 +1,13 @@ -#include "channelmanager.h" -#include "colorscheme.h" -#include "emojis.h" -#include "emotemanager.h" -#include "ircmanager.h" -#include "logging/loggingmanager.h" -#include "resources.h" -#include "settingsmanager.h" -#include "widgets/mainwindow.h" -#include "windowmanager.h" +#include "channelmanager.hpp" +#include "colorscheme.hpp" +#include "emojis.hpp" +#include "emotemanager.hpp" +#include "ircmanager.hpp" +#include "logging/loggingmanager.hpp" +#include "resources.hpp" +#include "settingsmanager.hpp" +#include "widgets/mainwindow.hpp" +#include "windowmanager.hpp" #include #include diff --git a/src/messages/lazyloadedimage.cpp b/src/messages/lazyloadedimage.cpp index 88f1e2ffb..3a9b72382 100644 --- a/src/messages/lazyloadedimage.cpp +++ b/src/messages/lazyloadedimage.cpp @@ -1,10 +1,10 @@ -#include "messages/lazyloadedimage.h" +#include "messages/lazyloadedimage.hpp" -#include "asyncexec.h" -#include "emotemanager.h" -#include "ircmanager.h" -#include "util/urlfetch.h" -#include "windowmanager.h" +#include "asyncexec.hpp" +#include "emotemanager.hpp" +#include "ircmanager.hpp" +#include "util/urlfetch.hpp" +#include "windowmanager.hpp" #include #include diff --git a/src/messages/lazyloadedimage.h b/src/messages/lazyloadedimage.hpp similarity index 100% rename from src/messages/lazyloadedimage.h rename to src/messages/lazyloadedimage.hpp diff --git a/src/messages/limitedqueue.h b/src/messages/limitedqueue.hpp similarity index 98% rename from src/messages/limitedqueue.h rename to src/messages/limitedqueue.hpp index 18c36458a..c44c0d6f7 100644 --- a/src/messages/limitedqueue.h +++ b/src/messages/limitedqueue.hpp @@ -1,6 +1,6 @@ #pragma once -#include "messages/limitedqueuesnapshot.h" +#include "messages/limitedqueuesnapshot.hpp" #include #include diff --git a/src/messages/limitedqueuesnapshot.h b/src/messages/limitedqueuesnapshot.hpp similarity index 100% rename from src/messages/limitedqueuesnapshot.h rename to src/messages/limitedqueuesnapshot.hpp diff --git a/src/messages/link.cpp b/src/messages/link.cpp index dfbfb6a21..02c01ed78 100644 --- a/src/messages/link.cpp +++ b/src/messages/link.cpp @@ -1,4 +1,4 @@ -#include "messages/link.h" +#include "messages/link.hpp" namespace chatterino { namespace messages { diff --git a/src/messages/link.h b/src/messages/link.hpp similarity index 100% rename from src/messages/link.h rename to src/messages/link.hpp diff --git a/src/messages/message.cpp b/src/messages/message.cpp index af878433f..90d46a8dc 100644 --- a/src/messages/message.cpp +++ b/src/messages/message.cpp @@ -1,15 +1,15 @@ -#include "messages/message.h" -#include "channel.h" -#include "colorscheme.h" -#include "emojis.h" -#include "emotemanager.h" -#include "fontmanager.h" -#include "ircmanager.h" -#include "messages/link.h" -#include "qcolor.h" -#include "resources.h" -#include "settingsmanager.h" +#include "messages/message.hpp" +#include "channel.hpp" +#include "colorscheme.hpp" +#include "emojis.hpp" +#include "emotemanager.hpp" +#include "fontmanager.hpp" +#include "ircmanager.hpp" +#include "messages/link.hpp" +#include "resources.hpp" +#include "settingsmanager.hpp" +#include #include #include diff --git a/src/messages/message.h b/src/messages/message.hpp similarity index 91% rename from src/messages/message.h rename to src/messages/message.hpp index 200840bce..7caca9d84 100644 --- a/src/messages/message.h +++ b/src/messages/message.hpp @@ -1,9 +1,9 @@ #pragma once -#include "messages/message.h" -#include "messages/messageparseargs.h" -#include "messages/word.h" -#include "messages/wordpart.h" +#include "messages/message.hpp" +#include "messages/messageparseargs.hpp" +#include "messages/word.hpp" +#include "messages/wordpart.hpp" #include #include diff --git a/src/messages/messagebuilder.cpp b/src/messages/messagebuilder.cpp index 64de84973..5858be799 100644 --- a/src/messages/messagebuilder.cpp +++ b/src/messages/messagebuilder.cpp @@ -1,7 +1,7 @@ -#include "messagebuilder.h" -#include "colorscheme.h" -#include "emotemanager.h" -#include "resources.h" +#include "messagebuilder.hpp" +#include "colorscheme.hpp" +#include "emotemanager.hpp" +#include "resources.hpp" namespace chatterino { namespace messages { diff --git a/src/messages/messagebuilder.h b/src/messages/messagebuilder.hpp similarity index 94% rename from src/messages/messagebuilder.h rename to src/messages/messagebuilder.hpp index b27fb7df3..8063d6a0c 100644 --- a/src/messages/messagebuilder.h +++ b/src/messages/messagebuilder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "messages/message.h" +#include "messages/message.hpp" #include diff --git a/src/messages/messageparseargs.h b/src/messages/messageparseargs.hpp similarity index 100% rename from src/messages/messageparseargs.h rename to src/messages/messageparseargs.hpp diff --git a/src/messages/messageref.cpp b/src/messages/messageref.cpp index 739608f68..e6cb18037 100644 --- a/src/messages/messageref.cpp +++ b/src/messages/messageref.cpp @@ -1,6 +1,6 @@ -#include "messageref.h" -#include "emotemanager.h" -#include "settingsmanager.h" +#include "messageref.hpp" +#include "emotemanager.hpp" +#include "settingsmanager.hpp" #include diff --git a/src/messages/messageref.h b/src/messages/messageref.hpp similarity index 96% rename from src/messages/messageref.h rename to src/messages/messageref.hpp index c25754b6b..dae426241 100644 --- a/src/messages/messageref.h +++ b/src/messages/messageref.hpp @@ -1,6 +1,6 @@ #pragma once -#include "messages/message.h" +#include "messages/message.hpp" #include diff --git a/src/messages/word.cpp b/src/messages/word.cpp index f1d06ebea..46d93bbf8 100644 --- a/src/messages/word.cpp +++ b/src/messages/word.cpp @@ -1,4 +1,4 @@ -#include "messages/word.h" +#include "messages/word.hpp" namespace chatterino { namespace messages { diff --git a/src/messages/word.h b/src/messages/word.hpp similarity index 97% rename from src/messages/word.h rename to src/messages/word.hpp index 01baa0c14..a17464a35 100644 --- a/src/messages/word.h +++ b/src/messages/word.hpp @@ -1,8 +1,8 @@ #pragma once -#include "fontmanager.h" -#include "messages/lazyloadedimage.h" -#include "messages/link.h" +#include "fontmanager.hpp" +#include "messages/lazyloadedimage.hpp" +#include "messages/link.hpp" #include #include diff --git a/src/messages/wordpart.cpp b/src/messages/wordpart.cpp index 8b77e536e..f727b7d05 100644 --- a/src/messages/wordpart.cpp +++ b/src/messages/wordpart.cpp @@ -1,5 +1,5 @@ -#include "messages/wordpart.h" -#include "messages/word.h" +#include "messages/wordpart.hpp" +#include "messages/word.hpp" namespace chatterino { namespace messages { diff --git a/src/messages/wordpart.h b/src/messages/wordpart.hpp similarity index 100% rename from src/messages/wordpart.h rename to src/messages/wordpart.hpp diff --git a/src/resources.cpp b/src/resources.cpp index a4aa35f0a..6c3994990 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -1,4 +1,4 @@ -#include "resources.h" +#include "resources.hpp" #include diff --git a/src/resources.h b/src/resources.hpp similarity index 98% rename from src/resources.h rename to src/resources.hpp index b57f34391..2bbee465d 100644 --- a/src/resources.h +++ b/src/resources.hpp @@ -1,6 +1,6 @@ #pragma once -#include "messages/lazyloadedimage.h" +#include "messages/lazyloadedimage.hpp" namespace chatterino { diff --git a/src/setting.h b/src/setting.hpp similarity index 100% rename from src/setting.h rename to src/setting.hpp diff --git a/src/settingsmanager.cpp b/src/settingsmanager.cpp index fb12c7ed8..32b3d951a 100644 --- a/src/settingsmanager.cpp +++ b/src/settingsmanager.cpp @@ -1,5 +1,5 @@ -#include "settingsmanager.h" -#include "appdatapath.h" +#include "settingsmanager.hpp" +#include "appdatapath.hpp" #include #include diff --git a/src/settingsmanager.h b/src/settingsmanager.hpp similarity index 95% rename from src/settingsmanager.h rename to src/settingsmanager.hpp index 710fc0888..9c4365392 100644 --- a/src/settingsmanager.h +++ b/src/settingsmanager.hpp @@ -1,8 +1,8 @@ #pragma once -#include "messages/word.h" -#include "setting.h" -#include "settingssnapshot.h" +#include "messages/word.hpp" +#include "setting.hpp" +#include "settingssnapshot.hpp" #include diff --git a/src/settingssnapshot.h b/src/settingssnapshot.hpp similarity index 96% rename from src/settingssnapshot.h rename to src/settingssnapshot.hpp index 858026d15..d17225c74 100644 --- a/src/settingssnapshot.h +++ b/src/settingssnapshot.hpp @@ -1,6 +1,6 @@ #pragma once -#include "setting.h" +#include "setting.hpp" namespace chatterino { diff --git a/src/twitch/emotevalue.h b/src/twitch/emotevalue.hpp similarity index 100% rename from src/twitch/emotevalue.h rename to src/twitch/emotevalue.hpp diff --git a/src/twitch/twitchmessagebuilder.cpp b/src/twitch/twitchmessagebuilder.cpp index 6a9338d28..77b765872 100644 --- a/src/twitch/twitchmessagebuilder.cpp +++ b/src/twitch/twitchmessagebuilder.cpp @@ -1,9 +1,9 @@ -#include "twitch/twitchmessagebuilder.h" -#include "colorscheme.h" -#include "emojis.h" -#include "emotemanager.h" -#include "ircmanager.h" -#include "resources.h" +#include "twitch/twitchmessagebuilder.hpp" +#include "colorscheme.hpp" +#include "emojis.hpp" +#include "emotemanager.hpp" +#include "ircmanager.hpp" +#include "resources.hpp" using namespace chatterino::messages; diff --git a/src/twitch/twitchmessagebuilder.h b/src/twitch/twitchmessagebuilder.hpp similarity index 91% rename from src/twitch/twitchmessagebuilder.h rename to src/twitch/twitchmessagebuilder.hpp index 52d87261e..9fd4af56c 100644 --- a/src/twitch/twitchmessagebuilder.h +++ b/src/twitch/twitchmessagebuilder.hpp @@ -1,7 +1,7 @@ #pragma once -#include "channel.h" -#include "messages/messagebuilder.h" +#include "channel.hpp" +#include "messages/messagebuilder.hpp" #include diff --git a/src/twitch/twitchparsemessage.cpp b/src/twitch/twitchparsemessage.cpp index 2c677bc30..6332197b8 100644 --- a/src/twitch/twitchparsemessage.cpp +++ b/src/twitch/twitchparsemessage.cpp @@ -1,10 +1,10 @@ -//#include "twitchparsemessage.h" -//#include "colorscheme.h" -//#include "emojis.h" -//#include "emotemanager.h" -//#include "ircmanager.h" -//#include "resources.h" -//#include "twitch/twitchmessagebuilder.h" +//#include "twitchparsemessage.hpp" +//#include "colorscheme.hpp" +//#include "emojis.hpp" +//#include "emotemanager.hpp" +//#include "ircmanager.hpp" +//#include "resources.hpp" +//#include "twitch/twitchmessagebuilder.hpp" // //#include // diff --git a/src/twitch/twitchparsemessage.h b/src/twitch/twitchparsemessage.hpp similarity index 53% rename from src/twitch/twitchparsemessage.h rename to src/twitch/twitchparsemessage.hpp index 23aec2f80..c4227d8fd 100644 --- a/src/twitch/twitchparsemessage.h +++ b/src/twitch/twitchparsemessage.hpp @@ -1,9 +1,9 @@ //#ifndef MESSAGEPARSER_H //#define MESSAGEPARSER_H // -//#include "messages/lazyloadedimage.h" -//#include "messages/messagebuilder.h" -//#include "messages/messageparseargs.h" +//#include "messages/lazyloadedimage.hpp" +//#include "messages/messagebuilder.hpp" +//#include "messages/messageparseargs.hpp" // // namespace chatterino { // namespace twitch { diff --git a/src/twitch/twitchuser.cpp b/src/twitch/twitchuser.cpp index 250d65cbe..b2122911c 100644 --- a/src/twitch/twitchuser.cpp +++ b/src/twitch/twitchuser.cpp @@ -1,4 +1,4 @@ -#include "twitchuser.h" +#include "twitchuser.hpp" namespace chatterino { namespace twitch { diff --git a/src/twitch/twitchuser.h b/src/twitch/twitchuser.hpp similarity index 94% rename from src/twitch/twitchuser.h rename to src/twitch/twitchuser.hpp index 9746bd8f5..aa4d1fe29 100644 --- a/src/twitch/twitchuser.h +++ b/src/twitch/twitchuser.hpp @@ -1,6 +1,6 @@ #pragma once -#include "ircaccount.h" +#include "ircaccount.hpp" #include diff --git a/src/util/distancebetweenpoints.h b/src/util/distancebetweenpoints.hpp similarity index 100% rename from src/util/distancebetweenpoints.h rename to src/util/distancebetweenpoints.hpp diff --git a/src/util/urlfetch.h b/src/util/urlfetch.hpp similarity index 100% rename from src/util/urlfetch.h rename to src/util/urlfetch.hpp diff --git a/src/widgets/accountpopup.cpp b/src/widgets/accountpopup.cpp index f724a706e..5dfffb28f 100644 --- a/src/widgets/accountpopup.cpp +++ b/src/widgets/accountpopup.cpp @@ -1,5 +1,5 @@ -#include "widgets/accountpopup.h" -#include "channel.h" +#include "widgets/accountpopup.hpp" +#include "channel.hpp" #include "ui_accountpopupform.h" #include diff --git a/src/widgets/accountpopup.h b/src/widgets/accountpopup.hpp similarity index 100% rename from src/widgets/accountpopup.h rename to src/widgets/accountpopup.hpp diff --git a/src/widgets/chatwidget.cpp b/src/widgets/chatwidget.cpp index 62486635c..d7f6b8f76 100644 --- a/src/widgets/chatwidget.cpp +++ b/src/widgets/chatwidget.cpp @@ -1,9 +1,9 @@ -#include "widgets/chatwidget.h" -#include "channelmanager.h" -#include "colorscheme.h" -#include "notebookpage.h" -#include "settingsmanager.h" -#include "widgets/textinputdialog.h" +#include "widgets/chatwidget.hpp" +#include "channelmanager.hpp" +#include "colorscheme.hpp" +#include "notebookpage.hpp" +#include "settingsmanager.hpp" +#include "widgets/textinputdialog.hpp" #include #include diff --git a/src/widgets/chatwidget.h b/src/widgets/chatwidget.hpp similarity index 90% rename from src/widgets/chatwidget.h rename to src/widgets/chatwidget.hpp index 1df618500..9d4a0b349 100644 --- a/src/widgets/chatwidget.h +++ b/src/widgets/chatwidget.hpp @@ -1,13 +1,13 @@ #pragma once -#include "channel.h" -#include "messages/limitedqueuesnapshot.h" -#include "messages/messageref.h" -#include "messages/word.h" -#include "messages/wordpart.h" -#include "widgets/chatwidgetheader.h" -#include "widgets/chatwidgetinput.h" -#include "widgets/chatwidgetview.h" +#include "channel.hpp" +#include "messages/limitedqueuesnapshot.hpp" +#include "messages/messageref.hpp" +#include "messages/word.hpp" +#include "messages/wordpart.hpp" +#include "widgets/chatwidgetheader.hpp" +#include "widgets/chatwidgetinput.hpp" +#include "widgets/chatwidgetview.hpp" #include #include diff --git a/src/widgets/chatwidgetheader.cpp b/src/widgets/chatwidgetheader.cpp index 3a7202221..ca7c00c20 100644 --- a/src/widgets/chatwidgetheader.cpp +++ b/src/widgets/chatwidgetheader.cpp @@ -1,7 +1,7 @@ -#include "widgets/chatwidgetheader.h" -#include "colorscheme.h" -#include "widgets/chatwidget.h" -#include "widgets/notebookpage.h" +#include "widgets/chatwidgetheader.hpp" +#include "colorscheme.hpp" +#include "widgets/chatwidget.hpp" +#include "widgets/notebookpage.hpp" #include #include diff --git a/src/widgets/chatwidgetheader.h b/src/widgets/chatwidgetheader.hpp similarity index 94% rename from src/widgets/chatwidgetheader.h rename to src/widgets/chatwidgetheader.hpp index f2088b32c..e0e50d67f 100644 --- a/src/widgets/chatwidgetheader.h +++ b/src/widgets/chatwidgetheader.hpp @@ -1,7 +1,7 @@ #pragma once -#include "signallabel.h" -#include "widgets/chatwidgetheaderbutton.h" +#include "signallabel.hpp" +#include "widgets/chatwidgetheaderbutton.hpp" #include #include diff --git a/src/widgets/chatwidgetheaderbutton.cpp b/src/widgets/chatwidgetheaderbutton.cpp index 6bd78a3b7..df6ce075c 100644 --- a/src/widgets/chatwidgetheaderbutton.cpp +++ b/src/widgets/chatwidgetheaderbutton.cpp @@ -1,5 +1,5 @@ -#include "widgets/chatwidgetheaderbutton.h" -#include "colorscheme.h" +#include "widgets/chatwidgetheaderbutton.hpp" +#include "colorscheme.hpp" #include #include diff --git a/src/widgets/chatwidgetheaderbutton.h b/src/widgets/chatwidgetheaderbutton.hpp similarity index 96% rename from src/widgets/chatwidgetheaderbutton.h rename to src/widgets/chatwidgetheaderbutton.hpp index 845b7a19d..5428d2161 100644 --- a/src/widgets/chatwidgetheaderbutton.h +++ b/src/widgets/chatwidgetheaderbutton.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/signallabel.h" +#include "widgets/signallabel.hpp" #include #include diff --git a/src/widgets/chatwidgetinput.cpp b/src/widgets/chatwidgetinput.cpp index f72359a1c..1a13c463e 100644 --- a/src/widgets/chatwidgetinput.cpp +++ b/src/widgets/chatwidgetinput.cpp @@ -1,8 +1,8 @@ -#include "widgets/chatwidgetinput.h" -#include "chatwidget.h" -#include "colorscheme.h" -#include "ircmanager.h" -#include "settingsmanager.h" +#include "widgets/chatwidgetinput.hpp" +#include "chatwidget.hpp" +#include "colorscheme.hpp" +#include "ircmanager.hpp" +#include "settingsmanager.hpp" #include #include diff --git a/src/widgets/chatwidgetinput.h b/src/widgets/chatwidgetinput.hpp similarity index 92% rename from src/widgets/chatwidgetinput.h rename to src/widgets/chatwidgetinput.hpp index 33852c161..beb208dee 100644 --- a/src/widgets/chatwidgetinput.h +++ b/src/widgets/chatwidgetinput.hpp @@ -1,7 +1,7 @@ #pragma once -#include "resizingtextedit.h" -#include "widgets/chatwidgetheaderbutton.h" +#include "resizingtextedit.hpp" +#include "widgets/chatwidgetheaderbutton.hpp" #include #include diff --git a/src/widgets/chatwidgetview.cpp b/src/widgets/chatwidgetview.cpp index 4af5a56cc..8ec13db8d 100644 --- a/src/widgets/chatwidgetview.cpp +++ b/src/widgets/chatwidgetview.cpp @@ -1,12 +1,12 @@ -#include "widgets/chatwidgetview.h" -#include "channelmanager.h" -#include "colorscheme.h" -#include "messages/message.h" -#include "messages/wordpart.h" -#include "settingsmanager.h" +#include "widgets/chatwidgetview.hpp" +#include "channelmanager.hpp" +#include "colorscheme.hpp" +#include "messages/message.hpp" +#include "messages/wordpart.hpp" +#include "settingsmanager.hpp" #include "ui_accountpopupform.h" -#include "util/distancebetweenpoints.h" -#include "widgets/chatwidget.h" +#include "util/distancebetweenpoints.hpp" +#include "widgets/chatwidget.hpp" #include #include diff --git a/src/widgets/chatwidgetview.h b/src/widgets/chatwidgetview.hpp similarity index 88% rename from src/widgets/chatwidgetview.h rename to src/widgets/chatwidgetview.hpp index 00af03513..61cd4b907 100644 --- a/src/widgets/chatwidgetview.h +++ b/src/widgets/chatwidgetview.hpp @@ -1,11 +1,11 @@ #pragma once -#include "channel.h" -#include "messages/lazyloadedimage.h" -#include "messages/messageref.h" -#include "messages/word.h" -#include "widgets/accountpopup.h" -#include "widgets/scrollbar.h" +#include "channel.hpp" +#include "messages/lazyloadedimage.hpp" +#include "messages/messageref.hpp" +#include "messages/word.hpp" +#include "widgets/accountpopup.hpp" +#include "widgets/scrollbar.hpp" #include #include diff --git a/src/widgets/fancybutton.cpp b/src/widgets/fancybutton.cpp index 49ec38b9c..7fc6e97f5 100644 --- a/src/widgets/fancybutton.cpp +++ b/src/widgets/fancybutton.cpp @@ -1,4 +1,4 @@ -#include "fancybutton.h" +#include "fancybutton.hpp" #include #include diff --git a/src/widgets/fancybutton.h b/src/widgets/fancybutton.hpp similarity index 100% rename from src/widgets/fancybutton.h rename to src/widgets/fancybutton.hpp diff --git a/src/widgets/mainwindow.cpp b/src/widgets/mainwindow.cpp index c17c28995..86a376177 100644 --- a/src/widgets/mainwindow.cpp +++ b/src/widgets/mainwindow.cpp @@ -1,9 +1,9 @@ -#include "widgets/mainwindow.h" -#include "colorscheme.h" -#include "settingsmanager.h" -#include "widgets/chatwidget.h" -#include "widgets/notebook.h" -#include "widgets/settingsdialog.h" +#include "widgets/mainwindow.hpp" +#include "colorscheme.hpp" +#include "settingsmanager.hpp" +#include "widgets/chatwidget.hpp" +#include "widgets/notebook.hpp" +#include "widgets/settingsdialog.hpp" #include #include @@ -12,7 +12,7 @@ #include #ifdef USEWINSDK -#include "Windows.h" +#include "Windows.hpp" #endif namespace chatterino { diff --git a/src/widgets/mainwindow.h b/src/widgets/mainwindow.hpp similarity index 92% rename from src/widgets/mainwindow.h rename to src/widgets/mainwindow.hpp index 799f631ab..3e41a8f8d 100644 --- a/src/widgets/mainwindow.h +++ b/src/widgets/mainwindow.hpp @@ -1,7 +1,7 @@ #pragma once -#include "widgets/notebook.h" -#include "widgets/titlebar.h" +#include "widgets/notebook.hpp" +#include "widgets/titlebar.hpp" #ifdef USEWINSDK #include diff --git a/src/widgets/notebook.cpp b/src/widgets/notebook.cpp index 460042a0c..960ad7979 100644 --- a/src/widgets/notebook.cpp +++ b/src/widgets/notebook.cpp @@ -1,9 +1,9 @@ -#include "widgets/notebook.h" -#include "colorscheme.h" -#include "widgets/notebookbutton.h" -#include "widgets/notebookpage.h" -#include "widgets/notebooktab.h" -#include "widgets/settingsdialog.h" +#include "widgets/notebook.hpp" +#include "colorscheme.hpp" +#include "widgets/notebookbutton.hpp" +#include "widgets/notebookpage.hpp" +#include "widgets/notebooktab.hpp" +#include "widgets/settingsdialog.hpp" #include #include diff --git a/src/widgets/notebook.h b/src/widgets/notebook.hpp similarity index 91% rename from src/widgets/notebook.h rename to src/widgets/notebook.hpp index d6e2bd68d..c9259df50 100644 --- a/src/widgets/notebook.h +++ b/src/widgets/notebook.hpp @@ -1,8 +1,8 @@ #pragma once -#include "widgets/notebookbutton.h" -#include "widgets/notebookpage.h" -#include "widgets/notebooktab.h" +#include "widgets/notebookbutton.hpp" +#include "widgets/notebookpage.hpp" +#include "widgets/notebooktab.hpp" #include #include diff --git a/src/widgets/notebookbutton.cpp b/src/widgets/notebookbutton.cpp index b130aa469..765aaf475 100644 --- a/src/widgets/notebookbutton.cpp +++ b/src/widgets/notebookbutton.cpp @@ -1,6 +1,6 @@ -#include "widgets/notebookbutton.h" -#include "colorscheme.h" -#include "widgets/fancybutton.h" +#include "widgets/notebookbutton.hpp" +#include "colorscheme.hpp" +#include "widgets/fancybutton.hpp" #include #include diff --git a/src/widgets/notebookbutton.h b/src/widgets/notebookbutton.hpp similarity index 95% rename from src/widgets/notebookbutton.h rename to src/widgets/notebookbutton.hpp index 7ec762857..fb3e9d692 100644 --- a/src/widgets/notebookbutton.h +++ b/src/widgets/notebookbutton.hpp @@ -1,6 +1,6 @@ #pragma once -#include "fancybutton.h" +#include "fancybutton.hpp" #include diff --git a/src/widgets/notebookpage.cpp b/src/widgets/notebookpage.cpp index 3c7d7a98c..3e8423c2b 100644 --- a/src/widgets/notebookpage.cpp +++ b/src/widgets/notebookpage.cpp @@ -1,7 +1,7 @@ -#include "widgets/notebookpage.h" -#include "colorscheme.h" -#include "widgets/chatwidget.h" -#include "widgets/notebooktab.h" +#include "widgets/notebookpage.hpp" +#include "colorscheme.hpp" +#include "widgets/chatwidget.hpp" +#include "widgets/notebooktab.hpp" #include #include diff --git a/src/widgets/notebookpage.h b/src/widgets/notebookpage.hpp similarity index 92% rename from src/widgets/notebookpage.h rename to src/widgets/notebookpage.hpp index c69746c41..9f71a432d 100644 --- a/src/widgets/notebookpage.h +++ b/src/widgets/notebookpage.hpp @@ -1,9 +1,9 @@ #pragma once -#include "widgets/chatwidget.h" -#include "widgets/notebookpage.h" -#include "widgets/notebookpagedroppreview.h" -#include "widgets/notebooktab.h" +#include "widgets/chatwidget.hpp" +#include "widgets/notebookpage.hpp" +#include "widgets/notebookpagedroppreview.hpp" +#include "widgets/notebooktab.hpp" #include #include diff --git a/src/widgets/notebookpagedroppreview.cpp b/src/widgets/notebookpagedroppreview.cpp index 1611d198c..d344cbca5 100644 --- a/src/widgets/notebookpagedroppreview.cpp +++ b/src/widgets/notebookpagedroppreview.cpp @@ -1,5 +1,5 @@ -#include "widgets/notebookpagedroppreview.h" -#include "colorscheme.h" +#include "widgets/notebookpagedroppreview.hpp" +#include "colorscheme.hpp" #include #include diff --git a/src/widgets/notebookpagedroppreview.h b/src/widgets/notebookpagedroppreview.hpp similarity index 100% rename from src/widgets/notebookpagedroppreview.h rename to src/widgets/notebookpagedroppreview.hpp diff --git a/src/widgets/notebooktab.cpp b/src/widgets/notebooktab.cpp index 08b25eacc..d31aadbd4 100644 --- a/src/widgets/notebooktab.cpp +++ b/src/widgets/notebooktab.cpp @@ -1,7 +1,7 @@ -#include "widgets/notebooktab.h" -#include "colorscheme.h" -#include "settingsmanager.h" -#include "widgets/notebook.h" +#include "widgets/notebooktab.hpp" +#include "colorscheme.hpp" +#include "settingsmanager.hpp" +#include "widgets/notebook.hpp" #include diff --git a/src/widgets/notebooktab.h b/src/widgets/notebooktab.hpp similarity index 100% rename from src/widgets/notebooktab.h rename to src/widgets/notebooktab.hpp diff --git a/src/widgets/resizingtextedit.h b/src/widgets/resizingtextedit.hpp similarity index 100% rename from src/widgets/resizingtextedit.h rename to src/widgets/resizingtextedit.hpp diff --git a/src/widgets/scrollbar.cpp b/src/widgets/scrollbar.cpp index 2eb02ff54..86eb3dee6 100644 --- a/src/widgets/scrollbar.cpp +++ b/src/widgets/scrollbar.cpp @@ -1,5 +1,5 @@ -#include "widgets/scrollbar.h" -#include "colorscheme.h" +#include "widgets/scrollbar.hpp" +#include "colorscheme.hpp" #include #include diff --git a/src/widgets/scrollbar.h b/src/widgets/scrollbar.hpp similarity index 97% rename from src/widgets/scrollbar.h rename to src/widgets/scrollbar.hpp index 217a41835..539b86a6e 100644 --- a/src/widgets/scrollbar.h +++ b/src/widgets/scrollbar.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/scrollbarhighlight.h" +#include "widgets/scrollbarhighlight.hpp" #include #include diff --git a/src/widgets/scrollbarhighlight.cpp b/src/widgets/scrollbarhighlight.cpp index c3347fc62..5e912d052 100644 --- a/src/widgets/scrollbarhighlight.cpp +++ b/src/widgets/scrollbarhighlight.cpp @@ -1,5 +1,5 @@ -#include "widgets/scrollbarhighlight.h" -#include "colorscheme.h" +#include "widgets/scrollbarhighlight.hpp" +#include "colorscheme.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/scrollbarhighlight.h b/src/widgets/scrollbarhighlight.hpp similarity index 100% rename from src/widgets/scrollbarhighlight.h rename to src/widgets/scrollbarhighlight.hpp diff --git a/src/widgets/settingsdialog.cpp b/src/widgets/settingsdialog.cpp index 0281a5171..66951fec1 100644 --- a/src/widgets/settingsdialog.cpp +++ b/src/widgets/settingsdialog.cpp @@ -1,8 +1,8 @@ -#include "widgets/settingsdialog.h" -#include "accountmanager.h" -#include "twitch/twitchuser.h" -#include "widgets/settingsdialogtab.h" -#include "windowmanager.h" +#include "widgets/settingsdialog.hpp" +#include "accountmanager.hpp" +#include "twitch/twitchuser.hpp" +#include "widgets/settingsdialogtab.hpp" +#include "windowmanager.hpp" #include #include diff --git a/src/widgets/settingsdialog.h b/src/widgets/settingsdialog.hpp similarity index 90% rename from src/widgets/settingsdialog.h rename to src/widgets/settingsdialog.hpp index b65d6cc2d..4fdd9033c 100644 --- a/src/widgets/settingsdialog.h +++ b/src/widgets/settingsdialog.hpp @@ -1,8 +1,8 @@ #pragma once -#include "settingsmanager.h" -#include "settingssnapshot.h" -#include "widgets/settingsdialogtab.h" +#include "settingsmanager.hpp" +#include "settingssnapshot.hpp" +#include "widgets/settingsdialogtab.hpp" #include #include diff --git a/src/widgets/settingsdialogtab.cpp b/src/widgets/settingsdialogtab.cpp index 302715598..3ea0a6d62 100644 --- a/src/widgets/settingsdialogtab.cpp +++ b/src/widgets/settingsdialogtab.cpp @@ -1,5 +1,5 @@ -#include "widgets/settingsdialogtab.h" -#include "widgets/settingsdialog.h" +#include "widgets/settingsdialogtab.hpp" +#include "widgets/settingsdialog.hpp" #include #include diff --git a/src/widgets/settingsdialogtab.h b/src/widgets/settingsdialogtab.hpp similarity index 100% rename from src/widgets/settingsdialogtab.h rename to src/widgets/settingsdialogtab.hpp diff --git a/src/widgets/signallabel.h b/src/widgets/signallabel.hpp similarity index 100% rename from src/widgets/signallabel.h rename to src/widgets/signallabel.hpp diff --git a/src/widgets/textinputdialog.cpp b/src/widgets/textinputdialog.cpp index 18b3270a5..87cafa787 100644 --- a/src/widgets/textinputdialog.cpp +++ b/src/widgets/textinputdialog.cpp @@ -1,4 +1,4 @@ -#include "widgets/textinputdialog.h" +#include "widgets/textinputdialog.hpp" #include namespace chatterino { diff --git a/src/widgets/textinputdialog.h b/src/widgets/textinputdialog.hpp similarity index 100% rename from src/widgets/textinputdialog.h rename to src/widgets/textinputdialog.hpp diff --git a/src/widgets/titlebar.cpp b/src/widgets/titlebar.cpp index 150d2fd64..ee3ac7426 100644 --- a/src/widgets/titlebar.cpp +++ b/src/widgets/titlebar.cpp @@ -1,4 +1,4 @@ -#include "titlebar.h" +#include "titlebar.hpp" namespace chatterino { namespace widgets { diff --git a/src/widgets/titlebar.h b/src/widgets/titlebar.hpp similarity index 100% rename from src/widgets/titlebar.h rename to src/widgets/titlebar.hpp diff --git a/src/windowmanager.cpp b/src/windowmanager.cpp index 8aa2a7b62..d97c42923 100644 --- a/src/windowmanager.cpp +++ b/src/windowmanager.cpp @@ -1,5 +1,5 @@ -#include "windowmanager.h" -#include "appdatapath.h" +#include "windowmanager.hpp" +#include "appdatapath.hpp" #include #include diff --git a/src/windowmanager.h b/src/windowmanager.hpp similarity index 94% rename from src/windowmanager.h rename to src/windowmanager.hpp index 9681b20f2..88b8e78c8 100644 --- a/src/windowmanager.h +++ b/src/windowmanager.hpp @@ -1,6 +1,6 @@ #pragma once -#include "widgets/mainwindow.h" +#include "widgets/mainwindow.hpp" #include