Adds the convenience method 'isCString' to ShibokenGenerator.

It checks if an AbstractMetaType represents a C string.
Also updated code to make use of the new method.

1 files changed, 7 insertions, 2 deletions

diff --git a/shibokengenerator.cpp b/shibokengenerator.cpp
index aeacb25b5..46f7083d1 100644
--- a/shibokengenerator.cpp
+++ b/shibokengenerator.cpp
@@ -379,7 +379,7 @@ QString ShibokenGenerator::getFormatUnitString(const AbstractMetaFunction* func)
                 result += m_formatUnits[ptype->name()];
             else
                 result += 'O';
-        } else if (arg->type()->isNativePointer() && arg->type()->name() == "char") {
+        } else if (isCString(arg->type())) {
             result += 'z';
         } else {
             ReportHandler::warning("Unknown type used in ShibokenGenerator::getFormatUnitString!");
@@ -391,7 +391,7 @@ QString ShibokenGenerator::getFormatUnitString(const AbstractMetaFunction* func)
 
 QString ShibokenGenerator::cpythonBaseName(const AbstractMetaType* type)
 {
-    if (type->name() == "char" && type->isNativePointer())
+    if (isCString(type))
         return QString("PyString");
     return cpythonBaseName(type->typeEntry());
 }
@@ -554,6 +554,11 @@ bool ShibokenGenerator::isPyInt(const AbstractMetaType* type)
     return isPyInt(type->typeEntry());
 }
 
+bool ShibokenGenerator::isCString(const AbstractMetaType* type)
+{
+    return type->isNativePointer() && type->name() == "char";
+}
+
 bool ShibokenGenerator::shouldDereferenceArgumentPointer(const AbstractMetaArgument* arg)
 {
     return shouldDereferenceAbstractMetaTypePointer(arg->type());