Cleanups of the search dialog

SearchDialog remove unused variable

convert heap var to stack var

get rid of obsolete methods search dialog

Implement simply RAII timer to measure and print search time

Signed-off-by: Viktor Kopp <[email protected]>

Author: vifactor

qdlt/qdltimporter.cpp

@@ -1249,7 +1249,6 @@ void QDltImporter::setPcapPorts(const QString &importPcapPorts)
     pcapPorts.clear();
     QStringList portList = importPcapPorts.split(' ');
 
-    unsigned short port;
     for (const QString& item : portList) {
         if(item.toUShort()!=0)
             pcapPorts.append(item.toUShort());

src/mainwindow.cpp

@@ -552,10 +552,6 @@ void MainWindow::initSignalConnections()
     connect(m_searchActions.at(ToolbarPosition::FindNext), SIGNAL(triggered()), searchDlg, SLOT(findNextClicked()));
     connect(m_searchActions.at(ToolbarPosition::FindNext), SIGNAL(triggered()), this, SLOT(on_actionFindNext()));
 
-   // connect(searchDlg->CheckBoxSearchtoList,SIGNAL(toggled(bool)),ui->actionSearchList,SLOT(setChecked(bool)));
-   // connect(ui->actionSearchList,SIGNAL(toggled(bool)),searchDlg->CheckBoxSearchtoList,SLOT(setChecked(bool)));
-   // ui->actionSearchList->setChecked(searchDlg->searchtoIndex());
-
     /* Connect Search dialog find to action History */
     connect(searchDlg,SIGNAL(addActionHistory()),this,SLOT(onAddActionToHistory()));
 
@@ -566,9 +562,9 @@ void MainWindow::initSignalConnections()
 
     /* adding shortcuts - regard: in the search window, the signal is caught by another way, this here only catches the keys when main window is active */
     m_shortcut_searchnext = new QShortcut(QKeySequence("F3"), this);
-    connect(m_shortcut_searchnext, SIGNAL(activated()), searchDlg, SLOT( on_pushButtonNext_clicked() ) );
+    connect(m_shortcut_searchnext, &QShortcut::activated, searchDlg, &SearchDialog::findNextClicked);
     m_shortcut_searchprev = new QShortcut(QKeySequence("F2"), this);
-    connect(m_shortcut_searchprev, SIGNAL(activated()), searchDlg, SLOT( on_pushButtonPrevious_clicked() ) );
+    connect(m_shortcut_searchprev, &QShortcut::activated, searchDlg, &SearchDialog::findPreviousClicked);
 
     connect(ui->tableView->horizontalHeader(), SIGNAL(sectionDoubleClicked(int)), this, SLOT(sectionInTableDoubleClicked(int)));
 
@@ -1167,7 +1163,6 @@ void MainWindow::onOpenTriggered(QStringList filenames)
     outputfileIsTemporary = false;
 
     searchDlg->setMatch(false);
-    searchDlg->setOnceClicked(false);
     searchDlg->focusRow(-1);
     searchDlg->setStartLine(-1);
 }

src/searchdialog.cpp

@@ -38,13 +38,10 @@ SearchDialog::SearchDialog(QWidget *parent) :
     ui->setupUi(this);
 
     regexpCheckBox = ui->checkBoxRegExp;
-    CheckBoxSearchtoList = ui->checkBoxFindAll;
     match = false;
-    onceClicked = false;
     startLine = -1;
 
-    lineEdits = new QList<QLineEdit*>();
-    lineEdits->append(ui->lineEditSearch);
+    lineEdits.append(ui->lineEditSearch);
     table = nullptr;
 
     // at start we want to know if single step search or "fill search table mode" is active !
@@ -112,8 +109,7 @@ void SearchDialog::setTimeRange(const QDateTime& min, const QDateTime& max) {
 
 bool SearchDialog::needTimeRangeReset() const { return m_timeRangeResetNeeded; }
 
-void SearchDialog::setOnceClicked(bool clicked){onceClicked=clicked;}
-void SearchDialog::appendLineEdit(QLineEdit *lineEdit){ lineEdits->append(lineEdit);}
+void SearchDialog::appendLineEdit(QLineEdit *lineEdit){ lineEdits.append(lineEdit);}
 
 QString SearchDialog::getText() { return ui->lineEditSearch->text(); }
 
@@ -138,7 +134,6 @@ bool SearchDialog::getRegExp()
 }
 
 bool SearchDialog::getNextClicked(){return nextClicked;}
-bool SearchDialog::getOnceClicked(){return onceClicked;}
 
 QString SearchDialog::getApIDText(){ return ui->lineEditApld->text();}
 QString SearchDialog::getCtIDText(){ return ui->lineEditCtid->text();}
@@ -392,6 +387,20 @@ int SearchDialog::find()
     return 0;
 }
 
+class ScopedTimer {
+public:
+    ScopedTimer() : m_start(std::chrono::high_resolution_clock::now()) {}
+
+    ~ScopedTimer() {
+        auto end = std::chrono::high_resolution_clock::now();
+        auto duration =
+            std::chrono::duration_cast<std::chrono::milliseconds>(end - m_start).count();
+        qDebug() << "Time for search: " << duration << " ms";
+    }
+
+private:
+    std::chrono::high_resolution_clock::time_point m_start;
+};
 
 void SearchDialog::findMessages(long int searchLine, long int searchBorder, QRegularExpression &searchTextRegExp)
 {
@@ -401,7 +410,7 @@ void SearchDialog::findMessages(long int searchLine, long int searchBorder, QReg
     int ctr = 0;
     Qt::CaseSensitivity is_Case_Sensitive = Qt::CaseInsensitive;
 
-    starttime();
+    ScopedTimer timer{};
 
     if(getCaseSensitive() == true)
     {
@@ -488,7 +497,6 @@ void SearchDialog::findMessages(long int searchLine, long int searchBorder, QReg
             continue;
     }
     while( searchBorder != searchLine );
-    stoptime();
 }
 
 bool SearchDialog::foundLine(long int searchLine)
@@ -510,36 +518,14 @@ bool SearchDialog::foundLine(long int searchLine)
     return false;//don't break search here
 }
 
-void SearchDialog::on_pushButtonNext_clicked() // connected to main window line 424
-{
-    /* For every new search, start payLoad and EndpayLoad will be different and hence member variable storing previous found
-     * value shoudl eb reset. */
-    setNextClicked(true);
-    int result = find();
-    for(int i=0; i<lineEdits->size();i++)
-    {
-       setSearchColour(lineEdits->at(i),result);
-    }
-}
-
-void SearchDialog::on_pushButtonPrevious_clicked()
-{
-    setNextClicked(false);
-    int result = find();
-    for(int i=0; i<lineEdits->size();i++)
-    {
-       setSearchColour(lineEdits->at(i),result);
-    }
-}
-
 void SearchDialog::findNextClicked()
 {
     setNextClicked(true);
 
     int result = find();
-    for(int i=0; i<lineEdits->size();i++)
+    for(int i=0; i<lineEdits.size();i++)
     {
-       setSearchColour(lineEdits->at(i),result);
+       setSearchColour(lineEdits.at(i),result);
     }
 }
 
@@ -548,33 +534,33 @@ void SearchDialog::findPreviousClicked()
     setNextClicked(false);
 
     int result = find();
-    for(int i=0; i<lineEdits->size();i++){
-       setSearchColour(lineEdits->at(i),result);
+    for(int i=0; i<lineEdits.size();i++){
+       setSearchColour(lineEdits.at(i),result);
     }
 }
 
 void SearchDialog::on_lineEditSearch_textEdited(QString newText)
 {
         {
             // block signal so that it does not trigger a setText back on lineEdits->at(0)!
-            QSignalBlocker signalBlocker(lineEdits->at(1));
-            lineEdits->at(1)->setText(newText);
+            QSignalBlocker signalBlocker(lineEdits.at(1));
+            lineEdits.at(1)->setText(newText);
         }
-        for(int i=0; i<lineEdits->size();i++){
-            if(lineEdits->at(0)->text().isEmpty())
-                setSearchColour(lineEdits->at(i),1);
+        for(int i=0; i<lineEdits.size();i++){
+            if(lineEdits.at(0)->text().isEmpty())
+                setSearchColour(lineEdits.at(i),1);
         }
 }
 void SearchDialog::textEditedFromToolbar(QString newText)
 {
         {
             // block signal so that it does not trigger a setText back on lineEdits->at(1)!
-            QSignalBlocker signalBlocker(lineEdits->at(0));
-            lineEdits->at(0)->setText(newText);
+            QSignalBlocker signalBlocker(lineEdits.at(0));
+            lineEdits.at(0)->setText(newText);
         }
-        for(int i=0; i<lineEdits->size();i++){
-            if(lineEdits->at(0)->text().isEmpty())
-                setSearchColour(lineEdits->at(i),1);
+        for(int i=0; i<lineEdits.size();i++){
+            if(lineEdits.at(0)->text().isEmpty())
+                setSearchColour(lineEdits.at(i),1);
         }
 }
 
@@ -703,44 +689,3 @@ void SearchDialog::on_checkBoxRegExp_toggled(bool checked)
 }
 
 
-void SearchDialog::starttime(void)
-{
-long int temps;
-
-#if defined(_MSC_VER)
-   SYSTEMTIME systemtime;
-   GetSystemTime(&systemtime);
-   time_t timestamp_sec;
-   time(&timestamp_sec);
-   temps = (time_t)timestamp_sec;
-#else
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    temps = (time_t)tv.tv_sec;
-#endif
-    searchseconds = temps;
-
-}
-
-void SearchDialog::stoptime(void)
-{
-long int temps;
-long int dtemps;
-
-#if defined(_MSC_VER)
-   SYSTEMTIME systemtime;
-   GetSystemTime(&systemtime);
-   time_t timestamp_sec;
-   time(&timestamp_sec);
-   temps = (time_t)timestamp_sec;
-#else
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    temps = (time_t)tv.tv_sec;
-#endif
-
-    dtemps = temps - searchseconds;
-    qDebug() << "Time for search [s]" << dtemps;
-}
-
-

src/searchdialog.h

@@ -22,34 +22,19 @@
 
 #include <QDialog>
 #include <QTableView>
-#include <QTreeWidget>
 #include <QCheckBox>
-#include <QCache>
 
 #include "searchtablemodel.h"
 
-
-#if defined(_MSC_VER)
-#include <io.h>
-#include <time.h>
-#include <WinSock.h>
-#else
-#include <unistd.h>     /* for read(), close() */
-#include <sys/time.h>	/* for gettimeofday() */
-#endif
-
-
 namespace Ui {
-    class SearchDialog;
+class SearchDialog;
 }
 
-
-class SearchDialog : public QDialog
-{
+class SearchDialog : public QDialog {
     Q_OBJECT
 
 public:
-    explicit SearchDialog(QWidget *parent = 0);
+    explicit SearchDialog(QWidget *parent = nullptr);
     ~SearchDialog();
 
     void focusRow(long int searchLine);
@@ -83,10 +68,8 @@ class SearchDialog : public QDialog
     bool isSearchCancelled{false};
 
     long int startLine;
-    long searchseconds;
     bool nextClicked;
     bool match;
-    bool onceClicked;
     bool fSilentMode;
     bool is_TimeStampSearchSelected{false};
     bool is_TimeSearchSelected{false};
@@ -115,9 +98,6 @@ class SearchDialog : public QDialog
     void setCaseSensitive(bool caseSensitive);
     void setNextClicked(bool next);
 
-    void starttime(void);
-    void stoptime(void);
-
     int find();
 
     bool getSearchFromBeginning();
@@ -127,7 +107,6 @@ class SearchDialog : public QDialog
     bool getRegExp();
     bool getNextClicked();
     bool getClicked();
-    bool getOnceClicked();
     bool searchtoIndex();
     bool foundLine(long int searchLine);
     QString getApIDText();
@@ -137,14 +116,10 @@ class SearchDialog : public QDialog
     QString getPayLoadStampStart();
     QString getPayLoadStampEnd();
     QList < QList <unsigned long>> m_searchHistory;
-    QList<QLineEdit*> *lineEdits;
-
-    QCheckBox *CheckBoxSearchtoList;
+    QList<QLineEdit*> lineEdits;
 
 private slots:
     void on_lineEditSearch_textEdited(QString newText);
-    void on_pushButtonPrevious_clicked();
-    void on_pushButtonNext_clicked();
     void on_buttonHighlightColor_clicked();
 
     void on_checkBoxFindAll_toggled(bool checked);