* lyxfunctional.h: delete compare_memfun and helper classes

[lyx.git] / src / support / path.C

diff --git a/src/support/path.C b/src/support/path.C
index 7752dccb11fda76377264ba3802057b9f45f9310..b3e46221d6d1682b7f59dc90ae5b2330833053b1 100644 (file)
--- a/src/support/path.C
+++ b/src/support/path.C
@@ -1,32 +1,63 @@
+/**
+ * \file path.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+// Needed to prevent the definition of the unnamed_Path macro in the header file.
+#define PATH_C
 
 #include "path.h"
+#include "lyxlib.h"
+
+
+using std::string;
+
+
+namespace lyx {
+namespace support {
+
+Path::Path(string const & path)
+       : popped_(false)
+{
+       if (!path.empty()) {
+               pushedDir_ = getcwd();
+               if (pushedDir_.empty() || chdir(path))
+                       /* FIXME: throw */;
+       } else {
+               popped_ = true;
+       }
+}
+
+
+Path::~Path()
+{
+       if (!popped_) pop();
+}
+
 
 int Path::pop()
 {
        if (popped_) {
                // should throw an exception
                // throw logical_error();
-               // The use of WriteFSAlerrt makes this impossible
-               // to inline.
-               //WriteFSAlert(_("Error: Dir already popped: "),
-               //           pushedDir_);
                return 0;
        }
-       if (lyx::chdir(pushedDir_.c_str())) {
+
+       if (chdir(pushedDir_)) {
                // should throw an exception
                // throw DirChangeError();
-               // The use of WriteFSAlert makes this impossible
-               // to inline.
-               //WriteFSAlert(
-               //      _("Error: Could not change to directory: "), 
-               //      pushedDir_);
        }
        popped_ = true;
+
        return 0;
 }
 
+} // namespace support
+} // namespace lyx