Add a -keep-ununsed-types argument to kdwsdl2cpp

KDAB · Jul 19, 2017 · 890eb7c · 890eb7c
1 parent 066a50e
commit 890eb7c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/kdwsdl2cpp/src/converter.cpp b/kdwsdl2cpp/src/converter.cpp
@@ -65,7 +65,9 @@ void Converter::setWSDL(const WSDL &wsdl)
 
     mTypeMap.setNSManager(&mNSManager);
 
-    cleanupUnusedTypes();
+    if (!Settings::self()->keepUnusedTypes()) {
+        cleanupUnusedTypes();
+    }
 
     // set the xsd types
     mTypeMap.addSchemaTypes(mWSDL.definitions().type().types(), Settings::self()->nameSpace());

diff --git a/kdwsdl2cpp/src/main.cpp b/kdwsdl2cpp/src/main.cpp
@@ -45,6 +45,7 @@ static void showHelp(const char *appName)
             "  -optional-element-type <type>\n"
             "                            use <type> as the getter return value for optional elements.\n"
             "                            <type> can be either raw-pointer or boost-optional\n"
+            " -keep-unused-types         keep the wsdl unused types to the cpp generation step\n"
             "\n", appName);
 }
 
@@ -61,6 +62,7 @@ int main(int argc, char **argv)
     QString exportMacro;
     QString nameSpace;
     Settings::OptionalElementType optionalElementType = Settings::ENone;
+    bool keepUnusedTypes = false;
 
     int arg = 1;
     while (arg < argc) {
@@ -121,6 +123,8 @@ int main(int argc, char **argv)
             } else if (optType == QLatin1String("boost-optional")) {
                 optionalElementType = Settings::EBoostOptional;
             }
+        } else if (opt == QLatin1String("-keep-unused-types")) {
+            keepUnusedTypes = true;
         } else if (!fileName) {
             fileName = argv[arg];
         } else {
@@ -145,6 +149,7 @@ int main(int argc, char **argv)
     Settings::self()->setExportDeclaration(exportMacro);
     Settings::self()->setNameSpace(nameSpace);
     Settings::self()->setOptionalElementType(optionalElementType);
+    Settings::self()->setKeepUnusedTypes(keepUnusedTypes);
     KWSDL::Compiler compiler;
 
     // so that we have an event loop, for downloads

diff --git a/kdwsdl2cpp/src/settings.cpp b/kdwsdl2cpp/src/settings.cpp
@@ -42,6 +42,7 @@ Settings::Settings()
     mOutputFileName = QString::fromLatin1("kwsdl_generated");
     mImpl = false;
     mServer = false;
+    mKeepUnusedTypes = false;
     mOptionalElementType = Settings::ENone;
 }
 
@@ -129,6 +130,16 @@ Settings::OptionalElementType Settings::optionalElementType() const
     return mOptionalElementType;
 }
 
+void Settings::setKeepUnusedTypes(bool b)
+{
+    mKeepUnusedTypes = b;
+}
+
+bool Settings::keepUnusedTypes() const
+{
+    return mKeepUnusedTypes;
+}
+
 void Settings::setNamespaceMapping(const NSMapping &namespaceMapping)
 {
     mNamespaceMapping = namespaceMapping;

diff --git a/kdwsdl2cpp/src/settings.h b/kdwsdl2cpp/src/settings.h
@@ -56,6 +56,9 @@ class Settings
     void setOptionalElementType(OptionalElementType optionalElementType);
     OptionalElementType optionalElementType() const;
 
+    void setKeepUnusedTypes(bool b);
+    bool keepUnusedTypes() const;
+
     // UNUSED
     void setNamespaceMapping(const NSMapping &namespaceMapping);
     NSMapping namespaceMapping() const;
@@ -84,6 +87,7 @@ class Settings
     bool mImpl;
     bool mServer;
     OptionalElementType mOptionalElementType;
+    bool mKeepUnusedTypes;
 };
 
 #endif