Added html export for LinuxDoc and DocBook. LinuxDoc import now available in file...

[lyx.git] / src / lyxfr1.h

diff --git a/src/lyxfr1.h b/src/lyxfr1.h
index f05a44aa4e2650b979fd06ffa1c4257ccf98037a..d1a6781d21b4617a26cb0ff0c43f969f81835110 100644 (file)
--- a/src/lyxfr1.h
+++ b/src/lyxfr1.h
@@ -6,44 +6,44 @@
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
 #include "lyxparagraph.h"
+#include "lyxfr0.h"
 
-class  LyXText;
+class LyXText;
 
 /**
-  LyXFindReplace1"
+  LyXFindReplace"
 
   This class implements Find & Replace in LyXText texts. It is based on
   LyXFindReplace0, which implements the form related stuff. (see lyxfr0.h)
   */
-class LyXFindReplace1 : public LyXFindReplace0 {
+class LyXFindReplace {
 public:
        ///
-       LyXFindReplace1() : LyXFindReplace0() {};
+       LyXFindReplace();
        ///
-       ~LyXFindReplace1() {};  
+       ~LyXFindReplace();
 
        /// Initialize internal variables and search form
-       virtual void StartSearch();
+       void StartSearch(BufferView *);
 
        ///
-       virtual bool SearchCB(bool fForward);
+       bool SearchCB(bool fForward);
        ///
-       virtual void SearchReplaceCB();
+       void SearchReplaceCB();
        ///
-       virtual void SearchReplaceAllCB();
-protected:
+       void SearchReplaceAllCB();
+private:
        /// Set by IsSearchStringInText:
-       int     iLenSelected;
+       mutable int iLenSelected;
 
        /// Direction we are searching:
        bool searchForward;
     
        ///
-       bool SearchForward(LyXText *lt);
+       bool SearchForward(LyXText * lt);
        ///
-       bool SearchBackward(LyXText *lt); 
+       bool SearchBackward(LyXText * lt); 
 
        /** Compares 2 char values. 
        return value is
@@ -53,13 +53,13 @@ protected:
            \item < 0 if ch1 < ch2
            \end{itemize}
        */
-       int CompareChars(char chSearch, char chText);
-#ifdef NEW_TEXT
+       int CompareChars(char chSearch, char chText) const;
        /// returns true if the specified string is at the specified position 
-       bool IsSearchStringInText(LyXParagraph * par, LyXParagraph::size_type pos);
-#else
-       /// returns true if the specified string is at the specified position 
-       bool IsSearchStringInText(LyXParagraph * par, int pos);
-#endif
+       bool IsSearchStringInText(LyXParagraph * par,
+                                 LyXParagraph::size_type pos) const;
+       ///
+       SearchForm SF;
+       ///
+       BufferView * bv;
 };
 #endif