diff --git a/Telegram/SourceFiles/platform/mac/touchbar.h b/Telegram/SourceFiles/platform/mac/mac_touchbar.h similarity index 100% rename from Telegram/SourceFiles/platform/mac/touchbar.h rename to Telegram/SourceFiles/platform/mac/mac_touchbar.h diff --git a/Telegram/SourceFiles/platform/mac/touchbar.mm b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm similarity index 99% rename from Telegram/SourceFiles/platform/mac/touchbar.mm rename to Telegram/SourceFiles/platform/mac/mac_touchbar.mm index 9bb0cec71..a265ae824 100644 --- a/Telegram/SourceFiles/platform/mac/touchbar.mm +++ b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm @@ -6,7 +6,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#import "touchbar.h" +#import "mac_touchbar.h" #import #include "auth_session.h" diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 8e3f13b81..6ea86253d 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -32,7 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/player/media_player_instance.h" #include "media/audio/media_audio.h" -#include "platform/mac/touchbar.h" +#include "platform/mac/mac_touchbar.h" #include "data/data_session.h" @interface MainWindowObserver : NSObject { diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm index 43f28cf08..2e8b5ed4b 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm @@ -15,8 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "storage/localstorage.h" #include "media/audio/media_audio.h" #include "media/player/media_player_instance.h" +#include "platform/mac/mac_touchbar.h" #include "platform/mac/mac_utilities.h" -#include "platform/mac/touchbar.h" #include "lang/lang_keys.h" #include "base/timer.h" #include "styles/style_window.h" diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index 43e043a55..bd8dc1a67 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -589,8 +589,8 @@ <(src_loc)/platform/mac/specific_mac_p.h <(src_loc)/platform/mac/window_title_mac.mm <(src_loc)/platform/mac/window_title_mac.h -<(src_loc)/platform/mac/touchbar.h -<(src_loc)/platform/mac/touchbar.mm +<(src_loc)/platform/mac/mac_touchbar.h +<(src_loc)/platform/mac/mac_touchbar.mm <(src_loc)/platform/win/audio_win.cpp <(src_loc)/platform/win/audio_win.h <(src_loc)/platform/win/file_utilities_win.cpp