From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 19 Jun 2011 19:03:33 +0000 Subject: TQt4 port kdegraphics This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kviewshell/plugins/djvu/libdjvu/GString.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kviewshell/plugins/djvu/libdjvu/GString.h') diff --git a/kviewshell/plugins/djvu/libdjvu/GString.h b/kviewshell/plugins/djvu/libdjvu/GString.h index 601db983..9614d328 100644 --- a/kviewshell/plugins/djvu/libdjvu/GString.h +++ b/kviewshell/plugins/djvu/libdjvu/GString.h @@ -306,9 +306,9 @@ public: int rsearch(char const *str, int from=0) const; - int contains(char const accept[], int from=0) const; + int tqcontains(char const accept[], int from=0) const; - int rcontains(char const accept[], int from=0) const; + int rtqcontains(char const accept[], int from=0) const; protected: // Return the next character and increment the source pointer. @@ -551,11 +551,11 @@ public: /** Searches for any of the specified characters in the accept string. It returns #-1# if the none of the characters and be found, otherwise the position of the first match. */ - int contains(const char accept[], const int from=0) const; + int tqcontains(const char accept[], const int from=0) const; /** Searches for any of the specified characters in the accept string. It returns #-1# if the none of the characters and be found, otherwise the position of the last match. */ - int rcontains(const char accept[], const int from=0) const; + int rtqcontains(const char accept[], const int from=0) const; /** Concatenates strings. Returns a string composed by concatenating the characters of strings #s1# and #s2#. */ @@ -1282,12 +1282,12 @@ GBaseString::rsearch(const char *str, const int from) const { return ptr?((*this)->rsearch(str,from)):(-1); } inline int -GBaseString::contains(const char accept[], const int from) const -{ return ptr?((*this)->contains(accept,from)):(-1); } +GBaseString::tqcontains(const char accept[], const int from) const +{ return ptr?((*this)->tqcontains(accept,from)):(-1); } inline int -GBaseString::rcontains(const char accept[], const int from) const -{ return ptr?((*this)->rcontains(accept,from)):(-1); } +GBaseString::rtqcontains(const char accept[], const int from) const +{ return ptr?((*this)->rtqcontains(accept,from)):(-1); } inline int GBaseString::cmp(const GBaseString &s2, const int len) const -- cgit v1.2.1