TQt4 port kdeadmin

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1237416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 5 insertions, 5 deletions

diff --git a/lilo-config/common/String.h b/lilo-config/common/String.h
index 354c427..5eaa77a 100644
--- a/lilo-config/common/String.h
+++ b/lilo-config/common/String.h
@@ -54,7 +54,7 @@ public:
 	char * cstr() const;
 	bool cmp(char const * const s) const;
 	bool casecmp(char const * const s) const;
-	bool contains(String const &s, bool cs=true) const;
+	bool tqcontains(String const &s, bool cs=true) const;
 	int locate(String const &s, bool cs=true, unsigned int startat=0) const;
 	void sprintf(const char *format, ...);
 	bool readfile(String filename);
@@ -63,11 +63,11 @@ public:
 	String right(unsigned int num=1) const;
 	String mid(unsigned int start, unsigned int num=0) const;
 	String &regex(String const &expr, bool cs=true) const;
-	String &replace(String const &what, String const &with, bool all=true) const;
+	String &tqreplace(String const &what, String const &with, bool all=true) const;
 	static String escapeForRegExp(String const &s);
 	char chr(unsigned int index) const { if(index>=size()) return 0; else return data()[index]; }
-	int length() const { return size(); } // For compatibility with QString
-	char const *latin1() const { return cstr(); } // For compatibility with QString
+	int length() const { return size(); } // For compatibility with TQString
+	char const *latin1() const { return cstr(); } // For compatibility with TQString
 };
 
 class StringList:public strlist {
@@ -82,7 +82,7 @@ public:
 	void operator +=(StringList const &s);
 	void operator +=(StringList const * const s);
 	operator String() const;
-	bool contains(String const &s) const;
+	bool tqcontains(String const &s) const;
 	void remove(String const &s);
 	void add(String const &s) { insert(end(), s); }
 	String const &grep(String const &s) const;