#include <config.h>
#include "lyx_cb.h"
-#include "lyx_main.h"
+
#include "buffer.h"
-#include "buffer_funcs.h"
#include "bufferlist.h"
-#include "bufferview_funcs.h"
+#include "BufferView.h"
#include "debug.h"
+#include "gettext.h"
#include "lastfiles.h"
+#include "lyx_main.h"
+#include "lyxlayout.h"
#include "lyxrc.h"
#include "lyxtext.h"
-#include "gettext.h"
-#include "BufferView.h"
-#include "Lsstream.h"
-
-#include "insets/insetlabel.h"
+#include "paragraph.h"
-#include "frontends/lyx_gui.h"
-#include "frontends/LyXView.h"
#include "frontends/Alert.h"
#include "frontends/FileDialog.h"
+#include "frontends/lyx_gui.h"
+#include "frontends/LyXView.h"
#include "support/FileInfo.h"
#include "support/filetools.h"
#include "support/forkedcall.h"
+#include "support/lyxlib.h"
+#include "support/os.h"
#include "support/path.h"
#include "support/path_defines.h"
#include "support/systemcall.h"
-#include "support/lstrings.h"
-#include <fstream>
-#include <algorithm>
-#include <utility>
#include <cerrno>
+#include <fstream>
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::bformat;
+using lyx::support::destroyDir;
+using lyx::support::FileInfo;
+using lyx::support::ForkedProcess;
+using lyx::support::IsLyXFilename;
+using lyx::support::LibFileSearch;
+using lyx::support::MakeAbsPath;
+using lyx::support::MakeDisplayPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::removeAutosaveFile;
+using lyx::support::rename;
+using lyx::support::split;
+using lyx::support::system_lyxdir;
+using lyx::support::Systemcall;
+using lyx::support::tempName;
+using lyx::support::unlink;
+using lyx::support::user_lyxdir;
+
+namespace os = lyx::support::os;
-using std::vector;
-using std::ifstream;
+using std::back_inserter;
using std::copy;
using std::endl;
+using std::make_pair;
+using std::string;
+using std::ifstream;
using std::ios;
-using std::back_inserter;
using std::istream_iterator;
-using std::pair;
-using std::make_pair;
+
extern BufferList bufferlist;
// this should be static, but I need it in buffer.C
istream_iterator<char> end;
#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
// We use this until the compilers get better...
- vector<char> tmp;
+ std::vector<char> tmp;
copy(ii, end, back_inserter(tmp));
string const tmpstr(tmp.begin(), tmp.end());
#else
string const getPossibleLabel(BufferView const & bv)
{
- ParagraphList::iterator pit = bv.getLyXText()->cursor.par();
+ ParagraphList::iterator pit = bv.getLyXText()->cursorPar();
ParagraphList & plist = bv.getLyXText()->ownerParagraphs();
LyXLayout_ptr layout = pit->layout();