add <string> and other small fixes to make

[lyx.git] / src / graphics / GraphicsConverter.h

diff --git a/src/graphics/GraphicsConverter.h b/src/graphics/GraphicsConverter.h
index 218dea2f494103368ea9ae2ac612fcdc6c3a287b..f1b69c90a0fa331dd05adb36cc95a59fa1715da0 100644 (file)
--- a/src/graphics/GraphicsConverter.h
+++ b/src/graphics/GraphicsConverter.h
@@ -1,42 +1,40 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsConverter.h
- *  Copyright 2002 the LyX Team
- *  Read the file COPYING
+ * \file GraphicsConverter.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  \author Angus Leeming <leeming@lyx.org>
+ * \author Angus Leeming
  *
- *  The controller of a conversion process from file AA of format A to
- *  file BB of format B.
- *  Once finished, a signal is emitted to inform any listeners (connected
- *  through the connect() method).
+ * Full author contact details are available in file CREDITS.
+ *
+ * The controller of a conversion process from file AA of format A to
+ * file BB of format B.
+ * Once finished, a signal is emitted to inform any listeners (connected
+ * through the connect() method).
  */
 
 #ifndef GRAPHICSCONVERTER_H
 #define GRAPHICSCONVERTER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "LString.h"
 #include <boost/signals/signal1.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
 
 class Converter : boost::noncopyable {
 public:
        /// Can the conversion be performed?
-       static bool isReachable(string const & from_format_name,
-                               string const & to_format_name);
+       static bool isReachable(std::string const & from_format_name,
+                               std::string const & to_format_name);
 
        /** One Converter per conversion ensures that the (hidden) signal
         *  is always connected to the expected slot.
         */
-       Converter(string const & from_file,   string const & to_file_base,
-                 string const & from_format, string const & to_format);
+       Converter(std::string const & from_file,   std::string const & to_file_base,
+                 std::string const & from_format, std::string const & to_format);
 
        /// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
        ~Converter();
@@ -57,7 +55,7 @@ public:
         *  If conversion fails or has not been completed, however, it
         *  returns an empty string.
         */
-       string const & convertedFile() const;
+       std::string const & convertedFile() const;
 
 private:
        /// Use the Pimpl idiom to hide the internals.
@@ -67,6 +65,7 @@ private:
        boost::scoped_ptr<Impl> const pimpl_;
 };
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
 
 #endif // GRAPHICSCONVERTER_H