From ee5c0b3cac528dc6901a6bb62a3d321e488dcf14 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Thu, 3 Oct 2013 11:04:06 +1030
Subject: Match change 4801 for Python binding types. From John Ehresman.

---
 qt/ScintillaEditPy/sepbuild.py                           | 2 +-
 qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'qt')

diff --git a/qt/ScintillaEditPy/sepbuild.py b/qt/ScintillaEditPy/sepbuild.py
index 43d9930fd..be1b238da 100644
--- a/qt/ScintillaEditPy/sepbuild.py
+++ b/qt/ScintillaEditPy/sepbuild.py
@@ -77,7 +77,7 @@ def methodSignature(name, v, options):
 	argTypes = ""
 	p1Type = WidgetGen.cppAlias(v["Param1Type"])
 	if p1Type == "int":
-		p1Type = "uptr_t"
+		p1Type = "sptr_t"
 	if p1Type:
 		argTypes = argTypes + p1Type
 	p2Type = WidgetGen.cppAlias(v["Param2Type"])
diff --git a/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template b/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
index 3c7e91cda..f9f166e56 100644
--- a/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
+++ b/qt/ScintillaEditPy/typesystem_ScintillaEdit.xml.template
@@ -15,7 +15,7 @@
 	<!-- Custom implementation of get and set_margin_mask_n: mask is defined 
 	     as an int but is really a bitfield and the numeric value can be 
 	     greater than max value of an int -->
-		<modify-function signature="set_margin_mask_n(uptr_t, sptr_t)">
+		<modify-function signature="set_margin_mask_n(sptr_t, sptr_t)">
 			<inject-code>
 				int margin = PyInt_AsLong(%PYARG_1);
 				if (margin == -1 &amp;&amp; PyErr_Occurred())
@@ -28,7 +28,7 @@
 				Py_RETURN_NONE;
 			</inject-code>
 		</modify-function>
-		<modify-function signature="get_margin_mask_n(uptr_t) const">
+		<modify-function signature="get_margin_mask_n(sptr_t) const">
 			<inject-code>
 				int margin = PyInt_AsLong(%PYARG_1);
 				if (margin == -1 &amp;&amp; PyErr_Occurred())
@@ -37,7 +37,7 @@
 				%PYARG_0 = PyInt_FromSize_t(mask);
 			</inject-code>
 		</modify-function>
-		<modify-function signature="setMarginMaskN(uptr_t, sptr_t)">
+		<modify-function signature="setMarginMaskN(sptr_t, sptr_t)">
 			<inject-code>
 				int margin = PyInt_AsLong(%PYARG_1);
 				if (margin == -1 &amp;&amp; PyErr_Occurred())
@@ -50,7 +50,7 @@
 				Py_RETURN_NONE;
 			</inject-code>
 		</modify-function>
-		<modify-function signature="marginMaskN(uptr_t) const">
+		<modify-function signature="marginMaskN(sptr_t) const">
 			<inject-code>
 				int margin = PyInt_AsLong(%PYARG_1);
 				if (margin == -1 &amp;&amp; PyErr_Occurred())
-- 
cgit v1.2.3