diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2018-06-12 18:59:56 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2018-06-12 18:59:56 +0000 |
| commit | 69c45fb3cf722a6589efc99bf1fe2c151a3ea491 (patch) | |
| tree | 05d335b9ec9e3cc4708c09e6ab98fd9f1176f192 /src/plugins/General | |
| parent | 414c5245e4927ba40963e83d1a8ab09ecfe16502 (diff) | |
| download | qmmp-69c45fb3cf722a6589efc99bf1fe2c151a3ea491.tar.gz qmmp-69c45fb3cf722a6589efc99bf1fe2c151a3ea491.tar.bz2 qmmp-69c45fb3cf722a6589efc99bf1fe2c151a3ea491.zip | |
replaced deprecated QDesktopWidget
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8034 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General')
4 files changed, 8 insertions, 10 deletions
diff --git a/src/plugins/General/hotkey/hotkeymanager_win.cpp b/src/plugins/General/hotkey/hotkeymanager_win.cpp index cb3793724..44fdb6cb6 100644 --- a/src/plugins/General/hotkey/hotkeymanager_win.cpp +++ b/src/plugins/General/hotkey/hotkeymanager_win.cpp @@ -1,5 +1,5 @@ /***************************************************************************
- * Copyright (C) 2013-2016 by Ilya Kotov *
+ * Copyright (C) 2013-2018 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -26,7 +26,6 @@ #include <QKeyEvent>
#include <QCoreApplication>
#include <QApplication>
-#include <QDesktopWidget>
#include <windows.h>
#include <winuser.h>
#include <commctrl.h>
diff --git a/src/plugins/General/hotkey/hotkeymanager_x11.cpp b/src/plugins/General/hotkey/hotkeymanager_x11.cpp index 05b46280a..7b7331357 100644 --- a/src/plugins/General/hotkey/hotkeymanager_x11.cpp +++ b/src/plugins/General/hotkey/hotkeymanager_x11.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2015 by Ilya Kotov * + * Copyright (C) 2009-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * Copyright (C) 2003-2007 by Justin Karneges and Michail Pishchagin * @@ -28,7 +28,6 @@ #include <QKeyEvent> #include <QCoreApplication> #include <QApplication> -#include <QDesktopWidget> #define Visual XVisual extern "C" { diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp index 7837aff65..1cc01f8ae 100644 --- a/src/plugins/General/notifier/popupwidget.cpp +++ b/src/plugins/General/notifier/popupwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2015 by Ilya Kotov * + * Copyright (C) 2008-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -21,7 +21,7 @@ #include <QVBoxLayout> #include <QLabel> #include <QApplication> -#include <QDesktopWidget> +#include <QScreen> #include <QTimer> #include <QPalette> #include <QSettings> @@ -126,7 +126,7 @@ void PopupWidget::showVolume(int v) void PopupWidget::updatePosition() { //calculate widget position - QRect desktopRect = QApplication::desktop()->availableGeometry(); + QRect desktopRect = QGuiApplication::primaryScreen()->availableGeometry(); int x = desktopRect.x() + 5, y = desktopRect.y() + 5; if (m_pos == LEFT || m_pos == RIGHT || m_pos == CENTER) y = desktopRect.y() + desktopRect.height()/2 - height()/2 + 5; diff --git a/src/plugins/General/statusicon/statusiconpopupwidget.cpp b/src/plugins/General/statusicon/statusiconpopupwidget.cpp index e74492fb0..f79b8ed6e 100644 --- a/src/plugins/General/statusicon/statusiconpopupwidget.cpp +++ b/src/plugins/General/statusicon/statusiconpopupwidget.cpp @@ -2,7 +2,7 @@ * Copyright (C) 2009 by Artur Guzik * * a.guzik88@gmail.com * * * - * Copyright (C) 2009-2015 by Ilya Kotov * + * Copyright (C) 2009-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -30,7 +30,7 @@ #include <QPixmap> #include <QFileInfo> #include <QApplication> -#include <QDesktopWidget> +#include <QScreen> #include <QSpacerItem> #include <QProgressBar> #include <QSettings> @@ -133,7 +133,7 @@ void StatusIconPopupWidget::updateTime(qint64 elapsed) void StatusIconPopupWidget::updatePosition(int trayx, int trayy) { - QRect screenGeometry = QApplication::desktop()->availableGeometry(); + QRect screenGeometry = QGuiApplication::primaryScreen()->availableGeometry(); int xpos = 0; int ypos = 0; |