Refactor typesystem modification structs

- Use member initialization where possible
- Make constructors explicit
- Remove unused version attributes, unused comparison operators of
  FunctionModification and unused struct ExpensePolicy
- Rearrange members to minimize Clang warnings about padding

Change-Id: I1423f120b2117237c2674cdbb6d06923c842999f
Reviewed-by: Christian Tismer <tismer@stackless.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
index 014b44476..5b58e7e8a 100644
--- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
@@ -1387,9 +1387,9 @@ bool QtDocGenerator::writeInjectDocumentation(QTextStream& s,
                 Documentation doc;
                 Documentation::Format fmt;
 
-                if (mod.format == TypeSystem::NativeCode)
+                if (mod.format() == TypeSystem::NativeCode)
                     fmt = Documentation::Native;
-                else if (mod.format == TypeSystem::TargetLangCode)
+                else if (mod.format() == TypeSystem::TargetLangCode)
                     fmt = Documentation::Target;
                 else
                     continue;
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 35d896333..0a07964a5 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -2354,7 +2354,7 @@ static void addConversionRuleCodeSnippet(CodeSnipList& snippetList, QString& rul
     } else {
         rule.replace(QLatin1String("%out"), outputName);
     }
-    CodeSnip snip(0, snippetLanguage);
+    CodeSnip snip(snippetLanguage);
     snip.position = (snippetLanguage == TypeSystem::NativeCode) ? TypeSystem::CodeSnipPositionAny : TypeSystem::CodeSnipPositionBeginning;
     snip.addCode(rule);
     snippetList << snip;