Commit ecc6635a authored by Jack Jansen's avatar Jack Jansen

Converted manually written code to the new K format specifier.

Untested, but at least it still compiles.
parent 269b2a67
...@@ -167,10 +167,10 @@ filldialogoptions(PyObject *d, ...@@ -167,10 +167,10 @@ filldialogoptions(PyObject *d,
} }
*defaultLocationP = defaultLocation_storage; *defaultLocationP = defaultLocation_storage;
} else if( strcmp(keystr, "version") == 0 ) { } else if( strcmp(keystr, "version") == 0 ) {
if ( !PyArg_Parse(value, "h", &opt->version) ) if ( !PyArg_Parse(value, "H", &opt->version) )
return 0; return 0;
} else if( strcmp(keystr, "dialogOptionFlags") == 0 ) { } else if( strcmp(keystr, "dialogOptionFlags") == 0 ) {
if ( !PyArg_Parse(value, "l", &opt->dialogOptionFlags) ) if ( !PyArg_Parse(value, "K", &opt->dialogOptionFlags) )
return 0; return 0;
} else if( strcmp(keystr, "location") == 0 ) { } else if( strcmp(keystr, "location") == 0 ) {
if ( !PyArg_Parse(value, "O&", PyMac_GetPoint, &opt->location) ) if ( !PyArg_Parse(value, "O&", PyMac_GetPoint, &opt->location) )
...@@ -247,7 +247,7 @@ nav_NavTranslateFile(navrrobject *self, PyObject *args) ...@@ -247,7 +247,7 @@ nav_NavTranslateFile(navrrobject *self, PyObject *args)
NavTranslationOptions howToTranslate; NavTranslationOptions howToTranslate;
OSErr err; OSErr err;
if (!PyArg_ParseTuple(args, "l", &howToTranslate)) if (!PyArg_ParseTuple(args, "K", &howToTranslate))
return NULL; return NULL;
err = NavTranslateFile(&self->itself, howToTranslate); err = NavTranslateFile(&self->itself, howToTranslate);
if ( err ) { if ( err ) {
...@@ -268,7 +268,7 @@ nav_NavCompleteSave(navrrobject *self, PyObject *args) ...@@ -268,7 +268,7 @@ nav_NavCompleteSave(navrrobject *self, PyObject *args)
NavTranslationOptions howToTranslate; NavTranslationOptions howToTranslate;
OSErr err; OSErr err;
if (!PyArg_ParseTuple(args, "l", &howToTranslate)) if (!PyArg_ParseTuple(args, "K", &howToTranslate))
return NULL; return NULL;
err = NavCompleteSave(&self->itself, howToTranslate); err = NavCompleteSave(&self->itself, howToTranslate);
if ( err ) { if ( err ) {
...@@ -528,7 +528,7 @@ nav_NavAskSaveChanges(PyObject *self, PyObject *args, PyObject *kw) ...@@ -528,7 +528,7 @@ nav_NavAskSaveChanges(PyObject *self, PyObject *args, PyObject *kw)
OSErr err; OSErr err;
if ( kw && PyObject_IsTrue(kw) ) { if ( kw && PyObject_IsTrue(kw) ) {
if (!PyArg_ParseTuple(args, "l", &action)) if (!PyArg_ParseTuple(args, "K", &action))
return NULL; return NULL;
dict = kw; dict = kw;
} else if (!PyArg_ParseTuple(args, "lO!", &action, &PyDict_Type, &dict)) } else if (!PyArg_ParseTuple(args, "lO!", &action, &PyDict_Type, &dict))
......
...@@ -138,7 +138,7 @@ static PyObject *ScrapObj_PutScrapFlavor(ScrapObject *_self, PyObject *_args) ...@@ -138,7 +138,7 @@ static PyObject *ScrapObj_PutScrapFlavor(ScrapObject *_self, PyObject *_args)
ScrapFlavorFlags flavorFlags; ScrapFlavorFlags flavorFlags;
char *flavorData__in__; char *flavorData__in__;
int flavorData__in_len__; int flavorData__in_len__;
if (!PyArg_ParseTuple(_args, "O&ls#", if (!PyArg_ParseTuple(_args, "O&Ks#",
PyMac_GetOSType, &flavorType, PyMac_GetOSType, &flavorType,
&flavorFlags, &flavorFlags,
&flavorData__in__, &flavorData__in_len__)) &flavorData__in__, &flavorData__in_len__))
......
...@@ -415,7 +415,7 @@ PyMac_BuildPoint(Point p) ...@@ -415,7 +415,7 @@ PyMac_BuildPoint(Point p)
int int
PyMac_GetEventRecord(PyObject *v, EventRecord *e) PyMac_GetEventRecord(PyObject *v, EventRecord *e)
{ {
return PyArg_Parse(v, "(Hll(hh)H)", return PyArg_Parse(v, "(HKK(hh)H)",
&e->what, &e->what,
&e->message, &e->message,
&e->when, &e->when,
...@@ -471,7 +471,7 @@ PyMac_Getwide(PyObject *v, wide *rv) ...@@ -471,7 +471,7 @@ PyMac_Getwide(PyObject *v, wide *rv)
rv->hi = -1; rv->hi = -1;
return 1; return 1;
} }
return PyArg_Parse(v, "(ll)", &rv->hi, &rv->lo); return PyArg_Parse(v, "(KK)", &rv->hi, &rv->lo);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment