ws changes only

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index efa81e1e71f828e5fe0b4e9c9b094cd95ea27558..e9dbaccf92657c23fd00e66f46378a697148dbc9 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -23,6 +23,7 @@
 #include "gettext.h"
 #include "lastfiles.h"
 #include "lyx_main.h"
+#include "lyxlayout.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
 #include "paragraph.h"
@@ -44,17 +45,39 @@
 #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::back_inserter;
 using std::copy;
 using std::endl;
 using std::make_pair;
-
+using std::string;
 using std::ifstream;
 using std::ios;
 using std::istream_iterator;
 
+
 extern BufferList bufferlist;
 // this should be static, but I need it in buffer.C
 bool quitting; // flag, that we are quitting the program
@@ -404,7 +427,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
 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();