Skip to content

Commit c6dd32d

Browse files
committed
qt: Replace obsolete functions of QDesktopWidget
1 parent 1260ecd commit c6dd32d

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

src/qt/bitcoingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
#include <QApplication>
4141
#include <QComboBox>
4242
#include <QDateTime>
43-
#include <QDesktopWidget>
4443
#include <QDragEnterEvent>
4544
#include <QListWidget>
4645
#include <QMenu>
4746
#include <QMenuBar>
4847
#include <QMessageBox>
4948
#include <QMimeData>
5049
#include <QProgressDialog>
50+
#include <QScreen>
5151
#include <QSettings>
5252
#include <QShortcut>
5353
#include <QStackedWidget>
@@ -81,7 +81,7 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
8181
QSettings settings;
8282
if (!restoreGeometry(settings.value("MainWindowGeometry").toByteArray())) {
8383
// Restore failed (perhaps missing setting), center the window
84-
move(QApplication::desktop()->availableGeometry().center() - frameGeometry().center());
84+
move(QGuiApplication::primaryScreen()->availableGeometry().center() - frameGeometry().center());
8585
}
8686

8787
#ifdef ENABLE_WALLET

src/qt/guiutil.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include <QClipboard>
4040
#include <QDateTime>
4141
#include <QDesktopServices>
42-
#include <QDesktopWidget>
4342
#include <QDoubleValidator>
4443
#include <QFileDialog>
4544
#include <QFont>

src/qt/rpcconsole.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
#include <wallet/wallet.h>
2929
#endif
3030

31-
#include <QDesktopWidget>
3231
#include <QKeyEvent>
3332
#include <QMenu>
3433
#include <QMessageBox>
3534
#include <QScrollBar>
35+
#include <QScreen>
3636
#include <QSettings>
3737
#include <QSignalMapper>
3838
#include <QTime>
@@ -451,7 +451,7 @@ RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformSty
451451
QSettings settings;
452452
if (!restoreGeometry(settings.value("RPCConsoleWindowGeometry").toByteArray())) {
453453
// Restore failed (perhaps missing setting), center the window
454-
move(QApplication::desktop()->availableGeometry().center() - frameGeometry().center());
454+
move(QGuiApplication::primaryScreen()->availableGeometry().center() - frameGeometry().center());
455455
}
456456

457457
QChar nonbreaking_hyphen(8209);

src/qt/splashscreen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#include <QApplication>
2323
#include <QCloseEvent>
24-
#include <QDesktopWidget>
2524
#include <QPainter>
2625
#include <QRadialGradient>
26+
#include <QScreen>
2727

2828

2929
SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const NetworkStyle *networkStyle) :
@@ -124,7 +124,7 @@ SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const Netw
124124
QRect r(QPoint(), QSize(pixmap.size().width()/devicePixelRatio,pixmap.size().height()/devicePixelRatio));
125125
resize(r.size());
126126
setFixedSize(r.size());
127-
move(QApplication::desktop()->screenGeometry().center() - r.center());
127+
move(QGuiApplication::primaryScreen()->geometry().center() - r.center());
128128

129129
subscribeToCoreSignals();
130130
installEventFilter(this);

0 commit comments

Comments
 (0)