diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp index 5f6bee73bf..4f0202b2f9 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -27,7 +27,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "window/window_session_controller.h" #include "base/platform/base_platform_info.h" #include "base/event_filter.h" -#include "base/unique_qptr.h" #include "ui/widgets/popup_menu.h" #include "ui/widgets/input_fields.h" #include "ui/ui_utility.h" @@ -405,14 +404,8 @@ uint djbStringHash(const std::string &string) { } // namespace -class MainWindow::Private { -public: - base::unique_qptr trayIconMenuXEmbed; -}; - MainWindow::MainWindow(not_null controller) -: Window::MainWindow(controller) -, _private(std::make_unique()) { +: Window::MainWindow(controller) { } void MainWindow::initHook() { @@ -462,7 +455,7 @@ bool MainWindow::isActiveForTrayMenu() { } void MainWindow::psShowTrayMenu() { - _private->trayIconMenuXEmbed->popup(QCursor::pos()); + _trayIconMenuXEmbed->popup(QCursor::pos()); } void MainWindow::psTrayMenuUpdated() { @@ -555,8 +548,8 @@ void MainWindow::updateIconCounters() { } void MainWindow::initTrayMenuHook() { - _private->trayIconMenuXEmbed.emplace(nullptr, trayIconMenu); - _private->trayIconMenuXEmbed->deleteOnHide(false); + _trayIconMenuXEmbed.emplace(nullptr, trayIconMenu); + _trayIconMenuXEmbed->deleteOnHide(false); } void MainWindow::createGlobalMenu() { diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h index 4091f09567..afcaabd289 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.h +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h @@ -8,9 +8,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "platform/platform_main_window.h" +#include "base/unique_qptr.h" class QMenuBar; +namespace Ui { +class PopupMenu; +} // namespace Ui + namespace Platform { class MainWindow : public Window::MainWindow { @@ -43,9 +48,7 @@ protected: void psSetupTrayIcon(); private: - class Private; - friend class Private; - const std::unique_ptr _private; + base::unique_qptr _trayIconMenuXEmbed; QMenuBar *psMainMenu = nullptr; QAction *psLogout = nullptr;