Fix the tab ordering of GuiDocument components.

[lyx.git] / src / frontends / qt4 / FindAndReplace.h

diff --git a/src/frontends/qt4/FindAndReplace.h b/src/frontends/qt4/FindAndReplace.h
index 3bb2b44394a7c95ce43ebc20f74bc1cf64259e84..392515ce221455993b2d7cbce6254801f3dda1a6 100644 (file)
--- a/src/frontends/qt4/FindAndReplace.h
+++ b/src/frontends/qt4/FindAndReplace.h
@@ -30,7 +30,7 @@
 namespace lyx {
 namespace frontend {
 
-class FindAndReplaceWidget : public QWidget, public Ui::FindAndReplaceUi
+class FindAndReplaceWidget : public QTabWidget, public Ui::FindAndReplaceUi
 {
        Q_OBJECT
 
@@ -45,18 +45,16 @@ private:
        /// add a string to the combo if needed
        void remember(std::string const & find, QComboBox & combo);
 
-       /// FIXME Probably to be merged with findAndReplace(bool, bool)
-       void findAndReplace(
-               bool casesensitive, bool matchword, bool backwards,
-               bool expandmacros, bool ignoreformat, bool replace,
-               bool keep_case
-       );
-
        /// Perform the scope-related buffer switch while searching
-       void findAndReplaceScope(FindAndReplaceOptions & opt);
+       bool findAndReplaceScope(FindAndReplaceOptions & opt, bool replace_all = false);
 
        /// Collect options from the GUI elements, then perform the search
-       void findAndReplace(bool backwards, bool replace);
+       bool findAndReplace(bool backwards, bool replace, bool replace_all = false);
+
+       /// FIXME Probably to be merged with findAndReplace(bool, bool, bool)
+       bool findAndReplace(bool casesensitive, bool matchword, bool backwards,
+               bool expandmacros, bool ignoreformat, bool replace,
+               bool keep_case, bool replace_all = false);
 
        bool eventFilter(QObject *obj, QEvent *event);
 
@@ -69,7 +67,6 @@ protected Q_SLOTS:
        void on_findNextPB_clicked();
        void on_replacePB_clicked();
        void on_replaceallPB_clicked();
-       void insertRegexp(QAction *);
 };