fix "make dist" target

[lyx.git] / src / lyxlex_pimpl.C

diff --git a/src/lyxlex_pimpl.C b/src/lyxlex_pimpl.C
index e67add9d4b2c23193815048d7acb726857c0eb90..173d542ceebec217572749e68a97ef8a70274664 100644 (file)
--- a/src/lyxlex_pimpl.C
+++ b/src/lyxlex_pimpl.C
@@ -9,9 +9,6 @@
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
 #include "debug.h"
-#if 1 // to get NEW_INSETS
-#include "lyxparagraph.h"
-#endif
 
 using std::sort;
 using std::ostream;
@@ -68,7 +65,7 @@ void LyXLex::Pimpl::verifyTable()
 {
        // Check if the table is sorted and if not, sort it.
        if (table
-           && !sorted(table, table + no_items, compare_tags())) {
+           && !lyx::sorted(table, table + no_items, compare_tags())) {
                lyxerr << "The table passed to LyXLex is not sorted!\n"
                       << "Tell the developers to fix it!" << endl;
                // We sort it anyway to avoid problems.
@@ -142,12 +139,6 @@ void LyXLex::Pimpl::setCommentChar(char c)
 bool LyXLex::Pimpl::next(bool esc /* = false */)
 {
        if (!pushTok.empty()) {
-#ifndef NEW_INSETS
-               pushTok.copy(buff, string::npos);
-               buff[pushTok.length()] = '\0';
-               pushTok.erase();
-               return true;
-#else
                // There can have been a whole line pushed so
                // we extract the first word and leaves the rest
                // in pushTok. (Lgb)
@@ -163,7 +154,6 @@ bool LyXLex::Pimpl::next(bool esc /* = false */)
                        pushTok.erase();
                        return true;
                }     
-#endif
        }
        if (!esc) {
                unsigned char c = 0; // getc() returns an int
@@ -401,15 +391,6 @@ int LyXLex::Pimpl::lex()
        
 bool LyXLex::Pimpl::EatLine()
 {
-#ifndef NEW_INSETS
-       // This is not handling the pushed token
-       if (!pushTok.empty()) {
-               pushTok.copy(buff, string::npos);
-               buff[pushTok.length()] = '\0';
-               pushTok.erase();
-               return true;
-       }
-#endif
        int i = 0;
        unsigned char c = '\0';
        char cc = 0;
@@ -442,12 +423,6 @@ bool LyXLex::Pimpl::EatLine()
 bool LyXLex::Pimpl::nextToken()
 {
        if (!pushTok.empty()) {
-#ifndef NEW_INSETS
-               pushTok.copy(buff, string::npos);
-               buff[pushTok.length()] = '\0';
-               pushTok.erase();
-               return true;
-#else
                // There can have been a whole line pushed so
                // we extract the first word and leaves the rest
                // in pushTok. (Lgb)
@@ -463,7 +438,6 @@ bool LyXLex::Pimpl::nextToken()
                        pushTok.erase();
                        return true;
                }
-#endif
        }
 
        status = 0;