diff options
author | renatofilho <renato.filho@openbossa.org> | 2010-11-10 12:49:49 -0300 |
---|---|---|
committer | renatofilho <renato.filho@openbossa.org> | 2010-11-10 12:49:49 -0300 |
commit | d8e2d87f8962175f90fea01026e0a6099ad7f93c (patch) | |
tree | 4e4103e1a09b5bdae103e25114ecfa83eb0023f1 | |
parent | 9c6fb1d821065e61f85a59503dea63f4e7b49180 (diff) | |
download | shiboken-d8e2d87f8962175f90fea01026e0a6099ad7f93c.tar.gz shiboken-d8e2d87f8962175f90fea01026e0a6099ad7f93c.tar.xz shiboken-d8e2d87f8962175f90fea01026e0a6099ad7f93c.zip |
Revert "Fixed overload decisor sorting to put QStrings after pointers to wrapped objects."
This reverts commit 167959faa575856b48c951fd9cc500049004cf60.
Conflicts:
generator/overloaddata.cpp
-rw-r--r-- | generator/overloaddata.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/generator/overloaddata.cpp b/generator/overloaddata.cpp index ca0babc7..9be972f1 100644 --- a/generator/overloaddata.cpp +++ b/generator/overloaddata.cpp @@ -147,11 +147,6 @@ void OverloadData::sortNextOverloads() OverloadSortData sortData; bool checkPyObject = false; int pyobjectIndex = 0; - bool checkQString = false; - int qstringIndex = 0; - bool checkQVariant = false; - int qvariantIndex = 0; - bool hasObjectPointer = false; // Primitive types that are not int, long, short, // char and their respective unsigned counterparts. @@ -177,14 +172,6 @@ void OverloadData::sortNextOverloads() if (!checkPyObject && getTypeName(ov->argType()).contains("PyObject")) { checkPyObject = true; pyobjectIndex = sortData.lastProcessedItemId(); - } else if (!checkQVariant && getTypeName(ov->argType()) == "QVariant") { - checkQVariant = true; - qvariantIndex = sortData.lastProcessedItemId(); - } else if (!checkQString && getTypeName(ov->argType()) == "QString") { - checkQString = true; - qstringIndex = sortData.lastProcessedItemId(); - } else if (!hasObjectPointer && (ov->argType()->isValuePointer() || ov->argType()->typeEntry()->isObject() )) { - hasObjectPointer = true; } foreach (const AbstractMetaType* instantiation, ov->argType()->instantiations()) { @@ -280,10 +267,6 @@ void OverloadData::sortNextOverloads() /* Add dependency on PyObject, so its check is the last one (too generic) */ if (checkPyObject && !targetTypeEntryName.contains("PyObject")) graph.addEdge(sortData.map[targetTypeEntryName], pyobjectIndex); - else if (checkQVariant && targetTypeEntryName != "QVariant") - graph.addEdge(sortData.map[targetTypeEntryName], qvariantIndex); - else if (checkQString && hasObjectPointer && targetTypeEntryName != "QString") - graph.addEdge(sortData.map[targetTypeEntryName], qstringIndex); if (targetTypeEntry->isEnum()) { for (int i = 0; i < numPrimitives; ++i) { |