hopefully fix tex2lyx linking.

[lyx.git] / src / support / unicode.h

diff --git a/src/support/unicode.h b/src/support/unicode.h
index 055dd7029df8878bbfd21b35b18967f6eddc4a25..e04f3b6ebb29e1b6af947945f6578f442bccd18f 100644 (file)
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -15,6 +15,8 @@
 
 #include "support/types.h"
 
+#include <boost/scoped_ptr.hpp>
+
 #include <string>
 #include <vector>
 
@@ -27,6 +29,12 @@ public:
        IconvProcessor(
                char const * tocode = "",
                char const * fromcode = "");
+       /// copy constructor needed because of pimpl_
+       IconvProcessor(IconvProcessor const &);
+       /// assignment operator needed because of pimpl_
+       IconvProcessor & operator=(IconvProcessor const &);
+       /// destructor (needs to be implemented in the .C file because the
+       /// boost::scoped_ptr destructor needs a fully defined type
        ~IconvProcessor();
 
        /// convert any data from \c fromcode to \c tocode unicode format.
@@ -41,14 +49,16 @@ private:
        /// \return true if the processor is ready to use.
        bool init();
 
-       std::string const tocode_;
-       std::string const fromcode_;
+       std::string tocode_;
+       std::string fromcode_;
 
        struct Private;
-       Private * pimpl_;
+       boost::scoped_ptr<Private> pimpl_;
 };
 
-// utf8_to_ucs4
+/// This is implemented in lyx_main.C for the LyX program 
+/// and in client.C for the LyX client program.
+extern IconvProcessor & utf8ToUcs4();
 
 // A single codepoint conversion for utf8_to_ucs4 does not make
 // sense, so that function is left out.