TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 14 insertions, 14 deletions

diff --git a/krita/core/createdcop.py b/krita/core/createdcop.py
index b3395ea2..bac48f33 100755
--- a/krita/core/createdcop.py
+++ b/krita/core/createdcop.py
@@ -34,7 +34,7 @@ class %(classname)sIface : virtual public DCOPObject
 {
 	K_DCOP
 public:
-	%(classname)sIface( %(classname)s * parent );
+	%(classname)sIface( %(classname)s * tqparent );
 k_dcop:
 
 private:
@@ -73,10 +73,10 @@ dcopiface_template = """/*
 
 #include <dcopclient.h>
 
-%(classname)sIface::%(classname)sIface( %(classname)s * parent )
+%(classname)sIface::%(classname)sIface( %(classname)s * tqparent )
 	: DCOPObject()
 {
-	m_parent = parent;
+	m_parent = tqparent;
 }
 
 """
@@ -84,10 +84,10 @@ dcopiface_template = """/*
 def parseHeader(headerfile, classname):
 	# parse the source class header to get a list of functions we're going to wrap
 	functions = []
-	if (headerfile.find("private:") > -1):
-		lines = headerfile[headerfile.find(classname):headerfile.find("private")].splitlines()
+	if (headerfile.tqfind("private:") > -1):
+		lines = headerfile[headerfile.tqfind(classname):headerfile.tqfind("private")].splitlines()
 	else:
-		lines = headerfile[headerfile.find(classname):headerfile.find("#endif")].splitlines()
+		lines = headerfile[headerfile.tqfind(classname):headerfile.tqfind("#endif")].splitlines()
 	i = 0
 	while i < len(lines):
 		line = lines[i].strip()
@@ -99,8 +99,8 @@ def parseHeader(headerfile, classname):
 			line.startswith("Q_OBJECT") or
 			line.startswith("#") or
 			line.startswith("}") or
-			line.startswith("public slots:") or
-			line.find("~")  != -1 or
+			line.startswith("public Q_SLOTS:") or
+			line.tqfind("~")  != -1 or
 			len(line) == 0
 			):
 			i+=1	
@@ -112,17 +112,17 @@ def parseHeader(headerfile, classname):
 		function = line
 		complete = 0
 		# strip the inline implementation
-		if (line.find("{") > -1):
-			function = line[:line.find("{")]
-			if function.find("}") > -1:
-				function += line[line.find("}") + 1:]
+		if (line.tqfind("{") > -1):
+			function = line[:line.tqfind("{")]
+			if function.tqfind("}") > -1:
+				function += line[line.tqfind("}") + 1:]
 				complete = 1
 			else:
 				i += 1
 				# search for the missing } on the next lines
 				while i < len(lines):
-					if (lines[i].find("}") > -1):
-						function += lines[i][lines[i].find("}") + 1:]
+					if (lines[i].tqfind("}") > -1):
+						function += lines[i][lines[i].tqfind("}") + 1:]
 						complete = 1
 					i += 1
 		else: