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

Merge 41305b43f6 into 23f925f81e

Browse source
This commit is contained in:
Thunder 2025-07-19 14:36:10 +02:00 • committed by GitHub
commit 91d22eb540
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
View file

@ -36,7 +36,7 @@
#include "gui/common/RSTreeWidgetItem.h"
#include "gui/settings/rsharesettings.h"
#include "util/HandleRichText.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "gui/Posted/PostedCreatePostDialog.h"
#include "gui/gxsforums/CreateGxsForumMsg.h"
#include "gui/common/FilesDefs.h"

2
retroshare-gui/src/CMakeLists.txt
View file

@ -512,7 +512,7 @@ list(
src/util/misc.h
src/util/HandleRichText.h
src/util/ObjectPainter.h
src/util/QtVersion.h
src/util/RsQtVersion.h
src/util/RsFile.h
src/util/qtthreadsutils.h
src/util/ClickableLabel.h

2
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View file

@ -35,7 +35,7 @@
#include "settings/rsharesettings.h"
#include "util/HandleRichText.h"
#include "util/misc.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "retroshare/rsmsgs.h"
#include "retroshare/rspeers.h"

2
retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
View file

@ -36,7 +36,7 @@
#include "gui/settings/rsharesettings.h"
#include "gui/advsearch/advancedsearchdialog.h"
#include "gui/common/RSTreeWidgetItem.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/qtthreadsutils.h"
#include "util/misc.h"

2
retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
View file

@ -33,7 +33,7 @@
#include "gui/gxsforums/GxsForumsDialog.h"
#include "gui/settings/AddFileAssociationDialog.h"
#include "gui/settings/rsharesettings.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/RsAction.h"
#include "util/misc.h"
#include "util/rstime.h"

2
retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
View file

@ -37,7 +37,7 @@
#include "gui/FileTransfer/xprogressbar.h"
#include "gui/settings/rsharesettings.h"
#include "util/misc.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/RsFile.h"
#include "util/qtthreadsutils.h"

2
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -47,7 +47,7 @@
#include "util/qtthreadsutils.h"
#include "retroshare-gui/RsAutoUpdatePage.h"
#include "util/misc.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/rstime.h"
#include "util/rsdebug.h"

2
retroshare-gui/src/gui/NetworkDialog.cpp
View file

@ -42,7 +42,7 @@
#include "connect/PGPKeyDialog.h"
#include "settings/rsharesettings.h"
#include "RetroShareLink.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include <time.h>

2
retroshare-gui/src/gui/QuickStartWizard.cpp
View file

@ -25,7 +25,7 @@
#include "gui/common/RSComboBox.h"
#endif
#include "settings/rsharesettings.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "retroshare/rsfiles.h"
#include "retroshare/rsconfig.h"

2
retroshare-gui/src/gui/ShareManager.cpp
View file

@ -36,7 +36,7 @@
#include "gui/common/GroupSelectionBox.h"
#include "gui/common/GroupDefs.h"
#include "gui/notifyqt.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/misc.h"
#include "gui/common/FilesDefs.h"

2
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View file

@ -43,7 +43,7 @@
#include "gui/settings/RsharePeerSettings.h"
#include "gui/settings/rsharesettings.h"
#include "util/HandleRichText.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "retroshare/rsnotify.h"
#include "util/rstime.h"

2
retroshare-gui/src/gui/common/FriendList.cpp
View file

@ -51,7 +51,7 @@
#include "StatusDefs.h"
#include "util/misc.h"
#include "vmessagebox.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "gui/chat/ChatUserNotify.h"
#include "gui/connect/ConnectProgressDialog.h"
#include "gui/common/ElidedLabel.h"

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

@ -28,7 +28,7 @@
#include "RSElidedItemDelegate.h"
#include "RSTreeWidgetItem.h"
#include "gui/settings/rsharesettings.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/DateTime.h"
#include <QDesktopWidget>

2
retroshare-gui/src/gui/common/NewFriendList.cpp
View file

@ -50,7 +50,7 @@
#include "util/misc.h"
#include "util/qtthreadsutils.h"
#include "vmessagebox.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "gui/chat/ChatUserNotify.h"
#include "gui/connect/ConnectProgressDialog.h"
#include "gui/common/ElidedLabel.h"

2
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View file

@ -44,7 +44,7 @@
#include "gui/msgs/MessageComposer.h"
#include "util/DateTime.h"
#include "gui/common/UIStateHelper.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/imageutil.h"
#include <retroshare/rsgxsforums.h>

2
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -66,7 +66,7 @@
#include "util/misc.h"
#include "util/DateTime.h"
#include "util/HandleRichText.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "textformat.h"
#include "TagsMenu.h"

2
retroshare-gui/src/gui/msgs/MessageWidget.cpp
View file

@ -45,7 +45,7 @@
#include "util/printpreview.h"
#include "util/HandleRichText.h"
#include "util/DateTime.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/qtthreadsutils.h"
#include <retroshare/rspeers.h>

2
retroshare-gui/src/gui/msgs/MessagesDialog.cpp
View file

@ -45,7 +45,7 @@
#include "util/DateTime.h"
#include "util/misc.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/qtthreadsutils.h"
#include "util/RsProtectedTimer.h"

2
retroshare-gui/src/gui/statistics/BwCtrlWindow.cpp
View file

@ -21,7 +21,7 @@
#include "BwCtrlWindow.h"
#include "gui/common/RSGraphWidget.h"
#include "ui_BwCtrlWindow.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include <QTimer>
#include <QDateTime>

2
retroshare-gui/src/gui/statistics/DhtWindow.cpp
View file

@ -20,7 +20,7 @@
#include "DhtWindow.h"
#include "ui_DhtWindow.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include <QClipboard>
#include <QTimer>

2
retroshare-gui/src/gui/statistics/GlobalRouterStatistics.cpp
View file

@ -43,7 +43,7 @@
#include "gui/gxs/GxsIdDetails.h"
#include "gui/gxs/GxsIdTreeWidgetItem.h"
#include "util/DateTime.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/misc.h"
#define COL_ID 0

2
retroshare-gui/src/gui/statistics/GxsIdStatistics.cpp
View file

@ -40,7 +40,7 @@
#include "GxsIdStatistics.h"
#include "util/DateTime.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "util/misc.h"
#include "util/qtthreadsutils.h"

2
retroshare-gui/src/gui/statistics/GxsTransportStatistics.cpp
View file

@ -43,7 +43,7 @@
#include "gui/Identity/IdDetailsDialog.h"
#include "gui/settings/rsharesettings.h"
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
#include "gui/common/UIStateHelper.h"
#include "util/misc.h"
#include "util/qtthreadsutils.h"

2
retroshare-gui/src/gui/unfinished/ExampleDialog.cpp
View file

@ -37,7 +37,7 @@
#include <QMessageBox>
#include <QHeaderView>
#include "util/QtVersion.h"
#include "util/RsQtVersion.h"
/* Images for context menu icons */
#define IMAGE_REMOVEFRIEND ":/images/removefriend16.png"

2
retroshare-gui/src/retroshare-gui.pro
View file

@ -446,7 +446,7 @@ HEADERS += rshare.h \
util/misc.h \
util/HandleRichText.h \
util/ObjectPainter.h \
util/QtVersion.h \
util/RsQtVersion.h \
util/RsFile.h \
util/qtthreadsutils.h \
util/ClickableLabel.h \

4
retroshare-gui/src/util/QtVersion.h → retroshare-gui/src/util/RsQtVersion.h
View file

@ -18,8 +18,8 @@
* *
*******************************************************************************/
#ifndef QTVERSION_H
#define QTVERSION_H
#ifndef RS_QTVERSION_H
#define RS_QTVERSION_H
// Macros to compile with Qt 4 and Qt 5