From a8e998a3e51425ab8c085f27bcbb8d39cd7bc672 Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Tue, 24 Apr 2018 23:53:22 +0300 Subject: [PATCH] Remove core includes path, use full header path core/xxx --- Telegram/CMakeLists.txt | 2 +- Telegram/SourceFiles/config.h.in | 2 +- Telegram/SourceFiles/messenger.h | 2 +- Telegram/SourceFiles/ui/widgets/continuous_sliders.h | 2 +- Telegram/SourceFiles/window/notifications_manager.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index a6bc226b8..4a1efb38c 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -569,7 +569,7 @@ include_directories(ThirdParty) # For minizip/ but we use fully-qualified include_directories(ThirdParty/GSL/include ThirdParty/variant/include ThirdParty/emoji_suggestions ThirdParty/libtgvoip) -include_directories(SourceFiles SourceFiles/core) +include_directories(SourceFiles) include_directories(${OPENAL_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${OPUS_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS} ${ALSA_INCLUDE_DIRS} ${PULSEAUDIO_INCLUDE_DIR}) diff --git a/Telegram/SourceFiles/config.h.in b/Telegram/SourceFiles/config.h.in index ee6dbc8a5..79865ec13 100644 --- a/Telegram/SourceFiles/config.h.in +++ b/Telegram/SourceFiles/config.h.in @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #endif #include "core/version.h" #include "settings.h" -#include "utils.h" +#include "core/utils.h" constexpr str_const AppName = "${KEPKA_APPNAME}"; diff --git a/Telegram/SourceFiles/messenger.h b/Telegram/SourceFiles/messenger.h index d0928838a..31eaa1d35 100644 --- a/Telegram/SourceFiles/messenger.h +++ b/Telegram/SourceFiles/messenger.h @@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "base/timer.h" #include "mtproto/rpc_sender.h" #include "structs.h" -#include "single_timer.h" +#include "core/single_timer.h" namespace App { void quit(); diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.h b/Telegram/SourceFiles/ui/widgets/continuous_sliders.h index fa7b4e38e..d9fb48794 100644 --- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.h +++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.h @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "base/lambda.h" -#include "single_timer.h" +#include "core/single_timer.h" #include "styles/style_widgets.h" #include "ui/twidget.h" #include "ui/animation.h" diff --git a/Telegram/SourceFiles/window/notifications_manager.h b/Telegram/SourceFiles/window/notifications_manager.h index 1aded043e..ed380e268 100644 --- a/Telegram/SourceFiles/window/notifications_manager.h +++ b/Telegram/SourceFiles/window/notifications_manager.h @@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include "base/observer.h" #include "structs.h" -#include "single_timer.h" +#include "core/single_timer.h" class AuthSession; class History;