From dea6943df7125926fb6ffd936d6d0851c5e7a823 Mon Sep 17 00:00:00 2001 From: leha-bot Date: Sun, 13 May 2018 15:41:20 +0300 Subject: [PATCH] Use "<",">" for Qt includes instead of quotes --- Telegram/SourceFiles/mtproto/connection_auto.cpp | 4 ++-- Telegram/SourceFiles/platform/win/specific_win.cpp | 11 ++++++----- Telegram/SourceFiles/platform/win/windows_dlls.cpp | 3 ++- Telegram/SourceFiles/profile/profile_cover.cpp | 3 ++- Telegram/SourceFiles/profile/profile_fixed_bar.cpp | 3 ++- .../SourceFiles/settings/settings_advanced_widget.cpp | 3 ++- Telegram/SourceFiles/shortcuts.cpp | 4 ++-- Telegram/SourceFiles/storage/localstorage.cpp | 9 +++++---- Telegram/SourceFiles/ui/effects/cross_animation.cpp | 3 ++- Telegram/SourceFiles/ui/effects/ripple_animation.cpp | 3 ++- Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp | 5 +++-- Telegram/SourceFiles/ui/special_buttons.cpp | 3 ++- Telegram/SourceFiles/ui/style/style_core_icon.cpp | 3 ++- Telegram/SourceFiles/ui/twidget.cpp | 5 +++-- Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp | 3 ++- Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp | 3 ++- Telegram/SourceFiles/ui/widgets/labels.cpp | 3 ++- Telegram/SourceFiles/window/section_widget.cpp | 3 ++- .../window/themes/window_theme_editor_block.cpp | 5 +++-- 19 files changed, 48 insertions(+), 31 deletions(-) diff --git a/Telegram/SourceFiles/mtproto/connection_auto.cpp b/Telegram/SourceFiles/mtproto/connection_auto.cpp index e00249df9..cb9f2971c 100644 --- a/Telegram/SourceFiles/mtproto/connection_auto.cpp +++ b/Telegram/SourceFiles/mtproto/connection_auto.cpp @@ -19,9 +19,9 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "mtproto/connection_auto.h" - #include "mtproto/connection_http.h" -#include "QNetworkProxy" + +#include namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp index 7a6b8cc2b..e28d6a657 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.cpp +++ b/Telegram/SourceFiles/platform/win/specific_win.cpp @@ -42,15 +42,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include -#include - -#include #include #include -#include "QStandardPaths" -#include "QDesktopServices" #include +#include +#include +#include +#include + + #ifndef DCX_USESTYLE #define DCX_USESTYLE 0x00010000 #endif diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.cpp b/Telegram/SourceFiles/platform/win/windows_dlls.cpp index 005c3fbb6..50883f0e9 100644 --- a/Telegram/SourceFiles/platform/win/windows_dlls.cpp +++ b/Telegram/SourceFiles/platform/win/windows_dlls.cpp @@ -20,7 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "platform/win/windows_dlls.h" #include "settings.h" -#include "QSysInfo" + +#include namespace Platform { namespace Dlls { diff --git a/Telegram/SourceFiles/profile/profile_cover.cpp b/Telegram/SourceFiles/profile/profile_cover.cpp index 56da6bb93..c03295583 100644 --- a/Telegram/SourceFiles/profile/profile_cover.cpp +++ b/Telegram/SourceFiles/profile/profile_cover.cpp @@ -39,7 +39,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "messenger.h" #include "platform/platform_file_utilities.h" #include "styles/style_widgets.h" -#include "QWidget" + +#include namespace Profile { namespace { diff --git a/Telegram/SourceFiles/profile/profile_fixed_bar.cpp b/Telegram/SourceFiles/profile/profile_fixed_bar.cpp index 10d99b8cf..59d2efe2c 100644 --- a/Telegram/SourceFiles/profile/profile_fixed_bar.cpp +++ b/Telegram/SourceFiles/profile/profile_fixed_bar.cpp @@ -30,7 +30,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "observer_peer.h" #include "styles/style_boxes.h" #include "profile/profile_back_button.h" -#include "QWidget" + +#include namespace Profile { namespace { diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp index 44db74dde..e8a8a8074 100644 --- a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp @@ -34,7 +34,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "scheme.h" #include "facades.h" #include "app.h" -#include "QDesktopServices" + +#include namespace Settings { diff --git a/Telegram/SourceFiles/shortcuts.cpp b/Telegram/SourceFiles/shortcuts.cpp index 00372296c..0fed86f8d 100644 --- a/Telegram/SourceFiles/shortcuts.cpp +++ b/Telegram/SourceFiles/shortcuts.cpp @@ -31,8 +31,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include #include -#include "QShortcut" -#include "QJsonArray" +#include +#include namespace ShortcutCommands { diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index 5e08a600b..9b164d680 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -39,10 +39,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "base/flags.h" #include -#include "QBuffer" -#include "QImageReader" -#include "QDirIterator" -#include "qendian.h" + +#include +#include +#include +#include namespace Local { namespace { diff --git a/Telegram/SourceFiles/ui/effects/cross_animation.cpp b/Telegram/SourceFiles/ui/effects/cross_animation.cpp index 38137c786..e22142074 100644 --- a/Telegram/SourceFiles/ui/effects/cross_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/cross_animation.cpp @@ -20,7 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/effects/cross_animation.h" #include "ui/twidget.h" -#include "qmath.h" + +#include namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/effects/ripple_animation.cpp b/Telegram/SourceFiles/ui/effects/ripple_animation.cpp index 1bd2c458f..86125a794 100644 --- a/Telegram/SourceFiles/ui/effects/ripple_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/ripple_animation.cpp @@ -22,7 +22,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/twidget.h" #include "ui/animation.h" #include "app.h" -#include "QPainter" + +#include namespace Ui { diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp index 3648ba642..175ba9b9a 100644 --- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp +++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp @@ -19,11 +19,12 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/effects/widget_fade_wrap.h" -#include "QWidget" #include "ui/twidget.h" -#include "QPixmap" #include "app.h" +#include +#include + namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/special_buttons.cpp b/Telegram/SourceFiles/ui/special_buttons.cpp index 639f893a8..ee99b0dd8 100644 --- a/Telegram/SourceFiles/ui/special_buttons.cpp +++ b/Telegram/SourceFiles/ui/special_buttons.cpp @@ -24,11 +24,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_history.h" #include "dialogs/dialogs_layout.h" #include "ui/effects/ripple_animation.h" -#include "qevent.h" #include "twidget.h" #include "structs.h" #include "app.h" +#include + namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/style/style_core_icon.cpp b/Telegram/SourceFiles/ui/style/style_core_icon.cpp index e20d2b970..0fd944493 100644 --- a/Telegram/SourceFiles/ui/style/style_core_icon.cpp +++ b/Telegram/SourceFiles/ui/style/style_core_icon.cpp @@ -19,11 +19,12 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/style/style_core_icon.h" -#include "QPainter" #include "settings.h" #include "style_core.h" #include "app.h" +#include + namespace style { namespace internal { namespace { diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp index caa6d7b62..9666f10af 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp @@ -21,11 +21,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "application.h" #include "twidget.h" #include "mainwindow.h" -#include "QWindow" #include "window\main_window.h" #include "messenger.h" #include "app.h" -#include "QFontDatabase" + +#include +#include namespace Fonts { namespace { diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp index d606c821c..0914c0e38 100644 --- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp +++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp @@ -22,8 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/ripple_animation.h" #include "styles/style_widgets.h" + #include -#include "qevent.h" +#include namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp b/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp index 237b0b8e5..8524ba32d 100644 --- a/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp +++ b/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp @@ -25,7 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/shadow.h" #include "ui/effects/panel_animation.h" #include "app.h" -#include "QWindow" + +#include namespace { diff --git a/Telegram/SourceFiles/ui/widgets/labels.cpp b/Telegram/SourceFiles/ui/widgets/labels.cpp index 3c0c93b1b..3370654ab 100644 --- a/Telegram/SourceFiles/ui/widgets/labels.cpp +++ b/Telegram/SourceFiles/ui/widgets/labels.cpp @@ -25,7 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "app.h" #include "facades.h" -#include "QDrag" + +#include namespace Ui { namespace { diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp index 151177807..2fef9d8a9 100644 --- a/Telegram/SourceFiles/window/section_widget.cpp +++ b/Telegram/SourceFiles/window/section_widget.cpp @@ -24,7 +24,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/twidget.h" #include "window_slide_animation.h" #include "facades.h" -#include "qevent.h" + +#include namespace Window { diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp index 7cfdacca3..2bde2444f 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp @@ -24,10 +24,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/ripple_animation.h" #include "boxes/edit_color_box.h" #include "lang/lang_keys.h" -#include "QColor" -#include "QString" #include "facades.h" +#include +#include + namespace Window { namespace Theme { namespace {