aboutsummaryrefslogtreecommitdiffstats
path: root/libpyside
diff options
context:
space:
mode:
authorMatthew Woehlke <matthew.woehlke@kitware.com>2013-06-11 17:20:28 -0400
committerJohn Ehresman <jpe@wingware.com>2013-06-22 23:07:28 +0200
commite35d8904491e9ded4e64c9156e5e9f2b777b399f (patch)
tree62b4e97ae8605c6433615ee15f5764765eeb78a7 /libpyside
parentbe2b62c13228c58d807a91e5912228cce65c1478 (diff)
fix build in C++11 mode
Add spaces between string literals and preprocessor symbols. These are required because C++11 defines string prefix and suffix operators, and confuses preprocessor tokens adjacent to string literals as unrecognized string literal modifies, resulting in compile errors. Change-Id: I70f4efca0acb6d2ee03327c0afbc56fe7d82c2a3 Reviewed-by: John Ehresman <jpe@wingware.com>
Diffstat (limited to 'libpyside')
-rw-r--r--libpyside/globalreceiver.cpp4
-rw-r--r--libpyside/pysidesignal.cpp8
-rw-r--r--libpyside/pysideslot.cpp4
3 files changed, 8 insertions, 8 deletions
diff --git a/libpyside/globalreceiver.cpp b/libpyside/globalreceiver.cpp
index 9e9ffc155..24f46872d 100644
--- a/libpyside/globalreceiver.cpp
+++ b/libpyside/globalreceiver.cpp
@@ -193,7 +193,7 @@ void GlobalReceiver::connectNotify(QObject* source, int slotId)
if (m_slotReceivers.contains(slotId)) {
DynamicSlotData* data = m_slotReceivers[slotId];
if (!data->hasRefTo(source))
- QObject::connect(source, SIGNAL(destroyed(QObject*)), this, "1"RECEIVER_DESTROYED_SLOT_NAME);
+ QObject::connect(source, SIGNAL(destroyed(QObject*)), this, "1" RECEIVER_DESTROYED_SLOT_NAME);
data->addRef(source);
}
}
@@ -207,7 +207,7 @@ void GlobalReceiver::disconnectNotify(QObject* source, int slotId)
removeSlot(slotId);
if (!hasConnectionWith(source))
- QObject::disconnect(source, SIGNAL(destroyed(QObject*)), this, "1"RECEIVER_DESTROYED_SLOT_NAME);
+ QObject::disconnect(source, SIGNAL(destroyed(QObject*)), this, "1" RECEIVER_DESTROYED_SLOT_NAME);
}
}
diff --git a/libpyside/pysidesignal.cpp b/libpyside/pysidesignal.cpp
index 6ff2263b1..40a18cd12 100644
--- a/libpyside/pysidesignal.cpp
+++ b/libpyside/pysidesignal.cpp
@@ -111,7 +111,7 @@ PyTypeObject PySideSignalMetaType = {
PyTypeObject PySideSignalType = {
PyVarObject_HEAD_INIT(&PySideSignalMetaType, 0)
- /*tp_name*/ "PySide.QtCore."SIGNAL_CLASS_NAME,
+ /*tp_name*/ "PySide.QtCore." SIGNAL_CLASS_NAME,
/*tp_basicsize*/ sizeof(PySideSignal),
/*tp_itemsize*/ 0,
/*tp_dealloc*/ 0,
@@ -173,7 +173,7 @@ static PyMappingMethods SignalInstance_as_mapping = {
PyTypeObject PySideSignalInstanceType = {
PyVarObject_HEAD_INIT(0, 0)
- /*tp_name*/ "PySide.QtCore."SIGNAL_INSTANCE_NAME,
+ /*tp_name*/ "PySide.QtCore." SIGNAL_INSTANCE_NAME,
/*tp_basicsize*/ sizeof(PySideSignalInstance),
/*tp_itemsize*/ 0,
/*tp_dealloc*/ 0,
@@ -230,7 +230,7 @@ int signalTpInit(PyObject* self, PyObject* args, PyObject* kwds)
emptyTuple = PyTuple_New(0);
if (!PyArg_ParseTupleAndKeywords(emptyTuple, kwds,
- "|s:QtCore."SIGNAL_CLASS_NAME, const_cast<char**>(kwlist), &argName))
+ "|s:QtCore." SIGNAL_CLASS_NAME, const_cast<char**>(kwlist), &argName))
return 0;
bool tupledArgs = false;
@@ -325,7 +325,7 @@ PyObject* signalInstanceConnect(PyObject* self, PyObject* args, PyObject* kwds)
static const char* kwlist[] = {"slot", "type", 0};
if (!PyArg_ParseTupleAndKeywords(args, kwds,
- "O|O:"SIGNAL_INSTANCE_NAME, const_cast<char**>(kwlist), &slot, &type))
+ "O|O:" SIGNAL_INSTANCE_NAME, const_cast<char**>(kwlist), &slot, &type))
return 0;
PySideSignalInstance* source = reinterpret_cast<PySideSignalInstance*>(self);
diff --git a/libpyside/pysideslot.cpp b/libpyside/pysideslot.cpp
index c84e4bf2e..97aa60dbe 100644
--- a/libpyside/pysideslot.cpp
+++ b/libpyside/pysideslot.cpp
@@ -47,7 +47,7 @@ static PyObject* slotCall(PyObject*, PyObject*, PyObject*);
// Class Definition -----------------------------------------------
static PyTypeObject PySideSlotType = {
PyVarObject_HEAD_INIT(0, 0)
- "PySide.QtCore."SLOT_DEC_NAME, /*tp_name*/
+ "PySide.QtCore." SLOT_DEC_NAME, /*tp_name*/
sizeof(PySideSlot), /*tp_basicsize*/
0, /*tp_itemsize*/
0, /*tp_dealloc*/
@@ -104,7 +104,7 @@ int slotTpInit(PyObject *self, PyObject *args, PyObject *kw)
if (emptyTuple == 0)
emptyTuple = PyTuple_New(0);
- if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore."SLOT_DEC_NAME, (char**) kwlist, &argName, &argResult))
+ if (!PyArg_ParseTupleAndKeywords(emptyTuple, kw, "|sO:QtCore." SLOT_DEC_NAME, (char**) kwlist, &argName, &argResult))
return 0;
PySideSlot *data = reinterpret_cast<PySideSlot*>(self);