get rid of MSVC warning (signed/unsigned comparison)

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

diff --git a/src/support/path.C b/src/support/path.C
index 18f5eaa6a87d8a6a1cc5cf9f5eeda9fc37729b0f..4989dd6a196f4f4edf95e180d3f259474239aa51 100644 (file)
--- a/src/support/path.C
+++ b/src/support/path.C
@@ -1,31 +1,66 @@
+/**
+ * \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 "support/path.h"
+#include "support/filename.h"
+#include "support/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(FileName(path))) {
+                       /* FIXME: throw */
+               }
+       } else {
+               popped_ = true;
+       }
+}
+
+
+Path::~Path()
+{
+       if (!popped_) pop();
+}
 
-#include "path.h"
 
 int Path::pop()
 {
        if (popped_) {
                // should throw an exception
                // throw logical_error();
-               // The use of WriteFSAlerrt makes this impossible
-               // to inline.
-               //Alert::err_alert(_("Error: Dir already popped: "),
-               //           pushedDir_);
                return 0;
        }
-       if (lyx::chdir(pushedDir_)) {
+
+       if (chdir(pushedDir_)) {
                // should throw an exception
                // throw DirChangeError();
-               // The use of Alert::err_alert makes this impossible
-               // to inline.
-               //Alert::err_alert(
-               //      _("Error: Could not change to directory: "),
-               //      pushedDir_);
        }
        popped_ = true;
+
        return 0;
 }
+
+} // namespace support
+} // namespace lyx