summaryrefslogtreecommitdiffstats
path: root/kjs/ustring.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 /kjs/ustring.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 'kjs/ustring.h')
-rw-r--r--kjs/ustring.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kjs/ustring.h b/kjs/ustring.h
index 0cdfa3f0f..70dd3d7d7 100644
--- a/kjs/ustring.h
+++ b/kjs/ustring.h
@@ -79,7 +79,7 @@ namespace KJS {
/**
* @return the 16 bit Unicode value of the character
*/
- unsigned short unicode() const { return uc; }
+ unsigned short tqunicode() const { return uc; }
public:
/**
* @return The character converted to lower case.
@@ -132,7 +132,7 @@ namespace KJS {
/**
* @return Unicode value.
*/
- unsigned short unicode() const { return ref().uc; }
+ unsigned short tqunicode() const { return ref().uc; }
/**
* @return Lower byte.
*/
@@ -158,7 +158,7 @@ namespace KJS {
int offset;
};
- inline UChar::UChar(const UCharReference &c) : uc(c.unicode()) { }
+ inline UChar::UChar(const UCharReference &c) : uc(c.tqunicode()) { }
/**
* @short 8 bit char based string class