1 files changed, 72 insertions, 91 deletions

diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
index dd5888043..e98111b69 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
@@ -1,42 +1,42 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 #include "finddialog.h"
-#include "mainwindow.h"
-#include "tabbedbrowser.h"
-#include "helpwindow.h"
+//#include "mainwindow.h"
+//#include "tabbedbrowser.h"
+//#include "helpwindow.h"
 
-#include <QTextBrowser>
+#include <QtWidgets/QTextBrowser>
 #include <QTextCursor>
-#include <QStatusBar>
-#include <QLineEdit>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QLineEdit>
 #include <QDateTime>
-#include <QGridLayout>
+#include <QtWidgets/QGridLayout>
 
 CaseSensitiveModel::CaseSensitiveModel(int rows, int columns, QObject *parent)
     : QStandardItemModel(rows, columns, parent)
@@ -50,23 +50,23 @@ QModelIndexList CaseSensitiveModel::match(const QModelIndex &start, int role, co
     return QStandardItemModel::match(start, role, value, hits, flags);
 }
 
-FindDialog::FindDialog(MainWindow *parent)
+FindDialog::FindDialog(QMainWindow *parent)
     : QDialog(parent)
 {
-    contentsWidget = new QWidget(this);
-    ui.setupUi(contentsWidget);
-    ui.comboFind->setModel(new CaseSensitiveModel(0, 1, ui.comboFind));
+    auto contentsWidget = new QWidget(this);
+    //ui.setupUi(contentsWidget);
+    //ui.comboFind->setModel(new CaseSensitiveModel(0, 1, ui.comboFind));
 
     QVBoxLayout *l = new QVBoxLayout(this);
     l->setContentsMargins(QMargins());
     l->setSpacing(0);
     l->addWidget(contentsWidget);
 
-    lastBrowser = 0;
-    onceFound = false;
-    findExpr.clear();
+    auto lastBrowser = 0;
+    auto onceFound = false;
+    //findExpr.clear();
 
-    sb = new QStatusBar(this);
+    auto sb = new QStatusBar(this);
     l->addWidget(sb);
 
 
@@ -74,35 +74,35 @@ FindDialog::FindDialog(MainWindow *parent)
     // then lupdate should add this one as a new one, and mark the old one as obsolete.
     sb->showMessage(tr("Enter the text you want to find."));
 
-    connect(ui.findButton, SIGNAL(clicked()), this, SLOT(findButtonClicked()));
-    connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(reject()));
+    //connect(ui.findButton, SIGNAL(clicked()), this, SLOT(findButtonClicked()));
+    //connect(ui.closeButton, SIGNAL(clicked()), this, SLOT(reject()));
 }
 
-FindDialog::~FindDialog()
-{
-}
+//FindDialog::~FindDialog()
+//{
+//}
 
-void FindDialog::findButtonClicked()
-{
-    doFind(ui.radioForward->isChecked());
-}
+//void FindDialog::findButtonClicked()
+//{
+  //doFind(ui.radioForward->isChecked());
+//}
 
 void FindDialog::doFind(bool forward)
 {
-    QTextBrowser *browser = static_cast<QTextBrowser*>(mainWindow()->browsers()->currentBrowser());
-    sb->clearMessage();
+  QTextBrowser *browser;// = static_cast<QTextBrowser*>(mainWindow()->browsers()->currentBrowser());
+    //sb->clearMessage();
 
-    if (ui.comboFind->currentText() != findExpr || lastBrowser != browser)
-        onceFound = false;
-    findExpr = ui.comboFind->currentText();
+    //if (ui.comboFind->currentText() != findExpr || lastBrowser != browser)
+    //    onceFound = false;
+    //findExpr = ui.comboFind->currentText();
 
-    QTextDocument::FindFlags flags = 0;
+    //QTextDocument::FindFlags flags = 0;
 
-    if (ui.checkCase->isChecked())
-        flags |= QTextDocument::FindCaseSensitively;
+    //if (ui.checkCase->isChecked())
+    //    flags |= QTextDocument::FindCaseSensitively;
 
-    if (ui.checkWords->isChecked())
-        flags |= QTextDocument::FindWholeWords;
+    //if (ui.checkWords->isChecked())
+    //    flags |= QTextDocument::FindWholeWords;
 
     QTextCursor c = browser->textCursor();
     if (!c.hasSelection()) {
@@ -115,50 +115,31 @@ void FindDialog::doFind(bool forward)
     }
 
     QTextDocument::FindFlags options;
-    if (forward == false)
-        flags |= QTextDocument::FindBackward;
-
-    QTextCursor found = browser->document()->find(findExpr, c, flags);
+    //if (forward == false)
+    //    flags |= QTextDocument::FindBackward;
+    bool onceFound = true;
+    QTextCursor found;// = browser->document()->find(findExpr, c, flags);
     if (found.isNull()) {
         if (onceFound) {
             if (forward)
-                statusMessage(tr("Search reached end of the document"));
+	      auto a = tr("Search reached end of the document");//statusMessage(tr("Search reached end of the document"));
             else
-                statusMessage(tr("Search reached start of the document"));
+	      auto aa = tr("Search reached start of the document");//statusMessage(tr("Search reached start of the document"));
         } else {
-            statusMessage(tr( "Text not found" ));
+	  auto aaa = tr( "Text not found" );//statusMessage(tr( "Text not found" ));
         }
     } else {
         browser->setTextCursor(found);
     }
     onceFound |= !found.isNull();
-    lastBrowser = browser;
+    auto lastBrowser = browser;
 }
 
-bool FindDialog::hasFindExpression() const
+void FindDialog::hasFindExpression() const
 {
     //% "This is some random text"
-    qtTrId("keep_id")
+  qtTrId("keep_id");
 
-    return !findExpr.isEmpty();
+      //return !findExpr.isEmpty();
 }
 
-void FindDialog::statusMessage(const QString &message)
-{
-    if (isVisible())
-        sb->showMessage(message);
-    else
-        static_cast<MainWindow*>(parent())->statusBar()->showMessage(message, 2000);
-}
-
-MainWindow *FindDialog::mainWindow() const
-{
-    return static_cast<MainWindow*>(parentWidget());
-}
-
-void FindDialog::reset()
-{
-    ui.comboFind->setFocus();
-    ui.comboFind->lineEdit()->setSelection(
-        0, ui.comboFind->lineEdit()->text().length());
-}