replaced deprecated QDesktopWidget

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8034 90c681e8-e032-0410-971d-27865f9a5e38

10 files changed, 35 insertions, 32 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;
 
diff --git a/src/plugins/Ui/qsui/popupwidget.cpp b/src/plugins/Ui/qsui/popupwidget.cpp
index dcad92917..ae145a2cc 100644
--- a/src/plugins/Ui/qsui/popupwidget.cpp
+++ b/src/plugins/Ui/qsui/popupwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2017 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 <QSettings>
 #include <QApplication>
@@ -98,7 +98,7 @@ void PopupWidget::prepare(PlayListTrack *track, QPoint pos)
     resize(sizeHint());
     qApp->processEvents();
     m_timer->start();
-    QRect rect = QApplication::desktop()->availableGeometry(this);
+    QRect rect = QGuiApplication::primaryScreen()->availableGeometry();
     if(pos.x() + width() > rect.x() + rect.width())
         pos.rx() -= width();
     move(pos);
diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp
index 47f2183bf..09249be58 100644
--- a/src/plugins/Ui/skinned/dock.cpp
+++ b/src/plugins/Ui/skinned/dock.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2012 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2018 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,7 +19,9 @@
  ***************************************************************************/
 
 #include <QAction>
-#include <QDesktopWidget>
+#include <QScreen>
+#include <QWindow>
+#include <QtDebug>
 #include <QApplication>
 #include "dock.h"
 
@@ -53,7 +55,10 @@ void Dock::setMainWidget (QWidget *widget)
 
 QPoint Dock::snapDesktop(QPoint npos, QWidget* mv)
 {
-    QRect desktopRect = QApplication::desktop()->availableGeometry(mv);
+    if(!mv->isVisible())
+        return npos;
+
+    QRect desktopRect = mv->window()->windowHandle()->screen()->availableGeometry();
     int nx = abs (npos.x() - desktopRect.x()); //left-top
     int ny = abs (npos.y() - desktopRect.y());
 
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index dfa24aaf1..7a87432ee 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2017 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2018 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,7 +23,7 @@
 #include <QInputDialog>
 #include <QCloseEvent>
 #include <QFile>
-#include <QDesktopWidget>
+#include <QScreen>
 #include <qmmpui/filedialog.h>
 #include <qmmpui/playlistmanager.h>
 #include <qmmp/soundcore.h>
@@ -146,11 +146,11 @@ void EqWidget::setMimimalMode(bool b)
 void EqWidget::readSettings()
 {
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
-    QDesktopWidget *desktop = qApp->desktop();
+    QScreen *screen = QGuiApplication::primaryScreen();
     QPoint pos = settings.value("Skinned/eq_pos", QPoint(100, 216)).toPoint();
-    if(!desktop->availableGeometry().contains(pos))
+    if(!screen->availableGeometry().contains(pos))
     {
-        QRect availableGeometry = desktop->availableGeometry();
+        QRect availableGeometry = screen->availableGeometry();
         int r = m_skin->ratio();
         pos.setX(qBound(availableGeometry.left(), pos.x(), availableGeometry.right() - r*275));
         pos.setY(qBound(availableGeometry.top(), pos.y(), availableGeometry.bottom() - r*116));
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index c860f577d..e7d619e82 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2017 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2018 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,7 +22,7 @@
 #include <QDir>
 #include <QAction>
 #include <QMenu>
-#include <QDesktopWidget>
+#include <QScreen>
 #include <QSignalMapper>
 #include <math.h>
 #include <qmmp/soundcore.h>
@@ -280,11 +280,11 @@ void MainWindow::readSettings()
     }
     else
     {
-        QDesktopWidget *desktop = qApp->desktop();
+        QScreen *screen = QGuiApplication::primaryScreen();
         QPoint pos = settings.value("mw_pos", QPoint(100, 100)).toPoint();
-        if(!desktop->availableGeometry().contains(pos))
+        if(!screen->availableGeometry().contains(pos))
         {
-            QRect availableGeometry = desktop->availableGeometry();
+            QRect availableGeometry = screen->availableGeometry();
             int r = m_skin->ratio();
             pos.setX(qBound(availableGeometry.left(), pos.x(), availableGeometry.right() - r*275));
             pos.setY(qBound(availableGeometry.top(), pos.y(), availableGeometry.bottom() - r*116));
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 6c57fbd9f..f6aad30f7 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2017 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2018 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -25,7 +25,7 @@
 #include <QSignalMapper>
 #include <QCloseEvent>
 #include <QInputDialog>
-#include <QDesktopWidget>
+#include <QScreen>
 #include <qmmpui/playlistitem.h>
 #include <qmmpui/playlistmodel.h>
 #include <qmmpui/playlistmanager.h>
@@ -496,7 +496,7 @@ void PlayList::readSettings()
     }
     else
     {
-        QDesktopWidget *desktop = qApp->desktop();
+        QScreen *desktop = QGuiApplication::primaryScreen();
         QPoint pos = settings.value ("Skinned/pl_pos", QPoint (100, 332)).toPoint();
         if(!desktop->availableGeometry().contains(pos))
         {
diff --git a/src/plugins/Ui/skinned/popupwidget.cpp b/src/plugins/Ui/skinned/popupwidget.cpp
index ba82c359b..5bb25afc4 100644
--- a/src/plugins/Ui/skinned/popupwidget.cpp
+++ b/src/plugins/Ui/skinned/popupwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2017 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 <QSettings>
 #include <QApplication>
@@ -99,7 +99,7 @@ void PopupWidget::prepare(PlayListTrack *item, QPoint pos)
     resize(sizeHint());
     qApp->processEvents();
     m_timer->start();
-    QRect rect = QApplication::desktop()->availableGeometry(this);
+    QRect rect = QGuiApplication::primaryScreen()->availableGeometry();
     if(pos.x() + width() > rect.x() + rect.width())
         pos.rx() -= width();
     move(pos);