the runlatex merge

[features.git] / src / lyxfr1.h

diff --git a/src/lyxfr1.h b/src/lyxfr1.h
index e4307b0c70f65bd0a3fa9eaa8f626232f0df7fac..f05a44aa4e2650b979fd06ffa1c4257ccf98037a 100644 (file)
--- a/src/lyxfr1.h
+++ b/src/lyxfr1.h
@@ -7,8 +7,9 @@
 #endif
 
 #include FORMS_H_LOCATION
+#include "lyxparagraph.h"
+
 class  LyXText;
-class  LyXParagraph;
 
 /**
   LyXFindReplace1"
@@ -53,8 +54,12 @@ protected:
            \end{itemize}
        */
        int CompareChars(char chSearch, char chText);
-
+#ifdef NEW_TEXT
        /// returns true if the specified string is at the specified position 
-       bool IsSearchStringInText(LyXParagraph *par, int pos);
+       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
 };
 #endif