summaryrefslogtreecommitdiffstats
path: root/kdecore/klocale.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
commitf7e71d47719ab6094cf4a9fafffa5ea351973522 (patch)
tree30834aa632d442019e14f88685001d94657d060b /kdecore/klocale.h
parentb31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff)
downloadtdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz
tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/klocale.h')
-rw-r--r--kdecore/klocale.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kdecore/klocale.h b/kdecore/klocale.h
index 5f8be8f7c..9bca02077 100644
--- a/kdecore/klocale.h
+++ b/kdecore/klocale.h
@@ -1225,7 +1225,7 @@ private:
static TQCString encodeFileNameUTF8( const TQString & fileName );
#endif // USE_QT3
#ifdef USE_QT4
- static TQByteArray encodeFileNameUTF8( const TQString & fileName );
+ static QByteArray encodeFileNameUTF8( const QString & fileName );
#endif // USE_QT4
/**
@@ -1235,7 +1235,7 @@ private:
static TQString decodeFileNameUTF8( const TQCString & localFileName );
#endif // USE_QT3
#ifdef USE_QT4
- static TQString decodeFileNameUTF8( const TQByteArray & localFileName );
+ static QString decodeFileNameUTF8( const QByteArray & localFileName );
#endif // USE_QT4
/**