From 69c45fb3cf722a6589efc99bf1fe2c151a3ea491 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 12 Jun 2018 18:59:56 +0000 Subject: replaced deprecated QDesktopWidget git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8034 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/qsui/popupwidget.cpp | 6 +++--- src/plugins/Ui/skinned/dock.cpp | 11 ++++++++--- src/plugins/Ui/skinned/eqwidget.cpp | 10 +++++----- src/plugins/Ui/skinned/mainwindow.cpp | 10 +++++----- src/plugins/Ui/skinned/playlist.cpp | 6 +++--- src/plugins/Ui/skinned/popupwidget.cpp | 6 +++--- 6 files changed, 27 insertions(+), 22 deletions(-) (limited to 'src/plugins/Ui') 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 #include #include -#include +#include #include #include #include @@ -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 -#include +#include +#include +#include #include #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 #include #include -#include +#include #include #include #include @@ -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 #include #include -#include +#include #include #include #include @@ -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 #include #include -#include +#include #include #include #include @@ -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 #include #include -#include +#include #include #include #include @@ -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); -- cgit v1.2.3-13-gbd6f