fixed PY3K compilation

fixed MSVC 2015 const errors

git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@437 ea8d5007-eb21-0410-b261-ccb3ea6e24a9

Author: florianlink

src/PythonQtConversion.cpp

@@ -748,8 +748,9 @@ QString PythonQtConv::PyObjGetString(PyObject* val, bool strict, bool& ok) {
   ok = true;
 #ifndef PY3K
   // in Python 3, we don't want to convert to QString, since we don't know anything about the encoding
+  // in Python 2, we assume the default for str is latin-1
   if (val->ob_type == &PyBytes_Type) {
-    r = QString(PyBytes_AS_STRING(val));
+    r = QString::fromLatin1(PyBytes_AS_STRING(val));
   } else
 #endif
   if (PyUnicode_Check(val)) {
@@ -1523,7 +1524,7 @@ QByteArray PythonQtConv::getCPPTypeName(PyObject* type)
 bool PythonQtConv::isStringType(PyTypeObject* type)
 {
 #ifdef PY3K
-  return type == &PyUnicode_Type
+  return type == &PyUnicode_Type;
 #else
   return type == &PyUnicode_Type || type == &PyString_Type;
 #endif

src/PythonQtSlotDecorator.cpp

@@ -42,9 +42,9 @@ int PythonQtSlotDecorator_init(PyObject *object, PyObject *args, PyObject *kw)
   char* argName = 0;
   PyObject* argResult = 0;
 
-  static char* kwlist[] = {"name", "result", 0};
+  static const char* kwlist[] = {"name", "result", 0};
   static PyObject* emptyTuple = PyTuple_New(0);
-  if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore.Slot", kwlist, &argName, &argResult)) {
+  if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore.Slot", (char**) kwlist, &argName, &argResult)) {
     return 0;
   }