From 24a1996a68c6c9dc4db9dbcabf6c6660389ff41d Mon Sep 17 00:00:00 2001 From: fourtf Date: Sun, 8 Sep 2019 18:17:18 +0200 Subject: [PATCH] fix project file --- chatterino.pro | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/chatterino.pro b/chatterino.pro index 83d81792..0c38c50a 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -82,8 +82,8 @@ SOURCES += \ src/common/DownloadManager.cpp \ src/common/Env.cpp \ src/common/LinkParser.cpp \ - src/common/NetworkPrivate.cpp \ src/common/NetworkManager.cpp \ + src/common/NetworkPrivate.cpp \ src/common/NetworkRequest.cpp \ src/common/NetworkResult.cpp \ src/common/UsernameSet.cpp \ @@ -104,6 +104,8 @@ SOURCES += \ src/controllers/moderationactions/ModerationActions.cpp \ src/controllers/notifications/NotificationController.cpp \ src/controllers/notifications/NotificationModel.cpp \ + src/controllers/pings/PingController.cpp \ + src/controllers/pings/PingModel.cpp \ src/controllers/taggedusers/TaggedUser.cpp \ src/controllers/taggedusers/TaggedUsersController.cpp \ src/controllers/taggedusers/TaggedUsersModel.cpp \ @@ -125,7 +127,6 @@ SOURCES += \ src/providers/chatterino/ChatterinoBadges.cpp \ src/providers/emoji/Emojis.cpp \ src/providers/ffz/FfzEmotes.cpp \ - src/providers/ffz/FfzModBadge.cpp \ src/providers/irc/AbstractIrcServer.cpp \ src/providers/irc/IrcAccount.cpp \ src/providers/irc/IrcChannel2.cpp \ @@ -161,9 +162,9 @@ SOURCES += \ src/singletons/Settings.cpp \ src/singletons/Theme.cpp \ src/singletons/Toasts.cpp \ + src/singletons/TooltipPreviewImage.cpp \ src/singletons/Updates.cpp \ src/singletons/WindowManager.cpp \ - src/singletons/TooltipPreviewImage.cpp \ src/util/DebugCount.cpp \ src/util/FormatTime.cpp \ src/util/IncognitoBrowser.cpp \ @@ -171,7 +172,7 @@ SOURCES += \ src/util/JsonQuery.cpp \ src/util/RapidjsonHelpers.cpp \ src/util/StreamLink.cpp \ - src/widgets/AccountSwitchPopupWidget.cpp \ + src/widgets/AccountSwitchPopup.cpp \ src/widgets/AccountSwitchWidget.cpp \ src/widgets/AttachedWindow.cpp \ src/widgets/dialogs/EmotePopup.cpp \ @@ -200,22 +201,15 @@ SOURCES += \ src/widgets/Scrollbar.cpp \ src/widgets/settingspages/AboutPage.cpp \ src/widgets/settingspages/AccountsPage.cpp \ - src/widgets/settingspages/AdvancedPage.cpp \ - src/widgets/settingspages/BrowserExtensionPage.cpp \ src/widgets/settingspages/CommandPage.cpp \ - src/widgets/settingspages/EmotesPage.cpp \ src/widgets/settingspages/ExternalToolsPage.cpp \ - src/widgets/settingspages/FeelPage.cpp \ src/widgets/settingspages/GeneralPage.cpp \ src/widgets/settingspages/HighlightingPage.cpp \ src/widgets/settingspages/IgnoresPage.cpp \ src/widgets/settingspages/KeyboardSettingsPage.cpp \ - src/widgets/settingspages/LogsPage.cpp \ - src/widgets/settingspages/LookPage.cpp \ src/widgets/settingspages/ModerationPage.cpp \ src/widgets/settingspages/NotificationPage.cpp \ src/widgets/settingspages/SettingsPage.cpp \ - src/widgets/settingspages/SpecialChannelsPage.cpp \ src/widgets/splits/ClosedSplits.cpp \ src/widgets/splits/Split.cpp \ src/widgets/splits/SplitContainer.cpp \ @@ -224,8 +218,6 @@ SOURCES += \ src/widgets/splits/SplitOverlay.cpp \ src/widgets/StreamView.cpp \ src/widgets/Window.cpp \ - src/controllers/pings/PingController.cpp \ - src/controllers/pings/PingModel.cpp \ HEADERS += \ src/Application.hpp \ @@ -238,10 +230,11 @@ HEADERS += \ src/common/CompletionModel.hpp \ src/common/ConcurrentMap.hpp \ src/common/DownloadManager.hpp \ + src/common/Env.hpp \ src/common/LinkParser.hpp \ src/common/NetworkCommon.hpp \ - src/common/NetworkPrivate.hpp \ src/common/NetworkManager.hpp \ + src/common/NetworkPrivate.hpp \ src/common/NetworkRequest.hpp \ src/common/NetworkResult.hpp \ src/common/NullablePtr.hpp \ @@ -271,9 +264,12 @@ HEADERS += \ src/controllers/moderationactions/ModerationActions.hpp \ src/controllers/notifications/NotificationController.hpp \ src/controllers/notifications/NotificationModel.hpp \ + src/controllers/pings/PingController.hpp \ + src/controllers/pings/PingModel.hpp \ src/controllers/taggedusers/TaggedUser.hpp \ src/controllers/taggedusers/TaggedUsersController.hpp \ src/controllers/taggedusers/TaggedUsersModel.hpp \ + src/ForwardDecl.hpp \ src/messages/Emote.hpp \ src/messages/Image.hpp \ src/messages/ImageSet.hpp \ @@ -296,7 +292,6 @@ HEADERS += \ src/providers/chatterino/ChatterinoBadges.hpp \ src/providers/emoji/Emojis.hpp \ src/providers/ffz/FfzEmotes.hpp \ - src/providers/ffz/FfzModBadge.hpp \ src/providers/irc/AbstractIrcServer.hpp \ src/providers/irc/IrcAccount.hpp \ src/providers/irc/IrcChannel2.hpp \ @@ -323,7 +318,6 @@ HEADERS += \ src/providers/twitch/TwitchServer.hpp \ src/providers/twitch/TwitchUser.hpp \ src/RunGui.hpp \ - src/singletons/TooltipPreviewImage.hpp \ src/singletons/Badges.hpp \ src/singletons/Emotes.hpp \ src/singletons/helper/GifTimer.hpp \ @@ -335,6 +329,7 @@ HEADERS += \ src/singletons/Settings.hpp \ src/singletons/Theme.hpp \ src/singletons/Toasts.hpp \ + src/singletons/TooltipPreviewImage.hpp \ src/singletons/Updates.hpp \ src/singletons/WindowManager.hpp \ src/util/ConcurrentMap.hpp \ @@ -351,10 +346,11 @@ HEADERS += \ src/util/rangealgorithm.hpp \ src/util/RapidjsonHelpers.hpp \ src/util/RemoveScrollAreaBackground.hpp \ + src/util/SampleCheerMessages.hpp \ src/util/SharedPtrElementLess.hpp \ src/util/StandardItemHelper.hpp \ src/util/StreamLink.hpp \ - src/widgets/AccountSwitchPopupWidget.hpp \ + src/widgets/AccountSwitchPopup.hpp \ src/widgets/AccountSwitchWidget.hpp \ src/widgets/AttachedWindow.hpp \ src/widgets/dialogs/EmotePopup.hpp \ @@ -385,22 +381,15 @@ HEADERS += \ src/widgets/Scrollbar.hpp \ src/widgets/settingspages/AboutPage.hpp \ src/widgets/settingspages/AccountsPage.hpp \ - src/widgets/settingspages/AdvancedPage.hpp \ - src/widgets/settingspages/BrowserExtensionPage.hpp \ src/widgets/settingspages/CommandPage.hpp \ - src/widgets/settingspages/EmotesPage.hpp \ src/widgets/settingspages/ExternalToolsPage.hpp \ - src/widgets/settingspages/FeelPage.hpp \ src/widgets/settingspages/GeneralPage.hpp \ src/widgets/settingspages/HighlightingPage.hpp \ src/widgets/settingspages/IgnoresPage.hpp \ src/widgets/settingspages/KeyboardSettingsPage.hpp \ - src/widgets/settingspages/LogsPage.hpp \ - src/widgets/settingspages/LookPage.hpp \ src/widgets/settingspages/ModerationPage.hpp \ src/widgets/settingspages/NotificationPage.hpp \ src/widgets/settingspages/SettingsPage.hpp \ - src/widgets/settingspages/SpecialChannelsPage.hpp \ src/widgets/splits/ClosedSplits.hpp \ src/widgets/splits/Split.hpp \ src/widgets/splits/SplitContainer.hpp \ @@ -409,9 +398,6 @@ HEADERS += \ src/widgets/splits/SplitOverlay.hpp \ src/widgets/StreamView.hpp \ src/widgets/Window.hpp \ - src/controllers/pings/PingController.hpp \ - src/controllers/pings/PingModel.hpp \ - src/util/SampleCheerMessages.hpp \ RESOURCES += \ resources/resources.qrc \ @@ -461,4 +447,4 @@ git_hash = $$str_member($$git_commit, 0, 8) # https://stackoverflow.com/questions/3348711/add-a-define-to-qmake-with-a-value/18343449#18343449 DEFINES += CHATTERINO_GIT_COMMIT=\\\"$$git_commit\\\" DEFINES += CHATTERINO_GIT_RELEASE=\\\"$$git_release\\\" -DEFINES += CHATTERINO_GIT_HASH=\\\"$$git_hash\\\" \ No newline at end of file +DEFINES += CHATTERINO_GIT_HASH=\\\"$$git_hash\\\"