Clean-up FileFilterList API.

[lyx.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index 154f365ffd9cb88e35abaa3af481fa2a7126de09..21740256db3cde6d9a3bd5b764cf544a5b536a36 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -82,10 +82,9 @@
 
 
 using lyx::pos_type;
-using lyx::par_type;
+using lyx::pit_type;
 
 using lyx::support::AddName;
-using lyx::support::atoi;
 using lyx::support::bformat;
 using lyx::support::ChangeExtension;
 using lyx::support::cmd_ret;
@@ -474,7 +473,7 @@ bool Buffer::readDocument(LyXLex & lex)
 
 // needed to insert the selection
 void Buffer::insertStringAsLines(ParagraphList & pars,
-       par_type & par, pos_type & pos,
+       pit_type & par, pos_type & pos,
        LyXFont const & fn, string const & str)
 {
        LyXLayout_ptr const & layout = pars[par].layout();
@@ -550,7 +549,7 @@ bool Buffer::readFile(string const & filename)
 }
 
 
-bool Buffer::readFile(string const & filename, par_type pit)
+bool Buffer::readFile(string const & filename, pit_type pit)
 {
        LyXLex lex(0, 0);
        lex.setFile(filename);
@@ -570,7 +569,7 @@ void Buffer::fully_loaded(bool value)
 }
 
 
-bool Buffer::readFile(LyXLex & lex, string const & filename, par_type pit)
+bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type pit)
 {
        BOOST_ASSERT(!filename.empty());
 
@@ -1255,15 +1254,15 @@ void Buffer::fillWithBibKeys(std::vector<std::pair<string, string> > & keys)
        }
 
        for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
-               if (it->lyxCode() == InsetOld::BIBTEX_CODE) {
+               if (it->lyxCode() == InsetBase::BIBTEX_CODE) {
                        InsetBibtex const & inset =
                                dynamic_cast<InsetBibtex const &>(*it);
                        inset.fillWithBibKeys(*this, keys);
-               } else if (it->lyxCode() == InsetOld::INCLUDE_CODE) {
+               } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) {
                        InsetInclude const & inset =
                                dynamic_cast<InsetInclude const &>(*it);
                        inset.fillWithBibKeys(*this, keys);
-               } else if (it->lyxCode() == InsetOld::BIBITEM_CODE) {
+               } else if (it->lyxCode() == InsetBase::BIBITEM_CODE) {
                        InsetBibitem const & inset =
                                dynamic_cast<InsetBibitem const &>(*it);
                        string const key = inset.getContents();