Merge pull request #2198 from barton2526/QT

qt: Remove obsolete topLevelWidget(), Remove obsolete QRegExpValidator
gridcoin-community · Jun 24, 2021 · 7bf8a7c · 7bf8a7c
2 parents 6f2e54b + 2fd8d4b
commit 7bf8a7c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/src/qt/bitcoinaddressvalidator.h b/src/qt/bitcoinaddressvalidator.h
@@ -1,7 +1,7 @@
 #ifndef BITCOINADDRESSVALIDATOR_H
 #define BITCOINADDRESSVALIDATOR_H
 
-#include <QRegExpValidator>
+#include <QValidator>
 
 /** Base48 entry widget validator.
    Corrects near-miss characters and refuses characters that are no part of base48.

diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp
@@ -6,7 +6,6 @@
 
 #include <QLabel>
 #include <QLineEdit>
-#include <QRegExpValidator>
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QDoubleSpinBox>

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -370,7 +370,7 @@ bool checkPoint(const QPoint &p, const QWidget *w)
 {
     QWidget *atW = qApp->widgetAt(w->mapToGlobal(p));
     if (!atW) return false;
-    return atW->topLevelWidget() == w;
+    return atW->window() == w;
 }
 
 bool isObscured(QWidget *w)

diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
@@ -13,8 +13,6 @@
 #include <QIntValidator>
 #include <QLocale>
 #include <QMessageBox>
-#include <QRegExp>
-#include <QRegExpValidator>
 
 OptionsDialog::OptionsDialog(QWidget* parent)
            : QDialog(parent)