[X2Go-Commits] [x2goclient] 02/03: src/{exportdialog, folder{button, explorer}, httpbrokerclient, onmainwindow.cpp, session{button, explorer, managedialog, widget}, sharewidget, sshmasterconnection}.cpp: use compat.h to select compatible Qt::SkipEmptyParts/KeepEmptyParts.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit aa675b52eb79317321339a917ae442aa7fb9d988
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jun 30 10:38:30 2024 +0200

    src/{exportdialog,folder{button,explorer},httpbrokerclient,onmainwindow.cpp,session{button,explorer,managedialog,widget},sharewidget,sshmasterconnection}.cpp: use compat.h to select compatible Qt::SkipEmptyParts/KeepEmptyParts.
---
 debian/changelog            | 4 ++++
 src/exportdialog.cpp        | 1 +
 src/folderbutton.cpp        | 1 +
 src/folderexplorer.cpp      | 1 +
 src/httpbrokerclient.cpp    | 1 +
 src/onmainwindow.cpp        | 1 +
 src/sessionbutton.cpp       | 1 +
 src/sessionexplorer.cpp     | 1 +
 src/sessionmanagedialog.cpp | 1 +
 src/sessionwidget.cpp       | 1 +
 src/sharewidget.cpp         | 1 +
 src/sshmasterconnection.cpp | 1 +
 12 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ec362069..dd4b756a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ x2goclient (4.1.2.4-0x2go1) UNRELEASED; urgency=medium
       errors gracefully.
     - src/compat.h: keep using QString::SkipEmptyParts/KeepEmptyParts for Qt <
       5.14.0.
+    - src/{exportdialog,folder{button,explorer},httpbrokerclient,
+           onmainwindow.cpp,session{button,explorer,managedialog,widget},
+           sharewidget,sshmasterconnection}.cpp: use compat.h to select
+      compatible Qt::SkipEmptyParts/KeepEmptyParts.
   * x2goclient.spec:
     + Add Recommends: x2gokdriveclient for FC30+, RH 8+, *SuSE 15.4+.
     + Fix typo leading to FTBFS in Fedora macro.
diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp
index 48ad1a96..807f206f 100644
--- a/src/exportdialog.cpp
+++ b/src/exportdialog.cpp
@@ -31,6 +31,7 @@
 #include "onmainwindow.h"
 #include <QFileDialog>
 #include "sessionexplorer.h"
+#include "compat.h"
 
 ExportDialog::ExportDialog ( QString sid,QWidget * par, Qt::WindowFlags f )
     : QDialog ( par,f )
diff --git a/src/folderbutton.cpp b/src/folderbutton.cpp
index e761c353..dfce6b8b 100644
--- a/src/folderbutton.cpp
+++ b/src/folderbutton.cpp
@@ -18,6 +18,7 @@
 #include "folderbutton.h"
 #include "x2goclientconfig.h"
 #include "x2goutils.h"
+#include "compat.h"
 
 #include <QFont>
 #include <QPixmap>
diff --git a/src/folderexplorer.cpp b/src/folderexplorer.cpp
index b3338a18..445e6b50 100644
--- a/src/folderexplorer.cpp
+++ b/src/folderexplorer.cpp
@@ -23,6 +23,7 @@
 #include <QFileDialog>
 #include <QInputDialog>
 #include <QMessageBox>
+#include "compat.h"
 
 FolderExplorer::FolderExplorer(QString path, SessionExplorer* explorer, ONMainWindow* mainw):QDialog((QWidget*)mainw)
 {
diff --git a/src/httpbrokerclient.cpp b/src/httpbrokerclient.cpp
index 9041a6ae..299c2dc6 100644
--- a/src/httpbrokerclient.cpp
+++ b/src/httpbrokerclient.cpp
@@ -40,6 +40,7 @@
 #include "InteractionDialog.h"
 #include <QStatusBar>
 #include "version.h"
+#include "compat.h"
 
 
 HttpBrokerClient::HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg )
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index c6c34bf0..c26a3c1a 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -17,6 +17,7 @@
 
 #include "onmainwindow_privat.h"
 #include "help.h"
+#include "compat.h"
 
 #include <QStyleFactory>
 
diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp
index 7eae5dc5..229e3eda 100644
--- a/src/sessionbutton.cpp
+++ b/src/sessionbutton.cpp
@@ -18,6 +18,7 @@
 #include "sessionbutton.h"
 #include "x2goclientconfig.h"
 #include "x2goutils.h"
+#include "compat.h"
 
 #include <QFont>
 #include <QPixmap>
diff --git a/src/sessionexplorer.cpp b/src/sessionexplorer.cpp
index 1bbd795f..48ae3376 100644
--- a/src/sessionexplorer.cpp
+++ b/src/sessionexplorer.cpp
@@ -34,6 +34,7 @@
 #include <QBuffer>
 #include <QDir>
 #include <QPushButton>
+#include "compat.h"
 
 SessionExplorer::SessionExplorer(ONMainWindow* p):QObject(p)
 {
diff --git a/src/sessionmanagedialog.cpp b/src/sessionmanagedialog.cpp
index dd93eaef..746ea165 100644
--- a/src/sessionmanagedialog.cpp
+++ b/src/sessionmanagedialog.cpp
@@ -30,6 +30,7 @@
 #include "sessionbutton.h"
 #include "folderbutton.h"
 #include "sessionexplorer.h"
+#include "compat.h"
 
 #define SESSIONROLE Qt::UserRole+1
 #define SESSIONIDROLE Qt::UserRole+2
diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp
index 72eaf823..b0951f28 100644
--- a/src/sessionwidget.cpp
+++ b/src/sessionwidget.cpp
@@ -37,6 +37,7 @@
 #include <QRadioButton>
 #include "folderexplorer.h"
 #include "sessionexplorer.h"
+#include "compat.h"
 
 SessionWidget::SessionWidget ( bool newSession, QString id, ONMainWindow * mw,
                                QWidget * parent, Qt::WindowFlags f )
diff --git a/src/sharewidget.cpp b/src/sharewidget.cpp
index cf1c15ff..ba858f79 100644
--- a/src/sharewidget.cpp
+++ b/src/sharewidget.cpp
@@ -35,6 +35,7 @@
 #include <QFileDialog>
 #include <QDir>
 #include "x2gosettings.h"
+#include "compat.h"
 
 ShareWidget::ShareWidget ( QString id, ONMainWindow * mw,
                            QWidget * parent, Qt::WindowFlags f )
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 0f1f6e76..1ebcae9f 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -45,6 +45,7 @@
 
 
 #include "onmainwindow.h"
+#include "compat.h"
 
 
 #define PROXYTUNNELPORT 44444

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git