Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-20 13:19:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed deprecated QDesktopWidget for Qt 6

Browse source
This commit is contained in:
thunder2 2025-07-18 03:23:54 +02:00
parent f53a30a0e4
commit f321ffe8fd
12 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/gui/StartDialog.cpp
View file

@ -29,7 +29,6 @@
#include <QLineEdit> #include <QLineEdit>
#include <QMessageBox> #include <QMessageBox>
#include <QDesktopWidget>
#include <iostream> #include <iostream>
@ -49,7 +48,7 @@ StartDialog::StartDialog(QWidget *parent)
Settings->loadWidgetInformation(this); Settings->loadWidgetInformation(this);
/* Put the Login dialog in the screen center */ /* Put the Login dialog in the screen center */
const QRect screen = QApplication::desktop()->screenGeometry(); const QRect screen = RsApplication::primaryScreenGeometry();
this->move( screen.center() - this->rect().center() ); this->move( screen.center() - this->rect().center() );
/* get all available pgp private certificates.... /* get all available pgp private certificates....

6
retroshare-gui/src/gui/common/Emoticons.cpp
View file

@ -19,7 +19,6 @@
*******************************************************************************/ *******************************************************************************/
#include <QApplication> #include <QApplication>
#include <QDesktopWidget>
#include <QFile> #include <QFile>
#include <QDir> #include <QDir>
#include <QGridLayout> #include <QGridLayout>
@ -34,6 +33,7 @@
#include <iostream> #include <iostream>
#include <math.h> #include <math.h>
#include "rshare.h"
#include "Emoticons.h" #include "Emoticons.h"
#include "util/HandleRichText.h" #include "util/HandleRichText.h"
#include "retroshare/rsinit.h" #include "retroshare/rsinit.h"
@ -261,7 +261,7 @@ void Emoticons::showSmileyWidget(QWidget *parent, QWidget *button, const char *s
//Get widget's size //Get widget's size
QSize sizeWidget = smWidget->sizeHint(); QSize sizeWidget = smWidget->sizeHint();
//Get screen's size //Get screen's size
QSize sizeScreen = QApplication::desktop()->size(); QSize sizeScreen = RsApplication::primaryScreenGeometry().size();
//Calculate left distance to screen start //Calculate left distance to screen start
int distToScreenLeft = butTopLeft.x(); int distToScreenLeft = butTopLeft.x();
@ -437,7 +437,7 @@ void Emoticons::showStickerWidget(QWidget *parent, QWidget *button, const char *
//Get widget's size //Get widget's size
QSize sizeWidget = smWidget->sizeHint(); QSize sizeWidget = smWidget->sizeHint();
//Get screen's size //Get screen's size
QSize sizeScreen = QApplication::desktop()->size(); QSize sizeScreen = RsApplication::primaryScreenGeometry().size();
//Calculate left distance to screen start //Calculate left distance to screen start
int distToScreenLeft = butTopLeft.x(); int distToScreenLeft = butTopLeft.x();

9
retroshare-gui/src/gui/common/GroupTreeWidget.cpp
View file

@ -31,9 +31,9 @@
#include "util/QtVersion.h" #include "util/QtVersion.h"
#include "util/DateTime.h" #include "util/DateTime.h"
#include <QDesktopWidget>
#include <QMenu> #include <QMenu>
#include <QToolButton> #include <QToolButton>
#include <QScreen>
#include <stdint.h> #include <stdint.h>
@ -192,8 +192,11 @@ void GroupTreeWidget::addToolButton(QToolButton *toolButton)
/* Initialize button */ /* Initialize button */
int i = qt_defaultDpi(); int i = qt_defaultDpi();
auto desktopWidget = QApplication::desktop(); QScreen *primaryScreen = QGuiApplication::primaryScreen();
auto y = desktopWidget->logicalDpiY(); int y = i;
if (primaryScreen) {
y = primaryScreen->logicalDotsPerInchY();
}
toolButton->setAutoRaise(true); toolButton->setAutoRaise(true);
toolButton->setIconSize(QSize(24*y/i,24*y/i)); toolButton->setIconSize(QSize(24*y/i,24*y/i));

4
retroshare-gui/src/gui/common/RSGraphWidget.cpp
View file

@ -33,6 +33,7 @@
#include <QTimer> #include <QTimer>
#include <retroshare-gui/RsAutoUpdatePage.h> #include <retroshare-gui/RsAutoUpdatePage.h>
#include "rshare.h"
#include "RSGraphWidget.h" #include "RSGraphWidget.h"
#if QT_VERSION < 0x040700 #if QT_VERSION < 0x040700
@ -314,8 +315,7 @@ void RSGraphWidget::setFiltering(bool b)
int int
RSGraphWidget::getNumPoints() RSGraphWidget::getNumPoints()
{ {
QDesktopWidget *desktop = QApplication::desktop(); int width = RsApplication::primaryScreenGeometry().width();
int width = desktop->width();
return width; return width;
} }

1
retroshare-gui/src/gui/common/RSGraphWidget.h
View file

@ -26,7 +26,6 @@
#include <set> #include <set>
#include <QApplication> #include <QApplication>
#include <QDesktopWidget>
#include <QFrame> #include <QFrame>
#include <stdint.h> #include <stdint.h>

1
retroshare-gui/src/gui/common/rwindow.cpp
View file

@ -24,7 +24,6 @@
#include <QShortcut> #include <QShortcut>
#include <QByteArray> #include <QByteArray>
#include <QKeySequence> #include <QKeySequence>
#include <QDesktopWidget>
#include <rshare.h> #include <rshare.h>
#include "rwindow.h" #include "rwindow.h"

1
retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
View file

@ -23,7 +23,6 @@
#include <QMessageBox> #include <QMessageBox>
#include <QFile> #include <QFile>
#include <QDesktopWidget>
#include <QDropEvent> #include <QDropEvent>
#include <QPushButton> #include <QPushButton>
#include <QTextDocumentFragment> #include <QTextDocumentFragment>

5
retroshare-gui/src/gui/notifyqt.cpp
View file

@ -29,6 +29,7 @@
#include <retroshare-gui/RsAutoUpdatePage.h> #include <retroshare-gui/RsAutoUpdatePage.h>
#include "rshare.h"
#include "MainWindow.h" #include "MainWindow.h"
#include "toaster/OnlineToaster.h" #include "toaster/OnlineToaster.h"
#include "toaster/MessageToaster.h" #include "toaster/MessageToaster.h"
@ -49,7 +50,6 @@
#include "retroshare/rsplugin.h" #include "retroshare/rsplugin.h"
#include <QDesktopWidget>
#include <QInputDialog> #include <QInputDialog>
#include <QMessageBox> #include <QMessageBox>
//#include <QMutexLocker> //#include <QMutexLocker>
@ -1040,8 +1040,7 @@ void NotifyQt::startWaitingToasters()
/* Calculate positions */ /* Calculate positions */
QSize size = toaster->widget->size(); QSize size = toaster->widget->size();
QDesktopWidget *desktop = QApplication::desktop(); QRect desktopGeometry = RsApplication::primaryScreenGeometry();
QRect desktopGeometry = desktop->availableGeometry(desktop->primaryScreen());
switch (toaster->position) { switch (toaster->position) {
case RshareSettings::TOASTERPOS_TOPLEFT: case RshareSettings::TOASTERPOS_TOPLEFT:

1
retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.h
View file

@ -24,7 +24,6 @@
#include <set> #include <set>
#include <QApplication> #include <QApplication>
#include <QDesktopWidget>
#include <QFrame> #include <QFrame>
#include <stdint.h> #include <stdint.h>

2
retroshare-gui/src/idle/idle_platform.cpp
View file

@ -24,7 +24,9 @@
#ifdef HAVE_XSS #ifdef HAVE_XSS
#include <qapplication.h> #include <qapplication.h>
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
#include <QDesktopWidget> #include <QDesktopWidget>
#endif
#include <QX11Info> #include <QX11Info>
#include <X11/Xlib.h> #include <X11/Xlib.h>

23
retroshare-gui/src/rshare.cpp
View file

@ -35,6 +35,7 @@
#include <QStyleFactory> #include <QStyleFactory>
#include <QTextStream> #include <QTextStream>
#include <QTimer> #include <QTimer>
#include <QScreen>
#ifdef __APPLE__ #ifdef __APPLE__
#include <QUrl> #include <QUrl>
#endif #endif
@ -676,3 +677,25 @@ bool RsApplication::updateLocalServer()
} }
return false; return false;
} }
/** Get available geometry of primary screen */
QRect RsApplication::availablePrimaryScreenGeometry()
{
QScreen *primaryScreen = QGuiApplication::primaryScreen();
if (!primaryScreen) {
return QRect(0, 0, 0, 0);
}
return primaryScreen->availableGeometry();
}
/** Get geometry of primary screen */
QRect RsApplication::primaryScreenGeometry()
{
QScreen *primaryScreen = QGuiApplication::primaryScreen();
if (!primaryScreen) {
return QRect(0, 0, 0, 0);
}
return primaryScreen->geometry();
}

5
retroshare-gui/src/rshare.h
View file

@ -154,6 +154,11 @@ public:
static void createShortcut(const QKeySequence &key, QWidget *sender, static void createShortcut(const QKeySequence &key, QWidget *sender,
QWidget *receiver, const char *slot); QWidget *receiver, const char *slot);
/** Get available geometry of primary screen */
static QRect availablePrimaryScreenGeometry();
/** Get geometry of primary screen */
static QRect primaryScreenGeometry();
#ifdef __APPLE__ #ifdef __APPLE__
/**To process event from Mac system */ /**To process event from Mac system */
bool event(QEvent *); bool event(QEvent *);