[KBear-cvs] kbear/kbear/lib/interfaces misc.cpp,1.11,1.12 misc.h,1.11,1.12

[<kb...@us...>]

Update of /cvsroot/kbear/kbear/kbear/lib/interfaces
In directory sc8-pr-cvs1:/tmp/cvs-serv10553/kbear/lib/interfaces

Modified Files:
	misc.cpp misc.h 
Log Message:
See Changelog

Index: misc.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/misc.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** misc.cpp	23 Aug 2003 07:47:51 -0000	1.11
--- misc.cpp	17 Nov 2003 23:55:02 -0000	1.12
***************
*** 19,23 ****
  #include <qpoint.h>
  #include <qcstring.h>
! #include <qpixmapcache.h>
  //////////////////////////////////////////////////////
  // KDE specific includes
--- 19,24 ----
  #include <qpoint.h>
  #include <qcstring.h>
! #include <qtextcodec.h>
!  #include <qpixmapcache.h>
  //////////////////////////////////////////////////////
  // KDE specific includes
***************
*** 252,254 ****
--- 253,298 ----
  }
  //-----------------------------------------------
+ QString toUnicode(const QString& str, const SiteInfo& site)
+  {
+  	if(site.isLocal())
+ 		return str;
+ 
+ 	QTextCodec *codec = QTextCodec::codecForName( site.fileSysEncoding().latin1() );
+ 	return codec->toUnicode( str.utf8().data() );
+  }
+ //-----------------------------------------------
+ KURL toUnicode(const KURL& u, const SiteInfo& site)
+  {
+  	if(site.isLocal())
+ 		return u;
+ 
+ 	QTextCodec *codec = QTextCodec::codecForName( site.fileSysEncoding().latin1() );
+ 	KURL url = u;
+ 	url.setPath( codec->toUnicode( u.path().utf8().data() ) );
+ 	return url;
+  }
+ //-----------------------------------------------
+ QString fromUnicode(const QString& str, const SiteInfo& site)
+  {
+  	if(site.isLocal())
+ 		return str;
+ 
+ 	QTextCodec *codec = QTextCodec::codecForName( site.fileSysEncoding().latin1() );
+ 	QCString tmp = codec->fromUnicode( str );
+ 	return codec->fromUnicode( tmp.data() );
+  }
+ //-----------------------------------------------
+ KURL fromUnicode(const KURL& u, const SiteInfo& site)
+  {
+  	if(site.isLocal())
+ 		return u;
+ 
+ 	QTextCodec *codec = QTextCodec::codecForName( site.fileSysEncoding().latin1() );
+ 	KURL url = u;
+ 	QCString tmp = codec->fromUnicode( u.path() );
+ 	url.setPath( tmp.data() );
+ 	return url;
+  }
+ //-----------------------------------------------
  }; // end namespace KBear
+ 

Index: misc.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/misc.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** misc.h	18 Jun 2003 19:30:48 -0000	1.11
--- misc.h	17 Nov 2003 23:55:02 -0000	1.12
***************
*** 19,25 ****
--- 19,27 ----
  // KDE specific includes
  #include <kio/job.h>
+ #include <kurl.h>
  #include <kmdcodec.h>
  //////////////////////////////////////////////////////
  // Application specific includes
+ #include "siteinfo.h"
  
  class KFileView;
***************
*** 61,64 ****
--- 63,78 ----
  
  	int getPortForProtocol( const QString &protocol );
+ 	/*
+ 	**/
+ 	extern QString toUnicode(const QString& str, const SiteInfo& site);
+ 	/*
+ 	**/
+ 	extern KURL toUnicode(const KURL& u, const SiteInfo& site);
+ 	/*
+ 	**/
+ 	extern QString fromUnicode(const QString& str, const SiteInfo& site);
+ 	/*
+ 	**/
+ 	extern KURL fromUnicode(const KURL& u, const SiteInfo& site);
  	/**
  	* This enum represents the different ChildFrame modes