Fix support lib dependency problem.

* docstring.C: Implement utf8ToUcs4() locally.

* all other files: remove utf8ToUcs4().

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17361 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/client/client.C b/src/client/client.C
index b4dc9ab435ba3e0d6a5154eeddf36112aef3e419..553c0ca6a2c4bd64bb91c55f262ab15aa38b6a48 100644 (file)
--- a/src/client/client.C
+++ b/src/client/client.C
@@ -70,13 +70,6 @@ using std::cin;
 using std::endl;
 
 
-IconvProcessor & utf8ToUcs4()
-{
-       static IconvProcessor iconv(ucs4_codeset, "UTF-8");
-       return iconv;
-}
-
-
 namespace support {
 
 string itoa(unsigned int i)

diff --git a/src/lyx_main.C b/src/lyx_main.C
index d9291ae68c0679dc32b96db9916f5ee76b9154f4..b881f3d78f55f3c383c1ffbaa09bfe24008f2650 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -58,7 +58,6 @@
 #include "support/package.h"
 #include "support/path.h"
 #include "support/systemcall.h"
-#include "support/unicode.h"
 
 #include <boost/bind.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -150,7 +149,7 @@ void reconfigureUserLyXDir()
 /// The main application class private implementation.
 struct LyX::Singletons 
 {
-       Singletons(): iconv(ucs4_codeset, "UTF-8")
+       Singletons()
        {
                // Set the default User Interface language as soon as possible.
                // The language used will be derived from the environment
@@ -172,9 +171,6 @@ struct LyX::Singletons
        /// lyx session, containing lastfiles, lastfilepos, and lastopened
        boost::scoped_ptr<Session> session_;
 
-       ///
-       IconvProcessor iconv;
-
        /// Files to load at start.
        vector<FileName> files_to_load_;
 
@@ -331,12 +327,6 @@ Converters & LyX::systemConverters()
 }
 
 
-IconvProcessor & LyX::iconvProcessor()
-{
-       return pimpl_->iconv;
-}
-
-
 kb_keymap const & LyX::topLevelKeymap() const
 {
        BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
@@ -1533,12 +1523,6 @@ Movers & theSystemMovers()
 }
 
 
-IconvProcessor & utf8ToUcs4()
-{
-       return LyX::ref().iconvProcessor();
-}
-
-
 Messages & getMessages(std::string const & language)
 {
        return LyX::ref().getMessages(language);

diff --git a/src/lyx_main.h b/src/lyx_main.h
index 6c53bc6a01dd8ee1c2f853a0cf2b9c1c8b572c53..71d8e8370a0b7bd0e4265a39e178b00a07647334 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -25,7 +25,6 @@ class Buffer;
 class BufferList;
 class Converters;
 class ErrorItem;
-class IconvProcessor;
 class InsetBase;
 class LyXFunc;
 class LyXServer;
@@ -93,8 +92,6 @@ public:
        void setGuiLanguage(std::string const & language);
 
        ///
-       IconvProcessor & iconvProcessor();
-
        LyXView * newLyXView();
 
        /** redraw \c inset in all the BufferViews in which it is currently

diff --git a/src/support/docstring.C b/src/support/docstring.C
index a50f3a2b941e18a22a651705c6273c63fb955b1f..89abf212991ebf5fec66865e629fb5b95f05f688 100644 (file)
--- a/src/support/docstring.C
+++ b/src/support/docstring.C
@@ -58,6 +58,14 @@ std::string const to_ascii(docstring const & ucs4)
 }
 
 
+IconvProcessor & utf8ToUcs4()
+{
+       static IconvProcessor iconv(ucs4_codeset, "UTF-8");
+       return iconv;
+}
+
+
+
 void utf8_to_ucs4(std::string const & utf8, docstring & ucs4)
 {
        size_t n = utf8.size();

diff --git a/src/support/unicode.h b/src/support/unicode.h
index 16c4e00a03ad48da47387db36b7ea4701d3cfb92..5137e8e663c01df4e9c9bacb51afa6b72a18fff7 100644 (file)
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -56,10 +56,6 @@ private:
        boost::scoped_ptr<Private> pimpl_;
 };
 
-/// 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.
 

diff --git a/src/tex2lyx/tex2lyx.C b/src/tex2lyx/tex2lyx.C
index 0f0c45fc90971db8618294e538118c8b460425b0..77992733d058472cb28385692d108179185df3f6 100644 (file)
--- a/src/tex2lyx/tex2lyx.C
+++ b/src/tex2lyx/tex2lyx.C
@@ -69,13 +69,6 @@ using support::isFileReadable;
 namespace fs = boost::filesystem;
 
 
-IconvProcessor & utf8ToUcs4()
-{
-       static IconvProcessor iconv(ucs4_codeset, "UTF-8");
-       return iconv;
-}
-
-
 // Hacks to allow the thing to link in the lyxlayout stuff
 LyXErr lyxerr(std::cerr.rdbuf());