From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- akregator/src/mk4storage/metakit/include/mk4str.h | 2 +- akregator/src/mk4storage/metakit/include/mk4str.inl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'akregator/src/mk4storage/metakit/include') diff --git a/akregator/src/mk4storage/metakit/include/mk4str.h b/akregator/src/mk4storage/metakit/include/mk4str.h index 88b7a39d6..7124a29ea 100644 --- a/akregator/src/mk4storage/metakit/include/mk4str.h +++ b/akregator/src/mk4storage/metakit/include/mk4str.h @@ -96,7 +96,7 @@ d4_inline bool operator== (const char* s1, const c4_String& s2); d4_inline bool operator!= (const c4_String& s1, const char* s2); d4_inline bool operator!= (const char* s1, const c4_String& s2); -#else // Universal tqreplacement classes +#else // Universal replacement classes /// An efficient string class, modeled after the MFC version class c4_String diff --git a/akregator/src/mk4storage/metakit/include/mk4str.inl b/akregator/src/mk4storage/metakit/include/mk4str.inl index 4f95fa514..eddbefb8d 100644 --- a/akregator/src/mk4storage/metakit/include/mk4str.inl +++ b/akregator/src/mk4storage/metakit/include/mk4str.inl @@ -131,12 +131,12 @@ d4_inline bool c4_String::operator< (const c4_String& str_) const d4_inline int c4_String::Find(char ch_) const { - return find(ch_); + return tqfind(ch_); } d4_inline int c4_String::ReverseFind(char ch_) const { - return rfind(ch_); + return rtqfind(ch_); } d4_inline int c4_String::FindOneOf(const char* set_) const @@ -146,7 +146,7 @@ d4_inline int c4_String::FindOneOf(const char* set_) const d4_inline int c4_String::Find(const char* sub_) const { - return find(sub_); + return tqfind(sub_); } d4_inline c4_String c4_String::SpanIncluding(const char* set_) const -- cgit v1.2.1