ReFind: layout improvements, stop button

* Layout: more using grid
* stop button + menu
* ReTest::run() renamed to runTests()

diff --git a/appl/refind/filefinder.cpp b/appl/refind/filefinder.cpp
index 449786404e7f7c0094d7089703b5d4c5fd735ac5..a061a60f38ce5929c9e9a4f15e00cc2b8e4acdde 100644 (file)
--- a/appl/refind/filefinder.cpp
+++ b/appl/refind/filefinder.cpp
@@ -142,6 +142,8 @@ void FileFinder::fillTable(const QString& path, int depth){
          }
          if (ignore)
                  continue;
+         if (isInterruptionRequested())
+                 break;
          if (depth >= m_minDepth && isValid(*it)){
                 bool isDir = it->isDir();
                 if (isDir)
@@ -166,7 +168,7 @@ void FileFinder::fillTable(const QString& path, int depth){
                 if (!isDir)
                        m_statistics.m_bytes += it->size();
                 m_guiQueue->pushBack(ReGuiQueueItem(ReGuiQueueItem::NewTableRow, m_table, row));
-                if (m_maxHits-- < 0)
+                if (--m_maxHits <= 0)
                         break;
        }
        clock_t now = clock();
@@ -178,7 +180,8 @@ void FileFinder::fillTable(const QString& path, int depth){
    for (it2 = antiPatterns.begin(); it2 != antiPatterns.end(); ++it2){
           delete *it2;
    }
-   if (depth < m_maxDepth || m_maxDepth < 0 && m_maxHits > 0){
+   if (! isInterruptionRequested()
+                  && (depth < m_maxDepth || m_maxDepth < 0) && m_maxHits > 0){
          entries = dir.entryInfoList(
                 QDir::NoSymLinks | QDir::NoDotAndDotDot | QDir::AllDirs, QDir::NoSort);
          bool filtered = m_excludedDirs.length() > 0;

diff --git a/appl/refind/icons/stop.png b/appl/refind/icons/stop.png
new file mode 100644 (file)
index 0000000..08f2493
Binary files /dev/null and b/appl/refind/icons/stop.png differ

diff --git a/appl/refind/mainwindow.cpp b/appl/refind/mainwindow.cpp
index 0e6b151217c85f7a4af8ca51694edc304acef6ea..a8cfd2ed3bfd7a89d56890eace3c94dcd42467bd 100644 (file)
--- a/appl/refind/mainwindow.cpp
+++ b/appl/refind/mainwindow.cpp
@@ -31,7 +31,7 @@
 #include <QProcess>
 #include <QMessageBox>
 
-const QString VERSION("2015.12.15");
+const QString VERSION("2015.12.24");
 
 inline QString addEsc(const QString& text){
        QString rc = text;
@@ -76,6 +76,7 @@ MainWindow::MainWindow(const QString& startDir, const QString& homeDir,
    statusBar()->addWidget(m_statusMessage);
    connect(ui->actionSearch, SIGNAL(triggered()), this, SLOT(search()));
    connect(ui->actionClear, SIGNAL(triggered()), this, SLOT(clear()));
+   connect(ui->actionStop, SIGNAL(triggered()), this, SLOT(stop()));
    connect(ui->pushButtonSearch, SIGNAL(clicked()), this, SLOT(search()));
    connect(ui->pushButtonSearch2, SIGNAL(clicked()), this, SLOT(search()));
    connect(ui->pushButtonClear, SIGNAL(clicked()), this, SLOT(clear()));
@@ -461,8 +462,7 @@ void MainWindow::guiTimerUpdate()
                        case ReGuiQueueItem::ReadyMessage:
                                say(LOG_INFO, item.m_value);
                                m_statistics = m_finder->statistics();
-                               ui->pushButtonSearch->setEnabled(true);
-                               ui->pushButtonSearch2->setEnabled(true);
+                               startStop(false);
                                break;
                        case ReGuiQueueItem::LogMessage:
                                say(LOG_INFO, item.m_value);
@@ -891,9 +891,10 @@ void MainWindow::search(){
                populateFinder(*m_finder);
                if (! ui->checkBoxAppend->isChecked())
                        clear();
+               startStop(true);
                m_finder->start();
                QApplication::restoreOverrideCursor();
-          }
+       }
 }
 /**
  * Handles the push of the button "select directory".
@@ -935,6 +936,27 @@ bool MainWindow::say(ReLoggerLevel level, const QString& message){
        m_statusMessage->setText(message);
        return rc;
 }
+/**
+ * Starts or stops the search.
+ *
+ * @param start        <code>true</code>: the search should start
+ */
+void MainWindow::startStop(bool start){
+       ui->actionSearch->setEnabled(!start);
+       ui->actionStop->setEnabled(start);
+       ui->pushButtonSearch->setEnabled(! start);
+       ui->pushButtonSearch2->setEnabled(! start);
+       ui->pushButtonStop->setEnabled(start);
+       ui->pushButtonStop2->setEnabled(start);
+}
+
+/**
+ * Handles the "search" button.
+ */
+void MainWindow::stop(){
+       m_finder->requestInterruption();
+       startStop(false);
+}
 
 /**
  * @brief Handles the "up" button: go to the parent directory.

diff --git a/appl/refind/mainwindow.hpp b/appl/refind/mainwindow.hpp
index db260f75a4b3a53db7fc1dc0dac8b35015b99b31..f4429e2848463f3f9fc629d5399a2c8a36f17bd4 100644 (file)
--- a/appl/refind/mainwindow.hpp
+++ b/appl/refind/mainwindow.hpp
@@ -73,6 +73,7 @@ private slots:
    void search();
    void selectDirectory();
    void selectExportFile();
+   void stop();
    void up();
 
 private:
@@ -91,6 +92,7 @@ private:
    QString replaceGlobalPlaceholders(QComboBox* combo,
          QMap <QString, QString>& placeholders);
    void restoreState();
+   void startStop(bool start);
 private:
    Ui::MainWindow *ui;
    QLabel* m_statusMessage;

diff --git a/appl/refind/mainwindow.ui b/appl/refind/mainwindow.ui
index 4a6ef11f009b5f51c983b3a01b7a32b3c0d32e71..153a6ce67bb2452ef3cf1a8a63866933fbbcae24 100644 (file)
--- a/appl/refind/mainwindow.ui
+++ b/appl/refind/mainwindow.ui
@@ -17,9 +17,6 @@
    <layout class="QVBoxLayout" name="verticalLayout_3">
     <item>
      <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout"/>
-      </item>
       <item>
        <widget class="QTabWidget" name="tabWidget">
         <property name="sizePolicy">
@@ -43,31 +40,81 @@
          </attribute>
          <layout class="QHBoxLayout" name="horizontalLayout_4">
           <item>
-           <layout class="QGridLayout" name="gridLayout" columnstretch="0,4,1,0,0,1,2">
-            <item row="3" column="0" colspan="2">
-             <widget class="QPushButton" name="pushButtonSearch">
-              <property name="toolTip">
-               <string>Execute the search</string>
+           <layout class="QGridLayout" name="gridLayout" columnstretch="0,4,1,0,0,1,2,0,0,0">
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_2">
+              <property name="maximumSize">
+               <size>
+                <width>200</width>
+                <height>16777215</height>
+               </size>
               </property>
               <property name="text">
-               <string>&amp;Run search</string>
+               <string>File Patterns:</string>
               </property>
-              <property name="icon">
-               <iconset>
-                <normaloff>:/main/icons/action_go.gif</normaloff>
-                <normalon>:/main/icons/action_go.png</normalon>:/main/icons/action_go.gif</iconset>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_3">
+              <property name="maximumSize">
+               <size>
+                <width>200</width>
+                <height>16777215</height>
+               </size>
               </property>
-              <property name="shortcut">
-               <string>Ctrl+F</string>
+              <property name="text">
+               <string>Text Pattern:</string>
               </property>
-              <property name="autoDefault">
-               <bool>true</bool>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_8">
+              <item>
+               <widget class="QPushButton" name="pushButtonSearch">
+                <property name="toolTip">
+                 <string>Execute the search</string>
+                </property>
+                <property name="text">
+                 <string>&amp;Run search</string>
+                </property>
+                <property name="icon">
+                 <iconset>
+                  <normaloff>:/main/icons/action_go.gif</normaloff>
+                  <normalon>:/main/icons/action_go.png</normalon>:/main/icons/action_go.gif</iconset>
+                </property>
+                <property name="shortcut">
+                 <string>Ctrl+F</string>
+                </property>
+                <property name="autoDefault">
+                 <bool>true</bool>
+                </property>
+                <property name="default">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item row="1" column="3">
+             <widget class="QCheckBox" name="checkBoxFiles">
+              <property name="text">
+               <string>Files</string>
               </property>
-              <property name="default">
+              <property name="checked">
                <bool>true</bool>
               </property>
              </widget>
             </item>
+            <item row="3" column="3">
+             <widget class="QCheckBox" name="checkBoxAppend">
+              <property name="toolTip">
+               <string>Adds the result of the next search to the table</string>
+              </property>
+              <property name="text">
+               <string>Append</string>
+              </property>
+             </widget>
+            </item>
             <item row="0" column="0">
              <widget class="QLabel" name="label">
               <property name="maximumSize">
@@ -81,7 +128,50 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
+            <item row="2" column="3">
+             <widget class="QCheckBox" name="checkBoxTextIgnoreCase">
+              <property name="maximumSize">
+               <size>
+                <width>125</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Ignore case</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="8" colspan="2">
+             <widget class="QPushButton" name="pushButtonClear">
+              <property name="toolTip">
+               <string>Clears the file table</string>
+              </property>
+              <property name="text">
+               <string>C&amp;lear</string>
+              </property>
+              <property name="shortcut">
+               <string notr="true"/>
+              </property>
+              <property name="checkable">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="2">
+             <widget class="QPushButton" name="pushButtonStop">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="text">
+               <string>S&amp;top search</string>
+              </property>
+              <property name="icon">
+               <iconset resource="refind.qrc">
+                <normaloff>:/main/icons/stop.png</normaloff>:/main/icons/stop.png</iconset>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1" colspan="2">
              <widget class="QComboBox" name="comboBoxTextPattern">
               <property name="minimumSize">
                <size>
@@ -94,21 +184,46 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_3">
+            <item row="1" column="1" colspan="2">
+             <widget class="QComboBox" name="comboBoxFilePatterns">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A comma (',') separated list of filename patterns. A prefix of '-'  means inversion: if a filename matches it will not be found.&lt;/p&gt;&lt;p&gt;Example: *.txt,*.odt&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="editable">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="5">
+             <widget class="QCheckBox" name="checkBoxDirs">
+              <property name="minimumSize">
+               <size>
+                <width>75</width>
+                <height>0</height>
+               </size>
+              </property>
               <property name="maximumSize">
                <size>
-                <width>200</width>
+                <width>100</width>
                 <height>16777215</height>
                </size>
               </property>
               <property name="text">
-               <string>Text Pattern:</string>
+               <string>Dirs</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_2">
+            <item row="2" column="5">
+             <widget class="QCheckBox" name="checkBoxRegExpr">
+              <property name="minimumSize">
+               <size>
+                <width>130</width>
+                <height>0</height>
+               </size>
+              </property>
               <property name="maximumSize">
                <size>
                 <width>200</width>
@@ -116,35 +231,70 @@
                </size>
               </property>
               <property name="text">
-               <string>File Patterns:</string>
+               <string>Regular expr.</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QComboBox" name="comboBoxFilePatterns">
-              <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A comma (',') separated list of filename patterns. A prefix of '-'  means inversion: if a filename matches it will not be found.&lt;/p&gt;&lt;p&gt;Example: *.txt,*.odt&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <item row="3" column="5">
+             <widget class="QLabel" name="label_16">
+              <property name="text">
+               <string>Stop after:</string>
               </property>
-              <property name="editable">
+             </widget>
+            </item>
+            <item row="1" column="6">
+             <widget class="QCheckBox" name="checkBoxLinks">
+              <property name="minimumSize">
+               <size>
+                <width>75</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>100</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Links</string>
+              </property>
+              <property name="checked">
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="2" column="2">
-             <widget class="QCheckBox" name="checkBoxTextIgnoreCase">
+            <item row="2" column="6">
+             <widget class="QCheckBox" name="checkBoxBinaryFiles">
+              <property name="minimumSize">
+               <size>
+                <width>150</width>
+                <height>0</height>
+               </size>
+              </property>
               <property name="maximumSize">
                <size>
-                <width>125</width>
+                <width>200</width>
                 <height>16777215</height>
                </size>
               </property>
               <property name="text">
-               <string>Ignore case</string>
+               <string>Binary files</string>
               </property>
              </widget>
             </item>
-            <item row="0" column="5">
-             <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item row="3" column="6">
+             <widget class="QComboBox" name="comboBoxMaxHits">
+              <property name="editable">
+               <bool>true</bool>
+              </property>
+              <property name="currentText">
+               <string notr="true"/>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="9">
+             <layout class="QHBoxLayout" name="horizontalLayout">
               <item>
                <widget class="QPushButton" name="pushButtonUp">
                 <property name="minimumSize">
@@ -199,17 +349,7 @@
               </item>
              </layout>
             </item>
-            <item row="1" column="2">
-             <widget class="QCheckBox" name="checkBoxFiles">
-              <property name="text">
-               <string>Files</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1" colspan="2">
+            <item row="0" column="1" colspan="6">
              <widget class="QComboBox" name="comboBoxDirectory">
               <property name="toolTip">
                <string>The base directory (starting point of the search)</string>
@@ -219,169 +359,6 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="5">
-             <layout class="QFormLayout" name="formLayout">
-              <item row="0" column="0">
-               <widget class="QLabel" name="label_16">
-                <property name="text">
-                 <string>Stop after:</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
-               <widget class="QComboBox" name="comboBoxMaxHits">
-                <property name="editable">
-                 <bool>true</bool>
-                </property>
-                <property name="currentText">
-                 <string notr="true"/>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="3" column="2">
-             <widget class="QCheckBox" name="checkBoxAppend">
-              <property name="toolTip">
-               <string>Adds the result of the next search to the table</string>
-              </property>
-              <property name="text">
-               <string>Append</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="6">
-             <widget class="QPushButton" name="pushButtonClear">
-              <property name="toolTip">
-               <string>Clears the file table</string>
-              </property>
-              <property name="text">
-               <string>C&amp;lear</string>
-              </property>
-              <property name="shortcut">
-               <string notr="true"/>
-              </property>
-              <property name="checkable">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="5">
-             <layout class="QHBoxLayout" name="horizontalLayout">
-              <item>
-               <widget class="QCheckBox" name="checkBoxDirs">
-                <property name="minimumSize">
-                 <size>
-                  <width>75</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>100</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Dirs</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBoxLinks">
-                <property name="minimumSize">
-                 <size>
-                  <width>75</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>100</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Links</string>
-                </property>
-                <property name="checked">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_2">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </item>
-            <item row="2" column="5">
-             <layout class="QHBoxLayout" name="horizontalLayout_5" stretch="2,1,0">
-              <item>
-               <widget class="QCheckBox" name="checkBoxRegExpr">
-                <property name="minimumSize">
-                 <size>
-                  <width>130</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>200</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Regular expr.</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBoxBinaryFiles">
-                <property name="minimumSize">
-                 <size>
-                  <width>150</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>200</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>Binary files</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_3">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </item>
            </layout>
           </item>
          </layout>
@@ -399,8 +376,8 @@
             <property name="bottomMargin">
              <number>10</number>
             </property>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_5">
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_4">
               <property name="maximumSize">
                <size>
                 <width>150</width>
@@ -408,12 +385,22 @@
                </size>
               </property>
               <property name="text">
-               <string>Max Size:</string>
+               <string>Min. Size:</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QComboBox" name="comboBoxMaxSize">
+            <item row="1" column="5">
+             <widget class="QComboBox" name="comboBoxMaxDepth">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum distance of the subdirectory containing the found file from the base directory.&lt;/p&gt;&lt;p&gt;Example:&lt;br/&gt;Max. Depth: 0&lt;br/&gt;It found no files in subdirectories.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+              <property name="editable">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QComboBox" name="comboBoxMinSize">
               <property name="minimumSize">
                <size>
                 <width>175</width>
@@ -427,37 +414,31 @@
                </size>
               </property>
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formula of the maximum size.&lt;/p&gt;&lt;p&gt;Example: 3*512ki + 5MiByte + -2^10&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;A non zero value excludes automatically directories.&lt;/p&gt;&lt;p&gt;A formula is a arithmetic expression with the operators '+', '*' and '^' (potentioning).&lt;/p&gt;&lt;p&gt;Usual precedence: '+' &amp;lt; '*' &amp;lt; '^'&lt;/p&gt;&lt;p&gt;The operands are integer numbers with potentionally a unit.&lt;/p&gt;&lt;p&gt;Units: factor 1000: KByte, MByte, GByte, TByte&lt;br/&gt;factor 1024: KiByte, MiByte, GiByte, TiByte&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formula of the minimal size.&lt;/p&gt;&lt;p&gt;Example: 3*512ki + 5MiByte + -2^10&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;A non zero value excludes automatically directories.&lt;/p&gt;&lt;p&gt;A formula is a arithmetic expression with the operators '+', '*' and '^' (potentioning).&lt;/p&gt;&lt;p&gt;Usual precedence: '+' &amp;lt; '*' &amp;lt; '^'&lt;/p&gt;&lt;p&gt;The operands are integer numbers with potentionally a unit.&lt;/p&gt;&lt;p&gt;Units: factor 1000: KByte, MByte, GByte, TByte&lt;br/&gt;factor 1024: KiByte, MiByte, GiByte, TiByte&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="editable">
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="0" column="3">
-             <widget class="QComboBox" name="comboBoxYounger">
-              <property name="minimumSize">
-               <size>
-                <width>200</width>
-                <height>0</height>
-               </size>
-              </property>
+            <item row="1" column="3">
+             <widget class="QComboBox" name="comboBoxOlder">
               <property name="maximumSize">
                <size>
-                <width>16777215</width>
+                <width>200</width>
                 <height>16777215</height>
                </size>
               </property>
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formula of the minimal file date.&lt;/p&gt;&lt;p&gt;Example (relative): 3*5days+ 2hour&lt;/p&gt;&lt;p&gt;Example (absolute): 2015.12.31/23:59:59 - 3weeks&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;A formula is a arithmetic expression with the operators '+', '*' and '^' (potentioning).&lt;/p&gt;&lt;p&gt;Usual precedence: '+' &amp;lt; '*' &amp;lt; '^'&lt;/p&gt;&lt;p&gt;The operands are integer numbers with potentionally a unit.&lt;/p&gt;&lt;p&gt;The first operand may be an absolute date, date and time or time:&lt;/p&gt;&lt;p&gt;Date syntax: yyyy.mm.dd&lt;/p&gt;&lt;p&gt;Time syntax HH:MM:SS&lt;/p&gt;&lt;p&gt;Units: minutes, hours, days, weeks&lt;/p&gt;&lt;p&gt;Abbrevation is allowed: 'd' is the same as 'days'&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formula of the maximal file date.&lt;/p&gt;&lt;p&gt;Example (relative): 3*5days+ 2hour&lt;/p&gt;&lt;p&gt;Example (absolute): 2015.12.31/23:59:59 - 3weeks&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;A formula is a arithmetic expression with the operators '+', '*' and '^' (potentioning).&lt;/p&gt;&lt;p&gt;Usual precedence: '+' &amp;lt; '*' &amp;lt; '^'&lt;/p&gt;&lt;p&gt;The operands are integer numbers with potentionally a unit.&lt;/p&gt;&lt;p&gt;The first operand may be an absolute date, date and time or time:&lt;/p&gt;&lt;p&gt;Date syntax: yyyy.mm.dd&lt;/p&gt;&lt;p&gt;Time syntax HH:MM:SS&lt;/p&gt;&lt;p&gt;Units: minutes, hours, days, weeks&lt;/p&gt;&lt;p&gt;Abbrevation is allowed: 'd' is the same as 'days'&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="editable">
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="QComboBox" name="comboBoxMinSize">
+            <item row="1" column="1">
+             <widget class="QComboBox" name="comboBoxMaxSize">
               <property name="minimumSize">
                <size>
                 <width>175</width>
@@ -471,36 +452,47 @@
                </size>
               </property>
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formula of the minimal size.&lt;/p&gt;&lt;p&gt;Example: 3*512ki + 5MiByte + -2^10&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;A non zero value excludes automatically directories.&lt;/p&gt;&lt;p&gt;A formula is a arithmetic expression with the operators '+', '*' and '^' (potentioning).&lt;/p&gt;&lt;p&gt;Usual precedence: '+' &amp;lt; '*' &amp;lt; '^'&lt;/p&gt;&lt;p&gt;The operands are integer numbers with potentionally a unit.&lt;/p&gt;&lt;p&gt;Units: factor 1000: KByte, MByte, GByte, TByte&lt;br/&gt;factor 1024: KiByte, MiByte, GiByte, TiByte&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formula of the maximum size.&lt;/p&gt;&lt;p&gt;Example: 3*512ki + 5MiByte + -2^10&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;A non zero value excludes automatically directories.&lt;/p&gt;&lt;p&gt;A formula is a arithmetic expression with the operators '+', '*' and '^' (potentioning).&lt;/p&gt;&lt;p&gt;Usual precedence: '+' &amp;lt; '*' &amp;lt; '^'&lt;/p&gt;&lt;p&gt;The operands are integer numbers with potentionally a unit.&lt;/p&gt;&lt;p&gt;Units: factor 1000: KByte, MByte, GByte, TByte&lt;br/&gt;factor 1024: KiByte, MiByte, GiByte, TiByte&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="editable">
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="1" column="3">
-             <widget class="QComboBox" name="comboBoxOlder">
-              <property name="maximumSize">
-               <size>
-                <width>200</width>
-                <height>16777215</height>
-               </size>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_13">
+              <property name="text">
+               <string>Excluded Dirs:</string>
               </property>
+             </widget>
+            </item>
+            <item row="2" column="1" colspan="3">
+             <widget class="QComboBox" name="comboBoxExcludedDirs">
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formula of the maximal file date.&lt;/p&gt;&lt;p&gt;Example (relative): 3*5days+ 2hour&lt;/p&gt;&lt;p&gt;Example (absolute): 2015.12.31/23:59:59 - 3weeks&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;A formula is a arithmetic expression with the operators '+', '*' and '^' (potentioning).&lt;/p&gt;&lt;p&gt;Usual precedence: '+' &amp;lt; '*' &amp;lt; '^'&lt;/p&gt;&lt;p&gt;The operands are integer numbers with potentionally a unit.&lt;/p&gt;&lt;p&gt;The first operand may be an absolute date, date and time or time:&lt;/p&gt;&lt;p&gt;Date syntax: yyyy.mm.dd&lt;/p&gt;&lt;p&gt;Time syntax HH:MM:SS&lt;/p&gt;&lt;p&gt;Units: minutes, hours, days, weeks&lt;/p&gt;&lt;p&gt;Abbrevation is allowed: 'd' is the same as 'days'&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;a comma (',') separated list of directory names not entered for the search.&lt;/p&gt;&lt;p&gt;Example: .git,.cache&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="editable">
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="1" column="5">
-             <widget class="QComboBox" name="comboBoxMaxDepth">
-              <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum distance of the subdirectory containing the found file from the base directory.&lt;/p&gt;&lt;p&gt;Example:&lt;br/&gt;Max. Depth: 0&lt;br/&gt;It found no files in subdirectories.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <item row="1" column="4">
+             <widget class="QLabel" name="label_12">
+              <property name="text">
+               <string>Max. Depth:</string>
               </property>
-              <property name="editable">
-               <bool>true</bool>
+             </widget>
+            </item>
+            <item row="1" column="2">
+             <widget class="QLabel" name="label_7">
+              <property name="maximumSize">
+               <size>
+                <width>200</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Older than:</string>
               </property>
              </widget>
             </item>
@@ -517,8 +509,8 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_4">
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_5">
               <property name="maximumSize">
                <size>
                 <width>150</width>
@@ -526,7 +518,7 @@
                </size>
               </property>
               <property name="text">
-               <string>Min. Size:</string>
+               <string>Max Size:</string>
               </property>
              </widget>
             </item>
@@ -540,51 +532,36 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="2">
-             <widget class="QLabel" name="label_7">
-              <property name="maximumSize">
-               <size>
-                <width>200</width>
-                <height>16777215</height>
-               </size>
-              </property>
+            <item row="0" column="4">
+             <widget class="QLabel" name="label_11">
               <property name="text">
-               <string>Older than:</string>
+               <string>Min. Depth:</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="4">
-             <widget class="QLabel" name="label_12">
-              <property name="text">
-               <string>Max. Depth:</string>
+            <item row="0" column="3">
+             <widget class="QComboBox" name="comboBoxYounger">
+              <property name="minimumSize">
+               <size>
+                <width>200</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>16777215</height>
+               </size>
               </property>
-             </widget>
-            </item>
-            <item row="2" column="1" colspan="3">
-             <widget class="QComboBox" name="comboBoxExcludedDirs">
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;a comma (',') separated list of directory names not entered for the search.&lt;/p&gt;&lt;p&gt;Example: .git,.cache&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formula of the minimal file date.&lt;/p&gt;&lt;p&gt;Example (relative): 3*5days+ 2hour&lt;/p&gt;&lt;p&gt;Example (absolute): 2015.12.31/23:59:59 - 3weeks&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;A formula is a arithmetic expression with the operators '+', '*' and '^' (potentioning).&lt;/p&gt;&lt;p&gt;Usual precedence: '+' &amp;lt; '*' &amp;lt; '^'&lt;/p&gt;&lt;p&gt;The operands are integer numbers with potentionally a unit.&lt;/p&gt;&lt;p&gt;The first operand may be an absolute date, date and time or time:&lt;/p&gt;&lt;p&gt;Date syntax: yyyy.mm.dd&lt;/p&gt;&lt;p&gt;Time syntax HH:MM:SS&lt;/p&gt;&lt;p&gt;Units: minutes, hours, days, weeks&lt;/p&gt;&lt;p&gt;Abbrevation is allowed: 'd' is the same as 'days'&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="editable">
                <bool>true</bool>
               </property>
              </widget>
             </item>
-            <item row="0" column="4">
-             <widget class="QLabel" name="label_11">
-              <property name="text">
-               <string>Min. Depth:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_13">
-              <property name="text">
-               <string>Excluded Dirs:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="1" colspan="4">
+            <item row="3" column="1" colspan="2">
              <widget class="QPushButton" name="pushButtonSearch2">
               <property name="text">
                <string>&amp;Run search</string>
@@ -596,8 +573,38 @@
               </property>
              </widget>
             </item>
+            <item row="3" column="3" colspan="2">
+             <widget class="QPushButton" name="pushButtonStop2">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="text">
+               <string>S&amp;top search</string>
+              </property>
+              <property name="icon">
+               <iconset resource="refind.qrc">
+                <normaloff>:/main/icons/stop.png</normaloff>:/main/icons/stop.png</iconset>
+              </property>
+              <property name="shortcut">
+               <string notr="true">Ctrl+T</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
+          <item>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
         <widget class="QWidget" name="tabExport">
@@ -924,7 +931,16 @@
     <addaction name="separator"/>
     <addaction name="actionOptions"/>
    </widget>
+   <widget class="QMenu" name="menuSearch">
+    <property name="title">
+     <string>&amp;Search</string>
+    </property>
+    <addaction name="actionStart"/>
+    <addaction name="separator"/>
+    <addaction name="actionStop"/>
+   </widget>
    <addaction name="menuFile"/>
+   <addaction name="menuSearch"/>
    <addaction name="menu_Edit"/>
    <addaction name="menuNavigation"/>
    <addaction name="menuHelp"/>
@@ -1178,6 +1194,33 @@
     <string>Ctrl+L</string>
    </property>
   </action>
+  <action name="actionStart">
+   <property name="icon">
+    <iconset resource="refind.qrc">
+     <normaloff>:/main/icons/action_go.png</normaloff>:/main/icons/action_go.png</iconset>
+   </property>
+   <property name="text">
+    <string>Start search</string>
+   </property>
+   <property name="toolTip">
+    <string>Start the search</string>
+   </property>
+  </action>
+  <action name="actionStop">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="refind.qrc">
+     <normaloff>:/main/icons/stop.png</normaloff>:/main/icons/stop.png</iconset>
+   </property>
+   <property name="text">
+    <string>Stop search</string>
+   </property>
+   <property name="toolTip">
+    <string>Stop the current search</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -1189,16 +1232,10 @@
  </customwidgets>
  <tabstops>
   <tabstop>comboBoxDirectory</tabstop>
-  <tabstop>pushButtonUp</tabstop>
-  <tabstop>pushButtonDirectory</tabstop>
   <tabstop>comboBoxFilePatterns</tabstop>
   <tabstop>checkBoxFiles</tabstop>
-  <tabstop>checkBoxDirs</tabstop>
-  <tabstop>checkBoxLinks</tabstop>
   <tabstop>comboBoxTextPattern</tabstop>
   <tabstop>checkBoxTextIgnoreCase</tabstop>
-  <tabstop>checkBoxRegExpr</tabstop>
-  <tabstop>checkBoxBinaryFiles</tabstop>
   <tabstop>comboBoxMinSize</tabstop>
   <tabstop>comboBoxMaxSize</tabstop>
   <tabstop>comboBoxYounger</tabstop>

diff --git a/appl/refind/refind.qrc b/appl/refind/refind.qrc
index 5f2890a32452b20b929888733a397ea44cd9626a..c1585c5bd6bdd1ff39804d627c6546ed5aea3b07 100644 (file)
--- a/appl/refind/refind.qrc
+++ b/appl/refind/refind.qrc
@@ -20,5 +20,6 @@
         <file>icons/disk.png</file>
         <file>icons/wrench.png</file>
         <file>icons/eye.png</file>
+        <file>icons/stop.png</file>
     </qresource>
 </RCC>

diff --git a/base/ReProgramArgs.cpp b/base/ReProgramArgs.cpp
index 895046aba910c227cfe40d5da808bc2a07120fe2..398d5cc34e520a7de7877b7fa7a7a592f8bef509 100644 (file)
--- a/base/ReProgramArgs.cpp
+++ b/base/ReProgramArgs.cpp
@@ -549,6 +549,7 @@ void ReProgramArgs::help(const char* message, bool issueLastError,
                default:
                        break;
                }
+               line.resize(0);
                if (opt->m_shortName != UNDEF_SHORT_NAME) {
                        line.append("-").append(opt->m_shortName);
                        line.append(param).append(' ').append(I18N::s2b(QObject::tr(" or ")));
@@ -572,7 +573,7 @@ void ReProgramArgs::help(const char* message, bool issueLastError,
                QByteArrayList::const_iterator it;
                for (it = desc.cbegin(); it != desc.cend(); ++it){
                        line.resize(0);
-                       line.append(PREFIX_LINE_OPTION).append(*it).append('\n');
+                       line.append(PREFIX_LINE_OPTION).append(*it);
                        lines.append(line);
                }
        }

diff --git a/base/ReTest.cpp b/base/ReTest.cpp
index be68737847a10c99866096b6061f46f16cef5703..6852e907055c69add8d5a0a0797a04de7e22bacf 100644 (file)
--- a/base/ReTest.cpp
+++ b/base/ReTest.cpp
@@ -42,7 +42,7 @@ ReTest::ReTest(const char* name) :
 }
 void ReTest::doIt() {
        try {
-               run();
+               runTests();
        } catch (ReException e) {
                error("unexpected RplException: %s", e.getMessage().constData());
        } catch (...) {

diff --git a/base/ReTest.hpp b/base/ReTest.hpp
index 1f6e5d13ccde876f677cfe6c0b5cb7b847466f36..afa6e813b66cad8ebbed504fdd42558dad74cdc3 100644 (file)
--- a/base/ReTest.hpp
+++ b/base/ReTest.hpp
@@ -63,7 +63,7 @@ public:
        QByteArray getTempFile(const char* node, const char* parent = NULL,
                bool deleteIfExists = true);
        bool logContains(const char* pattern);
-       virtual void run(void) = 0;
+       virtual void runTests(void) = 0;
 
 protected:
        int m_errors;

diff --git a/cunit/cuReByteStorage.cpp b/cunit/cuReByteStorage.cpp
index 0b0c64d35d93c6e13f032b4b515b07560ecdbe3f..1bb50309d9304161e9dc8204523f28693f20c295 100644 (file)
--- a/cunit/cuReByteStorage.cpp
+++ b/cunit/cuReByteStorage.cpp
@@ -65,7 +65,7 @@ private:
        }
 
 public:
-       virtual void run() {
+       virtual void runTests() {
                testBufferChange();
                testChars();
                testBytes();

diff --git a/cunit/cuReCharPtrMap.cpp b/cunit/cuReCharPtrMap.cpp
index 5cdd35197f32de2b08e2bcc2f4780f65a869afee..6ad49f2ca16e26812d5e3d472fd69dbc4a4c3f11 100644 (file)
--- a/cunit/cuReCharPtrMap.cpp
+++ b/cunit/cuReCharPtrMap.cpp
@@ -26,7 +26,7 @@ protected:
                checkEqu("x1", map["x"]);
        }
 public:
-       virtual void run(void) {
+       virtual void runTests(void) {
                testBasic();
        }
 };

diff --git a/cunit/cuReConfig.cpp b/cunit/cuReConfig.cpp
index 02c5c65ffcbeddcc7230fa7da613d379e2309f3d..5738b2059ca9a22af349d1e28aa6cc9ed2b02da8 100644 (file)
--- a/cunit/cuReConfig.cpp
+++ b/cunit/cuReConfig.cpp
@@ -46,7 +46,7 @@ public:
                checkEqu("x", config.asString("S", "x"));
        }
 
-       virtual void run() {
+       virtual void runTests() {
                testAsX();
                testBasic();
 

diff --git a/cunit/cuReContainer.cpp b/cunit/cuReContainer.cpp
index 36477f92f8d7117bc42dfbf5668cdd7c0a226e16..6c3e68825b811ca1fb537f813cb626e4a822aedd 100644 (file)
--- a/cunit/cuReContainer.cpp
+++ b/cunit/cuReContainer.cpp
@@ -48,7 +48,7 @@ public:
                log(("Example: " + data).constData());
        }
 
-       virtual void run() {
+       virtual void runTests() {
                testBasic();
        }
 };

diff --git a/cunit/cuReCryptFileSystem.cpp b/cunit/cuReCryptFileSystem.cpp
index b622349c54ef08efc8cd9866da2bbadf1a8cc401..a8589665739819f33d7338d175f660bb2c71183f 100644 (file)
--- a/cunit/cuReCryptFileSystem.cpp
+++ b/cunit/cuReCryptFileSystem.cpp
@@ -24,7 +24,7 @@ public:
        {
        }
 public:
-       virtual void run(void){
+       virtual void runTests(void){
                log("run");
        }
 
@@ -95,7 +95,7 @@ protected:
                cryptFs2.testDirRead();
        }
 
-       virtual void run() {
+       virtual void runTests() {
                init();
                testDirWriteRead();
                destroy();

diff --git a/cunit/cuReEdit.cpp b/cunit/cuReEdit.cpp
index acb57ae384c74ea8b491bf34e6e28c20222ffc7d..1f4ba762c4cb55f5f2a28344ddc7e89355390bcb 100644 (file)
--- a/cunit/cuReEdit.cpp
+++ b/cunit/cuReEdit.cpp
@@ -345,7 +345,7 @@ public:
                checkEqu(4, ReParagraphs::indexToColumn(4, tabWidth, "123\tx"));
        }
 
-       virtual void run() {
+       virtual void runTests() {
                testIndexToColumn();
                testDeleteLine();
                testDeleteText();

diff --git a/cunit/cuReException.cpp b/cunit/cuReException.cpp
index eeb107ceb970201cff5dbc447a912cfa2b52945f..51d187f0a8d1322615e728818bafb6b88015b339 100644 (file)
--- a/cunit/cuReException.cpp
+++ b/cunit/cuReException.cpp
@@ -44,7 +44,7 @@ public:
                }
                log("ok");
        }
-       virtual void run() {
+       virtual void runTests() {
                testBasic();
        }
 };

diff --git a/cunit/cuReFile.cpp b/cunit/cuReFile.cpp
index 28865f82c7b3cb3a549c14159ed4d4cd9f373eba..61fad46ee6a1ed1314648beabb1531d64504bd5d 100644 (file)
--- a/cunit/cuReFile.cpp
+++ b/cunit/cuReFile.cpp
@@ -367,7 +367,7 @@ public:
                checkEqu("2", lines.lineAt(1));
                checkEqu("", lines.lineAt(2));
        }
-       virtual void run() {
+       virtual void runTests() {
                testReLinesInsert();
                testReLinesSplitLine();
                testRelLinesjoinLines();

diff --git a/cunit/cuReFileSystem.cpp b/cunit/cuReFileSystem.cpp
index 1ac03120a10815724a5d0e31722da1319ad0b89a..96cef6f5e0f9ad49960dc7d649195e3a1783eccc 100644 (file)
--- a/cunit/cuReFileSystem.cpp
+++ b/cunit/cuReFileSystem.cpp
@@ -250,7 +250,7 @@ protected:
                checkMove("move1.txt", NULL);
        }
 
-       virtual void run() {
+       virtual void runTests() {
                testReOSPermissions();
                init();
                testReListInfos();

diff --git a/cunit/cuReFileUtils.cpp b/cunit/cuReFileUtils.cpp
index 9f12e2efb5763f2e1b897592a7d18fe87816934f..2259809b20f119105adb07c36fee231e5e220508 100644 (file)
--- a/cunit/cuReFileUtils.cpp
+++ b/cunit/cuReFileUtils.cpp
@@ -324,7 +324,7 @@ public:
                                 "index.htm", "");
        }
 
-       virtual void run() {
+       virtual void runTests() {
                testSplitUrl();
                testParentOf();
                testCleanPath();

diff --git a/cunit/cuReLexer.cpp b/cunit/cuReLexer.cpp
index cdbfb93ed7c389cf9937486dd3b841a4155d8695..b7b0e3453097d1144a45491599c38215fb7889eb 100644 (file)
--- a/cunit/cuReLexer.cpp
+++ b/cunit/cuReLexer.cpp
@@ -280,7 +280,7 @@ public:
                checkEqu(lex.prioOfOp(O_TIMES), lex.prioOfOp(O_DIV));
        }
 
-       virtual void run(void) {
+       virtual void runTests(void) {
                testPrio();
                testBasic();
                testIds();
@@ -295,5 +295,5 @@ public:
 };
 void testReLexer() {
        TestReLexer test;
-       test.run();
+       test.runTests();
 }

diff --git a/cunit/cuReMatcher.cpp b/cunit/cuReMatcher.cpp
index b14aa71f1d70e1afa054aac6f43be5f31ae488cd..582a3f53f1c7f700cc4d4739e6ce53afb1ca4b3f 100644 (file)
--- a/cunit/cuReMatcher.cpp
+++ b/cunit/cuReMatcher.cpp
@@ -165,7 +165,7 @@ public:
 
        }
 
-       virtual void run(void) {
+       virtual void runTests(void) {
                testBasics();
                test0Star();
                test1Star();

diff --git a/cunit/cuReProcess.cpp b/cunit/cuReProcess.cpp
index 8e3b2a22f5a0d9175ee4c7427eed8c57d9339c4d..2ca321df90a8a399417e658ae75d08e14ca35f4b 100644 (file)
--- a/cunit/cuReProcess.cpp
+++ b/cunit/cuReProcess.cpp
@@ -31,7 +31,7 @@ private:
        }
 
 public:
-       virtual void run() {
+       virtual void runTests() {
                testExecAndRead();
        }
 };

diff --git a/cunit/cuReProgArgs.cpp b/cunit/cuReProgArgs.cpp
index 31ace760c4714b7274ac860fabb7066a73f8bff5..a09ae435e52d485fdc7a04be4c092ccf16e13b15 100644 (file)
--- a/cunit/cuReProgArgs.cpp
+++ b/cunit/cuReProgArgs.cpp
@@ -30,7 +30,7 @@ public:
                args.addInt("intArg", "integer arg", 'i', "int-arg", 99);
                args.addString("stringArg", "string argument", 's', "string-arg", true, "");
                const char* arguments[] = { "example" };
-               args.init2(1, arguments);
+               args.init(1, arguments, false);
                checkF(args.getBool("boolArg"));
                checkEqu(99, args.getInt("intArg"));
                QByteArray buffer = "123";
@@ -56,7 +56,7 @@ public:
                        "-t", "-f",
                        NULL
                };
-               args.init2(9, arguments);
+               args.init(9, arguments, true);
                checkT(args.getBool("trueArg"));
                checkF(args.getBool("falseArg"));
                checkT(args.getBool("trueArg2"));
@@ -76,7 +76,7 @@ public:
                        "--arg2=3355",
                        NULL
                };
-               args.init2(4, arguments);
+               args.init(4, arguments, true);
                checkEqu(2244, args.getInt("intArg"));
                checkEqu(3355, args.getInt("intArg2"));
 
@@ -88,7 +88,7 @@ public:
                        NULL
                };
                try {
-                       args2.init2(2, arguments2);
+                       args.init(2, arguments2, true);
                        error("exception expected: missing parameter");
                } catch(ReOptionException e){
                        checkT(e.getMessage().indexOf("arg2") > 0);
@@ -106,7 +106,7 @@ public:
                        "--arg3=",
                        NULL
                };
-               args.init2(5, arguments);
+               args.init(5, arguments, true);
                QByteArray buffer;
                checkEqu("wow", args.getString("stringArg", buffer));
                checkEqu("1 2 3", args.getString("stringArg2", buffer));
@@ -120,7 +120,7 @@ public:
                        NULL
                };
                try {
-                       args2.init2(2, arguments2);
+                       args2.init(2, arguments2, true);
                        error("exception expected: missing parameter");
                } catch(ReOptionException e){
                        checkT(e.getMessage().indexOf("arg2") > 0);
@@ -135,7 +135,7 @@ public:
                        NULL
                };
                try {
-                       args3.init2(3, arguments3);
+                       args3.init(3, arguments3, true);
                        error("exception expected: empty string is not allowed");
                } catch(ReOptionException e){
                        checkT(e.getMessage().indexOf("arg2") > 0);
@@ -163,7 +163,7 @@ public:
                                "+++ dummy error\n";
                checkEqu(expected, list.join('\n'));
        }
-       virtual void run() {
+       virtual void runTests() {
                try {
                        testHelp();
                        testString();

diff --git a/cunit/cuReQStringUtils.cpp b/cunit/cuReQStringUtils.cpp
index 5281f4cbded7c7bcfa456e71d6de4ac3dfb558ab..c771ff7ece02db990b2ed14e3dc2556507f14638 100644 (file)
--- a/cunit/cuReQStringUtils.cpp
+++ b/cunit/cuReQStringUtils.cpp
@@ -206,7 +206,7 @@ public:
                checkEqu("", ReQStringUtils::longestPrefix(list));
        }
 
-       virtual void run(void) {
+       virtual void runTests(void) {
                testLongestPrefix();
                testLengtOfTime();
                testLengtOfDate();

diff --git a/cunit/cuReRandomizer.cpp b/cunit/cuReRandomizer.cpp
index 263c89607b3b5e3d1b2c537fc26997f0436cac05..6fe8698f58958234ba4006eca43db16503453a65 100644 (file)
--- a/cunit/cuReRandomizer.cpp
+++ b/cunit/cuReRandomizer.cpp
@@ -443,7 +443,7 @@ public:
                checkEqu(info, info2);
        }
 
-       virtual void run(void) {
+       virtual void runTests(void) {
                testContentEncoding();
                testScrambler();
                testCodec();

diff --git a/cunit/cuReSettings.cpp b/cunit/cuReSettings.cpp
index 63f8c7340cb1668508875beb728f92a3255aebc3..75221a7144040599dcd630ae173262a4cd71b253 100644 (file)
--- a/cunit/cuReSettings.cpp
+++ b/cunit/cuReSettings.cpp
@@ -103,7 +103,7 @@ public:
                checkEqu("???", settings.topOfHistory("unknown", "???"));
        }
 
-       virtual void run() {
+       virtual void runTests() {
                testTopOfHistory();
                testBasic();
                testAddHistoryEntry();

diff --git a/cunit/cuReStateStorage.cpp b/cunit/cuReStateStorage.cpp
index c019536ec21ac1ebba08bc85fe596a3d05af468c..8b6bae292bea7dcec55284bdb5e6604840515926 100644 (file)
--- a/cunit/cuReStateStorage.cpp
+++ b/cunit/cuReStateStorage.cpp
@@ -86,7 +86,7 @@ public:
                // form as parameter:
                checkEqu(3, store.historyAsList("version", list, "common").size());
        }
-       virtual void run() {
+       virtual void runTests() {
                testAddHistoryEntry();
                testBasic();
        }

diff --git a/cunit/cuReStringUtils.cpp b/cunit/cuReStringUtils.cpp
index ae67b4f5bc4929b6c3a9e92c2f99488c48f78808..57101862578157cffa08e99816233cae585c6494 100644 (file)
--- a/cunit/cuReStringUtils.cpp
+++ b/cunit/cuReStringUtils.cpp
@@ -231,7 +231,7 @@ public:
 
        }
 
-       virtual void run() {
+       virtual void runTests() {
                testIsInList();
                testChomp();
                testLengthOfReal();

diff --git a/cunit/cuReWriter.cpp b/cunit/cuReWriter.cpp
index f9d45f78f77d01a98244a20d7b133b71531cbbbf..be884bf9c633c6bb1ab993050440b971fc202d60 100644 (file)
--- a/cunit/cuReWriter.cpp
+++ b/cunit/cuReWriter.cpp
@@ -41,7 +41,7 @@ private:
        }
 
 public:
-       virtual void run(void) {
+       virtual void runTests(void) {
                testFileWriter();
        }
 };