From 54241a1f0a21c7433f8dd2fa0410b93d38cce520 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 17 Aug 2010 02:26:08 +0000
Subject: Typelocking

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1164527 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdecore/klocale.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'kdecore/klocale.cpp')

diff --git a/kdecore/klocale.cpp b/kdecore/klocale.cpp
index 810103e9f..f83ec6be1 100644
--- a/kdecore/klocale.cpp
+++ b/kdecore/klocale.cpp
@@ -2077,12 +2077,22 @@ void KLocale::initFileNameEncoding(KConfig *)
   // which, on Unix platforms, use the locale's codec.
 }
 
+#ifdef USE_QT3
 TQCString KLocale::encodeFileNameUTF8( const TQString & fileName )
+#endif // USE_QT3
+#ifdef USE_QT4
+TQByteArray KLocale::encodeFileNameUTF8( const TQString & fileName )
+#endif // USE_QT4
 {
   return fileName.utf8();
 }
 
+#ifdef USE_QT3
 TQString KLocale::decodeFileNameUTF8( const TQCString & localFileName )
+#endif // USE_QT3
+#ifdef USE_QT4
+TQString KLocale::decodeFileNameUTF8( const TQByteArray & localFileName )
+#endif // USE_QT4
 {
   return TQString::fromUtf8(localFileName);
 }
-- 
cgit v1.2.3