Adjust program code and project file to new libraries

bgl_babylon.cc

@@ -649,13 +649,13 @@ void Babylon::convertToUtf8( std::string &s, unsigned int type )
 
   inbufbytes = s.size();
   outbufbytes = s.size() * 6;
-#ifdef _WIN32
-  const char *inbuf;
-  inbuf = s.data();
-#else
+//#ifdef _WIN32
+//  const char *inbuf;
+//  inbuf = s.data();
+//#else
   char *inbuf;
   inbuf = (char *)s.data();
-#endif
+//#endif
   outbuf = (char*)malloc( outbufbytes + 1 );
   memset( outbuf, '\0', outbufbytes + 1 );
   defbuf = outbuf;

goldendict.pro

@@ -41,7 +41,7 @@ win32 {
     LIBS += -lvorbisfile \
         -lvorbis \
         -logg \
-        -lhunspell-1.2
+        -lhunspell-1.3.2
     RC_FILE = goldendict.rc
     INCLUDEPATH += winlibs/include
     LIBS += -Lwinlibs/lib

iconv.cc

@@ -44,11 +44,11 @@ Iconv::Result Iconv::convert( void const * & inBuf, size_t  & inBytesLeft,
   throw( exIncorrectSeq, exOther )
 {
   size_t result = iconv( state,
-                         #ifdef __WIN32
-                         (char const **)&inBuf,
-                         #else
+//                         #ifdef __WIN32
+//                         (char const **)&inBuf,
+//                         #else
                          (char **)&inBuf,
-                         #endif
+//                         #endif
                                            &inBytesLeft,
                          (char **)&outBuf, &outBytesLeft );