cleanup and reorder initialisation code of GuiView and GuiToolbars. Move some things...

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index d713c8ac0f037db54903b0c501e7f933380f47db..c3ea3ea4bd40098984763f0f35cdfee764c8a1ae 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -15,13 +15,10 @@
 #include "insets/InsetCode.h"
 
 #include "support/FileName.h"
-#include "support/docstring.h"
-#include "support/docstream.h"
+#include "support/strfwd.h"
 #include "support/types.h"
 
-#include <iosfwd>
 #include <string>
-#include <utility>
 #include <vector>
 
 
@@ -239,6 +236,9 @@ public:
        /// Mark this buffer as dirty.
        void markDirty();
 
+       /// Returns the buffer's filename. It is always an absolute path.
+       support::FileName fileName() const;
+
        /// Returns the buffer's filename. It is always an absolute path.
        std::string absFileName() const;
 
@@ -252,7 +252,7 @@ public:
        std::string latexName(bool no_path = true) const;
 
        /// Get thee name and type of the log.
-       std::pair<LogType, std::string> logName() const;
+       std::string logName(LogType * type = 0) const;
 
        /// Change name of buffer. Updates "read-only" flag.
        void setFileName(std::string const & newfile);