Merge pull request #231 from redhatrises/remove_qt_escape

Remove deprecated or obsolete QT4 code

Author: matejak

src/APIHelpers.cpp

@@ -44,7 +44,7 @@ QString oscapItemGetReadableTitle(struct xccdf_item* item, struct xccdf_policy*
     oscap_text_iterator_free(title_it);
     if (!unresolved)
         return "";
-    char* resolved = xccdf_policy_substitute(Qt::escape(QString::fromUtf8(unresolved)).toUtf8().constData(), policy);
+    char* resolved = xccdf_policy_substitute(QString::fromUtf8(unresolved).toHtmlEscaped().toUtf8().constData(), policy);
     free(unresolved);
     const QString ret = QString::fromUtf8(resolved);
     free(resolved);

src/DiagnosticsDialog.cpp

@@ -142,7 +142,7 @@ void DiagnosticsDialog::pushMessage(MessageSeverity severity, const QString& ful
     QString outputMessage = fullMessage;
     if (format & MF_XML)
     {
-        outputMessage = Qt::escape(outputMessage);
+        outputMessage = outputMessage.toHtmlEscaped();
     }
 
     if (format & MF_PREFORMATTED)

src/MainWindow.cpp

@@ -43,6 +43,7 @@
 #include <QFileSystemWatcher>
 #include <QDesktopWidget>
 #include <QMenu>
+#include <QScreen>
 
 #include <cassert>
 #include <set>
@@ -257,8 +258,22 @@ MainWindow::MainWindow(QWidget* parent):
 
     closeFile();
 
-    // start centered
-    move(QApplication::desktop()->screen()->rect().center() - rect().center());
+    /* start centered
+
+    As of https://codereview.qt.nokia.com/c/qt/qtbase/+/268417,
+    QWidget *QDesktopWidget::screen(int) or Application::desktop()->screen() has been
+    deprecated with no replacement. A replacement might be provided in QT6 which
+    the following 4 lines of code should be re-evaluated if a replacement is provided.
+
+    The solution of the following 4 lines of code was indirectly provided by
+    Riccardo Fagiolo in "window_main.cpp" at
+    https://stackoverflow.com/questions/46300065/dynamically-resizing-two-qlabel-implementations
+    */
+    QSize size = QGuiApplication::screens().at(0)->availableSize();
+    int x = size.width() / 2 - width() / 2;
+    int y = size.height() / 2 - height() / 2;
+    move(x, y);
+    // End stackoverflow provided code by Riccardo Fagiolo
 
     QAction* genBashRemediation = new QAction("&bash", this);
     QObject::connect(
@@ -909,7 +924,7 @@ void MainWindow::refreshProfiles()
             mUI.profileComboBox->addItem(profileTitle, QVariant(it->first));
         }
 
-        if (previouslySelected != QString::Null())
+        if (!previouslySelected.isNull())
         {
             const int indexCandidate = mUI.profileComboBox->findData(QVariant(previouslySelected));
             if (indexCandidate != -1)

src/OscapScannerBase.cpp

@@ -333,7 +333,7 @@ bool OscapScannerBase::tryToReadStdOutChar(QProcess& process)
                 {
                     // When fetching remote content, openscap will inform scap-workbench about
                     // resources being downloaded. Keep any colon found in URL of file being downloaded.
-                    mReadBuffer.append(QChar::fromAscii(readChar));
+                    mReadBuffer.append(QChar::fromLatin1(readChar));
                 }
                 break;
 
@@ -405,7 +405,7 @@ bool OscapScannerBase::tryToReadStdOutChar(QProcess& process)
     {
         // we know for sure that buffer[0] can only contain ASCII characters
         // (IDs and special keywords regarding rule status)
-        mReadBuffer.append(QChar::fromAscii(readChar));
+        mReadBuffer.append(QChar::fromLatin1(readChar));
     }
 
     return true;

src/TailoringWindow.cpp

@@ -36,6 +36,7 @@
 #include <QTimer>
 #include <QDateTime>
 #include <QStack>
+#include <QScreen>
 
 #include <algorithm>
 #include <cassert>
@@ -162,7 +163,7 @@ TailoringWindow::TailoringWindow(struct xccdf_policy* policy, struct xccdf_bench
     createTreeItem(mBenchmarkItem, xccdf_benchmark_to_item(mBenchmark));
     synchronizeTreeItem();
 
-    mUI.itemsTree->header()->setResizeMode(0, QHeaderView::ResizeToContents);
+    mUI.itemsTree->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
     mUI.itemsTree->header()->setStretchLastSection(false);
 
     deserializeCollapsedItems();
@@ -230,8 +231,22 @@ TailoringWindow::TailoringWindow(struct xccdf_policy* policy, struct xccdf_bench
         this, SLOT(searchNext())
     );
 
-    // start centered
-    move(QApplication::desktop()->screen()->rect().center() - rect().center());
+    /* start centered
+
+    As of https://codereview.qt.nokia.com/c/qt/qtbase/+/268417,
+    QWidget *QDesktopWidget::screen(int) or Application::desktop()->screen() has been
+    deprecated with no replacement. A replacement might be provided in QT6 which
+    the following 4 lines of code should be re-evaluated if a replacement is provided.
+
+    The solution of the following 4 lines of code was indirectly provided by
+    Riccardo Fagiolo in "window_main.cpp" at
+    https://stackoverflow.com/questions/46300065/dynamically-resizing-two-qlabel-implementations
+    */
+    QSize size = QGuiApplication::screens().at(0)->availableSize();
+    int x = size.width() / 2 - width() / 2;
+    int y = size.height() / 2 - height() / 2;
+    move(x, y);
+    // End stackoverflow provided code by Riccardo Fagiolo
     show();
 }