diff options
Diffstat (limited to 'sip/tdeui')
| -rw-r--r-- | sip/tdeui/keditlistbox.sip | 9 | ||||
| -rw-r--r-- | sip/tdeui/kkeydialog.sip | 6 | ||||
| -rw-r--r-- | sip/tdeui/tdemainwindow.sip | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/sip/tdeui/keditlistbox.sip b/sip/tdeui/keditlistbox.sip index 6fd3391..526db68 100644 --- a/sip/tdeui/keditlistbox.sip +++ b/sip/tdeui/keditlistbox.sip @@ -176,7 +176,7 @@ public: const char **PyTQtListToArray(PyObject *lst) { - int nstr; + SIP_SSIZE_T nstr; const char **str, **sp; nstr = PyList_Size(lst); @@ -190,15 +190,16 @@ const char **PyTQtListToArray(PyObject *lst) for (int i = 0; i < nstr; ++i) { - char *s; + PyObject *item = PyList_GetItem(lst, i); + const char *item_ascii = sipString_AsASCIIString(&item); - if ((s = PyString_AsString(PyList_GetItem(lst,i))) == NULL) + if (item_ascii == NULL) { sipFree((void *)str); return NULL; } - *sp++ = s; + *sp++ = item_ascii; } return str; diff --git a/sip/tdeui/kkeydialog.sip b/sip/tdeui/kkeydialog.sip index 41d8b3a..60e9c28 100644 --- a/sip/tdeui/kkeydialog.sip +++ b/sip/tdeui/kkeydialog.sip @@ -206,7 +206,7 @@ typedef TQDict<int> IntDict; { TQString current_key = it.currentKey (); PyObject *a0 = sipConvertFromInstance (¤t_key, sipClass_TQCString, sipTransferObj); - PyObject *a1 = PyInt_FromLong ((long) it.current ()); + PyObject *a1 = PyLong_FromLong ((long) it.current ()); if ((a0 == NULL) || (a1 == NULL) || (PyDict_SetItem (dict, a0, a1) < 0)) { @@ -240,7 +240,7 @@ typedef TQDict<int> IntDict; a0 = (TQString *)sipForceConvertToType(key, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &a0_state, &iserr); - if ((iserr) || (!PyInt_Check (value))) + if ((iserr) || (!PyLong_Check (value))) { if (a0) sipReleaseType(a0, sipType_TQString, a0_state); @@ -250,7 +250,7 @@ typedef TQDict<int> IntDict; return 0; } - a1 = (int) PyInt_AS_LONG (value); + a1 = (int) PyLong_AS_LONG (value); qdict->insert (*a0, &a1); diff --git a/sip/tdeui/tdemainwindow.sip b/sip/tdeui/tdemainwindow.sip index ea9635a..02e19ed 100644 --- a/sip/tdeui/tdemainwindow.sip +++ b/sip/tdeui/tdemainwindow.sip @@ -76,7 +76,7 @@ public: //ig TQPtrListIterator<TDEToolBar> toolBarIterator (); TDEAccel* accel (); void setFrameBorderWidth (int); - void setAutoSaveSettings (const TQString& = TQString ::fromLatin1 ("MainWindow" ), bool = 1); + void setAutoSaveSettings (const TQString& = TQString ::fromUtf8 ("MainWindow" ), bool = 1); void resetAutoSaveSettings (); %If ( KDE_3_1_0 - ) |