New Upstream Release - kdsoap
Ready changes
Summary
Merged new upstream version: 2.1.1+dfsg (was: 1.9.1+dfsg).
Diff
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..52c47d3
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,74 @@
+---
+Language: Json
+DisableFormat: true
+---
+BasedOnStyle: WebKit
+Language: Cpp
+Standard: Cpp11
+
+IndentWidth: 4
+SpacesBeforeTrailingComments: 1
+TabWidth: 8
+UseTab: Never
+ContinuationIndentWidth: 4
+MaxEmptyLinesToKeep: 3
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakConstructorInitializersBeforeComma: true
+
+BreakBeforeBraces: Custom
+BraceWrapping:
+ AfterClass: true
+ AfterControlStatement: false
+ AfterEnum: false
+ AfterFunction: true
+ AfterNamespace: false
+ AfterObjCDeclaration: false
+ AfterStruct: true
+ AfterUnion: false
+ BeforeCatch: false
+ BeforeElse: false
+ IndentBraces: false
+
+ForEachMacros:
+ - forever # avoids { wrapped to next line
+ - foreach
+ - Q_FOREACH
+
+AccessModifierOffset: -4
+ConstructorInitializerIndentWidth: 4
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false # requires clang-format 11
+AlignAfterOpenBracket: true
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+BinPackParameters: true
+ColumnLimit: 0
+Cpp11BracedListStyle: true
+DerivePointerBinding: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: false
+NamespaceIndentation: None
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 60
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerBindsToType: false
+SpaceAfterTemplateKeyword: false
+IndentFunctionDeclarationAfterType: false
+SpaceAfterControlStatementKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceInEmptyParentheses: false
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: true
+SpacesInParentheses: false
+...
diff --git a/.clazy b/.clazy
index dfd19e4..a31800e 100644
--- a/.clazy
+++ b/.clazy
@@ -1,8 +1,7 @@
#do not report clazy results for these subdirs
-#SKIP whatever
+#libkode is a separate project that we care about
+#SKIP /libkode/
#clazy checks specification
-CHECKS level2
-
-#Turn-on Qt4 compatibility
-QT4
+#currently there are more than 1000 qstring-allocation issues
+CHECKS level2,no-qstring-allocations
diff --git a/.cmake-format.py b/.cmake-format.py
new file mode 100644
index 0000000..d0101f7
--- /dev/null
+++ b/.cmake-format.py
@@ -0,0 +1,241 @@
+# ----------------------------------
+# Options affecting listfile parsing
+# ----------------------------------
+with section("parse"):
+
+ # Specify structure for custom cmake functions
+ additional_commands = {'foo': {'flags': ['BAR', 'BAZ'],
+ 'kwargs': {'DEPENDS': '*', 'HEADERS': '*', 'SOURCES': '*'}}}
+
+ # Override configurations per-command where available
+ override_spec = {}
+
+ # Specify variable tags.
+ vartags = []
+
+ # Specify property tags.
+ proptags = []
+
+# -----------------------------
+# Options affecting formatting.
+# -----------------------------
+with section("format"):
+
+ # Disable formatting entirely, making cmake-format a no-op
+ disable = False
+
+ # How wide to allow formatted cmake files
+ line_width = 120
+
+ # How many spaces to tab for indent
+ tab_size = 4
+
+ # If true, lines are indented using tab characters (utf-8 0x09) instead of
+ # <tab_size> space characters (utf-8 0x20). In cases where the layout would
+ # require a fractional tab character, the behavior of the fractional
+ # indentation is governed by <fractional_tab_policy>
+ use_tabchars = False
+
+ # If <use_tabchars> is True, then the value of this variable indicates how
+ # fractional indentions are handled during whitespace replacement. If set to
+ # 'use-space', fractional indentation is left as spaces (utf-8 0x20). If set
+ # to `round-up` fractional indentation is replaced with a single tab character
+ # (utf-8 0x09) effectively shifting the column to the next tabstop
+ fractional_tab_policy = 'use-space'
+
+ # If an argument group contains more than this many sub-groups (parg or kwarg
+ # groups) then force it to a vertical layout.
+ max_subgroups_hwrap = 2
+
+ # If a positional argument group contains more than this many arguments, then
+ # force it to a vertical layout.
+ max_pargs_hwrap = 4
+
+ # If a cmdline positional group consumes more than this many lines without
+ # nesting, then invalidate the layout (and nest)
+ max_rows_cmdline = 2
+
+ # If true, separate flow control names from their parentheses with a space
+ separate_ctrl_name_with_space = False
+
+ # If true, separate function names from parentheses with a space
+ separate_fn_name_with_space = False
+
+ # If a statement is wrapped to more than one line, than dangle the closing
+ # parenthesis on its own line.
+ dangle_parens = True
+
+ # If the trailing parenthesis must be 'dangled' on its on line, then align it
+ # to this reference: `prefix`: the start of the statement, `prefix-indent`:
+ # the start of the statement, plus one indentation level, `child`: align to
+ # the column of the arguments
+ dangle_align = 'prefix'
+
+ # If the statement spelling length (including space and parenthesis) is
+ # smaller than this amount, then force reject nested layouts.
+ min_prefix_chars = 4
+
+ # If the statement spelling length (including space and parenthesis) is larger
+ # than the tab width by more than this amount, then force reject un-nested
+ # layouts.
+ max_prefix_chars = 10
+
+ # If a candidate layout is wrapped horizontally but it exceeds this many
+ # lines, then reject the layout.
+ max_lines_hwrap = 2
+
+ # What style line endings to use in the output.
+ line_ending = 'unix'
+
+ # Format command names consistently as 'lower' or 'upper' case
+ command_case = 'lower'
+
+ # Format keywords consistently as 'lower' or 'upper' case
+ keyword_case = 'upper'
+
+ # A list of command names which should always be wrapped
+ always_wrap = ["add_executable", "add_library",
+ "target_link_libraries", "target_include_directories", "install"]
+
+ # If true, the argument lists which are known to be sortable will be sorted
+ # lexicographicall
+ enable_sort = True
+
+ # If true, the parsers may infer whether or not an argument list is sortable
+ # (without annotation).
+ autosort = True
+
+ # By default, if cmake-format cannot successfully fit everything into the
+ # desired linewidth it will apply the last, most agressive attempt that it
+ # made. If this flag is True, however, cmake-format will print error, exit
+ # with non-zero status code, and write-out nothing
+ require_valid_layout = False
+
+ # A dictionary mapping layout nodes to a list of wrap decisions. See the
+ # documentation for more information.
+ layout_passes = {}
+
+# ------------------------------------------------
+# Options affecting comment reflow and formatting.
+# ------------------------------------------------
+with section("markup"):
+
+ # What character to use for bulleted lists
+ bullet_char = '*'
+
+ # What character to use as punctuation after numerals in an enumerated list
+ enum_char = '.'
+
+ # If comment markup is enabled, don't reflow the first comment block in each
+ # listfile. Use this to preserve formatting of your copyright/license
+ # statements.
+ first_comment_is_literal = False
+
+ # If comment markup is enabled, don't reflow any comment block which matches
+ # this (regex) pattern. Default is `None` (disabled).
+ literal_comment_pattern = None
+
+ # Regular expression to match preformat fences in comments default=
+ # ``r'^\s*([`~]{3}[`~]*)(.*)$'``
+ fence_pattern = '^\\s*([`~]{3}[`~]*)(.*)$'
+
+ # Regular expression to match rulers in comments default=
+ # ``r'^\s*[^\w\s]{3}.*[^\w\s]{3}$'``
+ ruler_pattern = '^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$'
+
+ # If a comment line matches starts with this pattern then it is explicitly a
+ # trailing comment for the preceeding argument. Default is '#<'
+ explicit_trailing_pattern = '#<'
+
+ # If a comment line starts with at least this many consecutive hash
+ # characters, then don't lstrip() them off. This allows for lazy hash rulers
+ # where the first hash char is not separated by space
+ hashruler_min_length = 10
+
+ # If true, then insert a space between the first hash char and remaining hash
+ # chars in a hash ruler, and normalize its length to fill the column
+ canonicalize_hashrulers = True
+
+ # enable comment markup parsing and reflow
+ enable_markup = False
+
+# ----------------------------
+# Options affecting the linter
+# ----------------------------
+with section("lint"):
+
+ # a list of lint codes to disable
+ disabled_codes = []
+
+ # regular expression pattern describing valid function names
+ function_pattern = '[0-9a-z_]+'
+
+ # regular expression pattern describing valid macro names
+ macro_pattern = '[0-9a-z_]+'
+
+ # regular expression pattern describing valid names for variables with global
+ # (cache) scope
+ global_var_pattern = '[A-Z][0-9A-Z_]+'
+
+ # regular expression pattern describing valid names for variables with global
+ # scope (but internal semantic)
+ internal_var_pattern = '[A-Z][0-9A-Z_]+'
+
+ # regular expression pattern describing valid names for variables with local
+ # scope
+ local_var_pattern = '[_A-Za-z][A-Za-z0-9_]+'
+
+ # regular expression pattern describing valid names for privatedirectory
+ # variables
+ private_var_pattern = '[0-9a-z_]+'
+
+ # regular expression pattern describing valid names for public directory
+ # variables
+ public_var_pattern = '.*'
+
+ # regular expression pattern describing valid names for function/macro
+ # arguments and loop variables.
+ argument_var_pattern = '[a-z_][a-z0-9_]+'
+
+ # regular expression pattern describing valid names for keywords used in
+ # functions or macros
+ keyword_pattern = '[A-Z][0-9A-Z_]+'
+
+ # In the heuristic for C0201, how many conditionals to match within a loop in
+ # before considering the loop a parser.
+ max_conditionals_custom_parser = 2
+
+ # Require at least this many newlines between statements
+ min_statement_spacing = 1
+
+ # Require no more than this many newlines between statements
+ max_statement_spacing = 2
+ max_returns = 6
+ max_branches = 15
+ max_arguments = 10
+ max_localvars = 15
+ max_statements = 50
+
+# -------------------------------
+# Options affecting file encoding
+# -------------------------------
+with section("encode"):
+
+ # If true, emit the unicode byte-order mark (BOM) at the start of the file
+ emit_byteorder_mark = False
+
+ # Specify the encoding of the input file. Defaults to utf-8
+ input_encoding = 'utf-8'
+
+ # Specify the encoding of the output file. Defaults to utf-8. Note that cmake
+ # only claims to support utf-8 so be careful when using anything else
+ output_encoding = 'utf-8'
+
+# -------------------------------------
+# Miscellaneous configurations options.
+# -------------------------------------
+with section("misc"):
+
+ # A dictionary containing any per-command configuration overrides. Currently
+ # only `command_case` is supported.
+ per_command = {}
diff --git a/.codespellrc b/.codespellrc
new file mode 100644
index 0000000..7f8bba7
--- /dev/null
+++ b/.codespellrc
@@ -0,0 +1,4 @@
+[codespell]
+skip = *.wsdl,*.xsd,*.XSD,*.ts,./kdwsdl2cpp/libkode,./build-*,.git
+interactive = 3
+ignore-words-list = crosssite,statics
diff --git a/.gitignore b/.gitignore
index 64ada79..f2588fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@ configure.bat
configure.sh
.qmake.stash
+/build
+
/include
/examples/holidays_gui/qrc_resources.cpp
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..5ef7e3f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "kdwsdl2cpp/libkode"]
+ path = kdwsdl2cpp/libkode
+ url = https://github.com/cornelius/libkode
diff --git a/.krazy b/.krazy
index 42849e6..1c95fd0 100644
--- a/.krazy
+++ b/.krazy
@@ -1,30 +1,31 @@
-CHECKSETS qt4,c++,foss
-
-#exclude intrusive checks to investigate later
-EXCLUDE constref,dpointer,inline,null,doublequote_chars
-EXCLUDE style
+CHECKSETS qt5,c++,foss
#KDAB-specific checks
-EXTRA kdabcopyright
+EXTRA kdabcopyright-reuse,fosslicense-reuse
-#additional checks
-EXTRA defines,null
+#exclude checks now being done by clazy or clang-tools
+EXCLUDE includes,strings,explicit,normalize,passbyvalue,operators,nullstrcompare,nullstrassign,doublequote_chars,qobject,sigsandslots,staticobjects,cpp
+#exclude more checks
+EXCLUDE qminmax,captruefalse,dpointer,inline,constref
+#exclude spelling as codespell is much, much better tool
+#too many false positives
+EXCLUDE insecurenet
+EXCLUDE spelling
+EXCLUDE style
#if you have a build subdir, skip it
SKIP /build-
-#no need to check 3rdparty stuff
+
+#skip 3rdparty
+SKIP /libkode/
SKIP /kdwsdl2cpp/
SKIP /KDQName\.cpp|/KDQName\.h
-#skip autogen buildsystem
-SKIP /autogen/|/autogen.py|/genignore.py
-#nor examples
-SKIP /examples/
-#nor testtools
-SKIP /testtools/
-#skip generated headers
-SKIP /include/
-#skip generated cmake
-SKIP KDSoapConfig\.cmake\.in
+
+#skip scripts
+SKIP /scripts/
+#skip other cmake
+SKIP Doxyfile.cmake
+SKIP \.cmake-format\.py
#skip the borrowed code in the cmake subdir
-SKIP /cmake/WriteBasicConfigVersionFile.cmake|/cmake/CMakePackageConfigHelpers.cmake|/cmake/InstallLocation.cmake|/cmake/InstallLocation.cmake|/cmake/Qt5Portability.cmake|/cmake/ECMGenerateHeaders.cmake
+SKIP cmake/ECM|/cmake/KDAB/
diff --git a/.mdlrc b/.mdlrc
new file mode 100644
index 0000000..3acbfec
--- /dev/null
+++ b/.mdlrc
@@ -0,0 +1 @@
+style ".mdlrc.rb"
diff --git a/.mdlrc.rb b/.mdlrc.rb
new file mode 100644
index 0000000..edb59bc
--- /dev/null
+++ b/.mdlrc.rb
@@ -0,0 +1,4 @@
+all
+rule 'MD013', :line_length => 100, :tables => false
+rule 'MD029', :style => :ordered
+exclude_rule 'MD033'
diff --git a/.pep8 b/.pep8
new file mode 100644
index 0000000..9d54e0f
--- /dev/null
+++ b/.pep8
@@ -0,0 +1,2 @@
+[pycodestyle]
+max_line_length = 120
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..72cfebc
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,50 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+exclude: ^(cmake/ECM/|cmake/KDAB/)
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v3.2.0
+ hooks:
+ - id: trailing-whitespace
+ - id: end-of-file-fixer
+ - id: check-added-large-files
+ - id: check-case-conflict
+ - id: check-yaml
+ args: [--allow-multiple-documents]
+ - id: check-json
+- repo: https://github.com/pre-commit/mirrors-clang-format
+ rev: v13.0.0
+ hooks:
+ - id: clang-format
+- repo: https://github.com/PyCQA/pylint
+ rev: v2.12.2
+ hooks:
+ - id: pylint
+ exclude: ^(.cmake-format.py|conan/conanfile.py|scripts/genignore.py)
+- repo: https://github.com/pre-commit/mirrors-autopep8
+ rev: v1.6.0
+ hooks:
+ - id: autopep8
+ exclude: ^(.cmake-format.py|conan/conanfile.py)
+- repo: https://github.com/codespell-project/codespell
+ rev: v2.1.0
+ hooks:
+ - id: codespell
+- repo: https://github.com/cheshirekow/cmake-format-precommit
+ rev: v0.6.13
+ hooks:
+ - id: cmake-lint
+ exclude: (.py.cmake|Doxyfile.cmake)
+ - id: cmake-format
+ exclude: (.py.cmake|Doxyfile.cmake)
+- repo: https://github.com/markdownlint/markdownlint
+ rev: v0.11.0
+ hooks:
+ - id: markdownlint
+ entry: mdl
+ language: ruby
+ files: \.(md|mdown|markdown)$
+- repo: https://github.com/fsfe/reuse-tool
+ rev: v1.0.0
+ hooks:
+ - id: reuse
diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 0000000..0129252
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,596 @@
+[MASTER]
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code.
+extension-pkg-whitelist=
+ PyKDReports.KDReports, PyKDReportsQt6.KDReports,
+ PySide2.QtCore,PySide2.QtWidgets,PySide2.QtGui,PySide2.QtPrintSupport,
+ PySide6.QtCore,PySide6.QtWidgets,PySide6.QtGui,PySide6.QtPrintSupport
+
+# Specify a score threshold to be exceeded before program exits with error.
+fail-under=10.0
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS
+
+# Add files or directories matching the regex patterns to the blacklist. The
+# regex matches against base names, not paths.
+ignore-patterns=rc_assets.py,genignore.py
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use.
+jobs=1
+
+# Control the amount of potential inferred values when inferring a single
+# object. This can help the performance when dealing with large functions or
+# complex, nested conditions.
+limit-inference-results=100
+
+# List of plugins (as comma separated values of python module names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# When enabled, pylint would attempt to guess common misconfiguration and emit
+# user-friendly hints instead of false-positive error messages.
+suggestion-mode=yes
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
+confidence=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once). You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use "--disable=all --enable=classes
+# --disable=W".
+disable=print-statement,
+ parameter-unpacking,
+ unpacking-in-except,
+ old-raise-syntax,
+ backtick,
+ long-suffix,
+ old-ne-operator,
+ old-octal-literal,
+ import-star-module-level,
+ non-ascii-bytes-literal,
+ raw-checker-failed,
+ bad-inline-option,
+ locally-disabled,
+ file-ignored,
+ suppressed-message,
+ useless-suppression,
+ deprecated-pragma,
+ use-symbolic-message-instead,
+ apply-builtin,
+ basestring-builtin,
+ buffer-builtin,
+ cmp-builtin,
+ coerce-builtin,
+ execfile-builtin,
+ file-builtin,
+ long-builtin,
+ raw_input-builtin,
+ reduce-builtin,
+ standarderror-builtin,
+ unicode-builtin,
+ xrange-builtin,
+ coerce-method,
+ delslice-method,
+ getslice-method,
+ setslice-method,
+ no-absolute-import,
+ old-division,
+ dict-iter-method,
+ dict-view-method,
+ next-method-called,
+ metaclass-assignment,
+ indexing-exception,
+ raising-string,
+ reload-builtin,
+ oct-method,
+ hex-method,
+ nonzero-method,
+ cmp-method,
+ input-builtin,
+ round-builtin,
+ intern-builtin,
+ unichr-builtin,
+ map-builtin-not-iterating,
+ zip-builtin-not-iterating,
+ range-builtin-not-iterating,
+ filter-builtin-not-iterating,
+ using-cmp-argument,
+ eq-without-hash,
+ div-method,
+ idiv-method,
+ rdiv-method,
+ exception-message-attribute,
+ invalid-str-codec,
+ sys-max-int,
+ bad-python3-import,
+ deprecated-string-function,
+ deprecated-str-translate-call,
+ deprecated-itertools-function,
+ deprecated-types-field,
+ next-method-defined,
+ dict-items-not-iterating,
+ dict-keys-not-iterating,
+ dict-values-not-iterating,
+ deprecated-operator-function,
+ deprecated-urllib-function,
+ xreadlines-attribute,
+ deprecated-sys-function,
+ exception-escape,
+ comprehension-escape,
+ consider-using-f-string,
+ R0801,I1101,E0401
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=c-extension-no-member=
+
+
+[REPORTS]
+
+# Python expression which should return a score less than or equal to 10. You
+# have access to the variables 'error', 'warning', 'refactor', and 'convention'
+# which contain the number of messages in each category, as well as 'statement'
+# which is the total number of statements analyzed. This score is used by the
+# global evaluation report (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details.
+#msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio). You can also give a reporter class, e.g.
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Tells whether to display a full report or only the messages.
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=8
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit
+
+
+[BASIC]
+
+# Naming style matching correct argument names.
+argument-naming-style=camelCase
+
+# Regular expression matching correct argument names. Overrides argument-
+# naming-style.
+#argument-rgx=
+
+# Naming style matching correct attribute names.
+attr-naming-style=camelCase
+
+# Regular expression matching correct attribute names. Overrides attr-naming-
+# style.
+#attr-rgx=
+
+# Bad variable names which should always be refused, separated by a comma.
+bad-names=foo,
+ bar,
+ baz,
+ toto,
+ tutu,
+ tata
+
+# Bad variable names regexes, separated by a comma. If names match any regex,
+# they will always be refused
+bad-names-rgxs=
+
+# Naming style matching correct class attribute names.
+class-attribute-naming-style=any
+
+# Regular expression matching correct class attribute names. Overrides class-
+# attribute-naming-style.
+#class-attribute-rgx=
+
+# Naming style matching correct class names.
+class-naming-style=PascalCase
+
+# Regular expression matching correct class names. Overrides class-naming-
+# style.
+#class-rgx=
+
+# Naming style matching correct constant names.
+const-naming-style=camelCase
+
+# Regular expression matching correct constant names. Overrides const-naming-
+# style.
+#const-rgx=
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming style matching correct function names.
+function-naming-style=camelCase
+
+# Regular expression matching correct function names. Overrides function-
+# naming-style.
+#function-rgx=
+
+# Good variable names which should always be accepted, separated by a comma.
+good-names=i,
+ j,
+ k,
+ ex,
+ Run,
+ _
+
+# Good variable names regexes, separated by a comma. If names match any regex,
+# they will always be accepted
+good-names-rgxs=^[a-z]?$
+
+# Include a hint for the correct naming format with invalid-name.
+include-naming-hint=no
+
+# Naming style matching correct inline iteration names.
+inlinevar-naming-style=any
+
+# Regular expression matching correct inline iteration names. Overrides
+# inlinevar-naming-style.
+#inlinevar-rgx=
+
+# Naming style matching correct method names.
+method-naming-style=any
+
+# Regular expression matching correct method names. Overrides method-naming-
+# style.
+#method-rgx=
+
+# Naming style matching correct module names.
+module-naming-style=any
+
+# Regular expression matching correct module names. Overrides module-naming-
+# style.
+#module-rgx=
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+# These decorators are taken in consideration only for invalid-name.
+property-classes=abc.abstractproperty
+
+# Naming style matching correct variable names.
+variable-naming-style=camelCase
+
+# Regular expression matching correct variable names. Overrides variable-
+# naming-style.
+#variable-rgx="[a-z0-9_]{1,30}$"
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Number of spaces of indent required inside a hanging or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string=' '
+
+# Maximum number of characters on a single line.
+max-line-length=120
+
+# Maximum number of lines in a module.
+max-module-lines=1000
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[LOGGING]
+
+# The type of string formatting that logging methods do. `old` means using %
+# formatting, `new` is for `{}` formatting.
+logging-format-style=old
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format.
+logging-modules=logging
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=
+
+# Regular expression of note tags to take in consideration.
+#notes-rgx=
+
+
+[SIMILARITIES]
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=yes
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+
+[SPELLING]
+
+# Limits count of emitted suggestions for spelling mistakes.
+max-spelling-suggestions=4
+
+# Spelling dictionary name. Available dictionaries: en_AG (hunspell), en_AU
+# (hunspell), en_BS (hunspell), en_BW (hunspell), en_BZ (hunspell), en_CA
+# (hunspell), en_DK (hunspell), en_GB (hunspell), en_GH (hunspell), en_HK
+# (hunspell), en_IE (hunspell), en_IN (hunspell), en_JM (hunspell), en_MW
+# (hunspell), en_NA (hunspell), en_NG (hunspell), en_NZ (hunspell), en_PH
+# (hunspell), en_SG (hunspell), en_TT (hunspell), en_US (hunspell), en_ZA
+# (hunspell), en_ZM (hunspell), en_ZW (hunspell).
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains the private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to the private dictionary (see the
+# --spelling-private-dict-file option) instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[STRING]
+
+# This flag controls whether inconsistent-quotes generates a warning when the
+# character used as a quote delimiter is used inconsistently within a module.
+check-quote-consistency=no
+
+# This flag controls whether the implicit-str-concat should generate a warning
+# on implicit string concatenation in sequences defined over several lines.
+check-str-concat-over-line-jumps=no
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=.*connect
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# Tells whether to warn about missing members when the owner of the attribute
+# is inferred to be None.
+ignore-none=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis). It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+# List of decorators that change the signature of a decorated function.
+signature-mutators=
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid defining new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,
+ _cb
+
+# A regular expression matching the name of dummy variables (i.e. expected to
+# not be used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore.
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+
+
+[CLASSES]
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,
+ __new__,
+ setUp,
+ __post_init__
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,
+ _fields,
+ _replace,
+ _source,
+ _make
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=cls
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method.
+max-args=10
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Maximum number of boolean expressions in an if statement (see R0916).
+max-bool-expr=6
+
+# Maximum number of branch for function / method body.
+max-branches=20
+
+# Maximum number of locals for function / method body.
+max-locals=25
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of return / yield for function / method body.
+max-returns=6
+
+# Maximum number of statements in function / method body.
+max-statements=100
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+
+[IMPORTS]
+
+# List of modules that can be imported at any level, not just the top level
+# one.
+allow-any-import-level=
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Deprecated modules which should not be used, separated by a comma.
+deprecated-modules=optparse,tkinter.tix
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled).
+ext-import-graph=
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled).
+import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled).
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+# Couples of modules and preferred modules, separated by a comma.
+preferred-modules=
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "BaseException, Exception".
+overgeneral-exceptions=BaseException,
+ Exception
diff --git a/.reuse/dep5 b/.reuse/dep5
new file mode 100644
index 0000000..cd4d522
--- /dev/null
+++ b/.reuse/dep5
@@ -0,0 +1,61 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: KDSoap
+Upstream-Contact: <info@kdab.com>
+Source: https://www.github.com/KDAB/KDSoap
+
+#misc source code
+Files: unittests/*/*.xsd unittests/*/*.wsdl unittests/*/*.XSD unittests/*/*.xml testtools/*.qrc examples/*/*.qrc examples/*/*.wsdl *.html *.css docs/manual/*.pdf *.bat *.pem
+Copyright: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+License: MIT
+
+#artwork
+Files: images/*.png docs/api/*.png docs/*.png docs/*.odg examples/*/*.mng examples/*/*.gif
+Copyright: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+License: MIT
+
+#misc documentation
+Files: *md *.txt *.html docs/manual/*.pdf
+Copyright: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+License: MIT
+
+#misc config files
+Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format.py .clang-format .clang-tidy .clazy .codedocs .gitignore .gitmodules .mdlrc .mdlrc.rb .pep8 .pylintrc appveyor.yml docs/api/Doxyfile.cmake distro/*
+Copyright: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+License: BSD-3-Clause
+
+Files: kdwsdl2cpp/schemas/soapenc-1.1.xsd
+Copyright: 2001 DevelopMentor and 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
+License: W3C
+
+Files: kdwsdl2cpp/schemas/soapenc-1.2.xsd
+Copyright: 2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
+License: W3C
+
+Files: kdwsdl2cpp/schemas/schemas.qrc
+Copyright: 2005 Tobias Koenig <tokoe@kde.org>
+License: MIT
+
+#3rdparty
+Files: cmake/ECM/modules/*
+Copyright: The KDE Project
+License: BSD-3-Clause
+
+Files: unittests/groupwise_wsdl/*.xsd unittests/groupwise_wsdl/*.wsdl
+Copyright: 2005-2006 Novell, Inc All Rights reserved.
+License: GPL-2.0-only OR LicenseRef-Novell
+
+Files: unittests/salesforce_wsdl/*.wsdl
+Copyright: 1999-2010 salesforce.com, inc. All Rights reserved.
+License: BSD-3-Clause
+
+Files: unittests/soap_over_udp/*.wsdl unittests/soap_over_udp/docs.oasis-open.org/ws-dd/discovery/1.1/os/wsdd-discovery-1.1-schema-os.xsd unittests/soap_over_udp/www.w3.org/2006/03/addressing/ws-addr.xsd
+Copyright: 2009 OASIS(r) All Rights reserved.
+License: LicenseRef-OASIS
+
+Files: unittests/webcalls_wsdl/*.wsdl
+Copyright: 2003-2004 The Sporting Exchange Limited. All rights reserved.
+License: LicenseRef-SportingExchange
+
+Files: unittests/ws_discovery_wsdl/schemas.xmlsoap.org/ws/2005/04/discovery/ws-discovery.xsd unittests/ws_discovery_wsdl/schemas.xmlsoap.org/ws/2004/08/addressing unittests/ws_discovery_wsdl/*.wsdl
+Copyright: pyright © 2002-2004 BEA Systems Inc., International Business Machines Corporation, Microsoft Corporation, Inc, SAP AG, and Sun Microsystems, Inc.. All rights reserved.
+License: LicenseRef-Microsoft
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebdd93a..0b1db53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,19 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
# This is the top-level CMakeLists.txt file for the KDSoap project.
#
# Pass the following variables to cmake to control the build:
-# (See INSTALL-cmake.txt for more information)
+# (See INSTALL.txt for more information)
#
-# -DKDSoap_ENFORCE_QT4_BUILD=[true|false]
-# Force building against Qt4, even if Qt5 is found.
-# Default=false
+# -DKDSoap_QT6=[true|false]
+# Build against Qt6 rather than Qt5
+# Default=false (Qt5 will be used even if Qt6 is available)
#
# -DKDSoap_STATIC=[true|false]
# Build static libraries
@@ -19,197 +27,285 @@
# Build the examples.
# Default=true
#
-cmake_minimum_required(VERSION 2.8.7)
-if(POLICY CMP0020)
- cmake_policy(SET CMP0020 NEW)
-endif()
-if(POLICY CMP0025)
- cmake_policy(SET CMP0025 NEW)
-endif()
-if(POLICY CMP0054)
- cmake_policy(SET CMP0054 NEW)
-endif()
+# -DKDSoap_DOCS=[true|false]
+# Build the API documentation. Enables the 'docs' build target.
+# Default=false
+#
-if("${CMAKE_INSTALL_PREFIX}" STREQUAL "")
- set(USE_DEFAULT_INSTALL_LOCATION True)
-else()
- set(USE_DEFAULT_INSTALL_LOCATION False)
+cmake_minimum_required(VERSION 3.12)
+
+if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/kdwsdl2cpp/libkode/common")
+ message(FATAL_ERROR "Please do git submodule update --init --recursive")
endif()
-project(KDSoap CXX)
+# Allow using a non-KDAB install location.
+set(KDAB_INSTALL
+ True
+ CACHE INTERNAL "Install to default KDAB Location"
+)
+if(DEFINED CMAKE_INSTALL_PREFIX)
+ if(NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
+ set(KDAB_INSTALL
+ False
+ CACHE INTERNAL "Install to non-KDAB Location"
+ )
+ endif()
+endif()
-option(
- ${PROJECT_NAME}_ENFORCE_QT4_BUILD
- "Enable if you want to enforce a build with Qt4"
- OFF
+project(
+ KDSoap
+ DESCRIPTION "A Qt-based client-side and server-side SOAP component"
+ HOMEPAGE_URL "https://github.com/KDAB/KDSoap"
+ LANGUAGES CXX
)
-if(CMAKE_VERSION VERSION_LESS "3.1")
- if(CMAKE_COMPILER_IS_GNUCXX)
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- endif ()
-else()
- set(CMAKE_CXX_STANDARD 11)
-endif()
+set(${PROJECT_NAME}_VERSION_MAJOR 2)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
+set(${PROJECT_NAME}_VERSION_PATCH 1)
+set(${PROJECT_NAME}_VERSION
+ ${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH}
+)
+set(PROJECT_VERSION ${${PROJECT_NAME}_VERSION}) #needed for ECM
+set(${PROJECT_NAME}_SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR})
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/ ${CMAKE_MODULE_PATH}")
+include(FeatureSummary)
option(${PROJECT_NAME}_STATIC "Build statically" OFF)
option(${PROJECT_NAME}_TESTS "Build the tests" OFF)
option(${PROJECT_NAME}_EXAMPLES "Build the examples" ON)
+option(${PROJECT_NAME}_DOCS "Build the API documentation" OFF)
+option(${PROJECT_NAME}_QT6 "Build against Qt 6" OFF)
-set(${PROJECT_NAME}_VERSION_MAJOR 1)
-set(${PROJECT_NAME}_VERSION_MINOR 9)
-set(${PROJECT_NAME}_VERSION_PATCH 1)
-set(${PROJECT_NAME}_VERSION ${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
-set(${PROJECT_NAME}_SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR})
-
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ECM/modules")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/KDAB/modules")
-find_path(BOOST_OPTIONAL_DIR NAMES boost/optional.hpp)
-if (BOOST_OPTIONAL_DIR)
- message(STATUS "Found boost/optional.hpp in ${BOOST_OPTIONAL_DIR}")
- include_directories(${BOOST_OPTIONAL_DIR})
- add_definitions(-DBOOST_OPTIONAL_FOUND) # I'd really prefer using configure_file but this is more compatible with qmake
+# Set a default build type if none was specified
+set(default_build_type "Release")
+if(EXISTS "${CMAKE_SOURCE_DIR}/.git" OR ${PROJECT_NAME}_DEVELOPER_MODE)
+ set(default_build_type "Debug")
+endif()
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ message(STATUS "Setting build type to ${default_build_type} as none was specified.")
+ set(CMAKE_BUILD_TYPE
+ "${default_build_type}"
+ CACHE STRING "Choose the type of build." FORCE
+ )
+ # Set the possible values of build type for cmake-gui
+ set_property(
+ CACHE CMAKE_BUILD_TYPE
+ PROPERTY STRINGS
+ "Debug"
+ "Release"
+ "MinSizeRel"
+ "RelWithDebInfo"
+ )
endif()
-# setup default install locations
-include(InstallLocation)
-
-# try Qt5 first, and prefer that (if found), but only if not disabled via option
-if(NOT ${PROJECT_NAME}_ENFORCE_QT4_BUILD)
- find_package(Qt5Core QUIET)
-endif()
-
-if(Qt5Core_FOUND)
- find_package(Qt5Network REQUIRED)
- find_package(Qt5Widgets CONFIG)
- set(QT_LIBRARIES Qt5::Core)
- set(QT_USE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Qt5Portability.cmake")
-
- if(Qt5_POSITION_INDEPENDENT_CODE)
- if(CMAKE_VERSION VERSION_LESS 2.8.9)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- elseif(NOT CMAKE_VERSION VERSION_LESS 2.8.11)
- if(Qt5Core_VERSION VERSION_LESS 5.1)
- set_property(TARGET Qt5::Core PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE ON)
- endif()
- else()
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- endif()
- endif()
-
+if(${PROJECT_NAME}_QT6)
+ set(Qt_VERSION_MAJOR 6)
+ set(QT_MIN_VERSION "6.0.0")
+ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Network)
+ list(APPEND QT_LIBRARIES Qt6::Core Qt6::Network)
+ set(${PROJECT_NAME}_LIBRARY_QTID "-qt6")
+ set(libkode_QT6 ON)
else()
- find_package(Qt4 4.7 QUIET REQUIRED QtCore QtMain)
+ set(Qt_VERSION_MAJOR 5)
+ # Qt 5.9 required for QNetworkRequest::NoLessSafeRedirectPolicy
+ set(QT_MIN_VERSION "5.9.0")
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Network)
+ list(APPEND QT_LIBRARIES Qt5::Core Qt5::Network)
+ set(${PROJECT_NAME}_LIBRARY_QTID "")
+endif()
+include(KDQtInstallPaths) #to set QT_INSTALL_FOO variables
- # Workaround qt4 moc bug, see https://bugzilla.redhat.com/show_bug.cgi?id=1396755
- add_definitions(-D_SYS_SYSMACROS_H_OUTER)
+find_path(BOOST_OPTIONAL_DIR NAMES boost/optional.hpp)
+if(BOOST_OPTIONAL_DIR)
+ message(STATUS "Found boost/optional.hpp in ${BOOST_OPTIONAL_DIR}")
+ include_directories(${BOOST_OPTIONAL_DIR})
+ add_definitions(-DBOOST_OPTIONAL_FOUND)
endif()
set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
set(CMAKE_AUTOMOC TRUE)
+set(CMAKE_AUTORCC ON)
-add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY)
-add_definitions(-DUSE_EXCEPTIONS -DQT_FATAL_ASSERT)
-if(MSVC)
- add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if(TARGET Qt6::Core)
+ set(CMAKE_CXX_STANDARD 17)
endif()
-if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
- include(CheckCXXCompilerFlag)
- check_cxx_compiler_flag(-Wsuggest-override HAVE_GXX_SUGGEST_OVERRIDE)
- if(HAVE_GXX_SUGGEST_OVERRIDE)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override")
- endif()
+# Default to hidden visibility for symbols
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+
+include(KDCompilerFlags)
+
+add_definitions(-DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQURL_NO_CAST_FROM_STRING)
+add_definitions(-DUSE_EXCEPTIONS -DQT_FATAL_ASSERT -DQT_NO_FOREACH)
+if(MSVC)
+ add_definitions(-D_SCL_SECURE_NO_WARNINGS)
endif()
if(${PROJECT_NAME}_STATIC)
- set(${PROJECT_NAME}_LIBRARY_MODE "STATIC")
+ set(${PROJECT_NAME}_LIBRARY_MODE "STATIC")
else()
- set(${PROJECT_NAME}_LIBRARY_MODE "SHARED")
+ set(${PROJECT_NAME}_LIBRARY_MODE "SHARED")
endif()
+if(KDAB_INSTALL)
+ if(UNIX)
+ set(CMAKE_INSTALL_PREFIX
+ "/usr/local/KDAB/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}"
+ CACHE INTERNAL "Install to default KDAB Location"
+ )
+ elseif(WIN32)
+ set(CMAKE_INSTALL_PREFIX
+ "C:\\KDAB\\${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}"
+ CACHE INTERNAL "Install to default KDAB Location"
+ )
+ endif()
+endif()
+
+# setup default install locations
+include(KDInstallLocation)
+
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
- set(${PROJECT_NAME}_IS_ROOT_PROJECT TRUE)
+ set(${PROJECT_NAME}_IS_ROOT_PROJECT TRUE)
+
+ if(CMAKE_BUILD_TYPE MATCHES "Release")
+ add_definitions(-DNDEBUG)
+ endif()
- if(CMAKE_BUILD_TYPE MATCHES "Release")
- add_definitions(-DNDEBUG)
- endif()
+ message(STATUS "Building ${PROJECT_NAME} ${${PROJECT_NAME}_VERSION} in ${CMAKE_BUILD_TYPE} mode. "
+ "Installing to ${CMAKE_INSTALL_PREFIX}"
+ )
- if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "" FORCE)
- endif()
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
- if(USE_DEFAULT_INSTALL_LOCATION)
- if(UNIX)
- set(CMAKE_INSTALL_PREFIX "/usr/local/KDAB/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}")
- elseif(WIN32)
- set(CMAKE_INSTALL_PREFIX "C:\\KDAB\\${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}")
+ install(FILES README.md DESTINATION ${INSTALL_DOC_DIR})
+ if(NOT ${PROJECT_NAME}_QT6)
+ install(FILES kdsoap.pri kdwsdl2cpp.pri DESTINATION ${INSTALL_DOC_DIR})
+ endif()
+ install(DIRECTORY LICENSES DESTINATION ${INSTALL_DOC_DIR})
+
+ # Generate library version files
+ include(ECMSetupVersion)
+ ecm_setup_version(
+ ${${PROJECT_NAME}_VERSION}
+ VARIABLE_PREFIX
+ KDSOAP
+ VERSION_HEADER
+ "${CMAKE_CURRENT_BINARY_DIR}/kdsoap_version.h"
+ PACKAGE_VERSION_FILE
+ "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}ConfigVersion.cmake"
+ SOVERSION
+ ${${PROJECT_NAME}_SOVERSION}
+ COMPATIBILITY
+ AnyNewerVersion
+ )
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kdsoap_version.h" DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapClient)
+
+ configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig-buildtree.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}Config.cmake" @ONLY
+ )
+ configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapMacros.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapMacros.cmake"
+ @ONLY
+ )
+ configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/install/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}Config.cmake"
+ INSTALL_DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}"
+ PATH_VARS INSTALL_INCLUDE_DIR
+ )
+
+ install(
+ FILES "${CMAKE_CURRENT_BINARY_DIR}/install/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}Config.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}ConfigVersion.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapMacros.cmake"
+ DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}"
+ )
+
+ install(
+ EXPORT KDSoapTargets
+ NAMESPACE KDSoap::
+ DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}"
+ )
+
+ #Install the kdsoap features file for qmake users
+ add_subdirectory(features)
+
+ # Generate .pri file for qmake users (except when using the VS generator)
+ if(NOT CMAKE_CONFIGURATION_TYPES)
+ if(Qt_VERSION_MAJOR EQUAL 5 OR (Qt_VERSION_MAJOR EQUAL 6 AND Qt6Core_VERSION VERSION_GREATER "6.2"))
+ include(ECMGeneratePriFile)
+ ecm_generate_pri_file(
+ BASE_NAME
+ KDSoapClient
+ LIB_NAME
+ kdsoap${${PROJECT_NAME}_LIBRARY_QTID}
+ FILENAME_VAR
+ pri_client_filename
+ INCLUDE_INSTALL_DIR
+ ${INSTALL_INCLUDE_DIR}
+ )
+ ecm_generate_pri_file(
+ BASE_NAME
+ KDSoapServer
+ LIB_NAME
+ kdsoap-server${${PROJECT_NAME}_LIBRARY_QTID}
+ FILENAME_VAR
+ pri_server_filename
+ INCLUDE_INSTALL_DIR
+ ${INSTALL_INCLUDE_DIR}
+ )
+ install(FILES ${pri_client_filename} ${pri_server_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
+ endif()
endif()
- endif()
-
- message(STATUS "Building ${PROJECT_NAME} ${${PROJECT_NAME}_VERSION} in ${CMAKE_BUILD_TYPE} mode. Installing to ${CMAKE_INSTALL_PREFIX}")
-
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
-
- install(FILES LICENSE.GPL.txt LICENSE.US.txt LICENSE.txt README.txt kdsoap.pri kdwsdl2cpp.pri DESTINATION ${INSTALL_DOC_DIR})
-
- if(CMAKE_VERSION VERSION_LESS 2.8.8)
- include("${CMAKE_SOURCE_DIR}/cmake/CMakePackageConfigHelpers.cmake")
- else()
- include(CMakePackageConfigHelpers)
- endif()
-
- write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapConfigVersion.cmake"
- VERSION ${${PROJECT_NAME}_VERSION}
- COMPATIBILITY AnyNewerVersion
- )
-
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig-buildtree.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapConfig.cmake"
- @ONLY
- )
- file(COPY
- "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapMacros.cmake"
- DESTINATION
- "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/"
- )
- configure_package_config_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/install/KDSoapConfig.cmake"
- INSTALL_DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/KDSoap"
- PATH_VARS INSTALL_INCLUDE_DIR
- )
-
- install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/install/KDSoapConfig.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapConfigVersion.cmake"
- KDSoapMacros.cmake
- DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/KDSoap"
- )
- install(EXPORT KDSoapTargets NAMESPACE KDSoap::
- DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/KDSoap"
- )
+else()
+ #Always disable tests, examples, docs when used as a submodule
+ set(${PROJECT_NAME}_IS_ROOT_PROJECT FALSE)
+ set(${PROJECT_NAME}_TESTS FALSE)
+ set(${PROJECT_NAME}_EXAMPLES FALSE)
+ set(${PROJECT_NAME}_DOCS FALSE)
+endif()
+
+if(${PROJECT_NAME}_TESTS)
+ enable_testing()
endif()
add_subdirectory(src)
add_subdirectory(kdwsdl2cpp)
-if(${PROJECT_NAME}_IS_ROOT_PROJECT)
- export(TARGETS kdsoap kdsoap-server kdwsdl2cpp NAMESPACE KDSoap::
- FILE "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapTargets.cmake"
- )
+if(${PROJECT_NAME}_IS_ROOT_PROJECT)
+ export(
+ TARGETS kdsoap kdsoap-server kdwsdl2cpp
+ NAMESPACE KDSoap::
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapTargets.cmake"
+ )
+endif()
- add_subdirectory(features)
- if(${PROJECT_NAME}_TESTS)
- enable_testing()
+if(${PROJECT_NAME}_TESTS)
add_subdirectory(testtools)
add_subdirectory(unittests)
- endif()
- if(${PROJECT_NAME}_EXAMPLES)
+endif()
+
+if(${PROJECT_NAME}_EXAMPLES)
add_subdirectory(examples)
- endif()
endif()
+
+if(${PROJECT_NAME}_DOCS)
+ add_subdirectory(docs) # needs to go last, in case there are build source files
+endif()
+
+if(${PROJECT_NAME}_IS_ROOT_PROJECT)
+ # Add uninstall target (not for submodules since parent projects typically have uninstall too)
+ include(ECMUninstallTarget)
+endif()
+
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
new file mode 100644
index 0000000..eae482a
--- /dev/null
+++ b/CONTRIBUTORS.txt
@@ -0,0 +1,7 @@
+Casper Meijn <casper@meijn.net>
+Matt Broadstone <mbroadst@gmail.com>
+Raphaël Cotty <raphael.cotty@gmail.com>
+Rok Mandeljc <rok.mandeljc@gmail.com>
+Ryan van der Bijl <ryan@enzosystems.com>
+Miklós Márton <martonmiklosqdev@gmail.com>
+Research & Engineering Center of St. Petersburg Electro-Technical University <info@nicetu.spb.ru>
diff --git a/CPackIgnores.txt b/CPackIgnores.txt
deleted file mode 100644
index 5882834..0000000
--- a/CPackIgnores.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/unittests/basic/basic$
-/unittests/basic/basic.app/
-/unittests/builtinhttp/builtinhttp$
-/unittests/builtinhttp/builtinhttp.app/
-/unittests/dwservice_12_wsdl/dwservice_12_wsdl$
-/unittests/dwservice_12_wsdl/dwservice_12_wsdl.app/
-/unittests/dwservice_combined_wsdl/dwservice_combined_wsdl$
-/unittests/dwservice_combined_wsdl/dwservice_combined_wsdl.app/
-/unittests/dwservice_wsdl/dwservice_wsdl$
-/unittests/dwservice_wsdl/dwservice_wsdl.app/
-/unittests/groupwise_wsdl/groupwise_wsdl$
-/unittests/groupwise_wsdl/groupwise_wsdl.app/
-/unittests/logbook_wsdl/logbook_wsdl$
-/unittests/logbook_wsdl/logbook_wsdl.app/
-/unittests/messagereader/messagereader$
-/unittests/messagereader/messagereader.app/
-/unittests/msexchange_wsdl/msexchange_wsdl$
-/unittests/msexchange_wsdl/msexchange_wsdl.app/
-/unittests/salesforce_wsdl/salesforce_wsdl$
-/unittests/salesforce_wsdl/salesforce_wsdl.app/
-/unittests/servertest/servertest$
-/unittests/servertest/servertest.app/
-/unittests/sugar_wsdl/sugar_wsdl$
-/unittests/sugar_wsdl/sugar_wsdl.app/
-/unittests/webcalls/webcalls$
-/unittests/webcalls/webcalls.app/
-/unittests/webcalls_wsdl/webcalls_wsdl$
-/unittests/webcalls_wsdl/webcalls_wsdl.app/
-/unittests/wsdl_document/wsdl_document$
-/unittests/wsdl_document/wsdl_document.app/
-/unittests/wsdl_rpc/wsdl_rpc$
-/unittests/wsdl_rpc/wsdl_rpc.app/
diff --git a/FindKDSoap.cmake b/FindKDSoap.cmake
index 42fd467..211c016 100644
--- a/FindKDSoap.cmake
+++ b/FindKDSoap.cmake
@@ -1,27 +1,37 @@
-# - Find KDSoap
-# This module finds if KDSoap is installed.
#
-# KDSoap_FOUND - Set to TRUE if KDSoap was found.
-# KDSoap_LIBRARIES - Path to KDSoap libraries.
-# KDSoap_INCLUDE_DIR - Path to the KDSoap include directory.
-# KDSoap_CODEGENERATOR - Path to the KDSoap code generator.
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2011-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
#
-# Copyright (C) 2011-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
-
-# Redistribution and use is allowed according to the terms of the BSD license
include(FindPackageHandleStandardArgs)
-find_library(KDSoap_LIBRARIES
- NAMES KDSoap kdsoap
- PATH_SUFFIXES bin)
-find_path(KDSoap_INCLUDE_DIR
- NAMES KDSoapClient/KDSoapValue.h
- PATH_SUFFIXES include src)
-find_program(KDSoap_CODEGENERATOR
- NAMES kdwsdl2cpp
- PATH_SUFFIXES bin)
+find_library(
+ KDSoap_LIBRARIES
+ NAMES KDSoap kdsoap
+ PATH_SUFFIXES bin
+)
+
+find_path(
+ KDSoap_INCLUDE_DIR
+ NAMES KDSoapClient/KDSoapValue.h
+ PATH_SUFFIXES include src
+)
+
+find_program(
+ KDSoap_CODEGENERATOR
+ NAMES kdwsdl2cpp
+ PATH_SUFFIXES bin
+)
mark_as_advanced(KDSoap_LIBRARIES KDSoap_INCLUDE_DIR KDSoap_CODEGENERATOR)
-find_package_handle_standard_args(KDSoap DEFAULT_MSG KDSoap_LIBRARIES KDSoap_INCLUDE_DIR KDSoap_CODEGENERATOR)
+find_package_handle_standard_args(
+ KDSoap
+ DEFAULT_MSG
+ KDSoap_LIBRARIES
+ KDSoap_INCLUDE_DIR
+ KDSoap_CODEGENERATOR
+)
diff --git a/INSTALL-cmake.txt b/INSTALL-cmake.txt
deleted file mode 100644
index eae145e..0000000
--- a/INSTALL-cmake.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-These are the instructions for installing KD SOAP using the CMake buildsystem.
-CMake version 2.8.7 or higher is required.
-
-KD SOAP 1.x requires a Qt version >= 4.6 with Network and XML support enabled.
-
-The same source code compiles with either Qt 4 or Qt 5.
-
-Please see the comments at the top of CMakeLists.txt for
-the available configuration options you can pass to cmake.
-
-The installation directory defaults to c:\KDAB\KDSoap-<version> on Windows
-and /usr/local/KDAB/KDSoap-<version> on non-Windows. You can change this
-location by passing the option -DCMAKE_INSTALL_PREFIX=/install/path to cmake.
-
-1) From the top directory of your KD SOAP installation create a build directory:
-
- mkdir build
-
- and change directory into that build directory:
-
- cd build
-
-2) Now run 'cmake' depending on the kind of build one of the following:
- cmake -DCMAKE_BUILD_TYPE=Debug ..
- cmake -DCMAKE_BUILD_TYPE=Release ..
- cmake -DKDSoap_STATIC=True -DCMAKE_BUILD_TYPE=Debug ..
- cmake -DKDSoap_STATIC=True -DCMAKE_BUILD_TYPE=Release ..
-
- To define the install-location use for example:
- cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=C:/kdsoap ..
- cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/opt/kdsoap ..
-
-3) Unix
-
- set your LD_LIBRARY_PATH to point to your KD SOAP installation lib directory.
-
- If you do not have LD_LIBRARY_PATH set already, then in your terminal run:
- % LD_LIBRARY_PATH=/path/to/kdsoap/lib:$LD_LIBRARY_PATH
- % export LD_LIBRARY_PATH
-
- The above must be added into your .bashrc or similar to remain. It may also of course
- be run from a shell just before building software using KD SOAP, but in this case your settings will only be available for this shell.
-
-4) MacOS
-
- Proceed as described above, but using DYLD_LIBRARY_PATH instead of LD_LIBRARY_PATH
-
-5) Windows
-
- For running executables, add the path to the KD Soap dll (kdsoap\bin) into your PATH.
- eg. set PATH=\path\to\kdsoap\bin;%PATH%
-
- For development, add the path to the KD Soap lib (kdsoaplib) into your LIB environment.
- eg. set LIB=\path\to\kdsoap\lib;%LIB%
-
-6) Build everything by typing:
-
- From your top-level KD SOAP directory run:
-
- % make # Unix, Mac
- % nmake # Windows
-
-7) (optionally:) Install KD SOAP:
-
- From your top-level KD SOAP directory run:
-
- % make install # Unix, Mac
- % nmake install # Windows
-
- This will copy the necessary files into the sub-directories of your installation path:
- For Unix/Linux, Mac this is /usr/local/KDAB/KDSoap-VERSION/
- For Windows this is: C:\KDAB\KDSoap-VERSION\
-
-8) Have a look at the examples applications. They will get you started with KD SOAP.
-
diff --git a/INSTALL.txt b/INSTALL.txt
index fbb85e6..c5f26f7 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,54 +1,43 @@
-KD SOAP 1.x requires a Qt version >= 4.6 with Network and XML support enabled.
+These are the instructions for installing KD SOAP using the CMake buildsystem.
+CMake version 3.3 or higher is required.
-The same source code compiles with either Qt 4 or Qt 5.
+The qmake (via autogen.py) buildsystem is removed starting with KDSoap version 2.0.
-If you are using sources from github (via a git clone or a generated zip file), jump
-to section 1-bis). Commercial users, start at section 1).
+KD SOAP requires Qt with Network and XML support enabled.
+Qt Version support:
+ * KD SOAP 1.9 or below requires Qt4.6 up to Qt5.15
+ * KD SOAP 1.10 requires Qt5.7 up to Qt5.15
+ * KD SOAP 2.0 or above requires Qt5.9 up to Qt6.x
-1) From the top directory of your KD SOAP installation
- run the "configure" scripts.
+Also note that Qt6 builds require a C++17 compliant compiler,
+whereas Qt5 builds can get by with C++11 compliance.
- On Windows use depending on the kind of build one of the following;
- configure.bat -shared -debug
- configure.bat -shared -release
- configure.bat -static -debug
- configure.bat -static -release
+Please see the comments at the top of CMakeLists.txt for
+the available configuration options you can pass to cmake.
- On Unix use depending on the kind of build one of the following;
- ./configure.sh -shared -debug
- ./configure.sh -shared -release
- ./configure.sh -static -debug
- ./configure.sh -static -release
+The installation directory defaults to c:\KDAB\KDSoap-<version> on Windows
+and /usr/local/KDAB/KDSoap-<version> on non-Windows. You can change this
+location by passing the option -DCMAKE_INSTALL_PREFIX=/install/path to cmake.
- To define the install-location use for example;
- configure.bat -shared -debug -prefix c:/kdsoap
- ./configure.sh -shared -debug -prefix /opt/kdsoap
+1) From the top directory of your KD SOAP installation create a build directory:
- If this succeeded, jump to step 2.
+ mkdir build
-1-bis) If you are building KD SOAP from a github clone rather than a release tarball,
- the configure.bat/configure.sh script doesn't exist (it's generated at release time),
- you need to do this instead:
+ and change directory into that build directory:
- First, a working Python (version2) is required and must be found in your
- execute path. Either a 32-bit or 64-bit version of Python is fine, but run
- python --version to make sure it is found and is python2 before continuing.
+ cd build
- Now run autogen.py to create the configure tool.
+2) Now run 'cmake' depending on the kind of build one of the following:
+ cmake -DCMAKE_BUILD_TYPE=Debug ..
+ cmake -DCMAKE_BUILD_TYPE=Release ..
+ cmake -DKDSoap_STATIC=True -DCMAKE_BUILD_TYPE=Debug ..
+ cmake -DKDSoap_STATIC=True -DCMAKE_BUILD_TYPE=Release ..
- On Windows:
- c:\python27\python2 autogen.py [options]
- On Linux:
- python2 autogen.py [options]
+ To define the install-location use for example:
+ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=C:/kdsoap ..
+ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/opt/kdsoap ..
- Pass the same options to autogen.py as you would for configure.sh/configure.bat
- as shown above in step 1).
-
- After running autogen.py, a configure.sh/configure.bat script will exist and
- you can use that to re-configure later, as needed. Then you can continue on
- to the platform-specific setup instructions in step 2, 3 or 4.
-
-2) Unix
+3) Unix
set your LD_LIBRARY_PATH to point to your KD SOAP installation lib directory.
@@ -57,19 +46,14 @@ to section 1-bis). Commercial users, start at section 1).
% export LD_LIBRARY_PATH
The above must be added into your .bashrc or similar to remain. It may also of course
- be run from a shell just before building software using KD SOAP, but in this case your
- settings will only be available for this shell.
-
- If you want to install the libraries under the "lib64" folder then
- set the QMAKE_ARGS environment variable to "LIB_SUFFIX=64" like so:
- % QMAKE_ARGS="LIB_SUFFIX=64"
- % export QMAKE_ARGS
+ be run from a shell just before building software using KD SOAP, but in this case
+ your settings will only be available for this shell.
-3) MacOS
+4) MacOS
Proceed as described above, but using DYLD_LIBRARY_PATH instead of LD_LIBRARY_PATH
-4) Windows
+5) Windows
For running executables, add the path to the KD Soap dll (kdsoap\bin) into your PATH.
eg. set PATH=\path\to\kdsoap\bin;%PATH%
@@ -77,14 +61,14 @@ to section 1-bis). Commercial users, start at section 1).
For development, add the path to the KD Soap lib (kdsoaplib) into your LIB environment.
eg. set LIB=\path\to\kdsoap\lib;%LIB%
-5) Build everything by typing:
+6) Build everything by typing:
From your top-level KD SOAP directory run:
% make # Unix, Mac
% nmake # Windows
-6) (optionally:) Install KD SOAP:
+7) (optionally:) Install KD SOAP:
From your top-level KD SOAP directory run:
@@ -95,4 +79,25 @@ to section 1-bis). Commercial users, start at section 1).
For Unix/Linux, Mac this is /usr/local/KDAB/KDSoap-VERSION/
For Windows this is: C:\KDAB\KDSoap-VERSION\
-7) Have a look at the examples applications. They will get you started with KD SOAP.
+8) Have a look at the examples applications. They will get you started with KD SOAP.
+
+== Testing ==
+To build the testing harness, pass -DKDSoap_TESTS=true to CMake, like so:
+ % cmake -DKDSoap_TESTS=true
+
+Then run 'make test' to run the unit tests.
+
+== Using ==
+From your CMake project, add
+
+ find_package(KDSoap CONFIG REQUIRED)
+
+or for Qt6
+
+ find_package(KDSoap-qt6 CONFIG REQUIRED)
+
+and link to the imported target KDSoap::kdsoap.
+That's all you need to do (the imported target also brings in the include directories)
+
+You may also need to point the CMAKE_PREFIX_PATH environment variable depending
+on where you installed KDSoap.
diff --git a/KDSoapConfig-buildtree.cmake.in b/KDSoapConfig-buildtree.cmake.in
index 9e522c5..9ec74d3 100644
--- a/KDSoapConfig-buildtree.cmake.in
+++ b/KDSoapConfig-buildtree.cmake.in
@@ -1,3 +1,11 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2013-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
set(KDSoap_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR@")
diff --git a/KDSoapConfig.cmake.in b/KDSoapConfig.cmake.in
index 2745bde..fa92dcc 100644
--- a/KDSoapConfig.cmake.in
+++ b/KDSoapConfig.cmake.in
@@ -1,3 +1,10 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
@PACKAGE_INIT@
@@ -8,4 +15,3 @@ set(KDSoap_CODEGENERATOR KDSoap::kdwsdl2cpp)
include("${CMAKE_CURRENT_LIST_DIR}/KDSoapTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/KDSoapMacros.cmake")
-
diff --git a/KDSoapMacros.cmake b/KDSoapMacros.cmake
deleted file mode 100644
index 8ae10c4..0000000
--- a/KDSoapMacros.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (c) 2011-2020 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
-
-# Redistribution and use is allowed according to the terms of the BSD license.
-
-macro( KDSOAP_GENERATE_WSDL _sources )
- set(KDWSDL2CPP kdwsdl2cpp)
- if (KDSOAP_KDWSDL2CPP_COMPILER)
- set(KDWSDL2CPP ${KDSOAP_KDWSDL2CPP_COMPILER})
- elseif (TARGET KDSoap::kdwsdl2cpp)
- set(KDWSDL2CPP KDSoap::kdwsdl2cpp)
- endif()
- set(_KSWSDL2CPP_OPTION)
- if(KSWSDL2CPP_OPTION)
- set(_KSWSDL2CPP_OPTION ${KSWSDL2CPP_OPTION})
- endif()
- foreach (_source_FILE ${ARGN})
- get_filename_component(_tmp_FILE ${_source_FILE} ABSOLUTE)
- get_filename_component(_basename ${_tmp_FILE} NAME_WE)
- set(_header_wsdl_FILE ${CMAKE_CURRENT_BINARY_DIR}/wsdl_${_basename}.h)
- set(_source_wsdl_FILE ${CMAKE_CURRENT_BINARY_DIR}/wsdl_${_basename}.cpp)
- add_custom_command(OUTPUT ${_header_wsdl_FILE}
- COMMAND ${KDWSDL2CPP}
- ARGS ${_KSWSDL2CPP_OPTION} ${_tmp_FILE} -o ${_header_wsdl_FILE}
- MAIN_DEPENDENCY ${_tmp_FILE}
- DEPENDS ${_tmp_FILE} ${KDWSDL2CPP} )
-
- add_custom_command(OUTPUT ${_source_wsdl_FILE}
- COMMAND ${KDWSDL2CPP}
- ARGS ${_KSWSDL2CPP_OPTION} -impl ${_header_wsdl_FILE} ${_tmp_FILE} -o ${_source_wsdl_FILE}
- MAIN_DEPENDENCY ${_tmp_FILE} ${_header_wsdl_FILE}
- DEPENDS ${_tmp_FILE} ${KDWSDL2CPP} )
-
- set_source_files_properties(${_header_wsdl_FILE} ${_source_wsdl_FILE} PROPERTIES SKIP_AUTOMOC ON)
-
- if (Qt5Core_FOUND)
- qt5_wrap_cpp(_sources_MOCS ${_header_wsdl_FILE})
- else()
- qt4_wrap_cpp(_sources_MOCS ${_header_wsdl_FILE})
- endif()
- list(APPEND ${_sources} ${_header_wsdl_FILE} ${_source_wsdl_FILE} ${_sources_MOCS})
- endforeach ()
-endmacro()
-
diff --git a/KDSoapMacros.cmake.in b/KDSoapMacros.cmake.in
new file mode 100644
index 0000000..aa24283
--- /dev/null
+++ b/KDSoapMacros.cmake.in
@@ -0,0 +1,44 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2011-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+macro(KDSOAP_GENERATE_WSDL _sources)
+ set(KDWSDL2CPP kdwsdl2cpp)
+ if(KDSOAP_KDWSDL2CPP_COMPILER)
+ set(KDWSDL2CPP ${KDSOAP_KDWSDL2CPP_COMPILER})
+ elseif(TARGET KDSoap::kdwsdl2cpp)
+ set(KDWSDL2CPP KDSoap::kdwsdl2cpp)
+ endif()
+ set(_KSWSDL2CPP_OPTION)
+ if(KSWSDL2CPP_OPTION)
+ set(_KSWSDL2CPP_OPTION ${KSWSDL2CPP_OPTION})
+ endif()
+ foreach(_source_FILE ${ARGN})
+ get_filename_component(_tmp_FILE ${_source_FILE} ABSOLUTE)
+ get_filename_component(_basename ${_tmp_FILE} NAME_WE)
+ set(_header_wsdl_FILE ${CMAKE_CURRENT_BINARY_DIR}/wsdl_${_basename}.h)
+ set(_source_wsdl_FILE ${CMAKE_CURRENT_BINARY_DIR}/wsdl_${_basename}.cpp)
+ add_custom_command(OUTPUT ${_header_wsdl_FILE}
+ COMMAND ${KDWSDL2CPP}
+ ARGS ${_KSWSDL2CPP_OPTION} ${_tmp_FILE} -o ${_header_wsdl_FILE}
+ MAIN_DEPENDENCY ${_tmp_FILE}
+ DEPENDS ${_tmp_FILE} ${KDWSDL2CPP})
+
+ add_custom_command(OUTPUT ${_source_wsdl_FILE}
+ COMMAND ${KDWSDL2CPP}
+ ARGS ${_KSWSDL2CPP_OPTION} -impl ${_header_wsdl_FILE} ${_tmp_FILE} -o ${_source_wsdl_FILE}
+ MAIN_DEPENDENCY ${_tmp_FILE} ${_header_wsdl_FILE}
+ DEPENDS ${_tmp_FILE} ${KDWSDL2CPP})
+
+ set_source_files_properties(${_header_wsdl_FILE} ${_source_wsdl_FILE} PROPERTIES
+ SKIP_AUTOMOC ON
+ SKIP_AUTOUIC ON
+ )
+ qt@Qt_VERSION_MAJOR@_wrap_cpp(_sources_MOCS ${_header_wsdl_FILE})
+ list(APPEND ${_sources} ${_header_wsdl_FILE} ${_source_wsdl_FILE} ${_sources_MOCS})
+ endforeach()
+endmacro()
diff --git a/LICENSE.AGPL3-modified.txt b/LICENSE.AGPL3-modified.txt
deleted file mode 100644
index 2ae7542..0000000
--- a/LICENSE.AGPL3-modified.txt
+++ /dev/null
@@ -1,678 +0,0 @@
- The KD Soap Server Library is Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB.
-
- You may use, distribute and copy the KD Soap Server Library under the terms of
- the GNU Affero General Public License version 3, displayed below.
-
- Klaralvdalens Datakonsult AB grants you an additional permission under the GNU
- Affero GPL version 3 section 7:
-
-If you modify this Program, or any covered work, by linking or
-combining it with other code, such other code is not for that reason
-alone subject to any of the requirements of the GNU Affero GPL
-version 3.
-
--------------------------------------------------------------------------
-
-
- GNU AFFERO GENERAL PUBLIC LICENSE
- Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
- A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate. Many developers of free software are heartened and
-encouraged by the resulting cooperation. However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU Lesser General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
- The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community. It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server. Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
- An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals. This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU Affero General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Remote Network Interaction; Use with the GNU Lesser General Public License.
-
- Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software. This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU Lesser General Public License that is incorporated pursuant to the
-following paragraph.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Lesser General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU Lesser General Public License.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time. Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source. For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code. There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
-
diff --git a/LICENSE.GPL.txt b/LICENSE.GPL.txt
deleted file mode 100644
index 61d46f9..0000000
--- a/LICENSE.GPL.txt
+++ /dev/null
@@ -1,1030 +0,0 @@
-
- The KD Soap Library is Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB.
-
- You may use, distribute and copy the KD Soap Library under the terms of
- the GNU General Public License version 2 or under the terms of GNU General
- Public License version 3 both of which are displayed below.
-
- For the server-side library, see LICENSE.AGPL3-modified.txt
-
--------------------------------------------------------------------------
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- Appendix: How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
--------------------------------------------------------------------------
-
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
- software and other kinds of works.
-
- The licenses for most software and other practical works are designed
- to take away your freedom to share and change the works. By contrast,
- the GNU General Public License is intended to guarantee your freedom to
- share and change all versions of a program--to make sure it remains free
- software for all its users. We, the Free Software Foundation, use the
- GNU General Public License for most of our software; it applies also to
- any other work released this way by its authors. You can apply it to
- your programs, too.
-
- When we speak of free software, we are referring to freedom, not
- price. Our General Public Licenses are designed to make sure that you
- have the freedom to distribute copies of free software (and charge for
- them if you wish), that you receive source code or can get it if you
- want it, that you can change the software or use pieces of it in new
- free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
- these rights or asking you to surrender the rights. Therefore, you have
- certain responsibilities if you distribute copies of the software, or if
- you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
- gratis or for a fee, you must pass on to the recipients the same
- freedoms that you received. You must make sure that they, too, receive
- or can get the source code. And you must show them these terms so they
- know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
- (1) assert copyright on the software, and (2) offer you this License
- giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
- that there is no warranty for this free software. For both users' and
- authors' sake, the GPL requires that modified versions be marked as
- changed, so that their problems will not be attributed erroneously to
- authors of previous versions.
-
- Some devices are designed to deny users access to install or run
- modified versions of the software inside them, although the manufacturer
- can do so. This is fundamentally incompatible with the aim of
- protecting users' freedom to change the software. The systematic
- pattern of such abuse occurs in the area of products for individuals to
- use, which is precisely where it is most unacceptable. Therefore, we
- have designed this version of the GPL to prohibit the practice for those
- products. If such problems arise substantially in other domains, we
- stand ready to extend this provision to those domains in future versions
- of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
- States should not allow patents to restrict development and use of
- software on general-purpose computers, but in those that do, we wish to
- avoid the special danger that patents applied to a free program could
- make it effectively proprietary. To prevent this, the GPL assures that
- patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
- modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
- works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
- License. Each licensee is addressed as "you". "Licensees" and
- "recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
- in a fashion requiring copyright permission, other than the making of an
- exact copy. The resulting work is called a "modified version" of the
- earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
- on the Program.
-
- To "propagate" a work means to do anything with it that, without
- permission, would make you directly or secondarily liable for
- infringement under applicable copyright law, except executing it on a
- computer or modifying a private copy. Propagation includes copying,
- distribution (with or without modification), making available to the
- public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
- parties to make or receive copies. Mere interaction with a user through
- a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
- to the extent that it includes a convenient and prominently visible
- feature that (1) displays an appropriate copyright notice, and (2)
- tells the user that there is no warranty for the work (except to the
- extent that warranties are provided), that licensees may convey the
- work under this License, and how to view a copy of this License. If
- the interface presents a list of user commands or options, such as a
- menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
- for making modifications to it. "Object code" means any non-source
- form of a work.
-
- A "Standard Interface" means an interface that either is an official
- standard defined by a recognized standards body, or, in the case of
- interfaces specified for a particular programming language, one that
- is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
- than the work as a whole, that (a) is included in the normal form of
- packaging a Major Component, but which is not part of that Major
- Component, and (b) serves only to enable use of the work with that
- Major Component, or to implement a Standard Interface for which an
- implementation is available to the public in source code form. A
- "Major Component", in this context, means a major essential component
- (kernel, window system, and so on) of the specific operating system
- (if any) on which the executable work runs, or a compiler used to
- produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
- the source code needed to generate, install, and (for an executable
- work) run the object code and to modify the work, including scripts to
- control those activities. However, it does not include the work's
- System Libraries, or general-purpose tools or generally available free
- programs which are used unmodified in performing those activities but
- which are not part of the work. For example, Corresponding Source
- includes interface definition files associated with source files for
- the work, and the source code for shared libraries and dynamically
- linked subprograms that the work is specifically designed to require,
- such as by intimate data communication or control flow between those
- subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
- can regenerate automatically from other parts of the Corresponding
- Source.
-
- The Corresponding Source for a work in source code form is that
- same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
- copyright on the Program, and are irrevocable provided the stated
- conditions are met. This License explicitly affirms your unlimited
- permission to run the unmodified Program. The output from running a
- covered work is covered by this License only if the output, given its
- content, constitutes a covered work. This License acknowledges your
- rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
- convey, without conditions so long as your license otherwise remains
- in force. You may convey covered works to others for the sole purpose
- of having them make modifications exclusively for you, or provide you
- with facilities for running those works, provided that you comply with
- the terms of this License in conveying all material for which you do
- not control copyright. Those thus making or running the covered works
- for you must do so exclusively on your behalf, under your direction
- and control, on terms that prohibit them from making any copies of
- your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
- the conditions stated below. Sublicensing is not allowed; section 10
- makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
- measure under any applicable law fulfilling obligations under article
- 11 of the WIPO copyright treaty adopted on 20 December 1996, or
- similar laws prohibiting or restricting circumvention of such
- measures.
-
- When you convey a covered work, you waive any legal power to forbid
- circumvention of technological measures to the extent such circumvention
- is effected by exercising rights under this License with respect to
- the covered work, and you disclaim any intention to limit operation or
- modification of the work as a means of enforcing, against the work's
- users, your or third parties' legal rights to forbid circumvention of
- technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
- receive it, in any medium, provided that you conspicuously and
- appropriately publish on each copy an appropriate copyright notice;
- keep intact all notices stating that this License and any
- non-permissive terms added in accord with section 7 apply to the code;
- keep intact all notices of the absence of any warranty; and give all
- recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
- and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
- produce it from the Program, in the form of source code under the
- terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
- works, which are not by their nature extensions of the covered work,
- and which are not combined with it such as to form a larger program,
- in or on a volume of a storage or distribution medium, is called an
- "aggregate" if the compilation and its resulting copyright are not
- used to limit the access or legal rights of the compilation's users
- beyond what the individual works permit. Inclusion of a covered work
- in an aggregate does not cause this License to apply to the other
- parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
- of sections 4 and 5, provided that you also convey the
- machine-readable Corresponding Source under the terms of this License,
- in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
- from the Corresponding Source as a System Library, need not be
- included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
- tangible personal property which is normally used for personal, family,
- or household purposes, or (2) anything designed or sold for incorporation
- into a dwelling. In determining whether a product is a consumer product,
- doubtful cases shall be resolved in favor of coverage. For a particular
- product received by a particular user, "normally used" refers to a
- typical or common use of that class of product, regardless of the status
- of the particular user or of the way in which the particular user
- actually uses, or expects or is expected to use, the product. A product
- is a consumer product regardless of whether the product has substantial
- commercial, industrial or non-consumer uses, unless such uses represent
- the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
- procedures, authorization keys, or other information required to install
- and execute modified versions of a covered work in that User Product from
- a modified version of its Corresponding Source. The information must
- suffice to ensure that the continued functioning of the modified object
- code is in no case prevented or interfered with solely because
- modification has been made.
-
- If you convey an object code work under this section in, or with, or
- specifically for use in, a User Product, and the conveying occurs as
- part of a transaction in which the right of possession and use of the
- User Product is transferred to the recipient in perpetuity or for a
- fixed term (regardless of how the transaction is characterized), the
- Corresponding Source conveyed under this section must be accompanied
- by the Installation Information. But this requirement does not apply
- if neither you nor any third party retains the ability to install
- modified object code on the User Product (for example, the work has
- been installed in ROM).
-
- The requirement to provide Installation Information does not include a
- requirement to continue to provide support service, warranty, or updates
- for a work that has been modified or installed by the recipient, or for
- the User Product in which it has been modified or installed. Access to a
- network may be denied when the modification itself materially and
- adversely affects the operation of the network or violates the rules and
- protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
- in accord with this section must be in a format that is publicly
- documented (and with an implementation available to the public in
- source code form), and must require no special password or key for
- unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
- License by making exceptions from one or more of its conditions.
- Additional permissions that are applicable to the entire Program shall
- be treated as though they were included in this License, to the extent
- that they are valid under applicable law. If additional permissions
- apply only to part of the Program, that part may be used separately
- under those permissions, but the entire Program remains governed by
- this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
- remove any additional permissions from that copy, or from any part of
- it. (Additional permissions may be written to require their own
- removal in certain cases when you modify the work.) You may place
- additional permissions on material, added by you to a covered work,
- for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
- add to a covered work, you may (if authorized by the copyright holders of
- that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
- restrictions" within the meaning of section 10. If the Program as you
- received it, or any part of it, contains a notice stating that it is
- governed by this License along with a term that is a further
- restriction, you may remove that term. If a license document contains
- a further restriction but permits relicensing or conveying under this
- License, you may add to a covered work material governed by the terms
- of that license document, provided that the further restriction does
- not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
- must place, in the relevant source files, a statement of the
- additional terms that apply to those files, or a notice indicating
- where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
- form of a separately written license, or stated as exceptions;
- the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
- provided under this License. Any attempt otherwise to propagate or
- modify it is void, and will automatically terminate your rights under
- this License (including any patent licenses granted under the third
- paragraph of section 11).
-
- However, if you cease all violation of this License, then your
- license from a particular copyright holder is reinstated (a)
- provisionally, unless and until the copyright holder explicitly and
- finally terminates your license, and (b) permanently, if the copyright
- holder fails to notify you of the violation by some reasonable means
- prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
- reinstated permanently if the copyright holder notifies you of the
- violation by some reasonable means, this is the first time you have
- received notice of violation of this License (for any work) from that
- copyright holder, and you cure the violation prior to 30 days after
- your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
- licenses of parties who have received copies or rights from you under
- this License. If your rights have been terminated and not permanently
- reinstated, you do not qualify to receive new licenses for the same
- material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
- run a copy of the Program. Ancillary propagation of a covered work
- occurring solely as a consequence of using peer-to-peer transmission
- to receive a copy likewise does not require acceptance. However,
- nothing other than this License grants you permission to propagate or
- modify any covered work. These actions infringe copyright if you do
- not accept this License. Therefore, by modifying or propagating a
- covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
- receives a license from the original licensors, to run, modify and
- propagate that work, subject to this License. You are not responsible
- for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
- organization, or substantially all assets of one, or subdividing an
- organization, or merging organizations. If propagation of a covered
- work results from an entity transaction, each party to that
- transaction who receives a copy of the work also receives whatever
- licenses to the work the party's predecessor in interest had or could
- give under the previous paragraph, plus a right to possession of the
- Corresponding Source of the work from the predecessor in interest, if
- the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
- rights granted or affirmed under this License. For example, you may
- not impose a license fee, royalty, or other charge for exercise of
- rights granted under this License, and you may not initiate litigation
- (including a cross-claim or counterclaim in a lawsuit) alleging that
- any patent claim is infringed by making, using, selling, offering for
- sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
- License of the Program or a work on which the Program is based. The
- work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
- owned or controlled by the contributor, whether already acquired or
- hereafter acquired, that would be infringed by some manner, permitted
- by this License, of making, using, or selling its contributor version,
- but do not include claims that would be infringed only as a
- consequence of further modification of the contributor version. For
- purposes of this definition, "control" includes the right to grant
- patent sublicenses in a manner consistent with the requirements of
- this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
- patent license under the contributor's essential patent claims, to
- make, use, sell, offer for sale, import and otherwise run, modify and
- propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
- agreement or commitment, however denominated, not to enforce a patent
- (such as an express permission to practice a patent or covenant not to
- sue for patent infringement). To "grant" such a patent license to a
- party means to make such an agreement or commitment not to enforce a
- patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
- and the Corresponding Source of the work is not available for anyone
- to copy, free of charge and under the terms of this License, through a
- publicly available network server or other readily accessible means,
- then you must either (1) cause the Corresponding Source to be so
- available, or (2) arrange to deprive yourself of the benefit of the
- patent license for this particular work, or (3) arrange, in a manner
- consistent with the requirements of this License, to extend the patent
- license to downstream recipients. "Knowingly relying" means you have
- actual knowledge that, but for the patent license, your conveying the
- covered work in a country, or your recipient's use of the covered work
- in a country, would infringe one or more identifiable patents in that
- country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
- arrangement, you convey, or propagate by procuring conveyance of, a
- covered work, and grant a patent license to some of the parties
- receiving the covered work authorizing them to use, propagate, modify
- or convey a specific copy of the covered work, then the patent license
- you grant is automatically extended to all recipients of the covered
- work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
- the scope of its coverage, prohibits the exercise of, or is
- conditioned on the non-exercise of one or more of the rights that are
- specifically granted under this License. You may not convey a covered
- work if you are a party to an arrangement with a third party that is
- in the business of distributing software, under which you make payment
- to the third party based on the extent of your activity of conveying
- the work, and under which the third party grants, to any of the
- parties who would receive the covered work from you, a discriminatory
- patent license (a) in connection with copies of the covered work
- conveyed by you (or copies made from those copies), or (b) primarily
- for and in connection with specific products or compilations that
- contain the covered work, unless you entered into that arrangement,
- or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
- any implied license or other defenses to infringement that may
- otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
- otherwise) that contradict the conditions of this License, they do not
- excuse you from the conditions of this License. If you cannot convey a
- covered work so as to satisfy simultaneously your obligations under this
- License and any other pertinent obligations, then as a consequence you may
- not convey it at all. For example, if you agree to terms that obligate you
- to collect a royalty for further conveying from those to whom you convey
- the Program, the only way you could satisfy both those terms and this
- License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
- permission to link or combine any covered work with a work licensed
- under version 3 of the GNU Affero General Public License into a single
- combined work, and to convey the resulting work. The terms of this
- License will continue to apply to the part which is the covered work,
- but the special requirements of the GNU Affero General Public License,
- section 13, concerning interaction through a network will apply to the
- combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
- the GNU General Public License from time to time. Such new versions will
- be similar in spirit to the present version, but may differ in detail to
- address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
- Program specifies that a certain numbered version of the GNU General
- Public License "or any later version" applies to it, you have the
- option of following the terms and conditions either of that numbered
- version or of any later version published by the Free Software
- Foundation. If the Program does not specify a version number of the
- GNU General Public License, you may choose any version ever published
- by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
- versions of the GNU General Public License can be used, that proxy's
- public statement of acceptance of a version permanently authorizes you
- to choose that version for the Program.
-
- Later license versions may give you additional or different
- permissions. However, no additional obligations are imposed on any
- author or copyright holder as a result of your choosing to follow a
- later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
- APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
- HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
- OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
- IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
- ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
- WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
- THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
- GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
- USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
- DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
- PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
- EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
- above cannot be given local legal effect according to their terms,
- reviewing courts shall apply local law that most closely approximates
- an absolute waiver of all civil liability in connection with the
- Program, unless a warranty or assumption of liability accompanies a
- copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
- possible use to the public, the best way to achieve this is to make it
- free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
- to attach them to the start of each source file to most effectively
- state the exclusion of warranty; and each file should have at least
- the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-
- Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
- notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
- The hypothetical commands `show w' and `show c' should show the appropriate
- parts of the General Public License. Of course, your program's commands
- might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
- if any, to sign a "copyright disclaimer" for the program, if necessary.
- For more information on this, and how to apply and follow the GNU GPL, see
- <https://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
- into proprietary programs. If your program is a subroutine library, you
- may consider it more useful to permit linking proprietary applications with
- the library. If this is what you want to do, use the GNU Lesser General
- Public License instead of this License. But first, please read
- <https://www.gnu.org/philosophy/why-not-lgpl.html>.
-
--------------------------------------------------------------------------
diff --git a/LICENSE.LGPL.txt b/LICENSE.LGPL.txt
deleted file mode 100644
index e050e4e..0000000
--- a/LICENSE.LGPL.txt
+++ /dev/null
@@ -1,518 +0,0 @@
-
- KD SOAP is Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB.
-
- You may use, distribute and copy KD SOAP under the terms of
- GNU Lesser General Public License version 2.1, which is displayed below.
-
- For the server-side library, see LICENSE.AGPL3-modified.txt
-
--------------------------------------------------------------------------
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard. To achieve this, non-free programs must
-be allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at least
- three years, to give the same user the materials specified in
- Subsection 6a, above, for a charge no more than the cost of
- performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
- To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James
- Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/LICENSE.US.txt b/LICENSE.US.txt
deleted file mode 100644
index d9aed5e..0000000
--- a/LICENSE.US.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-KD Soap COMMERCIAL LICENSE AGREEMENT
-FOR COMMERCIAL VERSIONS
-March 27, 2002
-
-
-IMPORTANT-READ CAREFULLY: This Klaralvdalens Datakonsult AB End-User
-License Agreement ("EULA") is a legal agreement between you (either an
-individual or a legal entity) and Klaralvdalens Datakonsult AB
-("KDAB") for the Klaralvdalens Datakonsult AB software product(s)
-accompanying this EULA, which include(s) computer software and may
-include "online" or electronic documentation, associated media, and
-printed materials ("Licensed Product").
-
-The Licensed Product is protected by copyright laws and international
-copyright treaties, as well as other intellectual property laws and
-treaties. The Licensed Product is licensed, not sold.
-
-By installing, copying, or otherwise using the Licensed Product, you
-agree to be bound by the terms of this EULA. If you do not agree to
-the terms of this EULA, do not install, copy, or otherwise use the
-Licensed Product; you may, however, return it to your place of
-purchase for a full refund. In addition, by installing, copying, or
-otherwise using any updates or other components of the Licensed
-Product that you receive separately as part of the Licensed Product
-("Updates"), you agree to be bound by any additional license terms
-that accompany such Updates. If you do not agree to the additional
-license terms that accompany such Updates, you may not install, copy,
-or otherwise use such Updates.
-
-Upon your acceptance of the terms and conditions of this EULA, KDAB
-grants you the right to use the Licensed Product in the manner
-provided below.
-
-KDAB grants to you as an individual a personal, nonexclusive,
-nontransferable license to make and use copies of the Licensed Product
-for the sole purposes of designing, developing, and testing your
-software product(s) ("Applications"). You may install copies of the
-Licensed Product on an unlimited number of computers provided that you
-are the only individual using the Licensed Product. If you are an
-entity, KDAB grants you the right to designate one, and only one,
-individual within your organization who shall have the sole right to
-use the Licensed Product in the manner provided above. You may at any
-time, but not more frequently that once every six (6) months,
-designate another individual to replace the current designated user by
-notifying KDAB, so long as there is no more than one designated user
-at any given time.
-
-
-GENERAL TERMS THAT APPLY TO APPLICATIONS AND REDISTRIBUTABLES
-KDAB grants you a nonexclusive, royalty-free right to reproduce and
-distribute the object code form of any portion of the Licensed Product
-("Redistributables") for execution on any operating system of a type
-listed in the License Certificate ("Platforms"). Copies of
-Redistributables may only be distributed with and for the sole purpose
-of executing Applications permitted under this License Agreement that
-you have created using the Licensed Product. Under no circumstances
-may any copies of Redistributables be distributed separately.
-
-The license granted in this EULA for you to create your own
-Applications and distribute them and the Redistributables (if any) to
-your customers is subject to all of the following conditions: (i) all
-copies of the Applications you create must bear a valid copyright
-notice, either your own or the copyright notice that appears on the
-Licensed Product; (ii) you may not remove or alter any copyright,
-trademark or other proprietary rights notice contained in any portion
-of the Licensed Product; (iii) Redistributables, if any, shall be
-licensed to your customer "as is" (KDAB MAKES NO WARRANTIES OR
-REPRESENTATIONS VIS-A-VIS YOUR CUSTOMER WITH RESPECT TO
-REDISTRIBUTABLES, AND KDAB EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES
-VIS-A-VIS YOUR CUSTOMER, WHETHER EXPRESS OR IMPLIED, ORAL OR WRITTEN,
-INCLUDING, BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY
-OR FITNESS FOR ANY PARTICULAR PURPOSE, WHETHER OR NOT KDAB KNOWS, HAS
-REASON TO KNOW, HAS BEEN ADVISED OR IS OTHERWISE AWARE OF SUCH
-PURPOSE); (iv) you will indemnify and hold KDAB, its related companies
-and its suppliers, harmless from and against any claims or liabilities
-arising out of the use, reproduction or distribution of your
-Applications; (v) your Applications must be written using a licensed,
-registered copy of the Licensed Product; (vi) your Applications must
-add primary and substantial functionality to the Licensed Product;
-(vii) your Applications may not pass on functionality which in any way
-makes it possible for others to create Applications with the Software;
-(viii) your Applications may not compete with the Licensed Product;
-(ix)) you may not use KDAB's or any of its suppliers' names, logos, or
-trademarks to market your programs, except to state that your program
-was written using the Licensed Product.
-
-LICENSEE'S BREACH OF CONTRACT
-In addition to penalties, other sanctions and the like as stated in
-the Swedish Copyright Act (1960:729), or successive legislation as it
-may appear, the Licensee agrees to pay a Contractual Fine in case of
-his/her/their breach of any of the above mentioned obligations,
-including but not limited to, the Licensee's obligation to let only
-one person per license use the Software as stated under above. The
-Contractual Fine is EUR 5000 and is payable by the Licensee to the
-Licenser immediately upon the Licenser having reasonably demonstrated
-that the Licensee is in breach of his obligations in this Agreement.
-
-WARRANTY DISCLAIMER
-THE LICENSED PRODUCT IS LICENSED TO YOU "AS IS". TO THE MAXIMUM
-EXTENT PERMITTED BY APPLICABLE LAW, KDAB ON BEHALF OF ITSELF AND ITS
-SUPPLIERS, DISCLAIMS ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
-NON-INFRINGEMENT WITH REGARD TO THE LICENSED PRODUCT. THIS WARRANTY
-DISCLAIMER NOTWITHSTANDING, YOU MAY HAVE SPECIFIC LEGAL RIGHTS WHICH
-MAY VARY FROM STATE/JURISDICTION TO STATE/JURISDICTION.
-
-
-LIMITATION OF LIABILITY
-IF, KDAB'S WARRANTY DISCLAIMER NOTWITHSTANDING, KDAB IS HELD LIABLE TO
-YOU, WHETHER IN CONTRACT, TORT OR ANY OTHER LEGAL THEORY, BASED ON THE
-LICENSED PRODUCT, KDAB'S ENTIRE LIABILITY TO YOU AND YOUR EXCLUSIVE
-REMEDY SHALL BE, AT KDAB'S OPTION, EITHER (A) RETURN OF THE PRICE YOU
-PAID FOR THE LICENSED PRODUCT, OR (B) REPAIR OR REPLACEMENT OF THE
-LICENSED PRODUCT, PROVIDED YOU RETURN TO KDAB ALL COPIES OF THE
-LICENSED PRODUCT AS ORIGINALLY DELIVERED TO YOU. KDAB SHALL NOT UNDER
-ANY CIRCUMSTANCES BE LIABLE TO YOU BASED ON FAILURE OF THE LICENSED
-PRODUCT IF THE FAILURE RESULTED FROM ACCIDENT, ABUSE OR
-MISAPPLICATION, NOR SHALL KDAB UNDER ANY CIRCUMSTANCES BE LIABLE FOR
-SPECIAL DAMAGES, PUNITIVE OR EXEMPLARY DAMAGES, DAMAGES FOR LOSS OF
-PROFITS OR INTERRUPTION OF BUSINESS OR FOR LOSS OR CORRUPTION OF DATA.
-ANY AWARD OF DAMAGES FROM KDAB TO YOU SHALL NOT EXCEED THE TOTAL AMOUNT
-YOU HAVE PAID TO KDAB IN CONNECTION WITH THIS EULA.
-
-
-SUPPORT AND UPDATES
-You will receive email based, software developer support and access to
-Updates to the Licensed Product for one year from the date of initial
-delivery, in accordance with KDAB support policies and procedures.
-Such policies and procedures may be changed from time to time.
-
-
-GENERAL PROVISIONS
-This EULA may only be modified in writing signed by you and an
-authorized officer of KDAB. All terms of any purchase order or other
-ordering document shall be superseded by this EULA. If any provision
-of the EULA is found void or unenforceable, the remainder will remain
-valid and enforceable according to its terms. If any remedy provided
-is determined to have failed for its essential purpose, all
-limitations of liability and exclusions of damages set forth in this
-EULA shall remain in effect.
-
-This EULA shall be construed, interpreted and governed by the laws of
-Sweden, the venue to be Sunne Tingsratt. The EULA gives you specific
-legal rights; you may have others, which vary from state to state and
-from country to country. KDAB reserves all rights not specifically
-granted in this EULA.
-
diff --git a/LICENSE.txt b/LICENSE.txt
index c06399d..829ec19 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,104 +1,14 @@
-KD Soap COMMERCIAL LICENSE AGREEMENT
-FOR COMMERCIAL VERSIONS
-Version 1.0
+License
+=======
+The KD Soap Software is Copyright 2010-2022 Klarälvdalens Datakonsult AB (KDAB),
+and is available under the terms of the MIT license.
-Copyright of this license text (C) 2001 Trolltech AS and (C) 2002-2010
-Klaralvdalens Datakonsult AB. All rights reserved. License text used
-with kind permission of Trolltech AS. The software and accompanying
-material is Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB.
+Note that this project requires the 3rd party 'libkode' submodule
+that is licensed separately with LGPL-2.0-or-later; however, libkode
+is used for code-generation only and the resulting code can be made
+available under any license.
-This non-exclusive non-transferable License Agreement ("Agreement") is
-between you ("Licensee") and Klaralvdalens Datakonsult AB (KDAB), and
-pertains to the Klaralvdalens Datakonsult AB software product(s)
-accompanying this Agreement, which include(s) computer software and
-may include "online" or electronic documentation, associated media,
-and printed materials, including the source code, example programs and
-the documentation ("Software").
-
-
- COPYRIGHT AND RESTRICTIONS
-
-1. All intellectual property rights in the Software are owned by KDAB
-and are protected by Swedish copyright laws, other applicable
-copyright laws, and international treaty provisions. KDAB retains all
-rights not expressly granted. No title, property rights or copyright
-in the Software or in any modifications to the Software shall pass to
-the Licensee under any circumstances. The Software is licensed, not
-sold.
-
-2. By installing, copying, or otherwise using the Software, you agree
-to be bound by the terms of this agreement. If you do not agree to the
-terms of this Agreement, do not install, copy, or otherwise use the
-Software.
-
-3. Upon your acceptance of the terms and conditions of this Agreement,
-KDAB grants you the right to use the Software in the manner provided
-below.
-
-4. KDAB grants to you as an individual a personal, nonexclusive,
-non-transferable license to make and use copies of the Software for
-the sole purposes of designing, developing, testing and distributing
-your software product(s) ("Applications"). You may install copies of
-the Software on an unlimited number of computers provided that you are
-the only individual using the Software. If you are an entity, KDAB
-grants you the right to designate one, and only one, individual within
-your organization who shall have the sole right to use the Software in
-the manner provided above.
-
-5. The license granted in this Agreement for you to create and
-distribute your own Applications is subject to all of the following
-conditions: (i) all copies of the Applications you create must bear a
-valid copyright notice, either your own or the copyright notice that
-appears on the Software; (ii) you may not remove or alter any
-copyright, trademark or other proprietary rights notice contained in
-any portion of the Software; (iii) you will indemnify and hold KDAB, its
-related companies and its suppliers, harmless from and against any
-claims or liabilities arising out of the use and/or reproduction of
-your Applications; (iv) your Applications must be written using a
-licensed, registered copy of the Software; (v) your Applications must
-add primary and substantial functionality to the Software; (vi) your
-Applications may not pass on functionality which in any way makes it
-possible for others to create Applications with the Software; (vii)
-your Applications may not compete with the Software; (viii) you may
-not use KDAB's or any of its suppliers' names, logos, or trademarks to
-market your programs, except to state that your program was written
-using the Software.
-
-6. LICENSEE'S BREACH OF CONTRACT
-In addition to penalties, other sanctions and the like as stated in
-the Swedish Copyright Act (1960:729), or successive legislation as it
-may appear, the Licensee agrees to pay a Contractual Fine in case of
-his/her/their breach of any of the above mentioned obligations,
-including but not limited to, the Licensee's obligation to let only
-one person per license use the Software as stated under above. The
-Contractual Fine is EUR 5000 and is payable by the Licensee to the
-Licenser immediately upon the Licenser having reasonably demonstrated
-that the Licensee is in breach of his obligations in this Agreement.
-
-7. WARRANTY DISCLAIMER
-THE SOFTWARE IS LICENSED TO YOU "AS IS". TO THE MAXIMUM EXTENT
-PERMITTED BY APPLICABLE LAW, KDAB ON BEHALF OF ITSELF AND ITS SUPPLIERS,
-DISCLAIMS ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT WITH
-REGARD TO THE SOFTWARE.
-
-8. LIMITATION OF LIABILITY
-IF, KDAB'S WARRANTY DISCLAIMER NOTWITHSTANDING, KDAB IS HELD LIABLE TO
-YOU BASED ON THE SOFTWARE, KDAB'S ENTIRE LIABILITY TO YOU AND YOUR
-EXCLUSIVE REMEDY SHALL BE, AT REPAIR OR REPLACEMENT OF THE SOFTWARE,
-PROVIDED YOU RETURN TO KDAB ALL COPIES OF THE SOFTWARE AS ORIGINALLY
-DELIVERED TO YOU. KDAB SHALL NOT UNDER ANY CIRCUMSTANCES BE LIABLE TO
-YOU BASED ON FAILURE OF THE SOFTWARE IF THE FAILURE RESULTED FROM
-ACCIDENT, ABUSE OR MISAPPLICATION, NOR SHALL KDAB UNDER ANY
-CIRCUMSTANCES BE LIABLE FOR SPECIAL DAMAGES, PUNITIVE OR EXEMPLARY
-DAMAGES, DAMAGES FOR LOSS OF PROFITS OR INTERRUPTION OF BUSINESS OR
-FOR LOSS OR CORRUPTION OF DATA.
-
-9. This Agreement may only be modified in writing signed by you and an
-authorized officer of KDAB. All terms of any purchase order or other
-ordering document shall be superseded by this Agreement.
-
-10. This Agreement shall be construed, interpreted and governed by the
-laws of Sweden, the venue to be Sunne Tingsratt.
+Various other freely distributable files are contained in the unittests
+and are not used in the library code itself.
+See the full license texts in the LICENSES folder.
diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt
new file mode 100644
index 0000000..0741db7
--- /dev/null
+++ b/LICENSES/BSD-3-Clause.txt
@@ -0,0 +1,26 @@
+Copyright (c) <year> <owner>. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSES/GPL-2.0-only.txt b/LICENSES/GPL-2.0-only.txt
new file mode 100644
index 0000000..17cb286
--- /dev/null
+++ b/LICENSES/GPL-2.0-only.txt
@@ -0,0 +1,117 @@
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+ one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author
+
+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice
diff --git a/LICENSES/LicenseRef-Microsoft.txt b/LICENSES/LicenseRef-Microsoft.txt
new file mode 100644
index 0000000..2c9ea3b
--- /dev/null
+++ b/LICENSES/LicenseRef-Microsoft.txt
@@ -0,0 +1,43 @@
+Permission to copy, display, perform, modify and distribute the
+WS-Discovery Specification (the "Specification", which includes
+WSDL and schema documents), and to authorize others to do the
+foregoing, in any medium without fee or royalty is hereby granted
+for the purpose of developing and evaluating the Specification.
+
+BEA Systems, Canon, Intel, Microsoft, and webMethods, Inc.
+(collectively, the "Co-Developers") each agree to grant a license
+to third parties, under royalty-free and other reasonable,
+non-discriminatory terms and conditions, to their respective
+essential Licensed Claims, which reasonable, non-discriminatory
+terms and conditions may include, for example, but are not limited
+to, an affirmation of the obligation to grant reciprocal licenses
+under any of the licensee's patents that are necessary to implement
+the Specification.
+
+DISCLAIMERS:
+
+THE SPECIFICATION IS PROVIDED "AS IS," AND THE CO-DEVELOPERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING,
+BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS
+OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
+IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+THE CO-DEVELOPERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY
+USE OF THE SPECIFICATION OR THE PERFORMANCE OR IMPLEMENTATION OF
+THE CONTENTS THEREOF.
+
+You may remove these disclaimers from your modified versions of the
+Specification provided that you effectively disclaim all warranties
+and liabilities on behalf of all Co-developers and any copyright
+holders in the copies of any such modified versions you distribute.
+
+The name and trademarks of the Co-developers may NOT be used in any
+manner, including advertising or publicity pertaining to the
+Specification or its contents without specific, written prior
+permission. Title to copyright in the Specification will at all
+times remain with Microsoft.
+
+No other rights are granted by implication, estoppel or otherwise.
diff --git a/LICENSES/LicenseRef-Novell.txt b/LICENSES/LicenseRef-Novell.txt
new file mode 100644
index 0000000..81a91b8
--- /dev/null
+++ b/LICENSES/LicenseRef-Novell.txt
@@ -0,0 +1,36 @@
+
+Use and redistribution of this work is subject to the developer license
+agreement through which this work is made available. Pursuant to that license
+agreement, Novell hereby grants You a royalty-free, non-exclusive license to
+include Novell's sample code in Your product(s) that interoperate with the
+applicable Novell product, and worldwide distribution rights to market,
+distribute, or sell Novell's sample code as a component of Your product.
+
+THE WORK IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL NOVELL OR THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE WORK OR THE USE OR OTHER DEALINGS IN THE WORK.
+
+
+Alternatively, the contents of this file may be used under the terms of
+GNU General Public License Version 2 (the "GPL") as explained below.
+If you wish to allow use of your version of this file only under the terms
+of the GPL, and not to allow others to use your version of this file under
+the provisions appearing above, indicate your decision by deleting the
+provisions above and replace them with the notice and other provisions required
+by the GPL. If you do not delete the provisions above, a recipient may use
+your version of this file under the above provisions of the GPL.
+
+
+This file is free software; you can redistribute it and/or modify it under the
+terms of version 2 of the GNU General Public License as published by the
+Free Software Foundation. This program is distributed in the hope that it will
+be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details. You should have received a copy of the GNU General Public License
+along with this program; if not, contact Novell, Inc.
+
+To contact Novell about this file by physical or electronic mail, you may find
+current contact information at www.novell.com.
diff --git a/LICENSES/LicenseRef-OASIS.txt b/LICENSES/LicenseRef-OASIS.txt
new file mode 100644
index 0000000..a41202a
--- /dev/null
+++ b/LICENSES/LicenseRef-OASIS.txt
@@ -0,0 +1,15 @@
+All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website.
+
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this section are included on all such copies and derivative works. However, this document itself may not be modified in any way, including by removing the copyright notice or references to OASIS, except as needed for the purpose of developing any document or deliverable produced by an OASIS Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR Policy, must be followed) or as required to translate it into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+OASIS requests that any OASIS Party or any other party that believes it has patent claims that would necessarily be infringed by implementations of this OASIS Committee Specification or OASIS Standard, to notify OASIS TC Administrator and provide an indication of its willingness to grant patent licenses to such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that produced this specification.
+
+OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of any patent claims that would necessarily be infringed by implementations of this specification by a patent holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that produced this specification. OASIS may include such claims on its website, but disclaims any obligation to do so.
+
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS' procedures with respect to rights in any document or deliverable produced by an OASIS Technical Committee can be found on the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementers or users of this OASIS Committee Specification or OASIS Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any information or list of intellectual property rights will at any time be complete, or that any claims in such list are, in fact, Essential Claims.
+
+The name "OASIS" is trademarks of OASIS, the owner and developer of this specification, and should be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and implementation and use of, specifications, while reserving the right to enforce its marks against misleading uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.
diff --git a/LICENSES/LicenseRef-SportingExchange.txt b/LICENSES/LicenseRef-SportingExchange.txt
new file mode 100644
index 0000000..cbdbfd2
--- /dev/null
+++ b/LICENSES/LicenseRef-SportingExchange.txt
@@ -0,0 +1,6 @@
+The presentation, distribution or other dissemination of the information contained herein by The Sporting Exchange Limited (Betfair) is not a license, either expressly or impliedly, to any intellectual property owned or controlled by Betfair.
+Save as provided by statute and to the fullest extent permitted by law, the following provisions set out the entire liability of Betfair (including any liability for the acts and omissions of its employees, agents and sub-contractors) to the User in respect of the use of its WSDL file whether in contract, tort, statute, equity or otherwise:
+(a) The User acknowledges and agrees that (except as expressly provided in this Agreement) the WSDL is provided "AS IS" without warranties of any kind (whether express or implied);
+(b) All conditions, warranties, terms and undertakings (whether express or implied, statutory or otherwise relating to the delivery, performance, quality, uninterrupted use, fitness for purpose, occurrence or reliability of the WSDL are hereby excluded to the fullest extent permitted by law; and
+(c) Betfair shall not be liable to the User for loss of profit (whether direct or indirect), loss of contracts or goodwill, lost advertising, loss of data or any type of special, indirect, consequential or economic loss (including loss or damage suffered by the User as a result of an action brought by a third party) even if such loss was reasonably foreseeable or Betfair had been advised of the possibility of the User incurring such loss.
+No exclusion or limitation set out in this Agreement shall apply in the case of fraud or fraudulent concealment, death or personal injury resulting from the negligence of either party or any of its employees, agents or sub-contractors; and/or any breach of the obligations implied by (as appropriate) section 12 of the Sale of Goods Act 1979, section 2 of the Supply of Goods and Services Act 1982 or section 8 of the Supply of Goods (Implied Terms) Act 1973.
diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt
new file mode 100644
index 0000000..2071b23
--- /dev/null
+++ b/LICENSES/MIT.txt
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/LICENSES/W3C.txt b/LICENSES/W3C.txt
new file mode 100644
index 0000000..a485d10
--- /dev/null
+++ b/LICENSES/W3C.txt
@@ -0,0 +1,29 @@
+W3C SOFTWARE NOTICE AND LICENSE
+
+This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
+
+License
+
+By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
+
+ The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+
+ Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
+
+ Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+Disclaimers
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+
+Notes
+
+This version: http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This formulation of W3C's notice and license became active on December 31 2002. This version removes the copyright ownership notice such that this license can be used with materials other than those owned by the W3C, reflects that ERCIM is now a host of the W3C, includes references to this specific dated version of the license, and removes the ambiguous grant of "use". Otherwise, this version is the same as the previous version and is written so as to preserve the Free Software Foundation's assessment of GPL compatibility and OSI's certification under the Open Source Definition.
diff --git a/README-commercial.txt b/README-commercial.txt
deleted file mode 100644
index 1ef259d..0000000
--- a/README-commercial.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Introduction
-============
-KD Soap is a Qt-based client-side and server-side SOAP component.
-
-It can be used to create client applications for web services and also provides
-the means to create web services without the need for any further component such
-as a dedicated web server.
-
-For more information, see https://www.kdab.com/development-resources/qt-tools/kd-soap
-
-Contributing
-============
-KDAB will happily accept external contributions, but substantial
-contributions will require a signed Copyright Assignment Agreement.
-Contact info@kdab.com for more information.
-
-Licensing
-=========
-Copyright (C) 2010-2020 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>
-
-Commercial licensing terms are available in the included file
- LICENSE.txt (for non-US customers)
-or
- LICENSE.US.txt (for US customers)
-, respectively.
-
-For terms of redistribution, refer to the license agreement.
-
-About KDAB
-==========
-KD Soap is supported and maintained by Klarälvdalens Datakonsult AB (KDAB).
-
-The KDAB Group is the global No.1 software consultancy for Qt, C++ and
-OpenGL applications across desktop, embedded and mobile platforms.
-
-The KDAB Group provides consulting and mentoring for developing Qt applications
-from scratch and in porting from all popular and legacy frameworks to Qt.
-We continue to help develop parts of Qt and are one of the major contributors
-to the Qt Project. We can give advanced or standard trainings anywhere
-around the globe on Qt as well as C++, OpenGL, 3D and more.
-
-Please visit https://www.kdab.com to meet the people who write code like this.
-
-
-KD SOAP and the KD SOAP logo are registered trademarks of Klaralvdalens Datakonsult AB
-in the European Union, the United States, and/or other countries. Other product and
-company names and logos may be trademarks or registered trademarks of their respective companies.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2c6a9c5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,80 @@
+# Introduction
+
+KD Soap is a Qt-based client-side and server-side SOAP component.
+
+It can be used to create client applications for web services and also provides
+the means to create web services without the need for any further component such
+as a dedicated web server.
+
+KD Soap targets C++ programmers who use Qt in their applications.
+
+For more information, see <https://www.kdab.com/development-resources/qt-tools/kd-soap>
+
+## Using KD Soap
+
+KD Soap requires Qt 5.9.0 or newer, and a compiler with C++11 support.
+Qt6 support is added starting with KD Soap version 2.0, and requires
+a compiler with C++17 support.
+
+See [INSTALL.txt](INSTALL.txt) for installation instructions using CMake.
+
+Learn more at our:
+
+* [online API reference](https://docs.kdab.com/kdsoap)
+* [programmers manual with examples](docs/manual/kdsoap.pdf)
+* [sorted example programs](examples/)
+
+## Contact
+
+* See our official home page: <https://www.kdab.com/development-resources/qt-tools/kd-soap>
+* Visit us on GitHub: <https://github.com/KDAB/KDSoap>
+* Email info@kdab.com for questions about copyright, licensing or commercial support.
+
+Stay up-to-date with KDAB product announcements:
+
+* [KDAB Newsletter](https://news.kdab.com)
+* [KDAB Blogs](https://www.kdab.com/category/blogs)
+* [KDAB on Twitter](https://twitter.com/KDABQt)
+
+## Get Involved
+
+KDAB will happily accept external contributions.
+
+Please submit your contributions or issue reports from our GitHub space at
+<https://github.com/KDAB/KDSoap>.
+
+Thanks to our [contributors](CONTRIBUTORS.txt).
+
+## License
+
+The KD Soap Software is Copyright 2010-2022, Klarälvdalens Datakonsult AB (KDAB),
+and is available under the terms of the [MIT](LICENSES/MIT.txt) license.
+
+Contact KDAB at <info@kdab.com> to inquire about commercial licensing.
+
+Note that this project requires the 3rd party 'libkode' submodule
+that is licensed separately with LGPL-2.0-or-later; however, libkode
+is used for code-generation only and the resulting code can be made
+available under any license.
+
+Various other freely distributable files are contained in the unittests
+and are not used in the library code itself.
+
+## About KDAB
+
+KD Soap is supported and maintained by Klarälvdalens Datakonsult AB (KDAB).
+
+The KDAB Group is the global No.1 software consultancy for Qt, C++ and
+OpenGL applications across desktop, embedded and mobile platforms.
+
+The KDAB Group provides consulting and mentoring for developing Qt applications
+from scratch and in porting from all popular and legacy frameworks to Qt.
+We continue to help develop parts of Qt and are one of the major contributors
+to the Qt Project. We can give advanced or standard trainings anywhere
+around the globe on Qt as well as C++, OpenGL, 3D and more.
+
+Please visit <https://www.kdab.com> to meet the people who write code like this.
+
+KD SOAP and the KD SOAP logo are registered trademarks of Klaralvdalens Datakonsult AB
+in the European Union, the United States, and/or other countries. Other product and
+company names and logos may be trademarks or registered trademarks of their respective companies.
diff --git a/README.txt b/README.txt
deleted file mode 100644
index c34a2c7..0000000
--- a/README.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-# <a name="title"></a> KD Soap [](https://www.kdab.com/development-resources/qt-tools/kd-soap)
-Introduction
-============
-KD Soap is a Qt-based client-side and server-side SOAP component.
-
-It can be used to create client applications for web services and also provides
-the means to create web services without the need for any further component such
-as a dedicated web server.
-
-KD Soap targets C++ programmers who use Qt in their applications.
-
-For more information, see https://www.kdab.com/development-resources/qt-tools/kd-soap
-
-Using KD Soap
-=============
-KD Soap requires Qt 4.7.0 or newer, and a compiler with C++11 support.
-
-See [INSTALL.txt](INSTALL.txt) or [INSTALL-cmake.txt](INSTALL-cmake.txt)
-for installation instructions. (CMake and qmake and buildsystems supported)
-
-After reading the introductory overview files in doc/
-you will find more information at these places:
-
- * [detailed browsable API reference](https://docs.kdab.com/kdsoap)
- * [programmers manual with examples](doc/manual/kdsoap.pdf)
- * [our sorted example programs](examples/)
-
-Contact
-=======
-* Join our mailing list: https://mail.kdab.com/mailman/listinfo/kdsoap-interest
-* See our official home page: https://www.kdab.com/development-resources/qt-tools/kd-soap
-* Visit us on GitHub: https://github.com/KDAB/KDSoap
-* Email info@kdab.com for questions about copyright, licensing or commercial support.
-
-Get Involved
-============
-KDAB will happily accept external contributions, but substantial contributions require
-a signed [Copyright Assignment Agreement](doc/KDSoap-CopyrightAssignmentForm.docx).
-
-Contact info@kdab.com for more information about the Copyright Assignment Agreement.
-
-Please submit your contributions or issue reports from our GitHub space at
-https://github.com/KDAB/KDSoap
-
-License
-=======
-KD Soap is (C) 2010-2020, Klaralvdalens Datakonsult AB, and is available
-under the terms of:
-
-* the [LGPL](LICENSE.LGPL.txt)
- (except libkdsoap-server, see [LICENSE.AGPL3-modified.txt](LICENSE.AGPL3-modified.txt))
-* the [GPL](LICENSE.GPL.txt)
- (except libkdsoap-server, see [LICENSE.AGPL3-modified.txt](LICENSE.AGPL3-modified.txt))
-* the KDAB commercial license, provided that you buy a license.
- please contact info@kdab.com if you are interested in buying commercial licenses.
-
-Commercial licensing terms are available in the included file [LICENSE.txt](LICENSE.txt).
-
-About KDAB
-==========
-KD Soap is supported and maintained by Klarälvdalens Datakonsult AB (KDAB).
-
-The KDAB Group is the global No.1 software consultancy for Qt, C++ and
-OpenGL applications across desktop, embedded and mobile platforms.
-
-The KDAB Group provides consulting and mentoring for developing Qt applications
-from scratch and in porting from all popular and legacy frameworks to Qt.
-We continue to help develop parts of Qt and are one of the major contributors
-to the Qt Project. We can give advanced or standard trainings anywhere
-around the globe on Qt as well as C++, OpenGL, 3D and more.
-
-Please visit https://www.kdab.com to meet the people who write code like this.
-
-KD SOAP and the KD SOAP logo are registered trademarks of Klaralvdalens Datakonsult AB
-in the European Union, the United States, and/or other countries. Other product and
-company names and logos may be trademarks or registered trademarks of their respective companies.
diff --git a/ReadMe.md b/ReadMe.md
deleted file mode 120000
index c3ca074..0000000
--- a/ReadMe.md
+++ /dev/null
@@ -1 +0,0 @@
-README.txt
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..8e12001
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,97 @@
+#---------------------------------#
+# general configuration #
+#---------------------------------#
+
+# version format
+version: 1.0.{build}-{branch}
+
+# branches to build
+branches:
+ except:
+ - gh-pages
+
+# Do not build on tags (GitHub and BitBucket)
+skip_tags: false
+
+#---------------------------------#
+# environment configuration #
+#---------------------------------#
+
+# Build worker image
+image:
+ - Ubuntu2004
+ - macos
+ - Visual Studio 2019
+
+# scripts that are called at very beginning, before repo cloning
+init:
+ - git config --global core.autocrlf input
+
+#---------------------------------#
+# build configuration #
+#---------------------------------#
+
+# build platform, i.e. x86, x64, Any CPU. This setting is optional.
+platform:
+ - x64
+
+# build Configuration, i.e. Debug, Release, etc.
+configuration:
+ - Release
+ - Debug
+
+environment:
+ matrix:
+ - useqt6: False
+ - useqt6: True
+
+install:
+ - sh: if [ "`uname -s`" = "Darwin" ]; then brew install ninja; else sudo apt-get -y update; sudo apt-get -y install mesa-common-dev libglu1-mesa-dev; fi
+
+before_build:
+ - git submodule update --init --recursive
+ - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+ - cmd: set PATH=C:\Qt\6.2\msvc2019_64\bin;C:\Qt\5.15\msvc2019_64\bin;%PATH%
+ - sh: if [ "`uname -s`" = "Darwin" ]; then export PATH=$HOME/Qt/6.1/macos/bin:$HOME/Qt/5.15/clang_64/bin:$PATH; else export PATH=$HOME/Qt/6.2/gcc_64/bin:$HOME/Qt/5.15/gcc_64/bin:$PATH; fi
+
+build_script:
+ - mkdir build
+ - cd build
+ - cmd: cmake -G Ninja -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DKDSoap_QT6=%useqt6% -DKDSoap_TESTS=True -DKDSoap_EXAMPLES=True ..
+ - sh: cmake -G Ninja -DCMAKE_BUILD_TYPE=$CONFIGURATION -DKDSoap_QT6=$useqt6 -DKDSoap_TESTS=True -DKDSoap_EXAMPLES=True ..
+ - cmake --build .
+ - cmd: cmake --build . --target install
+ - sh: sudo cmake --build . --target install
+ - cmd: set PATH=.\bin;%PATH%
+ #temporarily disable testing on Windows
+ #- ctest --test-dir .
+ #- sh: if [ "`uname -s`" != "Darwin" ]; then export LD_LIBRARY_PATH=./lib:$HOME/Qt/6.2/gcc_64/lib:$HOME/Qt/5.15/gcc_64/lib; fi
+ #- sh: ctest --test-dir .
+ - sh: if [ "`uname -s`" = "Darwin" ]; then ctest --test-dir .; else echo "temporarily disable testing on Ubuntu (due to Subprocess aborted)"; fi
+
+# to disable automatic builds
+#build: off
+
+#---------------------------------#
+# tests configuration #
+#---------------------------------#
+
+# to disable automatic tests
+test: off
+
+#---------------------------------#
+# deployment configuration #
+#---------------------------------#
+
+deploy: off
+
+#---------------------------------#
+# notifications #
+#---------------------------------#
+notifications:
+ # Email
+ - provider: Email
+ to:
+ - allen.winter@kdab.com
+ on_build_success: false
+ on_build_failure: true
diff --git a/autogen.py b/autogen.py
deleted file mode 100755
index 97a622b..0000000
--- a/autogen.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-from autogen.autogen import autogen
-
-project = "KDSoap"
-version = "1.9.1"
-subprojects = ["KDSoapClient", "KDSoapServer"]
-prefixed = False
-
-autogen(project, version, subprojects, prefixed, policyVersion = 2)
diff --git a/autogen/.gitignore b/autogen/.gitignore
deleted file mode 100644
index 0d20b64..0000000
--- a/autogen/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/autogen/__init__.py b/autogen/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/autogen/autogen.py b/autogen/autogen.py
deleted file mode 100644
index f8ae0a9..0000000
--- a/autogen/autogen.py
+++ /dev/null
@@ -1,123 +0,0 @@
-import os, sys, subprocess
-
-if sys.version_info[0] != 2:
- print ("Autogen detected that you are not using Python2.")
- print ("Please make sure you have Python2 installed and run:")
- print (" python2 autogen.py")
- sys.exit(0)
-
-from cpack import CPackGenerateConfiguration
-from configure import ConfigureScriptGenerator
-from header import ForwardHeaderGenerator
-
-def parseSvnInfo( stdout ):
- lines = stdout.splitlines()
- repositoryUrl = [line for line in lines if line.startswith('URL:')][0].split( ':', 1 )[ 1 ]
- isTagged = repositoryUrl.find( 'tags/' ) != -1
- repositoryRevision = [line for line in lines if line.startswith('Revision:')][0].split( ':', 1 )[ 1 ].strip()
- return isTagged, repositoryRevision
-
-def checkVCS( sourceDirectory ):
- repositoryType = ''
- for i in xrange( 20 ):
- listing = os.listdir( sourceDirectory + '/..' * i )
- if '.svn' in listing:
- repositoryType = 'svn'
- break
- elif '.git' in listing:
- repositoryType = 'git'
- break
-
- isTagged = False
- repositoryRevision = "unknown"
- try:
- if repositoryType == 'git':
- p = subprocess.Popen( ["git", "describe", "--exact-match"], cwd = sourceDirectory, stdout = subprocess.PIPE, stderr = subprocess.PIPE )
- stdout, stderr = p.communicate()
- if p.returncode == 0:
- # git tag
- isTagged = True
- repositoryRevision = stdout.strip()
- if p.returncode != 0:
- p = subprocess.Popen( ["git", "svn", "info"], cwd = sourceDirectory, stdout = subprocess.PIPE, stderr = subprocess.PIPE )
- stdout, stderr = p.communicate()
- if p.returncode == 0:
- # git-svn revision
- isTagged, repositoryRevision = parseSvnInfo( stdout )
- if p.returncode != 0:
- p = subprocess.Popen( ["git", "rev-parse", "HEAD"], cwd = sourceDirectory, stdout = subprocess.PIPE, stderr = subprocess.PIPE )
- stdout, stderr = p.communicate()
- if p.returncode == 0:
- # svn revision
- repositoryRevision = stdout.strip()[:8]
- elif repositoryType == 'svn':
- p = subprocess.Popen( ["svn", "info"], cwd = sourceDirectory, stdout = subprocess.PIPE, stderr = subprocess.PIPE )
- stdout, stderr = p.communicate()
- if p.returncode == 0:
- isTagged, repositoryRevision = parseSvnInfo( stdout )
- else:
- raise Exception("Unknown repository type")
- except:
- print( "Error: Not a valid SVN or Git repository: {0}".format( sourceDirectory ) )
- sys.exit( 1 )
-
- return ( repositoryRevision, isTagged )
-
-def autogen(project, version, subprojects, prefixed, forwardHeaderMap = {}, steps=["generate-cpack", "generate-configure", "generate-forward-headers"], installPrefix="$$INSTALL_PREFIX", policyVersion = 1):
- global __policyVersion
- __policyVersion = policyVersion
- sourceDirectory = os.path.abspath( os.path.dirname( os.path.dirname( __file__ ) ) )
- buildDirectory = os.getcwd()
-
- print( "-- Using source directory: {0}".format( sourceDirectory ) )
-
- ( repositoryRevision, isTagged ) = checkVCS( sourceDirectory )
-
- print( "-- Using repository information: revision={0} isTagged={1}".format( repositoryRevision, isTagged ) )
-
- if "generate-cpack" in steps:
- licensePath = os.path.join( sourceDirectory, "LICENSE.txt" )
-
- # if this is a tag, use the tagname provided in repositoryRevision so that cpack can generate the correct filename
- if isTagged:
- realVersion = repositoryRevision.replace( project.lower() + "-", "" )
- else:
- realVersion = version
-
- cpackConfigurationGenerator = CPackGenerateConfiguration( project, realVersion, sourceDirectory,
- buildDirectory, repositoryRevision, licensePath, isTaggedRevision = isTagged )
- cpackConfigurationGenerator.run()
-
- if "generate-configure" in steps:
- configureScriptGenerator = ConfigureScriptGenerator( project, sourceDirectory, version )
- configureScriptGenerator.run()
-
- includePath = os.path.join( sourceDirectory, "include" )
- srcPath = os.path.join( sourceDirectory, "src" )
-
- if subprojects and "generate-cpack" in steps:
- forwardHeaderGenerator = ForwardHeaderGenerator(
- copy = True, path = sourceDirectory, includepath = includePath, srcpath = srcPath,
- project = project, subprojects = subprojects, prefix = installPrefix, prefixed = prefixed,
- additionalHeaders = forwardHeaderMap
- )
- forwardHeaderGenerator.run()
-
- print( "-- Auto-generation done." )
-
- with file( ".license.accepted", 'a' ):
- os.utime( ".license.accepted", None )
- print( "-- License marked as accepted." )
-
- print( "-- Wrote build files to: {0}".format( buildDirectory ) )
- print( "-- Now running configure script." )
- print( "" )
- sys.stdout.flush()
-
- configureFile = 'configure.bat' if sys.platform == 'win32' else 'configure.sh'
- configurePath = os.path.join( sourceDirectory, configureFile )
- os.execvp( configurePath, [configurePath] + sys.argv[1:] )
-
-def policyVersion():
- global __policyVersion
- return __policyVersion
diff --git a/autogen/configure.bat.in b/autogen/configure.bat.in
deleted file mode 100644
index 71642e7..0000000
--- a/autogen/configure.bat.in
+++ /dev/null
@@ -1,350 +0,0 @@
-@echo off
-set PRODUCT_CAP=@PRODUCT_UPPERCASE@
-set product_low=@PRODUCT_LOWERCASE@
-set Product_mix=@PRODUCT_MIXEDCASE@
-set Product_Space="@PRODUCT_MIXEDCASE_SPACED@"
-
-set VERSION=@VERSION@
-
-set SOURCE_DIR=%~dp0
-set PACKSCRIPTS_DIR=../admin/packscripts
-
-set shared=yes
-set debug=no
-set release=yes
-set debug_and_release=no
-set prefix=
-set unittests=no
-set static_qt=no
-set host_qmake=
-set target_qmake=
-set QMAKE_ARGS=
-
-if exist %PACKSCRIPTS_DIR% (
- set unittests=yes
- goto :CheckLicenseComplete
-)
-
-if exist .license.accepted goto :CheckLicenseComplete
-
-set license_file=
-
-if exist %SOURCE_DIR%\LICENSE.@PRODUCT_LICENSE_FREE@.txt (
- if exist %SOURCE_DIR%\LICENSE.US.txt (
- if exist %SOURCE_DIR%\LICENSE.txt (
- echo.
- echo Please choose your license.
- echo.
- echo Type 1 for the @PRODUCT_LICENSE_FREE_NAME@ ^(@PRODUCT_LICENSE_FREE@^).
- echo Type 2 for the %Product_Space% Commercial License for USA/Canada.
- echo Type 3 for the %Product_Space% Commercial License for anywhere outside USA/Canada.
- echo Anything else cancels.
- echo.
- set /p license=Select:
- )
- ) else (
- license=1
- )
-) else (
- if exist %SOURCE_DIR%\LICENSE.US.txt (
- license=2
- ) else (
- if exist %SOURCE_DIR%\LICENSE.txt (
- license=3
- ) else (
- echo "Couldn't find license file, aborting"
- exit /B 1
- )
- )
-)
-
-if "%license%" == "1" (
- set license_name="@PRODUCT_LICENSE_FREE_NAME@ (@PRODUCT_LICENSE_FREE@)"
- set license_file=LICENSE.@PRODUCT_LICENSE_FREE@.txt
- goto :CheckLicense
-) else (
- if "%license%" == "2" (
- set license_name="%Product_Space% USA/Canada Commercial License"
- set license_file=LICENSE.US.txt
- goto :CheckLicense
- ) else (
- if "%license%" == "3" (
- set license_name="%Product_Space% Commercial License"
- set license_file=LICENSE.txt
- goto :CheckLicense
- ) else (
- exit /B 1
- )
- )
-)
-
-:CheckLicense
-echo.
-echo License Agreement
-echo.
-echo You are licensed to use this software under the terms of
-echo the %license_name%.
-echo.
-echo Type '?' to view the %license_name%.
-echo Type 'yes' to accept this license offer.
-echo Type 'no' to decline this license offer.
-echo.
-set /p answer=Do you accept the terms of this license?
-
-if "%answer%" == "no" goto :CheckLicenseFailed
-if "%answer%" == "yes" (
- echo. > .license.accepted
- goto :CheckLicenseComplete
-)
-if "%answer%" == "?" more %SOURCE_DIR%\%license_file%
-goto :CheckLicense
-
-:CheckLicenseFailed
-echo You are not licensed to use this software.
-exit /B 1
-
-:CheckLicenseComplete
-
-rem This is the batch equivalent of KDAB_QT_PATH=`qmake -query QT_INSTALL_PREFIX`...
-for /f "tokens=*" %%V in ('qmake -query QT_INSTALL_PREFIX') do set KDAB_QT_PATH=%%V
-
-if "%KDAB_QT_PATH%" == "" (
- echo You need to add qmake to the PATH
- exit /B 1
-)
-
-echo Qt found: %KDAB_QT_PATH%
-
-del /Q /S Makefile* 2> NUL
-del /Q /S debug 2> NUL
-del /Q /S release 2> NUL
-if exist src\src.pro (
- del /Q lib 2> NUL
- del /Q bin 2> NUL
-)
-:Options
-if "%1" == "" goto :EndOfOptions
-
-if "%1" == "-prefix" goto :Prefix
-if "%1" == "/prefix" goto :Prefix
-
-if "%1" == "-override-version" goto :OverrideVersion
-if "%1" == "/override-version" goto :OverrideVersion
-
-if "%1" == "-unittests" goto :Unittests
-if "%1" == "/unittests" goto :Unittests
-
-if "%1" == "-no-unittests" goto :NoUnittests
-if "%1" == "/no-unittests" goto :NoUnittests
-
-if "%1" == "-shared" goto :Shared
-if "%1" == "/shared" goto :Shared
-
-if "%1" == "-static" goto :Static
-if "%1" == "/static" goto :Static
-
-if "%1" == "-qt_static" goto :QT_Static
-if "%1" == "/qt_static" goto :QT_Static
-
-if "%1" == "-release" goto :Release
-if "%1" == "/release" goto :Release
-
-if "%1" == "-debug_and_release" goto :Debug_And_Release
-if "%1" == "/debug_and_release" goto :Debug_And_Release
-
-if "%1" == "-debug" goto :Debug
-if "%1" == "/debug" goto :Debug
-
-if "%1" == "-hostqmake" goto :HostQMake
-if "%1" == "/hostqmake" goto :HostQMake
-
-if "%1" == "-qmake" goto :QMake
-if "%1" == "/qmake" goto :QMake
-
-if "%1" == "-help" goto :Help
-if "%1" == "/help" goto :Help
-if "%1" == "--help" goto :Help
-if "%1" == "/?" goto :Help
-
-echo Unknown option: %1
-goto :usage
-
-:OptionWithArg
-shift
-:OptionNoArg
-shift
-goto :Options
-
-:Prefix
- set prefix="%2"
- goto :OptionWithArg
- echo Installation not supported, -prefix option ignored
- goto :OptionWithArg
-rem goto :usage
-:OverrideVersion
- set VERSION=%2
- goto :OptionWithArg
-:Unittests
- set unittests=yes
- goto :OptionNoArg
-:NoUnittests
- set unittests=no
- goto :OptionNoArg
-:Shared
- set shared=yes
- goto :OptionNoArg
-:Static
- set shared=no
- goto :OptionNoArg
-:Release
- set release=yes
- set debug=no
- set debug_and_release=no
- goto :OptionNoArg
-
-:Debug_And_Release
- set release=no
- set debug=no
- set debug_and_release=yes
- goto :OptionNoArg
-:Debug
- set debug=yes
- set release=no
- set debug_and_release=no
- goto :OptionNoArg
-:QT_Static
-if "%STATIC_BUILD_SUPPORTED%" == "true" (
- set qt_static=yes
- goto :OptionNoArg
-) else (
- echo Static build not supported, -static option not allowed
- goto :usage
-)
-:HostQMake
- set host_qmake=%2
- goto :OptionWithArg
-:QMake
- set target_qmake=%2
- goto :OptionWithArg
-:Unittests
-:Help
- goto :usage
-
-:EndOfOptions
-
-if "%debug_and_release%" == "yes" (
- set QMAKE_ARGS=%QMAKE_ARGS% CONFIG+=debug_and_release CONFIG+=build_all
- goto :END_BUILDTYPE
-)
-
-if "%release%" == "yes" (
- if "%debug%" == "yes" (
- set QMAKE_ARGS=%QMAKE_ARGS% CONFIG+=debug_and_release CONFIG+=build_all
- set release="yes (combined)"
- set debug="yes (combined)"
- ) else (
- set QMAKE_ARGS=%QMAKE_ARGS% CONFIG+=release CONFIG-=debug CONFIG-=debug_and_release
- )
-) else (
- if "%debug%" == "yes" (
- set QMAKE_ARGS=%QMAKE_ARGS% CONFIG-=release CONFIG+=debug CONFIG-=debug_and_release
- ) else (
- echo "Internal error. At least one of debug and release must be set"
- goto :CleanEnd
- )
-)
-:END_BUILDTYPE
-
-if "%shared%" == "yes" (
- set QMAKE_ARGS=%QMAKE_ARGS% CONFIG+=shared
-) else (
- set QMAKE_ARGS=%QMAKE_ARGS% CONFIG+=static
- rem This is needed too, when Qt is static, otherwise it sets -DQT_DLL and linking fails.
- if "%qt_static%" == "yes" (
- set QMAKE_ARGS=%QMAKE_ARGS% CONFIG+=qt_static
- )
-)
-
-if "%unittests%" == "yes" (
- set QMAKE_ARGS=%QMAKE_ARGS% CONFIG+=unittests
-)
-
-set default_prefix=C:\\KDAB\\%Product_mix%-%VERSION%
-
-if "%prefix%" == "" (
- set prefix="%default_prefix%"
-)
-set QMAKE_ARGS=%QMAKE_ARGS% %PRODUCT_CAP%_INSTALL_PREFIX=%prefix%
-
-set QMAKE_ARGS=%QMAKE_ARGS% VERSION=%VERSION%
-set QMAKE_ARGS=%QMAKE_ARGS% CONFIG+=%product_low%_target
-
-if exist "%KDAB_QT_PATH%\include\Qt\private" (
- set QMAKE_ARGS=%QMAKE_ARGS% CONFIG+=have_private_qt_headers
- set QMAKE_ARGS=%QMAKE_ARGS% INCLUDEPATH+=%KDAB_QT_PATH%/include/Qt/private
-) else (
- rem echo KDAB_QT_PATH must point to an installation that has private headers installed.
- rem echo Some features will not be available.
-)
-
-if not "%host_qmake%" == "" (
- set HOST_QMAKE_ARGS=%QMAKE_ARGS%
- set QMAKE_ARGS=%QMAKE_ARGS% CONFIG+=crosscompiling CONFIG+=win32crosscompiling
-)
-
-echo %Product_mix% v%VERSION% configuration:
-echo.
-echo Debug...................: %debug% (default: no)
-echo Release.................: %release% (default: yes)
-echo Shared build............: %shared% (default: yes)
-echo Compiled-In Unit Tests..: %unittests% (default: no)
-echo.
-
-if "%target_qmake%" == "" set target_qmake=%KDAB_QT_PATH%\bin\qmake
-
-%target_qmake% %SOURCE_DIR%\%product_low%.pro -recursive %QMAKE_ARGS% "%PRODUCT_CAP%_BASE=%CD%"
-
-if errorlevel 1 (
- echo qmake failed
- goto :CleanEnd
-)
-
-if not "%host_qmake%" == "" (
- mkdir kdwsdl2cpp
- cd kdwsdl2cpp
- %host_qmake% %SOURCE_DIR%\kdwsdl2cpp -recursive %HOST_QMAKE_ARGS%
-)
-
-echo Ok, now run nmake (for Visual Studio) or mingw32-make (for mingw) to build the framework.
-goto :end
-
-:usage
-IF "%1" NEQ "" echo %0: unknown option "%1"
-echo usage: %0 [options]
-echo where options include:
-echo.
-echo -prefix ^<dir^>
-echo set installation prefix to ^<dir^>, used by make install
-echo.
-echo -release / -debug
-echo build in debug/release mode (default is release)
-echo.
-echo -static / -shared
-echo build static/shared libraries (default shared)
-echo.
-echo -unittests / -no-unittests
-echo enable/disable compiled-in unittests (default is disabled)
-echo
-echo -qmake ^<path^>
-echo explicitly sets the qmake location, instead of using the
-echo qmake in the path.
-echo.
-echo -hostqmake ^<path^>
-echo when cross-compiling, the qmake in the path will be used for
-echo compiling the product's code, but the host qmake will be used
-echo to compile the host tools (code generators).
-echo.
-
-:CleanEnd
-
-:end
diff --git a/autogen/configure.py b/autogen/configure.py
deleted file mode 100644
index 867e22d..0000000
--- a/autogen/configure.py
+++ /dev/null
@@ -1,56 +0,0 @@
-import os.path, sys
-
-class ConfigureScriptGenerator():
- def __init__( self, project, path, version, install = True, static = True ):
- self.__project = project
- self.__path = path
- self.__version = version
- self.__staticSupported = static
- autogen_dir = os.path.dirname( __file__ )
- self.__winTemplate = os.path.abspath( autogen_dir + "/configure.bat.in" )
- self.__unixTemplate = os.path.abspath( autogen_dir + "/configure.sh.in" )
- if not os.path.exists( self.__path + "/LICENSE.GPL.txt") and not os.path.exists( self.__path + "/LICENSE.LGPL.txt" ):
- print "no free license (LICENSE.GPL.txt or LICENSE.LGPL.txt) exists"
- sys.exit( 1 )
- self.__freeLicense = "LGPL" if os.path.exists( self.__path + "/LICENSE.LGPL.txt" ) else "GPL"
- self.__licenseName = { 'GPL': 'GNU General Public License',
- 'LGPL': 'GNU Lesser General Public License' }
-
- def run( self ):
- self.__generateFile( self.__unixTemplate, os.path.abspath( self.__path + "/configure.sh" ), "unix" )
- self.__generateFile( self.__winTemplate, os.path.abspath( self.__path + "/configure.bat" ), "win32" )
-
- def __replaceValues( self, value ):
- mixedname = self.__project
- mixedname = mixedname.replace( "KD", "KD " )
- value = value.replace( "@VERSION@", self.__version )
- strStaticSupported = 'false'
- if self.__staticSupported:
- strStaticSupported = 'true'
- value = value.replace( "@STATIC_BUILD_SUPPORTED@", strStaticSupported )
- value = value.replace( "@PRODUCT_UPPERCASE@", self.__project.upper() )
- value = value.replace( "@PRODUCT_LOWERCASE@", self.__project.lower() )
- value = value.replace( "@PRODUCT_MIXEDCASE@", self.__project )
- value = value.replace( "@PRODUCT_MIXEDCASE_SPACED@", mixedname )
- value = value.replace( "@PRODUCT_LICENSE_FREE@", self.__freeLicense )
- value = value.replace( "@PRODUCT_LICENSE_FREE_NAME@", self.__licenseName[self.__freeLicense] )
- return value
-
- def __generateFile( self, templateFile, outputFile, platformString ):
- if platformString == "win32":
- lineSep = "\r\n"
- else:
- lineSep = "\n"
-
- with open( outputFile, "wb" ) as fOutput:
- with open(os.path.dirname(__file__) + '/' + os.path.basename(outputFile) + '.in') as configureFile:
- configure = configureFile.read().splitlines()
- for line in ( configure ):
- fOutput.write( self.__replaceValues( line.rstrip() ) + lineSep )
-
- # make file executable for Unix
- if platformString != "win32":
- try:
- os.chmod( outputFile, 0755 )
- except SyntaxError: # Python 2.6 says syntax error on Windows, ignore it
- print "ignoring failing os.chmod call, configure.sh won't be executable"
diff --git a/autogen/configure.sh.in b/autogen/configure.sh.in
deleted file mode 100755
index 489d461..0000000
--- a/autogen/configure.sh.in
+++ /dev/null
@@ -1,340 +0,0 @@
-#!/bin/bash
-PRODUCT=@PRODUCT_UPPERCASE@
-Product=@PRODUCT_MIXEDCASE@
-product=@PRODUCT_LOWERCASE@
-ProductSpace="@PRODUCT_MIXEDCASE_SPACED@"
-
-VERSION=@VERSION@
-
-STATIC_BUILD_SUPPORTED=@STATIC_BUILD_SUPPORTED@
-
-SOURCE_DIR=`dirname "$0"`
-PACKSCRIPTS_DIR="$SOURCE_DIR"/../admin/packscripts
-
-hide_symbols=yes
-shared=yes
-debug=no
-release=yes
-prefix=
-unittests=no
-hostqmake=
-targetqmake=
-
-[ -d "$PACKSCRIPTS_DIR" ] && unittests=yes
-
-function die {
- echo "$1" 1>&2
- exit 1
-}
-
-function check_license {
-
- [ -d "$PACKSCRIPTS_DIR" ] && return 0
- [ -f .license.accepted ] && return 0
-
- if [ -f "$SOURCE_DIR"/LICENSE.@PRODUCT_LICENSE_FREE@.txt -a -f "$SOURCE_DIR"/LICENSE.US.txt -a -f "$SOURCE_DIR"/LICENSE.txt ] ; then
- echo
- echo "Please choose your license."
- echo
- echo "Type 1 for the @PRODUCT_LICENSE_FREE_NAME@ (@PRODUCT_LICENSE_FREE@)."
- echo "Type 2 for the $ProductSpace Commercial License for USA/Canada."
- echo "Type 3 for the $ProductSpace Commercial License for anywhere outside USA/Canada."
- echo "Anything else cancels."
- echo
- echo -n "Select: "
- read license
-
- elif [ -f "$SOURCE_DIR"/LICENSE.@PRODUCT_LICENSE_FREE@.txt ] ; then
- license="1"
-
- elif [ -f "$SOURCE_DIR"/LICENSE.US.txt ] ; then
- license="2"
-
- elif [ -f "$SOURCE_DIR"/LICENSE.txt ] ; then
- license="3"
- else
- die "Couldn't find license file, aborting"
- fi
-
- if [ "$license" = "1" ]; then
- license_name="@PRODUCT_LICENSE_FREE_NAME@ (@PRODUCT_LICENSE_FREE@)"
- license_file="$SOURCE_DIR"/LICENSE.@PRODUCT_LICENSE_FREE@.txt
- elif [ "$license" = "2" ]; then
- license_name="$ProductSpace USA/Canada Commercial License"
- license_file="$SOURCE_DIR"/LICENSE.US.txt
- elif [ "$license" = "3" ]; then
- license_name="$ProductSpace Commercial License"
- license_file="$SOURCE_DIR"/LICENSE.txt
- else
- return 1
- fi
-
- while true ; do
- cat <<EOF
-
-License Agreement
-
-You are licensed to use this software under the terms of
-the $license_name.
-
-Type '?' to view the $license_name
-Type 'yes' to accept this license offer.
-Type 'no' to decline this license offer.
-
-Do you accept the terms of this license?
-EOF
- read answer
-
- [ "$answer" = "no" ] && return 1
- [ "$answer" = "yes" ] && touch .license.accepted && return 0
- [ "$answer" = "?" ] && more $license_file
- done
-}
-
-if ! check_license ; then
- die "You are not licensed to use this software."
-fi
-
-function usage {
- [ -z "$1" ] || echo "$0: unknown option \"$1\"" 1>&2
- echo "usage: $0 [options]" 1>&2
- cat <<EOF 1>&2
-where options include:
-
-EOF
-cat <<EOF 1>&2
- -prefix <path>
- install $ProductSpace into <path>
-EOF
-cat <<EOF 1>&2
-
- -release / -debug
- build in debug/release mode
-EOF
-if [ "$STATIC_BUILD_SUPPORTED" = "true" ]; then
- cat <<EOF 1>&2
-
- -static / -shared
- build static/shared libraries
-EOF
-fi
-cat <<EOF 1>&2
-
- -[no-]hide-symbols (Unix only)
- reduce the number of exported symbols
-
- -[no-]unittests
- enable/disable compiled-in unittests
-
- -qmake </qt/bin/qmake>
- explicitly sets the qmake location, instead of using the
- qmake in the path.
-
- -hostqmake </host/qt/bin/qmake>
- when cross-compiling, the qmake in the path will be used for
- compiling the product's code, but the host qmake will be used
- to compile the host tools (code generators).
-
- -spec <mkspec>
- compile $ProductSpace for specific Qt-supported target <mkspec>
-
-EOF
- exit 1
-}
-
-
-while [ $# -ne 0 ] ; do
- case "$1" in
- -prefix)
- shift
- if [ $# -eq 0 ] ; then
- echo "-prefix needs an argument" 2>&1
- usage
- fi
- prefix="$1"
- ;;
- -no-hide-symbols)
- hide_symbols=no
- ;;
- -hide-symbols)
- hide_symbols=yes
- ;;
- -override-version) # undocumented by design
- shift
- if [ $# -eq 0 ] ; then
- echo "-override-version needs an argument" 2>&1
- usage
- fi
- VERSION="$1"
- ;;
- -no-unittests)
- unittests=no
- ;;
- -unittests)
- unittests=yes
- ;;
- -shared)
- shared=yes
- ;;
- -static)
- if [ "$STATIC_BUILD_SUPPORTED" != "true" ]; then
- echo "Static build not supported, -static option not allowed" 2>&1
- usage
- fi
- shared=no
- ;;
- -debug)
- debug=yes
- release=no
- ;;
- -release)
- debug=no
- release=yes
- ;;
- -spec)
- shift
- if [ $# -eq 0 ] ; then
- echo "-spec needs an argument" 2>&1
- usage
- fi
- SPEC="-spec $1"
- ;;
- -hostqmake)
- shift
- if [ $# -eq 0 ] ; then
- echo "-hostqmake needs an argument" 2>&1
- usage
- fi
- hostqmake="$1"
- ;;
- -qmake)
- shift
- if [ $# -eq 0 ] ; then
- echo "-make needs an argument" 2>&1
- usage
- fi
- targetqmake="$1"
- ;;
- *)
- usage "$1"
- ;;
- esac
- shift
-done
-
-if [ -n "$targetqmake" ] ; then
- if [ -z "$QTDIR" ] ; then
- QTDIR="$($targetqmake -query QT_INSTALL_PREFIX)"
- if [ $? -ne 0 ] ; then
- die "$targetqmake -query QT_INSTALL_PREFIX gave an error"
- fi
- fi
-else
- for qmk in qmake qmake-qt5 qmake-qt4
- do
- which "$qmk" >/dev/null 2>&1
- if [ $? -eq 0 -a -z "$targetqmake" ] ; then
- QTDIR="$($qmk -query QT_INSTALL_PREFIX)"
- if [ $? -eq 0 ] ; then
- targetqmake=$qmk
- break
- fi
- fi
- done
- [ -z "$targetqmake" ] && die "You need qmake or qmake-qt5 or qmake-qt4 in the PATH"
-fi
-
-
-find . -name debug -o -name release -o -name Makefile\* | xargs rm -rf
-
-if [ -f src/src.pro ] ; then
- rm -rf lib bin
-fi
-
-default_prefix=/usr/local/KDAB/$Product-$VERSION
-if [ -z "$prefix" ] ; then
- prefix="$default_prefix"
-fi
-
-QMAKE_ARGS="$QMAKE_ARGS VERSION=$VERSION"
-QMAKE_ARGS="$QMAKE_ARGS CONFIG+=${product}_target"
-
-if [ "$debug" = "yes" ]; then
- QMAKE_ARGS="$QMAKE_ARGS CONFIG-=release CONFIG+=debug CONFIG-=debug_and_release"
-fi
-
-if [ "$release" = "yes" ]; then
- QMAKE_ARGS="$QMAKE_ARGS CONFIG+=release CONFIG-=debug CONFIG-=debug_and_release"
-fi
-
-[ "$hide_symbols" = "yes" ] && QMAKE_ARGS="$QMAKE_ARGS CONFIG+=hide_symbols"
-
-[ "$unittests" = "yes" ] && QMAKE_ARGS="$QMAKE_ARGS CONFIG+=unittests"
-
-if [ "$shared" = "yes" ]; then
- QMAKE_ARGS="$QMAKE_ARGS CONFIG-=static CONFIG-=staticlib CONFIG+=shared"
-else
- QMAKE_ARGS="$QMAKE_ARGS CONFIG+=static CONFIG+=staticlib CONFIG-=shared"
-fi
-
-if [ -d "$QTDIR/include/Qt/private" ] ; then
- QMAKE_ARGS="$QMAKE_ARGS CONFIG+=have_private_qt_headers"
- QMAKE_ARGS="$QMAKE_ARGS INCLUDEPATH+=$QTDIR/include/Qt/private"
-#else
- #echo "QTDIR must point to an installation that has private headers installed."
- #echo "Some features will not be available."
-fi
-
-QMAKE_ARGS="$QMAKE_ARGS ${PRODUCT}_INSTALL_PREFIX=$prefix"
-
-# This must be the last line that touches QMAKE_ARGS
-if [ "$hostqmake" != "" ] ; then
- HOST_QMAKE_ARGS="$QMAKE_ARGS"
- QMAKE_ARGS="$QMAKE_ARGS CONFIG+=crosscompiling"
-fi
-
-
-cat <<EOF 1>&2
-$ProductSpace v$VERSION configuration:
-EOF
-
-cat <<EOF 1>&2
- Install Prefix.............: $prefix
- (default: $default_prefix)
-EOF
-
-cat <<EOF 1>&2
- Debug......................: $debug (default: no)
- Release....................: $release (default: yes)
-EOF
-if [ "$STATIC_BUILD_SUPPORTED" = "true" ]; then
- cat <<EOF 1>&2
- Shared build...............: $shared (default: yes)
-EOF
-fi
-if [ "$SPEC" != "" ]; then
- cat <<EOF 1>&2
- Spec.......................: ${SPEC#-spec }
-EOF
-fi
-if [ "$hostqmake" != "" ]; then
- cat <<EOF 1>&2
- Host qmake................: ${hostqmake}
-EOF
-fi
-cat <<EOF 1>&2
- Compiled-In Unit Tests.....: $unittests (default: no)
- Restricted symbol export
- (shared build only)......: $hide_symbols (default: yes)
-
-EOF
-
-"$targetqmake" ${SPEC} "$SOURCE_DIR"/$product.pro -recursive $QMAKE_ARGS "${PRODUCT}_BASE=`pwd`" || die "qmake failed"
-
-if [ "$hostqmake" != "" -a -d "$SOURCE_DIR"/kdwsdl2cpp ]; then
- [ -d kdwsdl2cpp ] || mkdir kdwsdl2cpp
- cd kdwsdl2cpp
- $hostqmake "$SOURCE_DIR"/kdwsdl2cpp -recursive $HOST_QMAKE_ARGS || die "host qmake failed"
-fi
-
-echo "Ok, now run make, then make install to install into $prefix"
diff --git a/autogen/cpack.cmake.in b/autogen/cpack.cmake.in
deleted file mode 100644
index b4719bf..0000000
--- a/autogen/cpack.cmake.in
+++ /dev/null
@@ -1,46 +0,0 @@
-SET(CPACK_PACKAGE_NAME "@CPACK_PACKAGE_NAME@")
-SET(CPACK_PACKAGE_NAME_SIMPLIFIED "@CPACK_PACKAGE_NAME_SIMPLIFIED@")
-SET(CPACK_PACKAGE_VERSION_MAJOR "@CPACK_PACKAGE_VERSION_MAJOR@")
-SET(CPACK_PACKAGE_VERSION_MINOR "@CPACK_PACKAGE_VERSION_MINOR@")
-SET(CPACK_PACKAGE_VERSION_PATCH "@CPACK_PACKAGE_VERSION_PATCH@")
-SET(CPACK_INSTALL_DIRECTORY "@CPACK_INSTALL_DIRECTORY@")
-SET(CPACK_PACKAGE_VENDOR "KDAB")
-
-SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-GET_FILENAME_COMPONENT(CPACK_INSTALLED_DIRECTORIES "${CPACK_INSTALL_DIRECTORY}" REALPATH)
-LIST(APPEND CPACK_INSTALLED_DIRECTORIES ".")
-
-SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_SIMPLIFIED}-${CPACK_PACKAGE_VERSION}-source")
-SET(CPACK_PACKAGE_NAME_AND_VERSION "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Source")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_FILE_NAME}")
-
-IF(WIN32)
- SET(CPACK_GENERATOR "@CPACK_GENERATOR_WINDOWS@")
- SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME_AND_VERSION}")
- SET(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_NAME_AND_VERSION}")
- SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME_AND_VERSION}")
- SET(CPACK_NSIS_INSTALL_ROOT "C:\\KDAB") # use "$PROGRAMFILES" to get "C:\Program Files" or similar
- SET(CPACK_NSIS_URL_INFO_ABOUT "https://www.kdab.com")
- SET(CPACK_NSIS_MENU_LINKS
- "LICENSE.txt" "License"
- "LICENSE.@PRODUCT_LICENSE_FREE@.txt" "License (@PRODUCT_LICENSE_FREE@)"
- "LICENSE.US.txt" "License (US)"
- "README.txt" "Readme")
- SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME_AND_VERSION}")
-ELSEIF(APPLE)
- SET(CPACK_GENERATOR "@CPACK_GENERATOR_APPLE@")
- SET(CPACK_SYSTEM_NAME "OSX")
-ELSE()
- SET(CPACK_GENERATOR "@CPACK_GENERATOR_ELSE@")
-ENDIF()
-
-SET(CPACK_TOPLEVEL_TAG "${CPACK_SYSTEM_NAME}")
-SET(CPACK_RESOURCE_FILE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@")
-FILE(TO_CMAKE_PATH "${CPACK_INSTALL_DIRECTORY}" XPLATFORM_INSTALL_DIR) # to get forward slashes on Windows
-SET(CPACK_IGNORE_FILES "^${XPLATFORM_INSTALL_DIR}/autogen.py$" "^${XPLATFORM_INSTALL_DIR}/genignore.py$"
- "^${XPLATFORM_INSTALL_DIR}/CPackIgnores.txt$"
- "/\\.svn/" "/\\.git/" "\\.cache$" "/[\\._]moc/" "/[\\._]obj/" "[\\._]ui/"
- "[\\._]qrc/" "\\.pdb$" "\\.zip$" "\\.exe$" "\\.tar" "Makefile" "CPack"
- "\\.license\\.accepted$" "/bin/" "/lib/" "/b/"
- "/debug/" "/release/" "-source/" "/autogen/" @CPACK_EXTRA_IGNORE_FILES@)
-SET(CPACK_PACKAGE_DESCRIPTION "")
diff --git a/autogen/cpack.py b/autogen/cpack.py
deleted file mode 100644
index f2c6279..0000000
--- a/autogen/cpack.py
+++ /dev/null
@@ -1,77 +0,0 @@
-from datetime import datetime
-import os.path
-
-class CPackGenerateConfiguration():
- def __init__( self, projectName, version, sourceDirectory, buildDirectory, revision,
- licenseFile, isTaggedRevision = False ):
- self._projectName = projectName
- self._sourceDirectory = sourceDirectory
- self._buildDirectory = buildDirectory
- self._revision = revision
- self._licenseFile = licenseFile
- self._isTaggedRevision = isTaggedRevision
- versionList = version.split( "." )
- assert( isinstance( versionList, list ) and len( versionList ) == 3 )
- self._versionList = versionList
- self._generators = { 'WINDOWS': 'NSIS', 'APPLE': 'ZIP', 'ELSE': 'TBZ2' }
-
- def fixCMakeWindowsPaths( self, path ):
- return path.replace( '\\', '\\\\' )
-
- def ignoreString( self ):
- ignores = str()
- try:
- with open( os.path.join( self._sourceDirectory, 'CPackIgnores.txt' ) ) as ignoresFile:
- for ignore in ignoresFile:
- # using ${CPACK_INSTALL_DIRECTORY} or similar seems to be the only way to specify
- # "absolute" *sub*directory names. XPLATFORM_INSTALL_DIR is set by us and like
- # CPACK_INSTALL_DIRECTORY, but with forward slashes instead of backslashes.
- ignores += '\n "^${XPLATFORM_INSTALL_DIR}' + ignore[ :-1 ] + '"'
- except:
- pass # It's not mandatory to add ignores
- return ignores
-
- def _formattedConfiguration( self ):
- with open(os.path.dirname(__file__) + '/cpack.cmake.in') as configFile:
- config = configFile.read()
-
- # Can't do this with str.format because of CMake's variable escaping conflicting
- # with Python's format escaping
- packageName = self._projectName
- packageNameSimplified = packageName.lower().replace( ' ', '_' )
- config = config.replace( "@CPACK_PACKAGE_NAME@", packageName, 1 )
- config = config.replace( "@CPACK_PACKAGE_NAME_SIMPLIFIED@", packageNameSimplified, 1 )
-
- versionList = self._versionList
- config = config.replace( "@CPACK_PACKAGE_VERSION_MAJOR@", versionList[0] or 1, 1 )
- config = config.replace( "@CPACK_PACKAGE_VERSION_MINOR@", versionList[1] or 0, 1 )
- patchVersion = versionList[2] or 0
- if not self._isTaggedRevision:
- patchVersion += '-r' + self._revision
- config = config.replace( "@CPACK_PACKAGE_VERSION_PATCH@", patchVersion, 1 )
- installDirectory = self.fixCMakeWindowsPaths( self._sourceDirectory )
- config = config.replace( "@CPACK_INSTALL_DIRECTORY@", installDirectory, 1 )
- config = config.replace( "@CPACK_EXTRA_IGNORE_FILES@", self.ignoreString(), 1 )
-
- licenseFile = self._licenseFile
-
- if not licenseFile:
- licenseFile = os.path.join( self._buildDirectory, "CPackGeneratedLicense.txt" )
- with open( licenseFile, 'w' ) as license:
- license.write( '{0} - Copyright {1}, All Rights Reserved.'.format( packageName, datetime.now().year ) )
- else:
- licenseFile = os.path.abspath( licenseFile ) # NSIS apparently requires an absolute path to find the license file
- licenseFile = self.fixCMakeWindowsPaths( licenseFile )
-
- config = config.replace( "@CPACK_RESOURCE_FILE_LICENSE@", licenseFile )
-
- for platform in ( 'WINDOWS', 'APPLE', 'ELSE' ):
- generator = self._generators[ platform ]
- config = config.replace( "@CPACK_GENERATOR_%s@" % platform, generator )
-
- return config
-
- def run( self ):
- config = os.path.join( self._buildDirectory, 'CPackConfig.cmake' )
- with open( config, 'w' ) as configFile:
- configFile.write( self._formattedConfiguration() )
diff --git a/autogen/header.py b/autogen/header.py
deleted file mode 100644
index 5854d88..0000000
--- a/autogen/header.py
+++ /dev/null
@@ -1,199 +0,0 @@
-from shutil import copyfile, rmtree
-from string import Template
-import os.path
-import re
-import sys
-import autogen
-
-class ForwardHeaderGenerator():
- def __init__( self, copy, path, includepath, srcpath, project, subprojects, prefix,
- prefixed, cleanIncludeDir = True, additionalHeaders = {} ):
- self.copy = copy
- self.path = path
- self.includepath = includepath
- self.srcpath = srcpath
- self.project = project
- self.subprojects = subprojects
- self.prefix = prefix
- self.prefixed = prefixed
- self.cleanIncludeDir = cleanIncludeDir
- self.additionalHeaders = additionalHeaders
- self.__projectFile = ""
-
- def run( self ):
- self.createProject()
-
- def _isValidHeaderFile( self, filename ):
- if ( filename.endswith( ".h" ) ):
- if filename.startswith( "moc_" ):
- return False
- if filename.startswith( "ui_" ):
- return False
- if filename.startswith( "qrc_" ):
- return False;
- if filename.endswith( "_p.h" ):
- return False
- return True
- else:
- return False
-
- def _suggestedHeaderNames( self, project, header ):
- regex = re.compile( "(?:class\s+[{0}|{1}][_0-9A-Z]*_EXPORT|MAKEINCLUDES_EXPORT)\s+([a-zA-Z_][A-Za-z0-9_]*)"
- .format( project.upper(), self.project.upper() ) )
- regex2 = re.compile( "(?:class\s+MAKEINCLUDES_EXPORT)\s+([a-zA-Z_][A-Za-z0-9_]*)" )
- regex3 = re.compile( "(?:\\\\file)\s+([a-zA-Z_][A-Za-z0-9_]*)" )
-
- f = open( header, "r" )
- classNames = set()
-
- for line in f.readlines():
- line = line.strip()
-
- className = None
- noPrefix = False
- if ( regex.match( line ) ):
- className = regex.match( line ).groups()[0]
- noPrefix = False
- else:
- if regex2.match( line ):
- className = regex2.match( line ).groups()[0]
- noPrefix = False
- else:
- if ( None != regex3.search( line ) ):
- className = regex3.search( line ).groups()[0]
- noPrefix = True
-
- if not className:
- continue
-
- if self.prefixed and not noPrefix:
- className = project + className
-
- classNames.add( className )
-
- f.close()
-
- return classNames
-
- def _addForwardHeader( self, targetPath, fileName, projectFile ):
- INCLUDE_STR = "#include \"{0}\""
- newHeader = open( targetPath, "wb" )
- newHeader.write( INCLUDE_STR.format( fileName ) + os.linesep )
- newHeader.close()
-
- basename = os.path.basename( targetPath )
- projectFile.write( basename + " \\" + os.linesep )
-
- def _createForwardHeader( self, header, projectFile, project ):
- path = os.path.dirname( header )
- basename = os.path.basename( header )
- classNames = self._suggestedHeaderNames( project, header )
-
- if len( classNames ) > 0:
- for classname in classNames:
- fHeaderName = os.path.abspath( path + "/" + classname )
- self._addForwardHeader( fHeaderName, basename, projectFile )
-
- projectFile.write( basename + " \\" + os.linesep )
- elif not basename in self.additionalHeaders.values(): # only create "foo" for "foo.h" if additionalHeaders doesn't overrides it
- sanitizedBasename = basename.replace( ".h", "" )
-
- #fHeaderName = os.path.abspath( self.includepath + "/" + sanitizedBasename )
- #self._addForwardHeader( fHeaderName, basename, self.__projectFile )
-
- fHeaderNameProjectDir = os.path.dirname( os.path.abspath( header ) ) + "/" + sanitizedBasename;
- self._addForwardHeader( fHeaderNameProjectDir, "{0}".format( basename ), projectFile )
- projectFile.write( basename + " \\" + os.linesep )
-
- def createProject( self ):
- if ( not os.path.exists( self.path ) ):
- errStr = Template( "Error, the directory $DIR does not exist!" )
- errStr = errStr.substitute( DIR = self.path )
- raise BaseException( errStr )
-
- if self.cleanIncludeDir and os.path.exists( self.includepath ):
- rmtree( self.includepath )
- if not os.path.exists( self.includepath ):
- os.mkdir( self.includepath )
-
- if autogen.policyVersion() >= 2:
- includeProjectName = os.path.basename( self.includepath.rstrip( "/" ) )
- else:
- includeProjectName = self.project
- profilename = os.path.abspath( self.includepath ) + "/" + includeProjectName + ".pro"
- projectFile = open( profilename, "wb" )
- self.__projectFile = projectFile
- lines = []
- lines.append( "TEMPLATE = subdirs" + os.linesep )
- lines.append( "SUBDIRS = " )
-
- for subProject in self.subprojects:
- line = subProject
- if ( subProject != self.subprojects[ -1 ] ):
- line += " \\"
- lines.append( line + os.linesep )
-
- projectFile.writelines( lines )
- projectFile.write( os.linesep )
-
- projectFile.write( "INSTALL_HEADERS.files = " )
-
- for subProject in self.subprojects:
- self._createSubproject( subProject )
-
- for fileName, includePath in self.additionalHeaders.items():
- targetPath = os.path.join( self.includepath, fileName )
- self._addForwardHeader( targetPath , includePath, projectFile )
-
- self._copyHeaders( self.srcpath, self.includepath, projectFile, self.project, self.prefixed )
- installPath = "{0}/include".format( self.prefix )
- self._projectFile_finalize( projectFile, installPath )
- projectFile.close()
-
- def _createSubproject( self, project ):
- inclPath = os.path.abspath( self.includepath + "/" + project )
- srcPath = os.path.abspath( self.srcpath + "/" + project )
- os.mkdir( inclPath )
- profilename = os.path.abspath( self.includepath ) + "/" + project + "/" + project + ".pro"
- projectFile = open( profilename, "wb" )
- projectFile.write( "TEMPLATE = subdirs" + os.linesep )
- projectFile.write( "INSTALL_HEADERS.files = " )
- self._copyHeaders( srcPath, inclPath, projectFile, project, self.prefixed )
- installPath = "{0}/include/{1}".format( self.prefix, project )
- self._projectFile_finalize( projectFile, installPath )
- projectFile.close()
-
- def _projectFile_finalize( self, projectFile, installPath ):
- projectFile.write( os.linesep )
- #projectFile.write( "message( $$INSTALL_HEADERS.path )" + os.linesep )
- projectFile.write( "INSTALL_HEADERS.path = {0}".format( installPath ) + os.linesep )
- #projectFile.write( "message( $$INSTALL_HEADERS.path )" + os.linesep )
- projectFile.write( "INSTALLS += INSTALL_HEADERS" + os.linesep )
-
- def _copyHeaders( self, srcDir, destDir, projectFile, project, prefixed = False ):
- rootDir = srcDir == self.srcpath
- dir = os.listdir( srcDir )
- headersForCatchAll = []
- for filename in dir:
- if ( rootDir ):
- if ( filename in self.subprojects ):
- continue
- file = os.path.abspath( srcDir + "/" + filename )
- if os.path.isdir( file ):
- self._copyHeaders( file, destDir, projectFile, project, prefixed )
- else:
- if self._isValidHeaderFile( filename ):
- destfile = os.path.abspath( destDir + "/" + filename )
- srcfile = os.path.abspath( srcDir + "/" + filename )
- copyfile( srcfile, destfile )
- self._createForwardHeader( destfile, projectFile, project )
- headersForCatchAll.append( filename )
- # Create "catch all" convenience header including all headers:
- if len( headersForCatchAll ) > 0:
- catchAllFileName = os.path.abspath( destDir + "/" + os.path.basename( destDir ) )
- catchAllContent = ["#include \"%s\"%s" % (header, os.linesep) for header in headersForCatchAll]
- catchAllFile = open( catchAllFileName, "wb" )
- catchAllFile.writelines( catchAllContent )
- catchAllFile.close()
- projectFile.write( os.path.basename( catchAllFileName ) + " \\" + os.linesep )
-
diff --git a/cmake/CMakePackageConfigHelpers.cmake b/cmake/CMakePackageConfigHelpers.cmake
deleted file mode 100644
index 48039e5..0000000
--- a/cmake/CMakePackageConfigHelpers.cmake
+++ /dev/null
@@ -1,227 +0,0 @@
-# - CONFIGURE_PACKAGE_CONFIG_FILE(), WRITE_BASIC_PACKAGE_VERSION_FILE()
-#
-# CONFIGURE_PACKAGE_CONFIG_FILE(<input> <output> INSTALL_DESTINATION <path>
-# [PATH_VARS <var1> <var2> ... <varN>]
-# [NO_SET_AND_CHECK_MACRO]
-# [NO_CHECK_REQUIRED_COMPONENTS_MACRO])
-#
-# CONFIGURE_PACKAGE_CONFIG_FILE() should be used instead of the plain
-# CONFIGURE_FILE() command when creating the <Name>Config.cmake or <Name>-config.cmake
-# file for installing a project or library. It helps making the resulting package
-# relocatable by avoiding hardcoded paths in the installed Config.cmake file.
-#
-# In a FooConfig.cmake file there may be code like this to make the
-# install destinations know to the using project:
-# set(FOO_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@" )
-# set(FOO_DATA_DIR "@CMAKE_INSTALL_PREFIX@/@RELATIVE_DATA_INSTALL_DIR@" )
-# set(FOO_ICONS_DIR "@CMAKE_INSTALL_PREFIX@/share/icons" )
-# ...logic to determine installedPrefix from the own location...
-# set(FOO_CONFIG_DIR "${installedPrefix}/@CONFIG_INSTALL_DIR@" )
-# All 4 options shown above are not sufficient, since the first 3 hardcode
-# the absolute directory locations, and the 4th case works only if the logic
-# to determine the installedPrefix is correct, and if CONFIG_INSTALL_DIR contains
-# a relative path, which in general cannot be guaranteed.
-# This has the effect that the resulting FooConfig.cmake file would work poorly
-# under Windows and OSX, where users are used to choose the install location
-# of a binary package at install time, independent from how CMAKE_INSTALL_PREFIX
-# was set at build/cmake time.
-#
-# Using CONFIGURE_PACKAGE_CONFIG_FILE() helps. If used correctly, it makes the
-# resulting FooConfig.cmake file relocatable.
-# Usage:
-# 1. write a FooConfig.cmake.in file as you are used to
-# 2. insert a line containing only the string "@PACKAGE_INIT@"
-# 3. instead of SET(FOO_DIR "@SOME_INSTALL_DIR@"), use SET(FOO_DIR "@PACKAGE_SOME_INSTALL_DIR@")
-# (this must be after the @PACKAGE_INIT@ line)
-# 4. instead of using the normal CONFIGURE_FILE(), use CONFIGURE_PACKAGE_CONFIG_FILE()
-#
-# The <input> and <output> arguments are the input and output file, the same way
-# as in CONFIGURE_FILE().
-#
-# The <path> given to INSTALL_DESTINATION must be the destination where the FooConfig.cmake
-# file will be installed to. This can either be a relative or absolute path, both work.
-#
-# The variables <var1> to <varN> given as PATH_VARS are the variables which contain
-# install destinations. For each of them the macro will create a helper variable
-# PACKAGE_<var...>. These helper variables must be used
-# in the FooConfig.cmake.in file for setting the installed location. They are calculated
-# by CONFIGURE_PACKAGE_CONFIG_FILE() so that they are always relative to the
-# installed location of the package. This works both for relative and also for absolute locations.
-# For absolute locations it works only if the absolute location is a subdirectory
-# of CMAKE_INSTALL_PREFIX.
-#
-# By default configure_package_config_file() also generates two helper macros,
-# set_and_check() and check_required_components() into the FooConfig.cmake file.
-#
-# set_and_check() should be used instead of the normal set()
-# command for setting directories and file locations. Additionally to setting the
-# variable it also checks that the referenced file or directory actually exists
-# and fails with a FATAL_ERROR otherwise. This makes sure that the created
-# FooConfig.cmake file does not contain wrong references.
-# When using the NO_SET_AND_CHECK_MACRO, this macro is not generated into the
-# FooConfig.cmake file.
-#
-# check_required_components(<package_name>) should be called at the end of the
-# FooConfig.cmake file if the package supports components.
-# This macro checks whether all requested, non-optional components have been found,
-# and if this is not the case, sets the Foo_FOUND variable to FALSE, so that the package
-# is considered to be not found.
-# It does that by testing the Foo_<Component>_FOUND variables for all requested
-# required components.
-# When using the NO_CHECK_REQUIRED_COMPONENTS option, this macro is not generated
-# into the FooConfig.cmake file.
-#
-# For an example see below the documentation for WRITE_BASIC_PACKAGE_VERSION_FILE().
-#
-#
-# WRITE_BASIC_PACKAGE_VERSION_FILE( filename VERSION major.minor.patch COMPATIBILITY (AnyNewerVersion|SameMajorVersion|ExactVersion) )
-#
-# Writes a file for use as <package>ConfigVersion.cmake file to <filename>.
-# See the documentation of FIND_PACKAGE() for details on this.
-# filename is the output filename, it should be in the build tree.
-# major.minor.patch is the version number of the project to be installed
-# The COMPATIBILITY mode AnyNewerVersion means that the installed package version
-# will be considered compatible if it is newer or exactly the same as the requested version.
-# This mode should be used for packages which are fully backward compatible,
-# also across major versions.
-# If SameMajorVersion is used instead, then the behaviour differs from AnyNewerVersion
-# in that the major version number must be the same as requested, e.g. version 2.0 will
-# not be considered compatible if 1.0 is requested.
-# This mode should be used for packages which guarantee backward compatibility within the
-# same major version.
-# If ExactVersion is used, then the package is only considered compatible if the requested
-# version matches exactly its own version number (not considering the tweak version).
-# For example, version 1.2.3 of a package is only considered compatible to requested version 1.2.3.
-# This mode is for packages without compatibility guarantees.
-# If your project has more elaborated version matching rules, you will need to write your
-# own custom ConfigVersion.cmake file instead of using this macro.
-#
-# Internally, this macro executes configure_file() to create the resulting
-# version file. Depending on the COMPATIBLITY, either the file
-# BasicConfigVersion-SameMajorVersion.cmake.in or BasicConfigVersion-AnyNewerVersion.cmake.in
-# is used. Please note that these two files are internal to CMake and you should
-# not call configure_file() on them yourself, but they can be used as starting
-# point to create more sophisticted custom ConfigVersion.cmake files.
-#
-#
-# Example using both configure_package_config_file() and write_basic_package_version_file():
-# CMakeLists.txt:
-# set(INCLUDE_INSTALL_DIR include/ ... CACHE )
-# set(LIB_INSTALL_DIR lib/ ... CACHE )
-# set(SYSCONFIG_INSTALL_DIR etc/foo/ ... CACHE )
-# ...
-# include(CMakePackageConfigHelpers)
-# configure_package_config_file(FooConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FooConfig.cmake
-# INSTALL_DESTINATION ${LIB_INSTALL_DIR}/Foo/cmake
-# PATH_VARS INCLUDE_INSTALL_DIR SYSCONFIG_INSTALL_DIR)
-# write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/FooConfigVersion.cmake
-# VERSION 1.2.3
-# COMPATIBILITY SameMajorVersion )
-# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FooConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/FooConfigVersion.cmake
-# DESTINATION ${LIB_INSTALL_DIR}/Foo/cmake )
-#
-# With a FooConfig.cmake.in:
-# set(FOO_VERSION x.y.z)
-# ...
-# @PACKAGE_INIT@
-# ...
-# set_and_check(FOO_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-# set_and_check(FOO_SYSCONFIG_DIR "@PACKAGE_SYSCONFIG_INSTALL_DIR@")
-#
-# check_required_components(Foo)
-
-
-#=============================================================================
-# Copyright 2012 Alexander Neundorf <neundorf@kde.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-include(CMakeParseArguments)
-
-include(WriteBasicConfigVersionFile)
-
-macro(WRITE_BASIC_PACKAGE_VERSION_FILE)
- write_basic_config_version_file(${ARGN})
-endmacro()
-
-
-function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
- set(options NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- set(oneValueArgs INSTALL_DESTINATION )
- set(multiValueArgs PATH_VARS )
-
- cmake_parse_arguments(CCF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
- if(CCF_UNPARSED_ARGUMENTS)
- message(FATAL_ERROR "Unknown keywords given to CONFIGURE_PACKAGE_CONFIG_FILE(): \"${CCF_UNPARSED_ARGUMENTS}\"")
- endif()
-
- if(NOT CCF_INSTALL_DESTINATION)
- message(FATAL_ERROR "No INSTALL_DESTINATION given to CONFIGURE_PACKAGE_CONFIG_FILE()")
- endif()
-
- if(IS_ABSOLUTE "${CCF_INSTALL_DESTINATION}")
- set(absInstallDir "${CCF_INSTALL_DESTINATION}")
- else()
- set(absInstallDir "${CMAKE_INSTALL_PREFIX}/${CCF_INSTALL_DESTINATION}")
- endif()
- file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${absInstallDir}" "${CMAKE_INSTALL_PREFIX}" )
-
- foreach(var ${CCF_PATH_VARS})
- if(NOT DEFINED ${var})
- message(FATAL_ERROR "Variable ${var} does not exist")
- else()
- if(IS_ABSOLUTE "${${var}}")
- string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${PACKAGE_PREFIX_DIR}"
- PACKAGE_${var} "${${var}}")
- else()
- set(PACKAGE_${var} "\${PACKAGE_PREFIX_DIR}/${${var}}")
- endif()
- endif()
- endforeach()
-
- set(PACKAGE_INIT "
-####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
-get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE_RELATIVE_PATH}\" ABSOLUTE)
-")
-
- if(NOT CCF_NO_SET_AND_CHECK_MACRO)
- set(PACKAGE_INIT "${PACKAGE_INIT}
-macro(set_and_check _var _file)
- set(\${_var} \"\${_file}\")
- if(NOT EXISTS \"\${_file}\")
- message(FATAL_ERROR \"File or directory \${_file} referenced by variable \${_var} does not exist !\")
- endif()
-endmacro()
-")
- endif()
-
-
- if(NOT CCF_NO_CHECK_REQUIRED_COMPONENTS_MACRO)
- set(PACKAGE_INIT "${PACKAGE_INIT}
-macro(check_required_components _NAME)
- foreach(comp \${\${_NAME}_FIND_COMPONENTS})
- if(NOT \${_NAME}_\${comp}_FOUND)
- if(\${_NAME}_FIND_REQUIRED_\${comp})
- set(\${_NAME}_FOUND FALSE)
- endif()
- endif()
- endforeach(comp)
-endmacro()
-")
- endif()
-
- set(PACKAGE_INIT "${PACKAGE_INIT}
-####################################################################################")
-
- configure_file("${_inputFile}" "${_outputFile}" @ONLY)
-
-endfunction()
diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS
deleted file mode 100644
index 4b41776..0000000
--- a/cmake/COPYING-CMAKE-SCRIPTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cmake/ECM/modules/BSD-3-Clause.txt b/cmake/ECM/modules/BSD-3-Clause.txt
new file mode 100644
index 0000000..d583b4a
--- /dev/null
+++ b/cmake/ECM/modules/BSD-3-Clause.txt
@@ -0,0 +1,28 @@
+Copyright (c) <year> <owner>. All rights reserved.
+
+This license applies to the CMake ECM modules only.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cmake/ECM/modules/ECMGenerateHeaders.cmake b/cmake/ECM/modules/ECMGenerateHeaders.cmake
new file mode 100644
index 0000000..86f35ad
--- /dev/null
+++ b/cmake/ECM/modules/ECMGenerateHeaders.cmake
@@ -0,0 +1,223 @@
+# SPDX-FileCopyrightText: 2013 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
+# SPDX-FileCopyrightText: 2014 Alex Merry <alex.merry@kdemail.net>
+# SPDX-FileCopyrightText: 2015 Patrick Spendrin <patrick.spendrin@kdab.com>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#[=======================================================================[.rst:
+ECMGenerateHeaders
+------------------
+
+Generate C/C++ CamelCase forwarding headers.
+
+::
+
+ ecm_generate_headers(<camelcase_forwarding_headers_var>
+ HEADER_NAMES <CamelCaseName> [<CamelCaseName> [...]]
+ [ORIGINAL <CAMELCASE|LOWERCASE>]
+ [HEADER_EXTENSION <header_extension>]
+ [OUTPUT_DIR <output_dir>]
+ [PREFIX <prefix>]
+ [REQUIRED_HEADERS <variable>]
+ [COMMON_HEADER <HeaderName>]
+ [RELATIVE <relative_path>])
+
+For each CamelCase header name passed to ``HEADER_NAMES``, a file of that name
+will be generated that will include a version with ``.h`` or, if set,
+``.<header_extension>`` appended.
+For example, the generated header ``ClassA`` will include ``classa.h`` (or
+``ClassA.h``, see ``ORIGINAL``).
+If a CamelCaseName consists of multiple comma-separated files, e.g.
+``ClassA,ClassB,ClassC``, then multiple camelcase header files will be
+generated which are redirects to the first header file.
+The file locations of these generated headers will be stored in
+<camelcase_forwarding_headers_var>.
+
+``ORIGINAL`` specifies how the name of the original header is written: lowercased
+or also camelcased. The default is "LOWERCASE". Since 1.8.0.
+
+``HEADER_EXTENSION`` specifies what file name extension is used for the header
+files. The default is "h". Since 5.48.0.
+
+``PREFIX`` places the generated headers in subdirectories. This should be a
+CamelCase name like ``KParts``, which will cause the CamelCase forwarding
+headers to be placed in the ``KParts`` directory (e.g. ``KParts/Part``). It
+will also, for the convenience of code in the source distribution, generate
+forwarding headers based on the original names (e.g. ``kparts/part.h``). This
+allows includes like ``"#include <kparts/part.h>"`` to be used before
+installation, as long as the include_directories are set appropriately.
+
+``OUTPUT_DIR`` specifies where the files will be generated; this should be within
+the build directory. By default, ``${CMAKE_CURRENT_BINARY_DIR}`` will be used.
+This option can be used to avoid file conflicts.
+
+``REQUIRED_HEADERS`` specifies an output variable name where all the required
+headers will be appended so that they can be installed together with the
+generated ones. This is mostly intended as a convenience so that adding a new
+header to a project only requires specifying the CamelCase variant in the
+CMakeLists.txt file; the original variant will then be added to this
+variable.
+
+``COMMON_HEADER`` generates an additional convenience header which includes all
+other header files.
+
+The ``RELATIVE`` argument indicates where the original headers can be found
+relative to ``CMAKE_CURRENT_SOURCE_DIR``. It does not affect the generated
+CamelCase forwarding files, but ``ecm_generate_headers()`` uses it when checking
+that the original header exists, and to generate originally named forwarding
+headers when ``PREFIX`` is set.
+
+To allow other parts of the source distribution (eg: tests) to use the
+generated headers before installation, it may be desirable to set the
+``INCLUDE_DIRECTORIES`` property for the library target to output_dir. For
+example, if ``OUTPUT_DIR`` is ``CMAKE_CURRENT_BINARY_DIR`` (the default), you could do
+
+.. code-block:: cmake
+
+ target_include_directories(MyLib PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
+
+Example usage (without ``PREFIX``):
+
+.. code-block:: cmake
+
+ ecm_generate_headers(
+ MyLib_FORWARDING_HEADERS
+ HEADERS
+ MLFoo
+ MLBar
+ # etc
+ REQUIRED_HEADERS MyLib_HEADERS
+ COMMON_HEADER MLGeneral
+ )
+ install(FILES ${MyLib_FORWARDING_HEADERS} ${MyLib_HEADERS}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include
+ COMPONENT Devel)
+
+Example usage (with ``PREFIX``):
+
+.. code-block:: cmake
+
+ ecm_generate_headers(
+ MyLib_FORWARDING_HEADERS
+ HEADERS
+ Foo
+ # several classes are contained in bar.h, so generate
+ # additional files
+ Bar,BarList
+ # etc
+ PREFIX MyLib
+ REQUIRED_HEADERS MyLib_HEADERS
+ )
+ install(FILES ${MyLib_FORWARDING_HEADERS}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MyLib
+ COMPONENT Devel)
+ install(FILES ${MyLib_HEADERS}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/mylib
+ COMPONENT Devel)
+
+Since pre-1.0.0.
+#]=======================================================================]
+
+include(CMakeParseArguments)
+
+function(ECM_GENERATE_HEADERS camelcase_forwarding_headers_var)
+ set(options)
+ set(oneValueArgs ORIGINAL HEADER_EXTENSION OUTPUT_DIR PREFIX REQUIRED_HEADERS COMMON_HEADER RELATIVE)
+ set(multiValueArgs HEADER_NAMES)
+ cmake_parse_arguments(EGH "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+ if (EGH_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR "Unexpected arguments to ECM_GENERATE_HEADERS: ${EGH_UNPARSED_ARGUMENTS}")
+ endif()
+
+ if(NOT EGH_HEADER_NAMES)
+ message(FATAL_ERROR "Missing header_names argument to ECM_GENERATE_HEADERS")
+ endif()
+
+ if(NOT EGH_ORIGINAL)
+ # default
+ set(EGH_ORIGINAL "LOWERCASE")
+ endif()
+ if(NOT EGH_ORIGINAL STREQUAL "LOWERCASE" AND NOT EGH_ORIGINAL STREQUAL "CAMELCASE")
+ message(FATAL_ERROR "Unexpected value for original argument to ECM_GENERATE_HEADERS: ${EGH_ORIGINAL}")
+ endif()
+
+ if(NOT EGH_HEADER_EXTENSION)
+ set(EGH_HEADER_EXTENSION "h")
+ endif()
+
+ if(NOT EGH_OUTPUT_DIR)
+ set(EGH_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+ endif()
+
+ # Make sure EGH_RELATIVE is /-terminated when it's not empty
+ if (EGH_RELATIVE AND NOT "${EGH_RELATIVE}" MATCHES "^.*/$")
+ set(EGH_RELATIVE "${EGH_RELATIVE}/")
+ endif()
+
+ set(originalprefix)
+ if (EGH_PREFIX)
+ if (NOT "${EGH_PREFIX}" MATCHES "^.*/$")
+ set(EGH_PREFIX "${EGH_PREFIX}/")
+ endif()
+ if (EGH_ORIGINAL STREQUAL "CAMELCASE")
+ set(originalprefix "${EGH_PREFIX}")
+ else()
+ string(TOLOWER "${EGH_PREFIX}" originalprefix)
+ endif()
+ endif()
+
+ foreach(_classnameentry ${EGH_HEADER_NAMES})
+ string(REPLACE "," ";" _classnames ${_classnameentry})
+ list(GET _classnames 0 _baseclass)
+
+ if (EGH_ORIGINAL STREQUAL "CAMELCASE")
+ set(originalbasename "${_baseclass}")
+ else()
+ string(TOLOWER "${_baseclass}" originalbasename)
+ endif()
+
+ set(_actualheader "${CMAKE_CURRENT_SOURCE_DIR}/${EGH_RELATIVE}${originalbasename}.${EGH_HEADER_EXTENSION}")
+ if (NOT EXISTS ${_actualheader})
+ message(FATAL_ERROR "Could not find \"${_actualheader}\"")
+ endif()
+
+ foreach(_CLASSNAME ${_classnames})
+ set(FANCY_HEADER_FILE "${EGH_OUTPUT_DIR}/${EGH_PREFIX}${_CLASSNAME}")
+ if (NOT EXISTS ${FANCY_HEADER_FILE})
+ file(WRITE ${FANCY_HEADER_FILE} "#include \"${originalprefix}${originalbasename}.${EGH_HEADER_EXTENSION}\"\n")
+ endif()
+ list(APPEND ${camelcase_forwarding_headers_var} "${FANCY_HEADER_FILE}")
+ if (EGH_PREFIX)
+ # Local forwarding header, for namespaced headers, e.g. kparts/part.h
+ if(EGH_ORIGINAL STREQUAL "CAMELCASE")
+ set(originalclassname "${_CLASSNAME}")
+ else()
+ string(TOLOWER "${_CLASSNAME}" originalclassname)
+ endif()
+ set(REGULAR_HEADER_NAME ${EGH_OUTPUT_DIR}/${originalprefix}${originalclassname}.${EGH_HEADER_EXTENSION})
+ if (NOT EXISTS ${REGULAR_HEADER_NAME})
+ file(WRITE ${REGULAR_HEADER_NAME} "#include \"${_actualheader}\"\n")
+ endif()
+ endif()
+ endforeach()
+
+ list(APPEND _REQUIRED_HEADERS "${_actualheader}")
+ endforeach()
+
+ if(EGH_COMMON_HEADER)
+ #combine required headers into 1 big convenience header
+ set(COMMON_HEADER ${EGH_OUTPUT_DIR}/${EGH_PREFIX}${EGH_COMMON_HEADER})
+ file(WRITE ${COMMON_HEADER} "// convenience header\n")
+ foreach(_header ${_REQUIRED_HEADERS})
+ get_filename_component(_base ${_header} NAME)
+ file(APPEND ${COMMON_HEADER} "#include \"${_base}\"\n")
+ endforeach()
+ list(APPEND ${camelcase_forwarding_headers_var} "${COMMON_HEADER}")
+ endif()
+
+ set(${camelcase_forwarding_headers_var} ${${camelcase_forwarding_headers_var}} PARENT_SCOPE)
+ if (EGH_REQUIRED_HEADERS)
+ set(${EGH_REQUIRED_HEADERS} ${${EGH_REQUIRED_HEADERS}} ${_REQUIRED_HEADERS} PARENT_SCOPE)
+ endif ()
+endfunction()
diff --git a/cmake/ECM/modules/ECMGeneratePriFile.cmake b/cmake/ECM/modules/ECMGeneratePriFile.cmake
new file mode 100644
index 0000000..8910cd9
--- /dev/null
+++ b/cmake/ECM/modules/ECMGeneratePriFile.cmake
@@ -0,0 +1,256 @@
+# SPDX-FileCopyrightText: 2014 David Faure <faure@kde.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#[=======================================================================[.rst:
+ECMGeneratePriFile
+------------------
+
+Generate a ``.pri`` file for the benefit of qmake-based projects.
+
+As well as the function below, this module creates the cache variable
+``ECM_MKSPECS_INSTALL_DIR`` and sets the default value to ``mkspecs/modules``.
+This assumes Qt and the current project are both installed to the same
+non-system prefix. Packagers who use ``-DCMAKE_INSTALL_PREFIX=/usr`` will
+certainly want to set ``ECM_MKSPECS_INSTALL_DIR`` to something like
+``share/qt5/mkspecs/modules``.
+
+The main thing is that this should be the ``modules`` subdirectory of either
+the default qmake ``mkspecs`` directory or of a directory that will be in the
+``$QMAKEPATH`` environment variable when qmake is run.
+
+::
+
+ ecm_generate_pri_file(BASE_NAME <baseName>
+ LIB_NAME <libName>
+ [VERSION <version>] # since 5.83
+ [DEPS "<dep> [<dep> [...]]"]
+ [FILENAME_VAR <filename_variable>]
+ [INCLUDE_INSTALL_DIRS <dir> [<dir> [...]]] # since 5.92
+ [INCLUDE_INSTALL_DIR <dir>] # deprecated since 5.92
+ [LIB_INSTALL_DIR <dir>])
+
+If your CMake project produces a Qt-based library, you may expect there to be
+applications that wish to use it that use a qmake-based build system, rather
+than a CMake-based one. Creating a ``.pri`` file will make use of your
+library convenient for them, in much the same way that CMake config files make
+things convenient for CMake-based applications. ``ecm_generate_pri_file()``
+generates just such a file.
+
+``VERSION`` specifies the version of the library the ``.pri`` file describes. If
+not set, the value is taken from the context variable ``PROJECT_VERSION``.
+This variable is usually set by the ``project(... VERSION ...)`` command or,
+if CMake policy CMP0048 is not ``NEW``, by :module:`ECMSetupVersion`.
+For backward-compatibility with older ECM versions the
+``PROJECT_VERSION_STRING`` variable as set by :module:`ECMSetupVersion`
+will be preferred over ``PROJECT_VERSION`` if set, unless the minimum
+required version of ECM is 5.83 and newer. Since 5.83.
+
+``BASE_NAME`` specifies the name qmake project (.pro) files should use to refer to
+the library (eg: KArchive). ``LIB_NAME`` is the name of the actual library to
+link to (ie: the first argument to add_library()). ``DEPS`` is a space-separated
+list of the base names of other libraries (for Qt libraries, use the same
+names you use with the ``QT`` variable in a qmake project file, such as "core"
+for QtCore). ``FILENAME_VAR`` specifies the name of a variable to store the path
+to the generated file in.
+
+``INCLUDE_INSTALL_DIRS`` are the paths (relative to ``CMAKE_INSTALL_PREFIX``) that
+include files will be installed to. It defaults to
+``${INCLUDE_INSTALL_DIR}/<baseName>`` if the ``INCLUDE_INSTALL_DIR`` variable
+is set. If that variable is not set, the ``CMAKE_INSTALL_INCLUDEDIR`` variable
+is used instead, and if neither are set ``include`` is used. ``LIB_INSTALL_DIR``
+operates similarly for the installation location for libraries; it defaults to
+``${LIB_INSTALL_DIR}``, ``${CMAKE_INSTALL_LIBDIR}`` or ``lib``, in that order.
+
+``INCLUDE_INSTALL_DIR`` is the old variant of ``INCLUDE_INSTALL_DIRS``, taking only one
+directory.
+
+Example usage:
+
+.. code-block:: cmake
+
+ ecm_generate_pri_file(
+ BASE_NAME KArchive
+ LIB_NAME KF5KArchive
+ DEPS "core"
+ FILENAME_VAR pri_filename
+ VERSION 4.2.0
+ )
+ install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
+
+A qmake-based project that wished to use this would then do::
+
+ QT += KArchive
+
+in their ``.pro`` file.
+
+Since pre-1.0.0.
+#]=======================================================================]
+
+# Replicate the logic from KDEInstallDirs.cmake as we can't depend on it
+# Ask qmake if we're using the same prefix as Qt
+set(_should_query_qt OFF)
+if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS)
+ include(ECMQueryQt)
+ ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY)
+ if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ set(_should_query_qt ON)
+ endif()
+endif()
+
+if(KDE_INSTALL_USE_QT_SYS_PATHS OR _should_query_qt)
+ include(ECMQueryQt)
+ ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX)
+ ecm_query_qt(qt_host_data_dir QT_HOST_DATA)
+ if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}")
+ file(RELATIVE_PATH qt_host_data_dir ${qt_install_prefix_dir} ${qt_host_data_dir})
+ endif()
+ if(qt_host_data_dir STREQUAL "")
+ set(mkspecs_install_dir mkspecs/modules)
+ else()
+ set(mkspecs_install_dir ${qt_host_data_dir}/mkspecs/modules)
+ endif()
+ set(ECM_MKSPECS_INSTALL_DIR ${mkspecs_install_dir} CACHE PATH "The directory where mkspecs will be installed to.")
+else()
+ set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
+endif()
+
+function(ECM_GENERATE_PRI_FILE)
+ set(options )
+ set(oneValueArgs BASE_NAME LIB_NAME DEPS FILENAME_VAR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR VERSION)
+ set(multiValueArgs INCLUDE_INSTALL_DIRS)
+
+ cmake_parse_arguments(EGPF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+ if(EGPF_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR "Unknown keywords given to ECM_GENERATE_PRI_FILE(): \"${EGPF_UNPARSED_ARGUMENTS}\"")
+ endif()
+
+ if(ECM_GLOBAL_FIND_VERSION VERSION_LESS 5.83.0)
+ set(_support_backward_compat_version_string_var TRUE)
+ else()
+ set(_support_backward_compat_version_string_var FALSE)
+ endif()
+
+ if(NOT EGPF_BASE_NAME)
+ message(FATAL_ERROR "Required argument BASE_NAME missing in ECM_GENERATE_PRI_FILE() call")
+ endif()
+ if(NOT EGPF_LIB_NAME)
+ message(FATAL_ERROR "Required argument LIB_NAME missing in ECM_GENERATE_PRI_FILE() call")
+ endif()
+ if(NOT EGPF_VERSION)
+ if(_support_backward_compat_version_string_var)
+ if(NOT PROJECT_VERSION_STRING AND NOT PROJECT_VERSION)
+ message(FATAL_ERROR "Required variable PROJECT_VERSION_STRING or PROJECT_VERSION not set before ECM_GENERATE_PRI_FILE() call. Missing call of ecm_setup_version() or project(VERSION)?")
+ endif()
+ else()
+ if(NOT PROJECT_VERSION)
+ message(FATAL_ERROR "Required variable PROJECT_VERSION not set before ECM_GENERATE_PRI_FILE() call. Missing call of ecm_setup_version() or project(VERSION)?")
+ endif()
+ endif()
+ endif()
+ if(EGPF_INCLUDE_INSTALL_DIR)
+ if(EGPF_INCLUDE_INSTALL_DIRS)
+ message(FATAL_ERROR "Only one argument of INCLUDE_INSTALL_DIR & INCLUDE_INSTALL_DIRS can be used in ECM_GENERATE_PRI_FILE() call")
+ endif()
+ set(EGPF_INCLUDE_INSTALL_DIRS ${EGPF_INCLUDE_INSTALL_DIR})
+ endif()
+ if(NOT EGPF_INCLUDE_INSTALL_DIRS)
+ if(INCLUDE_INSTALL_DIR)
+ set(EGPF_INCLUDE_INSTALL_DIRS "${INCLUDE_INSTALL_DIR}/${EGPF_BASE_NAME}")
+ elseif(CMAKE_INSTALL_INCLUDEDIR)
+ set(EGPF_INCLUDE_INSTALL_DIRS "${CMAKE_INSTALL_INCLUDEDIR}/${EGPF_BASE_NAME}")
+ else()
+ set(EGPF_INCLUDE_INSTALL_DIRS "include/${EGPF_BASE_NAME}")
+ endif()
+ endif()
+ if(NOT EGPF_LIB_INSTALL_DIR)
+ if(LIB_INSTALL_DIR)
+ set(EGPF_LIB_INSTALL_DIR "${LIB_INSTALL_DIR}")
+ elseif(CMAKE_INSTALL_LIBDIR)
+ set(EGPF_LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
+ else()
+ set(EGPF_LIB_INSTALL_DIR "lib")
+ endif()
+ endif()
+
+ if(EGPF_VERSION)
+ set(PRI_VERSION "${EGPF_VERSION}")
+ else()
+ if(_support_backward_compat_version_string_var AND PROJECT_VERSION_STRING)
+ set(PRI_VERSION "${PROJECT_VERSION_STRING}")
+ if(NOT PROJECT_VERSION_STRING STREQUAL PROJECT_VERSION)
+ message(DEPRECATION "ECM_GENERATE_PRI_FILE() will no longer support PROJECT_VERSION_STRING when the required minimum version of ECM is 5.83 or newer. Set VERSION parameter or use PROJECT_VERSION instead.")
+ endif()
+ else()
+ set(PRI_VERSION "${PROJECT_VERSION}")
+ endif()
+ endif()
+
+ string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" PRI_VERSION_MAJOR "${PRI_VERSION}")
+ string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" PRI_VERSION_MINOR "${PRI_VERSION}")
+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" PRI_VERSION_PATCH "${PRI_VERSION}")
+
+ # Prepare the right number of "../.." to go from ECM_MKSPECS_INSTALL_DIR to the install prefix
+ # This allows to make the generated pri files relocatable (no absolute paths)
+ if (IS_ABSOLUTE ${ECM_MKSPECS_INSTALL_DIR})
+ set(BASEPATH ${CMAKE_INSTALL_PREFIX})
+ else()
+ string(REGEX REPLACE "[^/]+" ".." PRI_ROOT_RELATIVE_TO_MKSPECS ${ECM_MKSPECS_INSTALL_DIR})
+ set(BASEPATH "$$PWD/${PRI_ROOT_RELATIVE_TO_MKSPECS}")
+ endif()
+
+ set(PRI_TARGET_BASENAME ${EGPF_BASE_NAME})
+ set(PRI_TARGET_LIBNAME ${EGPF_LIB_NAME})
+ set(PRI_TARGET_QTDEPS ${EGPF_DEPS})
+ set(PRI_TARGET_INCLUDES)
+ foreach(_dir ${EGPF_INCLUDE_INSTALL_DIRS})
+ # separate list entries with space
+ if(IS_ABSOLUTE "${_dir}")
+ string(APPEND PRI_TARGET_INCLUDES " ${_dir}")
+ else()
+ string(APPEND PRI_TARGET_INCLUDES " ${BASEPATH}/${_dir}")
+ endif()
+ endforeach()
+ if(IS_ABSOLUTE "${EGPF_LIB_INSTALL_DIR}")
+ set(PRI_TARGET_LIBS "${EGPF_LIB_INSTALL_DIR}")
+ else()
+ set(PRI_TARGET_LIBS "${BASEPATH}/${EGPF_LIB_INSTALL_DIR}")
+ endif()
+ set(PRI_TARGET_DEFINES "")
+
+ set(PRI_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/qt_${PRI_TARGET_BASENAME}.pri)
+ if (EGPF_FILENAME_VAR)
+ set(${EGPF_FILENAME_VAR} ${PRI_FILENAME} PARENT_SCOPE)
+ endif()
+
+ set(PRI_TARGET_MODULE_CONFIG "")
+ # backward compat: it was not obvious LIB_NAME needs to be a target name,
+ # and some projects where the target name was not the actual library output name
+ # passed the output name for LIB_NAME, so .name & .module prperties are correctly set.
+ # TODO: improve API dox, allow control over module name if target name != output name
+ if(TARGET ${EGPF_LIB_NAME})
+ get_target_property(target_type ${EGPF_LIB_NAME} TYPE)
+ if (target_type STREQUAL "STATIC_LIBRARY")
+ set(PRI_TARGET_MODULE_CONFIG "staticlib")
+ endif()
+ endif()
+
+ file(GENERATE
+ OUTPUT ${PRI_FILENAME}
+ CONTENT
+ "QT.${PRI_TARGET_BASENAME}.VERSION = ${PRI_VERSION}
+QT.${PRI_TARGET_BASENAME}.MAJOR_VERSION = ${PRI_VERSION_MAJOR}
+QT.${PRI_TARGET_BASENAME}.MINOR_VERSION = ${PRI_VERSION_MINOR}
+QT.${PRI_TARGET_BASENAME}.PATCH_VERSION = ${PRI_VERSION_PATCH}
+QT.${PRI_TARGET_BASENAME}.name = ${PRI_TARGET_LIBNAME}
+QT.${PRI_TARGET_BASENAME}.module = ${PRI_TARGET_LIBNAME}
+QT.${PRI_TARGET_BASENAME}.defines = ${PRI_TARGET_DEFINES}
+QT.${PRI_TARGET_BASENAME}.includes = ${PRI_TARGET_INCLUDES}
+QT.${PRI_TARGET_BASENAME}.private_includes =
+QT.${PRI_TARGET_BASENAME}.libs = ${PRI_TARGET_LIBS}
+QT.${PRI_TARGET_BASENAME}.depends = ${PRI_TARGET_QTDEPS}
+QT.${PRI_TARGET_BASENAME}.module_config = ${PRI_TARGET_MODULE_CONFIG}
+"
+ )
+endfunction()
diff --git a/cmake/ECM/modules/ECMQueryQmake.cmake b/cmake/ECM/modules/ECMQueryQmake.cmake
new file mode 100644
index 0000000..4277eee
--- /dev/null
+++ b/cmake/ECM/modules/ECMQueryQmake.cmake
@@ -0,0 +1,51 @@
+if (${ECM_GLOBAL_FIND_VERSION} VERSION_GREATER_EQUAL 5.93)
+ message(DEPRECATION "ECMQueryQmake.cmake is deprecated since 5.93, please use ECMQueryQt.cmake instead.")
+endif()
+
+include(${CMAKE_CURRENT_LIST_DIR}/QtVersionOption.cmake)
+find_package(Qt${QT_MAJOR_VERSION}Core QUIET)
+
+if (Qt5Core_FOUND)
+ set(_qmake_executable_default "qmake-qt5")
+endif ()
+if (TARGET Qt5::qmake)
+ get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
+endif()
+set(QMAKE_EXECUTABLE ${_qmake_executable_default}
+ CACHE FILEPATH "Location of the Qt5 qmake executable")
+
+# Helper method
+# This is not public API (yet)!
+# Usage: query_qmake(<result_variable> <qt_variable> [TRY])
+# Passing TRY will result in the method not failing fatal if no qmake executable
+# has been found, but instead simply returning an empty string
+function(query_qmake result_variable qt_variable)
+ set(options TRY)
+ set(oneValueArgs )
+ set(multiValueArgs )
+
+ cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+ if(NOT QMAKE_EXECUTABLE)
+ if(ARGS_TRY)
+ set(${result_variable} "" PARENT_SCOPE)
+ message(STATUS "No qmake Qt5 binary found. Can't check ${qt_variable}")
+ return()
+ else()
+ message(FATAL_ERROR "No qmake Qt5 binary found. Can't check ${qt_variable} as required")
+ endif()
+ endif()
+ execute_process(
+ COMMAND ${QMAKE_EXECUTABLE} -query "${qt_variable}"
+ RESULT_VARIABLE return_code
+ OUTPUT_VARIABLE output
+ )
+ if(return_code EQUAL 0)
+ string(STRIP "${output}" output)
+ file(TO_CMAKE_PATH "${output}" output_path)
+ set(${result_variable} "${output_path}" PARENT_SCOPE)
+ else()
+ message(WARNING "Failed call: ${QMAKE_EXECUTABLE} -query \"${qt_variable}\"")
+ message(FATAL_ERROR "QMake call failed: ${return_code}")
+ endif()
+endfunction()
diff --git a/cmake/ECM/modules/ECMQueryQt.cmake b/cmake/ECM/modules/ECMQueryQt.cmake
new file mode 100644
index 0000000..98eb500
--- /dev/null
+++ b/cmake/ECM/modules/ECMQueryQt.cmake
@@ -0,0 +1,100 @@
+# SPDX-FileCopyrightText: 2014 Rohan Garg <rohan16garg@gmail.com>
+# SPDX-FileCopyrightText: 2014 Alex Merry <alex.merry@kde.org>
+# SPDX-FileCopyrightText: 2014-2016 Aleix Pol <aleixpol@kde.org>
+# SPDX-FileCopyrightText: 2017 Friedrich W. H. Kossebau <kossebau@kde.org>
+# SPDX-FileCopyrightText: 2022 Ahmad Samir <a.samir78@gmail.com>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#[=======================================================================[.rst:
+ECMQueryQt
+---------------
+This module can be used to query the installation paths used by Qt.
+
+For Qt5 this uses ``qmake``, and for Qt6 this used ``qtpaths`` (the latter has built-in
+support to query the paths of a target platform when cross-compiling).
+
+This module defines the following function:
+::
+
+ ecm_query_qt(<result_variable> <qt_variable> [TRY])
+
+Passing ``TRY`` will result in the method not making the build fail if the executable
+used for querying has not been found, but instead simply print a warning message and
+return an empty string.
+
+Example usage:
+
+.. code-block:: cmake
+
+ include(ECMQueryQt)
+ ecm_query_qt(bin_dir QT_INSTALL_BINS)
+
+If the call succeeds ``${bin_dir}`` will be set to ``<prefix>/path/to/bin/dir`` (e.g.
+``/usr/lib64/qt/bin/``).
+
+Since: 5.93
+#]=======================================================================]
+
+include(${CMAKE_CURRENT_LIST_DIR}/QtVersionOption.cmake)
+include(CheckLanguage)
+check_language(CXX)
+if (CMAKE_CXX_COMPILER)
+ # Enable the CXX language to let CMake look for config files in library dirs.
+ # See: https://gitlab.kitware.com/cmake/cmake/-/issues/23266
+ enable_language(CXX)
+endif()
+
+if (QT_MAJOR_VERSION STREQUAL "5")
+ # QUIET to accommodate the TRY option
+ find_package(Qt${QT_MAJOR_VERSION}Core QUIET)
+ if(TARGET Qt5::qmake)
+ get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
+
+ set(QUERY_EXECUTABLE ${_qmake_executable_default}
+ CACHE FILEPATH "Location of the Qt5 qmake executable")
+ set(_exec_name_text "Qt5 qmake")
+ set(_cli_option "-query")
+ endif()
+elseif(QT_MAJOR_VERSION STREQUAL "6")
+ # QUIET to accommodate the TRY option
+ find_package(Qt6 COMPONENTS CoreTools QUIET CONFIG)
+ if (TARGET Qt6::qtpaths)
+ get_target_property(_qtpaths_executable Qt6::qtpaths LOCATION)
+
+ set(QUERY_EXECUTABLE ${_qtpaths_executable}
+ CACHE FILEPATH "Location of the Qt6 qtpaths executable")
+ set(_exec_name_text "Qt6 qtpaths")
+ set(_cli_option "--query")
+ endif()
+endif()
+
+function(ecm_query_qt result_variable qt_variable)
+ set(options TRY)
+ set(oneValueArgs)
+ set(multiValueArgs)
+
+ cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+ if(NOT QUERY_EXECUTABLE)
+ if(ARGS_TRY)
+ set(${result_variable} "" PARENT_SCOPE)
+ message(STATUS "No ${_exec_name_text} executable found. Can't check ${qt_variable}")
+ return()
+ else()
+ message(FATAL_ERROR "No ${_exec_name_text} executable found. Can't check ${qt_variable} as required")
+ endif()
+ endif()
+ execute_process(
+ COMMAND ${QUERY_EXECUTABLE} ${_cli_option} "${qt_variable}"
+ RESULT_VARIABLE return_code
+ OUTPUT_VARIABLE output
+ )
+ if(return_code EQUAL 0)
+ string(STRIP "${output}" output)
+ file(TO_CMAKE_PATH "${output}" output_path)
+ set(${result_variable} "${output_path}" PARENT_SCOPE)
+ else()
+ message(WARNING "Failed call: ${_command} \"${qt_variable}\"")
+ message(FATAL_ERROR "${_exec_name_text} call failed: ${return_code}")
+ endif()
+endfunction()
diff --git a/cmake/ECM/modules/ECMSetupVersion.cmake b/cmake/ECM/modules/ECMSetupVersion.cmake
new file mode 100644
index 0000000..330f736
--- /dev/null
+++ b/cmake/ECM/modules/ECMSetupVersion.cmake
@@ -0,0 +1,213 @@
+# SPDX-FileCopyrightText: 2014 Alex Merry <alex.merry@kde.org>
+# SPDX-FileCopyrightText: 2012 Alexander Neundorf <neundorf@kde.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#[=======================================================================[.rst:
+ECMSetupVersion
+---------------
+
+Handle library version information.
+
+::
+
+ ecm_setup_version(<version>
+ VARIABLE_PREFIX <prefix>
+ [SOVERSION <soversion>]
+ [VERSION_HEADER <filename>]
+ [PACKAGE_VERSION_FILE <filename> [COMPATIBILITY <compat>]] )
+
+This parses a version string and sets up a standard set of version variables.
+It can optionally also create a C version header file and a CMake package
+version file to install along with the library.
+
+If the ``<version>`` argument is of the form ``<major>.<minor>.<patch>``
+(or ``<major>.<minor>.<patch>.<tweak>``), The following CMake variables are
+set::
+
+ <prefix>_VERSION_MAJOR - <major>
+ <prefix>_VERSION_MINOR - <minor>
+ <prefix>_VERSION_PATCH - <patch>
+ <prefix>_VERSION - <version>
+ <prefix>_SOVERSION - <soversion>, or <major> if SOVERSION was not given
+
+For backward-compatibility also this variable is set (only if the minimum required
+version of ECM is < 5.83)::
+
+ <prefix>_VERSION_STRING - <version> (use <prefix>_VERSION instead)
+
+If CMake policy CMP0048 is not ``NEW``, the following CMake variables will also
+be set::
+
+ PROJECT_VERSION_MAJOR - <major>
+ PROJECT_VERSION_MINOR - <minor>
+ PROJECT_VERSION_PATCH - <patch>
+ PROJECT_VERSION - <version>
+
+For backward-compatibility, if CMake policy CMP0048 is not ``NEW``, also this variable is set
+(only if the minimum required version of ECM is < 5.83)::
+
+ PROJECT_VERSION_STRING - <version> (use PROJECT_VERSION instead)
+
+If the ``VERSION_HEADER`` option is used, a simple C header is generated with the
+given filename. If filename is a relative path, it is interpreted as relative
+to ``CMAKE_CURRENT_BINARY_DIR``. The generated header contains the following
+macros::
+
+ <prefix>_VERSION_MAJOR - <major> as an integer
+ <prefix>_VERSION_MINOR - <minor> as an integer
+ <prefix>_VERSION_PATCH - <patch> as an integer
+ <prefix>_VERSION_STRING - <version> as a C string
+ <prefix>_VERSION - the version as an integer
+
+``<prefix>_VERSION`` has ``<patch>`` in the bottom 8 bits, ``<minor>`` in the
+next 8 bits and ``<major>`` in the remaining bits. Note that ``<patch>`` and
+``<minor>`` must be less than 256.
+
+If the ``PACKAGE_VERSION_FILE`` option is used, a simple CMake package version
+file is created using the ``write_basic_package_version_file()`` macro provided by
+CMake. It should be installed in the same location as the Config.cmake file of
+the library so that it can be found by ``find_package()``. If the filename is a
+relative path, it is interpreted as relative to ``CMAKE_CURRENT_BINARY_DIR``. The
+optional ``COMPATIBILITY`` option is forwarded to
+``write_basic_package_version_file()``, and defaults to ``AnyNewerVersion``.
+
+If CMake policy CMP0048 is ``NEW``, an alternative form of the command is
+available::
+
+ ecm_setup_version(PROJECT
+ [VARIABLE_PREFIX <prefix>]
+ [SOVERSION <soversion>]
+ [VERSION_HEADER <filename>]
+ [PACKAGE_VERSION_FILE <filename>] )
+
+This will use the version information set by the ``project()`` command.
+``VARIABLE_PREFIX`` defaults to the project name. Note that ``PROJECT`` must be the
+first argument. In all other respects, it behaves like the other form of the
+command.
+
+Since pre-1.0.0.
+
+``COMPATIBILITY`` option available since 1.6.0.
+#]=======================================================================]
+
+include(CMakePackageConfigHelpers)
+
+# save the location of the header template while CMAKE_CURRENT_LIST_DIR
+# has the value we want
+set(_ECM_SETUP_VERSION_HEADER_TEMPLATE "${CMAKE_CURRENT_LIST_DIR}/ECMVersionHeader.h.in")
+
+function(ecm_setup_version _version)
+ set(options )
+ set(oneValueArgs VARIABLE_PREFIX SOVERSION VERSION_HEADER PACKAGE_VERSION_FILE COMPATIBILITY)
+ set(multiValueArgs )
+
+ cmake_parse_arguments(ESV "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+ if(ESV_UNPARSED_ARGUMENTS)
+ message(FATAL_ERROR "Unknown keywords given to ECM_SETUP_VERSION(): \"${ESV_UNPARSED_ARGUMENTS}\"")
+ endif()
+
+ set(project_manages_version FALSE)
+ set(use_project_version FALSE)
+ cmake_policy(GET CMP0048 project_version_policy)
+ if(project_version_policy STREQUAL "NEW")
+ set(project_manages_version TRUE)
+ if(_version STREQUAL "PROJECT")
+ set(use_project_version TRUE)
+ endif()
+ elseif(_version STREQUAL "PROJECT")
+ message(FATAL_ERROR "ecm_setup_version given PROJECT argument, but CMP0048 is not NEW")
+ endif()
+
+ set(should_set_prefixed_vars TRUE)
+ if(NOT ESV_VARIABLE_PREFIX)
+ if(use_project_version)
+ set(ESV_VARIABLE_PREFIX "${PROJECT_NAME}")
+ set(should_set_prefixed_vars FALSE)
+ else()
+ message(FATAL_ERROR "Required argument PREFIX missing in ECM_SETUP_VERSION() call")
+ endif()
+ endif()
+
+ if(use_project_version)
+ set(_version "${PROJECT_VERSION}")
+ # drop leading 0 from values to avoid bogus octal values in c/C++ e.g. with 08 or 09
+ string(REGEX REPLACE "0*([0-9]+)" "\\1" _major "${PROJECT_VERSION_MAJOR}")
+ string(REGEX REPLACE "0*([0-9]+)" "\\1" _minor "${PROJECT_VERSION_MINOR}")
+ string(REGEX REPLACE "0*([0-9]+)" "\\1" _patch "${PROJECT_VERSION_PATCH}")
+ else()
+ string(REGEX REPLACE "^0*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" _major "${_version}")
+ string(REGEX REPLACE "^[0-9]+\\.0*([0-9]+)\\.[0-9]+.*" "\\1" _minor "${_version}")
+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.0*([0-9]+).*" "\\1" _patch "${_version}")
+ endif()
+
+ if(NOT ESV_SOVERSION)
+ set(ESV_SOVERSION ${_major})
+ endif()
+
+ if(ECM_GLOBAL_FIND_VERSION VERSION_LESS 5.83.0)
+ set(_set_backward_compat_version_string_vars TRUE)
+ else()
+ set(_set_backward_compat_version_string_vars FALSE)
+ endif()
+
+ if(should_set_prefixed_vars)
+ set(${ESV_VARIABLE_PREFIX}_VERSION "${_version}")
+ set(${ESV_VARIABLE_PREFIX}_VERSION_MAJOR ${_major})
+ set(${ESV_VARIABLE_PREFIX}_VERSION_MINOR ${_minor})
+ set(${ESV_VARIABLE_PREFIX}_VERSION_PATCH ${_patch})
+ endif()
+
+ set(${ESV_VARIABLE_PREFIX}_SOVERSION ${ESV_SOVERSION})
+
+ if(NOT project_manages_version)
+ set(PROJECT_VERSION "${_version}")
+ set(PROJECT_VERSION_MAJOR "${_major}")
+ set(PROJECT_VERSION_MINOR "${_minor}")
+ set(PROJECT_VERSION_PATCH "${_patch}")
+ endif()
+
+ if(_set_backward_compat_version_string_vars)
+ set(PROJECT_VERSION_STRING "${PROJECT_VERSION}")
+ set(${ESV_VARIABLE_PREFIX}_VERSION_STRING "${${ESV_VARIABLE_PREFIX}_VERSION}")
+ endif()
+
+ if(ESV_VERSION_HEADER)
+ set(HEADER_PREFIX "${ESV_VARIABLE_PREFIX}")
+ set(HEADER_VERSION "${_version}")
+ set(HEADER_VERSION_MAJOR "${_major}")
+ set(HEADER_VERSION_MINOR "${_minor}")
+ set(HEADER_VERSION_PATCH "${_patch}")
+ configure_file("${_ECM_SETUP_VERSION_HEADER_TEMPLATE}" "${ESV_VERSION_HEADER}")
+ endif()
+
+ if(ESV_PACKAGE_VERSION_FILE)
+ if(NOT ESV_COMPATIBILITY)
+ set(ESV_COMPATIBILITY AnyNewerVersion)
+ endif()
+ write_basic_package_version_file("${ESV_PACKAGE_VERSION_FILE}" VERSION ${_version} COMPATIBILITY ${ESV_COMPATIBILITY})
+ endif()
+
+ if(should_set_prefixed_vars)
+ set(${ESV_VARIABLE_PREFIX}_VERSION_MAJOR "${${ESV_VARIABLE_PREFIX}_VERSION_MAJOR}" PARENT_SCOPE)
+ set(${ESV_VARIABLE_PREFIX}_VERSION_MINOR "${${ESV_VARIABLE_PREFIX}_VERSION_MINOR}" PARENT_SCOPE)
+ set(${ESV_VARIABLE_PREFIX}_VERSION_PATCH "${${ESV_VARIABLE_PREFIX}_VERSION_PATCH}" PARENT_SCOPE)
+ set(${ESV_VARIABLE_PREFIX}_VERSION "${${ESV_VARIABLE_PREFIX}_VERSION}" PARENT_SCOPE)
+ endif()
+
+ # always set the soversion
+ set(${ESV_VARIABLE_PREFIX}_SOVERSION "${${ESV_VARIABLE_PREFIX}_SOVERSION}" PARENT_SCOPE)
+
+ if(NOT project_manages_version)
+ set(PROJECT_VERSION "${PROJECT_VERSION}" PARENT_SCOPE)
+ set(PROJECT_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}" PARENT_SCOPE)
+ set(PROJECT_VERSION_MINOR "${PROJECT_VERSION_MINOR}" PARENT_SCOPE)
+ set(PROJECT_VERSION_PATCH "${PROJECT_VERSION_PATCH}" PARENT_SCOPE)
+ endif()
+
+ if(_set_backward_compat_version_string_vars)
+ set(PROJECT_VERSION_STRING "${PROJECT_VERSION_STRING}" PARENT_SCOPE)
+ set(${ESV_VARIABLE_PREFIX}_VERSION_STRING "${${ESV_VARIABLE_PREFIX}_VERSION}" PARENT_SCOPE)
+ endif()
+endfunction()
diff --git a/cmake/ECM/modules/ECMUninstallTarget.cmake b/cmake/ECM/modules/ECMUninstallTarget.cmake
new file mode 100644
index 0000000..7298012
--- /dev/null
+++ b/cmake/ECM/modules/ECMUninstallTarget.cmake
@@ -0,0 +1,50 @@
+# SPDX-FileCopyrightText: 2015 Alex Merry <alex.merry@kde.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#[=======================================================================[.rst:
+ECMUninstallTarget
+------------------
+
+Add an ``uninstall`` target.
+
+By including this module, an ``uninstall`` target will be added to your CMake
+project. This will remove all files installed (or updated) by a previous
+invocation of the ``install`` target. It will not remove files created or
+modified by an ``install(SCRIPT)`` or ``install(CODE)`` command; you should
+create a custom uninstallation target for these and use ``add_dependency`` to
+make the ``uninstall`` target depend on it:
+
+.. code-block:: cmake
+
+ include(ECMUninstallTarget)
+ install(SCRIPT install-foo.cmake)
+ add_custom_target(uninstall_foo COMMAND ${CMAKE_COMMAND} -P uninstall-foo.cmake)
+ add_dependency(uninstall uninstall_foo)
+
+The target will fail if the ``install`` target has not yet been run (so it is
+not possible to run CMake on the project and then immediately run the
+``uninstall`` target).
+
+.. warning::
+
+ CMake deliberately does not provide an ``uninstall`` target by default on
+ the basis that such a target has the potential to remove important files
+ from a user's computer. Use with caution.
+
+Since 1.7.0.
+#]=======================================================================]
+
+if (NOT TARGET uninstall)
+ configure_file(
+ "${CMAKE_CURRENT_LIST_DIR}/ecm_uninstall.cmake.in"
+ "${CMAKE_BINARY_DIR}/ecm_uninstall.cmake"
+ IMMEDIATE
+ @ONLY
+ )
+
+ add_custom_target(uninstall
+ COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/ecm_uninstall.cmake"
+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+ )
+endif()
diff --git a/cmake/ECM/modules/ECMVersionHeader.h.in b/cmake/ECM/modules/ECMVersionHeader.h.in
new file mode 100644
index 0000000..c0ed6c0
--- /dev/null
+++ b/cmake/ECM/modules/ECMVersionHeader.h.in
@@ -0,0 +1,17 @@
+// This file was generated by ecm_setup_version(): DO NOT EDIT!
+
+#ifndef @HEADER_PREFIX@_VERSION_H
+#define @HEADER_PREFIX@_VERSION_H
+
+#define @HEADER_PREFIX@_VERSION_STRING "@HEADER_VERSION@"
+#define @HEADER_PREFIX@_VERSION_MAJOR @HEADER_VERSION_MAJOR@
+#define @HEADER_PREFIX@_VERSION_MINOR @HEADER_VERSION_MINOR@
+#define @HEADER_PREFIX@_VERSION_PATCH @HEADER_VERSION_PATCH@
+#define @HEADER_PREFIX@_VERSION @HEADER_PREFIX@_VERSION_CHECK(@HEADER_PREFIX@_VERSION_MAJOR, @HEADER_PREFIX@_VERSION_MINOR, @HEADER_PREFIX@_VERSION_PATCH)
+
+/*
+ for example: @HEADER_PREFIX@_VERSION >= @HEADER_PREFIX@_VERSION_CHECK(1, 2, 2))
+*/
+#define @HEADER_PREFIX@_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
+
+#endif
diff --git a/cmake/ECM/modules/QtVersionOption.cmake b/cmake/ECM/modules/QtVersionOption.cmake
new file mode 100644
index 0000000..ea37da2
--- /dev/null
+++ b/cmake/ECM/modules/QtVersionOption.cmake
@@ -0,0 +1,36 @@
+# SPDX-FileCopyrightText: 2021 Volker Krause <vkrause@kde.org>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+#[=======================================================================[.rst:
+QtVersionOption
+---------------
+
+Adds a build option to select the major Qt version if necessary,
+that is, if the major Qt version has not yet been determined otherwise
+(e.g. by a corresponding ``find_package()`` call).
+This module is typically included by other modules requiring knowledge
+about the major Qt version.
+
+``QT_MAJOR_VERSION`` is defined to either be "5" or "6".
+
+Since 5.82.0.
+#]=======================================================================]
+
+if (DEFINED QT_MAJOR_VERSION)
+ return()
+endif()
+
+if (TARGET Qt5::Core)
+ set(QT_MAJOR_VERSION 5)
+elseif (TARGET Qt6::Core)
+ set(QT_MAJOR_VERSION 6)
+else()
+ option(BUILD_WITH_QT6 "Build against Qt 6" OFF)
+
+ if (BUILD_WITH_QT6)
+ set(QT_MAJOR_VERSION 6)
+ else()
+ set(QT_MAJOR_VERSION 5)
+ endif()
+endif()
diff --git a/cmake/ECM/modules/ecm_uninstall.cmake.in b/cmake/ECM/modules/ecm_uninstall.cmake.in
new file mode 100644
index 0000000..379239b
--- /dev/null
+++ b/cmake/ECM/modules/ecm_uninstall.cmake.in
@@ -0,0 +1,21 @@
+if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
+ message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
+endif()
+
+file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+ message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+ if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+ exec_program(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ if(NOT "${rm_retval}" STREQUAL 0)
+ message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+ endif()
+ else()
+ message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+ endif()
+endforeach()
diff --git a/cmake/ECMGenerateHeaders.cmake b/cmake/ECMGenerateHeaders.cmake
deleted file mode 100644
index d5332e5..0000000
--- a/cmake/ECMGenerateHeaders.cmake
+++ /dev/null
@@ -1,222 +0,0 @@
-#.rst:
-# ECMGenerateHeaders
-# ------------------
-#
-# Generate C/C++ CamelCase forwarding headers.
-#
-# ::
-#
-# ecm_generate_headers(<camelcase_forwarding_headers_var>
-# HEADER_NAMES <CamelCaseName> [<CamelCaseName> [...]]
-# [ORIGINAL <CAMELCASE|LOWERCASE>]
-# [HEADER_EXTENSION <header_extension>]
-# [OUTPUT_DIR <output_dir>]
-# [PREFIX <prefix>]
-# [REQUIRED_HEADERS <variable>]
-# [COMMON_HEADER <HeaderName>]
-# [RELATIVE <relative_path>])
-#
-# For each CamelCase header name passed to HEADER_NAMES, a file of that name
-# will be generated that will include a version with ``.h`` or, if set,
-# ``.<header_extension>`` appended.
-# For example, the generated header ``ClassA`` will include ``classa.h`` (or
-# ``ClassA.h``, see ORIGINAL).
-# If a CamelCaseName consists of multiple comma-separated files, e.g.
-# ``ClassA,ClassB,ClassC``, then multiple camelcase header files will be
-# generated which are redirects to the first header file.
-# The file locations of these generated headers will be stored in
-# <camelcase_forwarding_headers_var>.
-#
-# ORIGINAL specifies how the name of the original header is written: lowercased
-# or also camelcased. The default is LOWERCASE. Since 1.8.0.
-#
-# HEADER_EXTENSION specifies what file name extension is used for the header
-# files. The default is "h". Since 5.48.0.
-#
-# PREFIX places the generated headers in subdirectories. This should be a
-# CamelCase name like ``KParts``, which will cause the CamelCase forwarding
-# headers to be placed in the ``KParts`` directory (e.g. ``KParts/Part``). It
-# will also, for the convenience of code in the source distribution, generate
-# forwarding headers based on the original names (e.g. ``kparts/part.h``). This
-# allows includes like ``"#include <kparts/part.h>"`` to be used before
-# installation, as long as the include_directories are set appropriately.
-#
-# OUTPUT_DIR specifies where the files will be generated; this should be within
-# the build directory. By default, ``${CMAKE_CURRENT_BINARY_DIR}`` will be used.
-# This option can be used to avoid file conflicts.
-#
-# REQUIRED_HEADERS specifies an output variable name where all the required
-# headers will be appended so that they can be installed together with the
-# generated ones. This is mostly intended as a convenience so that adding a new
-# header to a project only requires specifying the CamelCase variant in the
-# CMakeLists.txt file; the original variant will then be added to this
-# variable.
-#
-# COMMON_HEADER generates an additional convenience header which includes all
-# other header files.
-#
-# The RELATIVE argument indicates where the original headers can be found
-# relative to CMAKE_CURRENT_SOURCE_DIR. It does not affect the generated
-# CamelCase forwarding files, but ecm_generate_headers() uses it when checking
-# that the original header exists, and to generate originally named forwarding
-# headers when PREFIX is set.
-#
-# To allow other parts of the source distribution (eg: tests) to use the
-# generated headers before installation, it may be desirable to set the
-# INCLUDE_DIRECTORIES property for the library target to output_dir. For
-# example, if OUTPUT_DIR is CMAKE_CURRENT_BINARY_DIR (the default), you could do
-#
-# .. code-block:: cmake
-#
-# target_include_directories(MyLib PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
-#
-# Example usage (without PREFIX):
-#
-# .. code-block:: cmake
-#
-# ecm_generate_headers(
-# MyLib_FORWARDING_HEADERS
-# HEADERS
-# MLFoo
-# MLBar
-# # etc
-# REQUIRED_HEADERS MyLib_HEADERS
-# COMMON_HEADER MLGeneral
-# )
-# install(FILES ${MyLib_FORWARDING_HEADERS} ${MyLib_HEADERS}
-# DESTINATION ${CMAKE_INSTALL_PREFIX}/include
-# COMPONENT Devel)
-#
-# Example usage (with PREFIX):
-#
-# .. code-block:: cmake
-#
-# ecm_generate_headers(
-# MyLib_FORWARDING_HEADERS
-# HEADERS
-# Foo
-# # several classes are contained in bar.h, so generate
-# # additional files
-# Bar,BarList
-# # etc
-# PREFIX MyLib
-# REQUIRED_HEADERS MyLib_HEADERS
-# )
-# install(FILES ${MyLib_FORWARDING_HEADERS}
-# DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MyLib
-# COMPONENT Devel)
-# install(FILES ${MyLib_HEADERS}
-# DESTINATION ${CMAKE_INSTALL_PREFIX}/include/mylib
-# COMPONENT Devel)
-#
-# Since pre-1.0.0.
-
-#=============================================================================
-# SPDX-FileCopyrightText: 2013 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
-# SPDX-FileCopyrightText: 2014 Alex Merry <alex.merry@kdemail.net>
-# SPDX-FileCopyrightText: 2015 Patrick Spendrin <patrick.spendrin@kdab.com>
-#
-# SPDX-License-Identifier: BSD-3-Clause
-
-include(CMakeParseArguments)
-
-function(ECM_GENERATE_HEADERS camelcase_forwarding_headers_var)
- set(options)
- set(oneValueArgs ORIGINAL HEADER_EXTENSION OUTPUT_DIR PREFIX REQUIRED_HEADERS COMMON_HEADER RELATIVE)
- set(multiValueArgs HEADER_NAMES)
- cmake_parse_arguments(EGH "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
- if (EGH_UNPARSED_ARGUMENTS)
- message(FATAL_ERROR "Unexpected arguments to ECM_GENERATE_HEADERS: ${EGH_UNPARSED_ARGUMENTS}")
- endif()
-
- if(NOT EGH_HEADER_NAMES)
- message(FATAL_ERROR "Missing header_names argument to ECM_GENERATE_HEADERS")
- endif()
-
- if(NOT EGH_ORIGINAL)
- # default
- set(EGH_ORIGINAL "LOWERCASE")
- endif()
- if(NOT EGH_ORIGINAL STREQUAL "LOWERCASE" AND NOT EGH_ORIGINAL STREQUAL "CAMELCASE")
- message(FATAL_ERROR "Unexpected value for original argument to ECM_GENERATE_HEADERS: ${EGH_ORIGINAL}")
- endif()
-
- if(NOT EGH_HEADER_EXTENSION)
- set(EGH_HEADER_EXTENSION "h")
- endif()
-
- if(NOT EGH_OUTPUT_DIR)
- set(EGH_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
- endif()
-
- # Make sure EGH_RELATIVE is /-terminated when it's not empty
- if (EGH_RELATIVE AND NOT "${EGH_RELATIVE}" MATCHES "^.*/$")
- set(EGH_RELATIVE "${EGH_RELATIVE}/")
- endif()
-
- if (EGH_PREFIX)
- if (NOT "${EGH_PREFIX}" MATCHES "^.*/$")
- set(EGH_PREFIX "${EGH_PREFIX}/")
- endif()
- if (EGH_ORIGINAL STREQUAL "CAMELCASE")
- set(originalprefix "${EGH_PREFIX}")
- else()
- string(TOLOWER "${EGH_PREFIX}" originalprefix)
- endif()
- endif()
-
- foreach(_classnameentry ${EGH_HEADER_NAMES})
- string(REPLACE "," ";" _classnames ${_classnameentry})
- list(GET _classnames 0 _baseclass)
-
- if (EGH_ORIGINAL STREQUAL "CAMELCASE")
- set(originalbasename "${_baseclass}")
- else()
- string(TOLOWER "${_baseclass}" originalbasename)
- endif()
-
- set(_actualheader "${CMAKE_CURRENT_SOURCE_DIR}/${EGH_RELATIVE}${originalbasename}.${EGH_HEADER_EXTENSION}")
- if (NOT EXISTS ${_actualheader})
- message(FATAL_ERROR "Could not find \"${_actualheader}\"")
- endif()
-
- foreach(_CLASSNAME ${_classnames})
- set(FANCY_HEADER_FILE "${EGH_OUTPUT_DIR}/${EGH_PREFIX}${_CLASSNAME}")
- if (NOT EXISTS ${FANCY_HEADER_FILE})
- file(WRITE ${FANCY_HEADER_FILE} "#include \"${originalprefix}${originalbasename}.${EGH_HEADER_EXTENSION}\"\n")
- endif()
- list(APPEND ${camelcase_forwarding_headers_var} "${FANCY_HEADER_FILE}")
- if (EGH_PREFIX)
- # Local forwarding header, for namespaced headers, e.g. kparts/part.h
- if(EGH_ORIGINAL STREQUAL "CAMELCASE")
- set(originalclassname "${_CLASSNAME}")
- else()
- string(TOLOWER "${_CLASSNAME}" originalclassname)
- endif()
- set(REGULAR_HEADER_NAME ${EGH_OUTPUT_DIR}/${originalprefix}${originalclassname}.${EGH_HEADER_EXTENSION})
- if (NOT EXISTS ${REGULAR_HEADER_NAME})
- file(WRITE ${REGULAR_HEADER_NAME} "#include \"${_actualheader}\"\n")
- endif()
- endif()
- endforeach()
-
- list(APPEND _REQUIRED_HEADERS "${_actualheader}")
- endforeach()
-
- if(EGH_COMMON_HEADER)
- #combine required headers into 1 big convenience header
- set(COMMON_HEADER ${EGH_OUTPUT_DIR}/${EGH_PREFIX}${EGH_COMMON_HEADER})
- file(WRITE ${COMMON_HEADER} "// convenience header\n")
- foreach(_header ${_REQUIRED_HEADERS})
- get_filename_component(_base ${_header} NAME)
- file(APPEND ${COMMON_HEADER} "#include \"${_base}\"\n")
- endforeach()
- list(APPEND ${camelcase_forwarding_headers_var} "${COMMON_HEADER}")
- endif()
-
- set(${camelcase_forwarding_headers_var} ${${camelcase_forwarding_headers_var}} PARENT_SCOPE)
- if (NOT EGH_REQUIRED_HEADERS STREQUAL "")
- set(${EGH_REQUIRED_HEADERS} ${${EGH_REQUIRED_HEADERS}} ${_REQUIRED_HEADERS} PARENT_SCOPE)
- endif ()
-endfunction()
diff --git a/cmake/KDAB/modules/KDCompilerFlags.cmake b/cmake/KDAB/modules/KDCompilerFlags.cmake
new file mode 100644
index 0000000..f06a3ee
--- /dev/null
+++ b/cmake/KDAB/modules/KDCompilerFlags.cmake
@@ -0,0 +1,86 @@
+#
+# SPDX-FileCopyrightText: 2021-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Compiler settings
+
+include(KDFunctions)
+
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ kd_add_flag_if_supported(-Wunused-but-set-variable UNUSED_BUT_SET)
+ kd_add_flag_if_supported(-Wlogical-op LOGICAL_OP)
+ kd_add_flag_if_supported(-Wsizeof-pointer-memaccess POINTER_MEMACCESS)
+ kd_add_flag_if_supported(-Wreorder REORDER)
+ kd_add_flag_if_supported(-Wformat-security FORMAT_SECURITY)
+ kd_add_flag_if_supported(-Wsuggest-override SUGGEST_OVERRIDE)
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Woverloaded-virtual -Winit-self")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-include-dirs -Wunused -Wundef -Wpointer-arith")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-noreturn -Werror=return-type -Wswitch")
+ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ # -Wgnu-zero-variadic-macro-arguments (part of -pedantic) is triggered by every qCDebug() call
+ # and therefore results in a lot of noise. This warning is only notifying us that clang is
+ # emulating the GCC behaviour instead of the exact standard wording so we can safely ignore it
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
+ endif()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -Wdocumentation")
+endif()
+if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -Wdocumentation")
+endif()
+
+# Do not treat the operator name keywords and, bitand, bitor, compl, not, or and xor as synonyms as keywords.
+# They're not supported under Visual Studio out of the box thus using them limits the portability of code
+if(CMAKE_COMPILER_IS_GNUCXX OR
+ CMAKE_C_COMPILER_ID MATCHES "Clang" OR
+ (CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-operator-names")
+endif()
+
+if(MSVC)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-") #use strict C++ compliance
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244") #conversion from __int64 to int possible loss of data
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267") #conversion from size_t to int possible loss of data
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus") #for an accurate __cplusplus macro
+endif()
+
+if(WIN32)
+ add_definitions(-DUNICODE -D_UNICODE -D_USING_V110_SDK71_=1)
+endif()
+
+if(QNXNTO)
+ add_definitions(-D_QNX_SOURCE)
+endif()
+
+if(CYGWIN)
+ add_definitions(-D_GNU_SOURCE)
+endif()
+
+if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR
+ (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT APPLE) OR
+ (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32))
+ # Linker warnings should be treated as errors
+ set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}")
+ set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}")
+
+ string(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" compileflags)
+ if("${CMAKE_CXX_FLAGS} ${${compileflags}}" MATCHES "-fsanitize")
+ set(sanitizers_enabled TRUE)
+ else()
+ set(sanitizers_enabled FALSE)
+ endif()
+
+ if(APPLE OR LINUX) #explicitly, not OpenBSD (or FreeBSD?)
+ # cannot enable this for clang + sanitizers
+ if(NOT sanitizers_enabled OR NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ # Do not allow undefined symbols, even in non-symbolic shared libraries
+ set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
+ set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}")
+ endif()
+ endif()
+endif()
diff --git a/cmake/KDAB/modules/KDFunctions.cmake b/cmake/KDAB/modules/KDFunctions.cmake
new file mode 100644
index 0000000..4d5143a
--- /dev/null
+++ b/cmake/KDAB/modules/KDFunctions.cmake
@@ -0,0 +1,39 @@
+#
+# SPDX-FileCopyrightText: 2021-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+if(POLICY CMP0057)
+ cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST
+endif()
+
+get_property(_supported_languages GLOBAL PROPERTY ENABLED_LANGUAGES)
+if("C" IN_LIST _supported_languages)
+ include(CheckCCompilerFlag)
+ set(KD_C_PROJECT True SCOPE GLOBAL)
+endif()
+if("CXX" IN_LIST _supported_languages)
+ include(CheckCXXCompilerFlag)
+ set(KD_CXX_PROJECT True SCOPE GLOBAL)
+endif()
+
+# If the condition is true, add the specified value to the arguments at the parent scope
+function(kd_append_if condition value)
+ if(${condition})
+ foreach(variable ${ARGN})
+ set(${variable} "${${variable}} ${value}" PARENT_SCOPE)
+ endforeach()
+ endif()
+endfunction()
+
+# Add C and C++ compiler command line option
+macro(kd_add_flag_if_supported flag name)
+ if(KD_C_PROJECT)
+ check_c_compiler_flag("-Werror ${flag}" "C_SUPPORTS_${name}")
+ kd_append_if("C_SUPPORTS_${name}" "${flag}" CMAKE_C_FLAGS)
+ endif()
+ if(KD_CXX_PROJECT)
+ check_cxx_compiler_flag("-Werror ${flag}" "CXX_SUPPORTS_${name}")
+ kd_append_if("CXX_SUPPORTS_${name}" "${flag}" CMAKE_CXX_FLAGS)
+ endif()
+endmacro()
diff --git a/cmake/InstallLocation.cmake b/cmake/KDAB/modules/KDInstallLocation.cmake
similarity index 51%
rename from cmake/InstallLocation.cmake
rename to cmake/KDAB/modules/KDInstallLocation.cmake
index cdd6d00..74b4559 100644
--- a/cmake/InstallLocation.cmake
+++ b/cmake/KDAB/modules/KDInstallLocation.cmake
@@ -1,3 +1,9 @@
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
# Some default installation locations. These should be global, with any project
# specific locations added to the end. These paths are all relative to the
# install prefix.
@@ -9,27 +15,27 @@
include(GNUInstallDirs)
if(NOT INSTALL_RUNTIME_DIR)
- set(INSTALL_RUNTIME_DIR ${CMAKE_INSTALL_BINDIR})
+ set(INSTALL_RUNTIME_DIR ${CMAKE_INSTALL_BINDIR})
endif()
if(NOT INSTALL_LIBRARY_DIR)
- set(INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR})
+ set(INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR})
endif()
if(NOT INSTALL_ARCHIVE_DIR)
- set(INSTALL_ARCHIVE_DIR ${CMAKE_INSTALL_LIBDIR})
+ set(INSTALL_ARCHIVE_DIR ${CMAKE_INSTALL_LIBDIR})
endif()
if(NOT INSTALL_INCLUDE_DIR)
- set(INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
+ set(INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
endif()
if(NOT INSTALL_DATADIR)
- set(INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR})
+ set(INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR})
endif()
if(NOT INSTALL_DOC_DIR)
- set(INSTALL_DOC_DIR ${CMAKE_INSTALL_DOCDIR})
+ set(INSTALL_DOC_DIR ${CMAKE_INSTALL_DOCDIR}${${PROJECT_NAME}_LIBRARY_QTID})
endif()
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-if (APPLE)
- set(CMAKE_MACOSX_RPATH ON)
+if(APPLE)
+ set(CMAKE_MACOSX_RPATH ON)
else()
- set(CMAKE_INSTALL_RPATH "$ORIGIN/../${INSTALL_LIBRARY_DIR}")
+ set(CMAKE_INSTALL_RPATH "$ORIGIN/../${INSTALL_LIBRARY_DIR}")
endif()
diff --git a/cmake/KDAB/modules/KDQtInstallPaths.cmake b/cmake/KDAB/modules/KDQtInstallPaths.cmake
new file mode 100644
index 0000000..eb7a125
--- /dev/null
+++ b/cmake/KDAB/modules/KDQtInstallPaths.cmake
@@ -0,0 +1,52 @@
+#
+# SPDX-FileCopyrightText: 2016-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+# Author: Allen Winter <allen.winter@kdab.com>
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Assumes you've already found Qt and Qt_VERSION_MAJOR is set
+#
+# Create variables for all the various install paths for the Qt version in use
+# Make sure to have found Qt before using this.
+# sets variables like QT_INSTALL_PREFIX, QT_INSTALL_DATA, QT_INSTALL_DOCS, etc.
+# run qmake -query to see a full list
+
+if(NOT DEFINED Qt_VERSION_MAJOR)
+ message(FATAL_ERROR "Please set Qt_VERSION_MAJOR first (ie. set(Qt_VERSION_MAJOR 5))")
+endif()
+
+if(TARGET Qt${Qt_VERSION_MAJOR}::qmake)
+ get_target_property(QT_QMAKE_EXECUTABLE Qt${Qt_VERSION_MAJOR}::qmake LOCATION)
+else()
+ message(FATAL_ERROR "No supported Qt version found. Make sure you find Qt before calling this")
+endif()
+
+execute_process(
+ COMMAND ${QT_QMAKE_EXECUTABLE} -query
+ RESULT_VARIABLE return_code
+ OUTPUT_VARIABLE ALL_VARS
+)
+if(NOT return_code EQUAL 0)
+ message(WARNING "Failed call: ${QT_QMAKE_EXECUTABLE} -query")
+ message(FATAL_ERROR "QMake call failed: ${return_code}")
+endif()
+
+string(REPLACE "\n" ";" VARS_LIST ${ALL_VARS})
+foreach(qval ${VARS_LIST})
+ if(qval MATCHES "QT_INSTALL_")
+ string(REPLACE ":" ";" QVAL_LIST ${qval})
+ list(LENGTH QVAL_LIST listlen)
+ list(GET QVAL_LIST 0 var)
+ if(WIN32 AND ${listlen} GREATER 2)
+ list(GET QVAL_LIST 2 path)
+ list(GET QVAL_LIST 1 drive)
+ set(path "${drive}:${path}")
+ else()
+ list(GET QVAL_LIST 1 path)
+ endif()
+ if(NOT ${var}) #if set already on the command line for example
+ set(${var} ${path} CACHE PATH "Qt install path for ${var}")
+ endif()
+ endif()
+endforeach()
diff --git a/cmake/Qt5Portability.cmake b/cmake/Qt5Portability.cmake
deleted file mode 100644
index 313b845..0000000
--- a/cmake/Qt5Portability.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-
-include_directories(${Qt5Widgets_INCLUDE_DIRS})
-
-if(QT_USE_QTNETWORK)
- find_package(Qt5Network REQUIRED)
- list(APPEND QT_LIBRARIES Qt5::Network)
- include_directories(${Qt5Network_INCLUDE_DIRS})
-endif()
-
-if(QT_USE_QTXML)
- find_package(Qt5Xml REQUIRED)
- list(APPEND QT_LIBRARIES Qt5::Xml)
- include_directories(${Qt5Xml_INCLUDE_DIRS})
-endif()
-
-if(QT_USE_QTTEST)
- find_package(Qt5Test REQUIRED)
- list(APPEND QT_LIBRARIES Qt5::Test)
- include_directories(${Qt5Test_INCLUDE_DIRS})
-endif()
-
-macro(qt4_wrap_ui)
- qt5_wrap_ui(${ARGN})
-endmacro()
-
-macro(qt4_wrap_cpp)
- qt5_wrap_cpp(${ARGN})
-endmacro()
-
-macro(qt4_add_resources)
- qt5_add_resources(${ARGN})
-endmacro()
diff --git a/cmake/WriteBasicConfigVersionFile.cmake b/cmake/WriteBasicConfigVersionFile.cmake
deleted file mode 100644
index 038cb57..0000000
--- a/cmake/WriteBasicConfigVersionFile.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-# WRITE_BASIC_CONFIG_VERSION_FILE( filename VERSION major.minor.patch COMPATIBILITY (AnyNewerVersion|SameMajorVersion) )
-#
-# Deprecated, see WRITE_BASIC_PACKAGE_VERSION_FILE(), it is identical.
-
-#=============================================================================
-# Copyright 2008-2011 Alexander Neundorf, <neundorf@kde.org>
-# Copyright 2004-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-include(CMakeParseArguments)
-
-function(WRITE_BASIC_CONFIG_VERSION_FILE _filename)
-
- set(options )
- set(oneValueArgs VERSION COMPATIBILITY )
- set(multiValueArgs )
-
- cmake_parse_arguments(CVF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
- if(CVF_UNPARSED_ARGUMENTS)
- message(FATAL_ERROR "Unknown keywords given to WRITE_BASIC_CONFIG_VERSION_FILE(): \"${CVF_UNPARSED_ARGUMENTS}\"")
- endif(CVF_UNPARSED_ARGUMENTS)
-
- set(versionTemplateFile "${CMAKE_ROOT}/Modules/BasicConfigVersion-${CVF_COMPATIBILITY}.cmake.in")
- if(NOT EXISTS "${versionTemplateFile}")
- message(FATAL_ERROR "Bad COMPATIBILITY value used for WRITE_BASIC_CONFIG_VERSION_FILE(): \"${CVF_COMPATIBILITY}\"")
- endif()
-
- if("${CVF_VERSION}" STREQUAL "")
- message(FATAL_ERROR "No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE()")
- endif()
-
- configure_file("${versionTemplateFile}" "${_filename}" @ONLY)
-
-endfunction(WRITE_BASIC_CONFIG_VERSION_FILE)
diff --git a/conan/conanfile.py b/conan/conanfile.py
index 3916388..acb8cdf 100644
--- a/conan/conanfile.py
+++ b/conan/conanfile.py
@@ -1,34 +1,17 @@
-#############################################################################
-## Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-## All rights reserved.
-##
-## This file is part of the KD Soap library.
-##
-## Licensees holding valid commercial KD Soap licenses may use this file in
-## accordance with the KD Soap Commercial License Agreement provided with
-## the Software.
-##
-## This file may be distributed and/or modified under the terms of the
-## GNU Lesser General Public License version 2.1 and version 3 as published by the
-## Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-##
-## This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-## WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-##
-## Contact info@kdab.com if any conditions of this licensing are not
-## clear to you.
-##
-######################################################################/
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
from conans import ConanFile, CMake, tools
class KdsoapConan(ConanFile):
name = "KDSoap"
- version = "1.9.1"
- license = ("https://raw.githubusercontent.com/KDAB/KDSoap/kdsoap-{0}-release/LICENSE.txt,"
- "https://raw.githubusercontent.com/KDAB/KDSoap/kdsoap-{0}-release/LICENSE.AGPL3-modified.txt,"
- "https://raw.githubusercontent.com/KDAB/KDSoap/kdsoap-{0}-release/LICENSE.GPL.txt,"
- "https://raw.githubusercontent.com/KDAB/KDSoap/kdsoap-{0}-release/LICENSE.LGPL.txt").format(version)
+ version = "2.1.1"
+ license = ("https://raw.githubusercontent.com/KDAB/KDSoap/master/LICENSES/MIT.txt")
author = "Klaralvdalens Datakonsult AB (KDAB) info@kdab.com"
url = "https://github.com/KDAB/KDSoap.git"
description = "KD Soap is a Qt-based client-side and server-side SOAP component."
diff --git a/debian.rules b/debian.rules
deleted file mode 100644
index f3d803d..0000000
--- a/debian.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index ff77d35..b27e22e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdsoap (2.1.1+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sat, 25 Feb 2023 16:58:18 -0000
+
kdsoap (1.9.1+dfsg-5) unstable; urgency=medium
* Update symbols files for mipsel, mips64el, alpha, hppa and sparc64 architectures.
diff --git a/debian.changelog b/distro/debian.changelog
similarity index 75%
rename from debian.changelog
rename to distro/debian.changelog
index 4c9b4cc..ed64f86 100644
--- a/debian.changelog
+++ b/distro/debian.changelog
@@ -1,10 +1,33 @@
+kdsoap (2.1.1) final; urgency=low
+
+ * 2.1.1 bugfix release
+
+ -- Allen Winter <allen.winter@kdab.com> Mon, 12 Sep 2022 17:25:00 -0500
+
+kdsoap (2.1.0) final; urgency=low
+
+ * 2.1.0 final release
+
+ -- Allen Winter <allen.winter@kdab.com> Sun, 11 Sep 2022 11:35:00 -0500
+
+kdsoap (2.0.0) final; urgency=low
+
+ * 2.0.0 final release
+
+ -- Allen Winter <allen.winter@kdab.com> Tue, 29 Jun 2021 16:55:00 -0500
+
+kdsoap (1.10.0) final; urgency=low
+
+ * 1.10.0 final release
+
+ -- Allen Winter <allen.winter@kdab.com> Tue, 22 Dec 2020 10:30:00 -0500
+
kdsoap (1.9.1) final; urgency=low
* 1.9.1 final release
-- Allen Winter <allen.winter@kdab.com> Wed, 30 Sep 2020 15:30:00 -0500
-
kdsoap (1.9.0) final; urgency=low
* 1.9.0 final release
diff --git a/debian.compat b/distro/debian.compat
similarity index 100%
rename from debian.compat
rename to distro/debian.compat
diff --git a/qt5-kdsoap-debian.control b/distro/qt5-debian.control
similarity index 72%
rename from qt5-kdsoap-debian.control
rename to distro/qt5-debian.control
index 0fbd387..38eccec 100644
--- a/qt5-kdsoap-debian.control
+++ b/distro/qt5-debian.control
@@ -2,13 +2,14 @@ Source: kdsoap
Section: Miscellaneous
Priority: optional
Maintainer: Allen Winter <allen.winter@kdab.com>
+Build-Depends: debhelper (>=9), cdbs, cmake
Standards-Version: 3.9.6
Homepage: https://github.com/KDAB/KDSoap
Package: qt5-kdsoap
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Description: A Qt-based client-side and server-side SOAP component
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: A Qt5-based client-side and server-side SOAP component
KDSoap can be used to create client applications for web services
and also provides the means to create web services without the need
for any further component such as a dedicated web server.
diff --git a/distro/qt5-debian.rules b/distro/qt5-debian.rules
new file mode 100644
index 0000000..e458b70
--- /dev/null
+++ b/distro/qt5-debian.rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_BUILD_TYPE=Release
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
diff --git a/distro/qt5-kdsoap.dsc b/distro/qt5-kdsoap.dsc
new file mode 100644
index 0000000..20262dd
--- /dev/null
+++ b/distro/qt5-kdsoap.dsc
@@ -0,0 +1,10 @@
+Format: 1.0
+Source: kdsoap
+Version: 2.1.1-1
+Binary: kdsoap
+Maintainer: Allen Winter <allen.winter@kdab.com>
+Architecture: any
+Build-Depends: debhelper (>=9), cdbs, cmake, qtbase5-dev
+
+Files:
+ 00000000000000000000000000000000 00000 qt5-kdsoap-2.1.1.tar.gz
diff --git a/qt5-kdsoap.spec b/distro/qt5-kdsoap.spec
similarity index 82%
rename from qt5-kdsoap.spec
rename to distro/qt5-kdsoap.spec
index ceb80db..ec9ea35 100644
--- a/qt5-kdsoap.spec
+++ b/distro/qt5-kdsoap.spec
@@ -1,12 +1,12 @@
Name: qt5-kdsoap
-Version: 1.9.1
+Version: 2.1.1
Release: 1
Summary: A Qt5-based client-side and server-side SOAP component
Source0: %{name}-%{version}.tar.gz
Source1: %{name}-%{version}.tar.gz.asc
Url: https://github.com/KDAB/KDSoap
Group: System/Libraries
-License: LGPL-2.1-only AND (GPL-2.0-only OR GPL-3.0-only)
+License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Vendor: Klaralvdalens Datakonsult AB (KDAB)
Packager: Klaralvdalens Datakonsult AB (KDAB) <info@kdab.com>
@@ -71,15 +71,35 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=True -DCMAKE_BUILD_TYPE=R
%files devel
%defattr(-,root,root)
%{_bindir}/kdwsdl2cpp
-%{_prefix}/share/mkspecs
%{_includedir}/KDSoapClient
%{_includedir}/KDSoapServer
%dir %{_libdir}/cmake/KDSoap
%{_libdir}/cmake/KDSoap/*
%{_libdir}/libkdsoap.so
%{_libdir}/libkdsoap-server.so
+%if 0%{?sle_version} >= 150200 && 0%{?is_opensuse}
+%{_libdir}/qt5/mkspecs/modules/*
+%endif
+%{_prefix}/share/mkspecs/
+%if 0%{?suse_version} > 1500
+%{_libdir}/qt5/mkspecs/modules/*
+%endif
+%if 0%{?fedora} > 28
+%{_libdir}/qt5/mkspecs/modules/*
+%endif
+%if %{defined rhel}
+%{_libdir}/qt5/mkspecs/modules/*
+%endif
%changelog
+* Mon Sep 12 2022 Allen Winter <allen.winter@kdab.com> 2.1.1
+ 2.1.1
+* Sun Sep 11 2022 Allen Winter <allen.winter@kdab.com> 2.1.0
+ 2.1.0
+* Tue Jun 29 2021 Allen Winter <allen.winter@kdab.com> 2.0.0
+ 2.0.0
+* Tue Dec 22 2020 Allen Winter <allen.winter@kdab.com> 1.10.0
+ 1.10.0
* Wed Sep 30 2020 Allen Winter <allen.winter@kdab.com> 1.9.1
1.9.1
* Mon Feb 17 2020 Allen Winter <allen.winter@kdab.com> 1.9.0
diff --git a/debian.control b/distro/qt6-debian.control
similarity index 65%
rename from debian.control
rename to distro/qt6-debian.control
index a9180fb..c413836 100644
--- a/debian.control
+++ b/distro/qt6-debian.control
@@ -2,14 +2,14 @@ Source: kdsoap
Section: Miscellaneous
Priority: optional
Maintainer: Allen Winter <allen.winter@kdab.com>
-Build-Depends: debhelper (>=9), cdbs, cmake, libqt4-dev
+Build-Depends: debhelper (>=9), cdbs, cmake
Standards-Version: 3.9.6
Homepage: https://github.com/KDAB/KDSoap
-Package: kdsoap
+Package: qt6-kdsoap
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Description: A Qt-based client-side and server-side SOAP component
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: A Qt6-based client-side and server-side SOAP component
KDSoap can be used to create client applications for web services
and also provides the means to create web services without the need
for any further component such as a dedicated web server.
diff --git a/distro/qt6-debian.rules b/distro/qt6-debian.rules
new file mode 100644
index 0000000..e22200e
--- /dev/null
+++ b/distro/qt6-debian.rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+DEB_CMAKE_EXTRA_FLAGS = -DKDSoap_QT6=True -DCMAKE_BUILD_TYPE=Release
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
diff --git a/distro/qt6-kdsoap.dsc b/distro/qt6-kdsoap.dsc
new file mode 100644
index 0000000..414940d
--- /dev/null
+++ b/distro/qt6-kdsoap.dsc
@@ -0,0 +1,10 @@
+Format: 1.0
+Source: kdsoap
+Version: 2.1.1-1
+Binary: kdsoap
+Maintainer: Allen Winter <allen.winter@kdab.com>
+Architecture: any
+Build-Depends: debhelper (>=9), cdbs, cmake, qt6-base-dev, libgl1-mesa-dev
+
+Files:
+ 00000000000000000000000000000000 00000 qt6-kdsoap-2.1.1.tar.gz
diff --git a/kdsoap.spec b/distro/qt6-kdsoap.spec
similarity index 64%
rename from kdsoap.spec
rename to distro/qt6-kdsoap.spec
index 5dd94bc..51e06c7 100644
--- a/kdsoap.spec
+++ b/distro/qt6-kdsoap.spec
@@ -1,26 +1,27 @@
-Name: kdsoap
-Version: 1.9.1
+Name: qt6-kdsoap
+Version: 2.1.1
Release: 1
-Summary: A Qt4-based client-side and server-side SOAP component
+Summary: A Qt6-based client-side and server-side SOAP component
Source0: %{name}-%{version}.tar.gz
Source1: %{name}-%{version}.tar.gz.asc
Url: https://github.com/KDAB/KDSoap
Group: System/Libraries
-License: LGPL-2.1-only AND (GPL-2.0-only OR GPL-3.0-only)
+License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Vendor: Klaralvdalens Datakonsult AB (KDAB)
Packager: Klaralvdalens Datakonsult AB (KDAB) <info@kdab.com>
+BuildRequires: cmake
%if %{defined suse_version}
-BuildRequires: libqt4-devel
+BuildRequires: libqt6-qtbase-devel
%endif
%if %{defined fedora}
-BuildRequires: gcc-c++ qt-devel desktop-file-utils
+BuildRequires: gcc-c++ qt6-qtbase-devel desktop-file-utils
%endif
%if %{defined rhel}
-BuildRequires: gcc-c++ qt-devel desktop-file-utils
+BuildRequires: gcc-c++ qt6-qtbase-devel desktop-file-utils
%endif
%description
@@ -49,11 +50,7 @@ develop programs which need to access web services using the SOAP protocol.
%build
touch .license.accepted
-%if "%{_lib}"=="lib64"
-QMAKE_ARGS="LIB_SUFFIX=64" ./configure.sh -shared -release -prefix %{buildroot}/usr
-%else
-./configure.sh -shared -release -prefix %{buildroot}/usr
-%endif
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DKDSoap_QT6=True -DCMAKE_SKIP_RPATH=True -DCMAKE_BUILD_TYPE=Release
%__make %{?_smp_mflags}
%post -p /sbin/ldconfig
@@ -67,34 +64,47 @@ QMAKE_ARGS="LIB_SUFFIX=64" ./configure.sh -shared -release -prefix %{buildroot}/
%files
%defattr(-,root,root)
-%{_prefix}/share/doc/KDSoap
-%{_libdir}/libkdsoap.so.*
-%{_libdir}/libkdsoap-server.so.*
+%{_prefix}/share/doc/KDSoap-qt6
+%{_libdir}/libkdsoap-qt6.so.*
+%{_libdir}/libkdsoap-server-qt6.so.*
%files devel
%defattr(-,root,root)
-%{_bindir}/kdwsdl2cpp
-%{_prefix}/share/mkspecs
+%if 0%{?fedora} > 35
+%{_libdir}/qt6/mkspecs/modules/*
+%endif
+#%dir %{_prefix}/share/mkspecs
+#%dir %{_prefix}/share/mkspecs/features
+#%{_prefix}/share/mkspecs/features/kdsoap.prf
+%{_bindir}/kdwsdl2cpp-qt6
%{_includedir}/KDSoapClient
%{_includedir}/KDSoapServer
-%{_libdir}/libkdsoap.so
-%{_libdir}/libkdsoap-server.so
+%dir %{_libdir}/cmake/KDSoap-qt6
+%{_libdir}/cmake/KDSoap-qt6/*
+%{_libdir}/libkdsoap-qt6.so
+%{_libdir}/libkdsoap-server-qt6.so
%changelog
+* Mon Sep 12 2022 Allen Winter <allen.winter@kdab.com> 2.1.1
+ 2.1.1
+* Sun Sep 11 2022 Allen Winter <allen.winter@kdab.com> 2.1.0
+ 2.1.0
+* Tue Jun 29 2021 Allen Winter <allen.winter@kdab.com> 2.0.0
+ 2.0.0
+* Tue Dec 22 2020 Allen Winter <allen.winter@kdab.com> 1.10.0
+ 1.10.0
* Wed Sep 30 2020 Allen Winter <allen.winter@kdab.com> 1.9.1
1.9.1
* Mon Feb 17 2020 Allen Winter <allen.winter@kdab.com> 1.9.0
1.9.0
-* Fri May 17 2019 Allen Winter <allen.winter@kdab.com> 1.8.0
+* Fri May 17 2019 Allen Winter <allen.winter@kdab.com> 1.8.0-1
1.8.0
* Thu Mar 01 2018 Allen Winter <allen.winter@kdab.com> 1.7.0
1.7.0
* Mon May 01 2017 Allen Winter <allen.winter@kdab.com> 1.6.0
1.6.0
-* Tue Jun 06 2016 Allen Winter <allen.winter@kdab.com> 1.5.1
+* Tue Jun 07 2016 Allen Winter <allen.winter@kdab.com> 1.5.1
1.5.1 bug fix
-* Thu Mar 03 2016 Allen Winter <allen.winter@kdab.com> 1.5.0
- 1.5.0 Final
* Mon Feb 29 2016 Allen Winter <allen.winter@kdab.com> 1.4.99
1.5.0 RC1
* Thu Jun 25 2015 Allen Winter <allen.winter@kdab.com> 1.4.0
diff --git a/doc/KDSoap-CopyrightAssignmentForm.docx b/doc/KDSoap-CopyrightAssignmentForm.docx
deleted file mode 100644
index 50f8eae..0000000
Binary files a/doc/KDSoap-CopyrightAssignmentForm.docx and /dev/null differ
diff --git a/doc/config/footer.html b/doc/config/footer.html
deleted file mode 100644
index 35d1a79..0000000
--- a/doc/config/footer.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<hr size="1"><address style="align: right;"><small>
-<table width="100%">
-<tr>
-<td align="left" width="50%">Copyright © 2010-2020, <a class="el" href="https://www.kdab.com">Klarälvdalens Datakonsult AB</a></td>
-<td align="right" width="50%"><a class="el" href="https://www.kdab.com/development-resources/qt-tools/kd-soap">KD Soap</a></td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/doc/CHANGES_1_1.txt b/docs/CHANGES_1_1.txt
similarity index 99%
rename from doc/CHANGES_1_1.txt
rename to docs/CHANGES_1_1.txt
index 7e0e173..791d5b7 100644
--- a/doc/CHANGES_1_1.txt
+++ b/docs/CHANGES_1_1.txt
@@ -7,4 +7,3 @@ Response parsing in KDSoapMessage: implement type conversion based on type infor
Fix compilation error when the name of a wsdl:service contains a '-'.
NEW: server side support
-
diff --git a/docs/CHANGES_1_10.txt b/docs/CHANGES_1_10.txt
new file mode 100644
index 0000000..98a8ca0
--- /dev/null
+++ b/docs/CHANGES_1_10.txt
@@ -0,0 +1,18 @@
+General:
+========
+* No longer supporting Qt 4
+* Minimum Qt version is 5.7
+* Minimum CMake version is 3.0.2
+* qmake buildsystem -- no longer prompt for license choice.
+ users should carefully consider their choice of license
+* The qmake buildsystem is deprecated
+
+CMake buildsystem:
+==================
+* Generates .pri files for qmake users
+* Installs library pdb files with MSVC builds
+* fix library versioning for RelWithDebInfo on Windows (Version 1.10.1)
+
+WSDL parser / code generator changes, applying to both client and server side:
+================================================================
+* Add commandline options to turn off generation of the sync/async/asyncjobs APIs. This improves compilation times. (#225)
diff --git a/doc/CHANGES_1_2.txt b/docs/CHANGES_1_2.txt
similarity index 100%
rename from doc/CHANGES_1_2.txt
rename to docs/CHANGES_1_2.txt
diff --git a/doc/CHANGES_1_3.txt b/docs/CHANGES_1_3.txt
similarity index 98%
rename from doc/CHANGES_1_3.txt
rename to docs/CHANGES_1_3.txt
index 384b856..3a466db 100644
--- a/doc/CHANGES_1_3.txt
+++ b/docs/CHANGES_1_3.txt
@@ -36,7 +36,7 @@ Server-side:
(fix compilation error, and set version to SOAP_1_2 in the 1.2 binding) (SOAP-44).
* Fix handling of requests in RPC mode.
* Fix small memory leak if the device returned from processFileRequest can not be accessed (SOAP-48).
-* Clean incoming path recieved via HTTP from "./" and "../" (SOAP-49).
+* Clean incoming path received via HTTP from "./" and "../" (SOAP-49).
* Add ability to set custom ssl configuration for new connections.
Code generator changes, applying to both client and server side:
diff --git a/doc/CHANGES_1_4.txt b/docs/CHANGES_1_4.txt
similarity index 98%
rename from doc/CHANGES_1_4.txt
rename to docs/CHANGES_1_4.txt
index 57be56c..a767ec4 100644
--- a/doc/CHANGES_1_4.txt
+++ b/docs/CHANGES_1_4.txt
@@ -30,11 +30,10 @@ Code generator changes, applying to both client and server side:
* Only set xsi:nil="true" on elements that are marked as nillable in the WSDL file.
* Omit non-nillable empty elements of a complex type.
* Support for minOccurs=0 for elements and use=optional for attributes:
- omit such elements/attributes when they haven't been set by the C++ code explicitely. (SOAP-93/SOAP-80)
+ omit such elements/attributes when they haven't been set by the C++ code explicitly. (SOAP-93/SOAP-80)
optionally wrap them in a boost::optional or use raw pointers so apps can find out the element is missing (issue43).
* Support for attributes marked as "prohibited", ensuring they are not settable nor sent in the request. (SOAP-102)
* Generate <service> element automatically if there's none in the WSDL file. (SOAP-60/issue9)
* Implement support for inheritance between complex types, using QSharedPointer as internal storage. (issue26/SOAP-87/SOAP-62)
* Implement support for substitutionGroup, in order to send the correct element name (SOAP-87 followup, SOAP-97).
* Fix crash when parsing elements without a type.
-
diff --git a/doc/CHANGES_1_5.txt b/docs/CHANGES_1_5.txt
similarity index 99%
rename from doc/CHANGES_1_5.txt
rename to docs/CHANGES_1_5.txt
index 2ec9910..5fc2b72 100644
--- a/doc/CHANGES_1_5.txt
+++ b/docs/CHANGES_1_5.txt
@@ -64,4 +64,3 @@ WSDL parser / code generator changes, applying to both client and server side:
* Relative paths to schemas being imported or included are now resolved based on the location of the parent file
rather than the location of the toplevel WSDL file.
-
diff --git a/doc/CHANGES_1_5_1.txt b/docs/CHANGES_1_5_1.txt
similarity index 98%
rename from doc/CHANGES_1_5_1.txt
rename to docs/CHANGES_1_5_1.txt
index a9b59c4..1166ff8 100644
--- a/doc/CHANGES_1_5_1.txt
+++ b/docs/CHANGES_1_5_1.txt
@@ -4,7 +4,7 @@ General:
Client-side:
============
-*
+*
Server-side:
============
@@ -13,4 +13,3 @@ Server-side:
WSDL parser / code generator changes, applying to both client and server side:
================================================================
* RPC mode: escape part names which look like C++ keywords (e.g. "delete")
-
diff --git a/doc/CHANGES_1_6.txt b/docs/CHANGES_1_6.txt
similarity index 99%
rename from doc/CHANGES_1_6.txt
rename to docs/CHANGES_1_6.txt
index bd415d8..b8ca63c 100644
--- a/doc/CHANGES_1_6.txt
+++ b/docs/CHANGES_1_6.txt
@@ -9,9 +9,8 @@ Client-side:
Server-side:
============
-*
+*
WSDL parser / code generator changes, applying to both client and server side:
================================================================
* Fix deserialization of optional lists (the associated nil variable wasn't set to false)
-
diff --git a/doc/CHANGES_1_7.txt b/docs/CHANGES_1_7.txt
similarity index 100%
rename from doc/CHANGES_1_7.txt
rename to docs/CHANGES_1_7.txt
diff --git a/doc/CHANGES_1_8.txt b/docs/CHANGES_1_8.txt
similarity index 94%
rename from doc/CHANGES_1_8.txt
rename to docs/CHANGES_1_8.txt
index f7b89c0..cbcac3d 100644
--- a/doc/CHANGES_1_8.txt
+++ b/docs/CHANGES_1_8.txt
@@ -32,13 +32,13 @@ Server-side:
WSDL parser / code generator changes, applying to both client and server side:
================================================================
-* Source incompatible change: all deserialize() functions now require a KDSoapValue instead of a
- QVariant. If you use a deserialize(QVariant) function, you need to port your code to use
+* Source incompatible change: all deserialize() functions now require a KDSoapValue instead of a
+ QVariant. If you use a deserialize(QVariant) function, you need to port your code to use
KDSoapValue::setValue(QVariant) before deserialize()
-* Source incompatible change: all serialize() functions now return a KDSoapValue instead of a
- QVariant. If you use a QVariant serialize() function, you need to port your code to use
+* Source incompatible change: all serialize() functions now return a KDSoapValue instead of a
+ QVariant. If you use a QVariant serialize() function, you need to port your code to use
QVariant KDSoapValue::value() after serialize()
-* Source incompatible change: xs:QName is now represented by KDQName instead of QString, which
+* Source incompatible change: xs:QName is now represented by KDQName instead of QString, which
allows the namespace to be extracted. The old behaviour is available via KDQName::qname().
* Fix double-handling of empty elements
* Fix fault elements being generated in the wrong namespace, must be SOAP-ENV:Fault (github issue #81).
@@ -52,10 +52,9 @@ WSDL parser / code generator changes, applying to both client and server side:
* Generated services now include soapVersion() and endpoint() accessors to match the setSoapVersion(...) and setEndpoint(...) mutators
* Added support for generating messages for WSDL files without services or bindings
* Fix erroneous QT_BEGIN_NAMESPACE around forward-declarations like Q17__DialogType.
-* KDSoapValue now stores the namespace declarations during parsing of a message and writes
+* KDSoapValue now stores the namespace declarations during parsing of a message and writes
namespace declarations during sending of a message
* Avoid serialize crash with required polymorphic types, if the required variable wasn't actually provided
* Fix generated code for restriction to base class (it wouldn't compile)
* Prepend "undef daylight" and "undef timezone" to all generated files, to fix compilation errors in wsdl files that use those names, due to nasty Windows macros
-* Added generation for default attribute values.
-
+* Added generation for default attribute values.
diff --git a/doc/CHANGES_1_9.txt b/docs/CHANGES_1_9.txt
similarity index 100%
rename from doc/CHANGES_1_9.txt
rename to docs/CHANGES_1_9.txt
diff --git a/docs/CHANGES_2_0.txt b/docs/CHANGES_2_0.txt
new file mode 100644
index 0000000..622ea72
--- /dev/null
+++ b/docs/CHANGES_2_0.txt
@@ -0,0 +1,24 @@
+
+General:
+========
+* Supports Qt6 in addition to Qt5
+* Minimum Qt version is 5.9
+* The qmake buildsystem (via autogen.py) is removed.
+* buildsystem: a new 'docs' target is created when CMake -DKDSoap_DOCS=True.
+* buildsystem: the API manual is now generated in build/docs vice source/docs.
+* buildsystem: added an uninstall target
+* buildsystem: generate and install kdsoap-version.h
+* The API manual is generated+installed in qch format for Qt assistant.
+
+Client-side:
+============
+* Added options to the KDSoapClient specifying the SOAP action sending method
+
+Server-side:
+============
+
+WSDL parser / code generator changes, applying to both client and server side:
+================================================================
+* Fix generated code in case a variable is called "d" or "q" (#118)
+* Fix generated code for an enumeration type with a length restriction (#234)
+* Avoid potential type collisions in nested complexTypes (#239)
diff --git a/docs/CHANGES_2_1.txt b/docs/CHANGES_2_1.txt
new file mode 100644
index 0000000..34517a1
--- /dev/null
+++ b/docs/CHANGES_2_1.txt
@@ -0,0 +1,19 @@
+
+General:
+========
+* Re-license project to MIT and remove the commercial offering
+* buildsystem - Increase minimum CMake version to 3.12.0
+* buildsystem - Build in Release mode by default (in non-developer situations)
+
+Client-side:
+============
+* Generate "explicit" in front of service and job constructors (issue #206)
+
+Server-side:
+============
+* Disable HTTP/2 support (which Qt 6 enables by default), it causes trouble with some SOAP servers (issue #246).
+* Improve parsing of GET argument to avoid misinterpreting queries (possible security issue #247).
+
+WSDL parser / code generator changes, applying to both client and server side:
+================================================================
+*
diff --git a/docs/CHANGES_2_1_1.txt b/docs/CHANGES_2_1_1.txt
new file mode 100644
index 0000000..27018ac
--- /dev/null
+++ b/docs/CHANGES_2_1_1.txt
@@ -0,0 +1,18 @@
+
+General:
+========
+* buildsystem - undo co-installability of Qt5 and Qt6 headers.
+ It would require that kdwsdl2cpp generates #include <KDSoapClient-qt6/KDSoapJob.h>
+ which in turn would break the build of KDSoap itself, so this gets tricky.
+
+Client-side:
+============
+*
+
+Server-side:
+============
+*
+
+WSDL parser / code generator changes, applying to both client and server side:
+================================================================
+*
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
new file mode 100644
index 0000000..d45b20a
--- /dev/null
+++ b/docs/CMakeLists.txt
@@ -0,0 +1,21 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2021-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+# Doxygen
+find_package(Doxygen)
+set_package_properties(
+ Doxygen PROPERTIES
+ TYPE OPTIONAL
+ DESCRIPTION "API Documentation system"
+ URL "https://www.doxygen.org"
+ PURPOSE "Needed to build the API documentation."
+)
+
+if(DOXYGEN_FOUND)
+ add_subdirectory(api)
+endif()
diff --git a/docs/api/CMakeLists.txt b/docs/api/CMakeLists.txt
new file mode 100644
index 0000000..beacac9
--- /dev/null
+++ b/docs/api/CMakeLists.txt
@@ -0,0 +1,92 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2021-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+# dot should come with Doxygen find_package(Doxygen)
+if(DOXYGEN_DOT_EXECUTABLE)
+ set(HAVE_DOT "YES")
+else()
+ set(HAVE_DOT "NO")
+ message(STATUS "Unable to provide inheritance diagrams for the API documentation. "
+ "To fix, install the graphviz project from https://www.graphviz.org"
+ )
+endif()
+
+# latex
+set(HAVE_LATEX "NO")
+find_package(LATEX)
+set_package_properties(
+ LATEX PROPERTIES
+ TYPE OPTIONAL
+ DESCRIPTION "A document preparation system"
+ URL "https://www.latex-project.org"
+ PURPOSE "Provides for building a PS or PDF version of the API documentation"
+)
+if(LATEX_FOUND)
+ if(MAKEINDEX_COMPILER)
+ set(HAVE_LATEX "YES")
+ else()
+ message(STATUS "The LaTeX makeindex compiler could not be located. "
+ "Unable to generate the buildsystem for LaTex documentation generation."
+ )
+ endif()
+endif()
+
+# qhelpgenerator
+find_program(QHELPGEN_EXECUTABLE qhelpgenerator HINTS ${QT_INSTALL_BINS})
+if(QHELPGEN_EXECUTABLE)
+ set(HAVE_QHELPGEN "YES")
+else()
+ set(HAVE_QHELPGEN "NO")
+ message(STATUS "Unable to generate the API documentation in qch format. "
+ "To fix, install the qthelpgenerator program which comes with Qt."
+ )
+endif()
+
+find_file(QDOC_QTCORE_TAG qtcore.tags HINTS ${QT_INSTALL_DOCS}/qtcore ${QT_INSTALL_DATA}/doc/qtcore)
+set(QDOC_TAG_DIR "<QDOC_TAG_DIR_not_found>")
+if(QDOC_QTCORE_TAG)
+ get_filename_component(QDOC_TAG_DIR ${QDOC_QTCORE_TAG} DIRECTORY)
+ get_filename_component(QDOC_TAG_DIR ${QDOC_TAG_DIR} DIRECTORY)
+endif()
+
+file(GLOB _dox_deps *.dox *.html)
+set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+
+#apidox generation using doxygen
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+
+add_custom_command(
+ OUTPUT ${DOXYGEN_OUTPUT_DIR}/qch/kdsoap-api.qch
+ COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+ DEPENDS ${_dox_deps} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ COMMENT "Generate the .qch file"
+)
+add_custom_target(
+ kdsoap-api.qch ALL
+ DEPENDS ${DOXYGEN_OUTPUT_DIR}/qch/kdsoap-api.qch
+ COMMENT "Target to generate the .qch file"
+)
+add_custom_target(
+ docs
+ DEPENDS kdsoap-api.qch
+ COMMENT "Target to generate the documentation"
+)
+
+set(QCH_INSTALL_DIR
+ ${INSTALL_DOC_DIR}
+ CACHE STRING "Install location of Qt Assistant help files."
+)
+install(
+ FILES ${DOXYGEN_OUTPUT_DIR}/qch/kdsoap-api.qch
+ DESTINATION ${QCH_INSTALL_DIR}
+)
+install(
+ FILES ${DOXYGEN_OUTPUT_DIR}/kdsoap.tags
+ DESTINATION ${INSTALL_DOC_DIR}
+)
diff --git a/Doxyfile b/docs/api/Doxyfile.cmake
similarity index 96%
rename from Doxyfile
rename to docs/api/Doxyfile.cmake
index 52dc9e2..f0d65cb 100644
--- a/Doxyfile
+++ b/docs/api/Doxyfile.cmake
@@ -32,13 +32,13 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.
-PROJECT_NAME = "KD SOAP"
+PROJECT_NAME = "KD SOAP API Documentation"
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 1.9.1
+PROJECT_NUMBER = @KDSoap_VERSION_MAJOR@.@KDSoap_VERSION_MINOR@
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -51,14 +51,14 @@ PROJECT_BRIEF =
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory.
-PROJECT_LOGO = images/kdsoap-medium.png
+PROJECT_LOGO = "@CMAKE_SOURCE_DIR@/images/kdsoap-medium.png"
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = doc
+OUTPUT_DIRECTORY = "@DOXYGEN_OUTPUT_DIR@"
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -126,9 +126,9 @@ REPEAT_BRIEF = YES
# the entity):The $name class, The $name widget, The $name file, is, provides,
# specifies, contains, represents, a, an and the.
-ABBREVIATE_BRIEF = "The $name class" \
- "The $name widget" \
- "The $name file" \
+ABBREVIATE_BRIEF = "The \$name class" \
+ "The \$name widget" \
+ "The \$name file" \
is \
provides \
specifies \
@@ -158,7 +158,7 @@ INLINE_INHERITED_MEMB = NO
# shortest path that makes the file name unique will be used
# The default value is: YES.
-FULL_PATH_NAMES = YES
+FULL_PATH_NAMES = NO
# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
# Stripping is only done if one of the specified strings matches the left-hand
@@ -213,7 +213,7 @@ JAVADOC_BANNER = NO
# requiring an explicit \brief command for a brief description.)
# The default value is: NO.
-QT_AUTOBRIEF = NO
+QT_AUTOBRIEF = YES
# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
@@ -239,7 +239,7 @@ PYTHON_DOCSTRING = YES
# documentation from any documented member that it re-implements.
# The default value is: YES.
-INHERIT_DOCS = NO
+INHERIT_DOCS = YES
# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
# page for each member. If set to NO, the documentation of a member will be part
@@ -353,7 +353,7 @@ MARKDOWN_SUPPORT = YES
# Minimum value: 0, maximum value: 99, default value: 5.
# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-TOC_INCLUDE_HEADINGS = 0
+TOC_INCLUDE_HEADINGS = 5
# When enabled doxygen tries to link words that correspond to documented
# classes, or namespaces to their corresponding documentation. Such a link can
@@ -403,7 +403,7 @@ IDL_PROPERTY_SUPPORT = YES
# all members of a group must be documented explicitly.
# The default value is: NO.
-DISTRIBUTE_GROUP_DOC = YES
+DISTRIBUTE_GROUP_DOC = NO
# If one adds a struct or class to a group and this option is enabled, then also
# any nested class or struct is added to the same group. By default this option
@@ -491,13 +491,13 @@ NUM_PROC_THREADS = 1
# normally produced when WARNINGS is set to YES.
# The default value is: NO.
-EXTRACT_ALL = NO
+EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
# be included in the documentation.
# The default value is: NO.
-EXTRACT_PRIVATE = YES
+EXTRACT_PRIVATE = NO
# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
# methods of a class will be included in the documentation.
@@ -523,7 +523,7 @@ EXTRACT_STATIC = YES
# for Java sources.
# The default value is: YES.
-EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_CLASSES = NO
# This flag is only useful for Objective-C code. If set to YES, local methods,
# which are defined in the implementation section but not in the interface are
@@ -548,7 +548,7 @@ EXTRACT_ANON_NSPACES = NO
# section is generated. This option has no effect if EXTRACT_ALL is enabled.
# The default value is: NO.
-HIDE_UNDOC_MEMBERS = YES
+HIDE_UNDOC_MEMBERS = NO
# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
# undocumented classes that are normally visible in the class hierarchy. If set
@@ -556,7 +556,7 @@ HIDE_UNDOC_MEMBERS = YES
# has no effect if EXTRACT_ALL is enabled.
# The default value is: NO.
-HIDE_UNDOC_CLASSES = YES
+HIDE_UNDOC_CLASSES = NO
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
# declarations. If set to NO, these declarations will be included in the
@@ -570,7 +570,7 @@ HIDE_FRIEND_COMPOUNDS = YES
# blocks will be appended to the function's detailed documentation block.
# The default value is: NO.
-HIDE_IN_BODY_DOCS = NO
+HIDE_IN_BODY_DOCS = YES
# The INTERNAL_DOCS tag determines if documentation that is typed after a
# \internal command is included. If the tag is set to NO then the documentation
@@ -586,7 +586,7 @@ INTERNAL_DOCS = NO
# (including Cygwin) and Mac users are advised to set this option to NO.
# The default value is: system dependent.
-CASE_SENSE_NAMES = NO
+CASE_SENSE_NAMES = YES
# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
# their full class and namespace scopes in the documentation. If set to YES, the
@@ -632,7 +632,7 @@ INLINE_INFO = YES
# name. If set to NO, the members will appear in declaration order.
# The default value is: YES.
-SORT_MEMBER_DOCS = NO
+SORT_MEMBER_DOCS = YES
# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
# descriptions of file, namespace and class members alphabetically by member
@@ -640,7 +640,7 @@ SORT_MEMBER_DOCS = NO
# this will also influence the order of the classes in the class list.
# The default value is: NO.
-SORT_BRIEF_DOCS = NO
+SORT_BRIEF_DOCS = YES
# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
# (brief and detailed) documentation of class members so that constructors and
@@ -652,7 +652,7 @@ SORT_BRIEF_DOCS = NO
# detailed member documentation.
# The default value is: NO.
-SORT_MEMBERS_CTORS_1ST = NO
+SORT_MEMBERS_CTORS_1ST = YES
# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
# of group names into alphabetical order. If set to NO the group names will
@@ -691,13 +691,13 @@ GENERATE_TODOLIST = NO
# list. This list is created by putting \test commands in the documentation.
# The default value is: YES.
-GENERATE_TESTLIST = YES
+GENERATE_TESTLIST = NO
# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
# list. This list is created by putting \bug commands in the documentation.
# The default value is: YES.
-GENERATE_BUGLIST = YES
+GENERATE_BUGLIST = NO
# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
# the deprecated list. This list is created by putting \deprecated commands in
@@ -786,7 +786,7 @@ CITE_BIB_FILES =
# messages are off.
# The default value is: NO.
-QUIET = YES
+QUIET = NO
# The WARNINGS tag can be used to turn on/off the warning messages that are
# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
@@ -802,7 +802,7 @@ WARNINGS = YES
# will automatically be disabled.
# The default value is: YES.
-WARN_IF_UNDOCUMENTED = NO
+WARN_IF_UNDOCUMENTED = YES
# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
# potential errors in the documentation, such as not documenting some parameters
@@ -853,7 +853,7 @@ WARN_LOGFILE = doxygen.log
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.
-INPUT = src
+INPUT = "@CMAKE_SOURCE_DIR@/src"
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -880,9 +880,11 @@ INPUT_ENCODING = UTF-8
# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
# *.vhdl, *.ucf, *.qsf and *.ice.
-FILE_PATTERNS = [a-zA-Z]*.cpp \
- [a-zA-Z]*.h \
- *.dox
+FILE_PATTERNS = *.cpp \
+ *.h \
+ *.dox \
+ *.md \
+ *.gif
# The RECURSIVE tag can be used to specify whether or not subdirectories should
# be searched for input files as well.
@@ -953,7 +955,8 @@ EXAMPLE_RECURSIVE = YES
# that contain images that are to be included in the documentation (see the
# \image command).
-IMAGE_PATH = images
+IMAGE_PATH = "@CMAKE_SOURCE_DIR@/images" \
+ "@CMAKE_CURRENT_SOURCE_DIR@"
# The INPUT_FILTER tag can be used to specify a program that doxygen should
# invoke to filter for each input file. Doxygen will invoke the filter program
@@ -1022,7 +1025,7 @@ USE_MDFILE_AS_MAINPAGE =
# also VERBATIM_HEADERS is set to NO.
# The default value is: NO.
-SOURCE_BROWSER = NO
+SOURCE_BROWSER = YES
# Setting the INLINE_SOURCES tag to YES will include the body of functions,
# classes and enums directly into the documentation.
@@ -1041,13 +1044,13 @@ STRIP_CODE_COMMENTS = YES
# entity all documented functions referencing it will be listed.
# The default value is: NO.
-REFERENCED_BY_RELATION = NO
+REFERENCED_BY_RELATION = YES
# If the REFERENCES_RELATION tag is set to YES then for each documented function
# all documented entities called/used by that function will be listed.
# The default value is: NO.
-REFERENCES_RELATION = NO
+REFERENCES_RELATION = YES
# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
# to YES then the hyperlinks from functions in REFERENCES_RELATION and
@@ -1097,38 +1100,6 @@ USE_HTAGS = NO
VERBATIM_HEADERS = YES
-# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS =
-
-# If clang assisted parsing is enabled you can provide the clang parser with the
-# path to the directory containing a file called compile_commands.json. This
-# file is the compilation database (see:
-# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
-# options used when the source files were built. This is equivalent to
-# specifying the "-p" option to a clang tool, such as clang-check. These options
-# will then be passed to the parser. Any options specified with CLANG_OPTIONS
-# will be added as well.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-
-CLANG_DATABASE_PATH =
-
#---------------------------------------------------------------------------
# Configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
@@ -1170,7 +1141,7 @@ GENERATE_HTML = YES
# The default directory is: html.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_OUTPUT = refman
+HTML_OUTPUT = html
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
# generated HTML page (for example: .htm, .php, .asp).
@@ -1207,7 +1178,7 @@ HTML_HEADER =
# that doxygen normally uses.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_FOOTER = images/footer.html
+HTML_FOOTER = "@CMAKE_CURRENT_SOURCE_DIR@/footer.html"
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
# sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1242,7 +1213,9 @@ HTML_EXTRA_STYLESHEET =
# files will be copied as-is; there are no commands or markers available.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_EXTRA_FILES = images/kdab-small.png images/kdsoap-small.png images/kdsoap-medium.png
+HTML_EXTRA_FILES = "@CMAKE_CURRENT_SOURCE_DIR@/kdab-logo-22x22.png" \
+ "@CMAKE_SOURCE_DIR@/images/kdsoap-small.png" \
+ "@CMAKE_SOURCE_DIR@/images/kdsoap-medium.png"
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
# will adjust the colors in the style sheet and background images according to
@@ -1281,7 +1254,7 @@ HTML_COLORSTYLE_GAMMA = 80
# The default value is: NO.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_TIMESTAMP = NO
+HTML_TIMESTAMP = YES
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that
@@ -1427,14 +1400,14 @@ TOC_EXPAND = NO
# The default value is: NO.
# This tag requires that the tag GENERATE_HTML is set to YES.
-GENERATE_QHP = NO
+GENERATE_QHP = @HAVE_QHELPGEN@
# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
# the file name of the resulting .qch file. The path specified is relative to
# the HTML output folder.
# This tag requires that the tag GENERATE_QHP is set to YES.
-QCH_FILE =
+QCH_FILE = "@DOXYGEN_OUTPUT_DIR@/qch/kdsoap-api.qch"
# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
# Project output. For more information please see Qt Help Project / Namespace
@@ -1442,7 +1415,7 @@ QCH_FILE =
# The default value is: org.doxygen.Project.
# This tag requires that the tag GENERATE_QHP is set to YES.
-QHP_NAMESPACE = org.doxygen.Project
+QHP_NAMESPACE = com.kdab.@PROJECT_NAME@.api.@KDSoap_VERSION@
# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
# Help Project output. For more information please see Qt Help Project / Virtual
@@ -1451,7 +1424,7 @@ QHP_NAMESPACE = org.doxygen.Project
# The default value is: doc.
# This tag requires that the tag GENERATE_QHP is set to YES.
-QHP_VIRTUAL_FOLDER = doc
+QHP_VIRTUAL_FOLDER = @PROJECT_NAME@-@KDSoap_VERSION@
# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
# filter to add. For more information please see Qt Help Project / Custom
@@ -1481,7 +1454,7 @@ QHP_SECT_FILTER_ATTRS =
# generated .qhp file.
# This tag requires that the tag GENERATE_QHP is set to YES.
-QHG_LOCATION =
+QHG_LOCATION = "@QHELPGEN_EXECUTABLE@"
# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
# generated, together with the HTML files, they form an Eclipse help plugin. To
@@ -1624,7 +1597,7 @@ MATHJAX_FORMAT = HTML-CSS
# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
# This tag requires that the tag USE_MATHJAX is set to YES.
-MATHJAX_RELPATH = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/
+MATHJAX_RELPATH = https://cdn.jsdelivr.net/npm/mathjax@2
# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
# extension names that should be enabled during MathJax rendering. For example
@@ -1734,7 +1707,7 @@ EXTRA_SEARCH_MAPPINGS =
# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
# The default value is: YES.
-GENERATE_LATEX = YES
+GENERATE_LATEX = @HAVE_LATEX@
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1754,7 +1727,7 @@ LATEX_OUTPUT = latex
# the output language.
# This tag requires that the tag GENERATE_LATEX is set to YES.
-LATEX_CMD_NAME = latex
+LATEX_CMD_NAME = @LATEX_COMPILER@
# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
# index for LaTeX.
@@ -1868,7 +1841,7 @@ PDF_HYPERLINKS = YES
# The default value is: YES.
# This tag requires that the tag GENERATE_LATEX is set to YES.
-USE_PDFLATEX = YES
+USE_PDFLATEX = NO
# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
# command to the generated LaTeX files. This will instruct LaTeX to keep running
@@ -2158,7 +2131,7 @@ ENABLE_PREPROCESSING = YES
# The default value is: NO.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-MACRO_EXPANSION = YES
+MACRO_EXPANSION = NO
# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
# the macro expansion is limited to the macros specified with the PREDEFINED and
@@ -2166,7 +2139,7 @@ MACRO_EXPANSION = YES
# The default value is: NO.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-EXPAND_ONLY_PREDEF = YES
+EXPAND_ONLY_PREDEF = NO
# If the SEARCH_INCLUDES tag is set to YES, the include files in the
# INCLUDE_PATH will be searched if a #include is found.
@@ -2198,7 +2171,13 @@ INCLUDE_FILE_PATTERNS =
# recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-PREDEFINED = "DOXYGEN_PROPERTY(x)=Q_PROPERTY(x)" \
+PREDEFINED = "KODE_EXPORT=" \
+ "KXMLCOMMON_EXPORT=" \
+ "SCHEMA_EXPORT=" \
+ "KWSDL_EXPORT=" \
+ "KDSOAPSERVER_EXPORT=" \
+ "KDSOAP_EXPORT=" \
+ "DOXYGEN_PROPERTY(x)=Q_PROPERTY(x)" \
"Q_PRIVATE_SLOT(x,y)=" \
"KDAB_IMPLEMENT_SAFE_BOOL_OPERATOR(x):=public:operator unspecified_bool_type() const;" \
"KDAB_USING_SAFE_BOOL_OPERATOR(x):=public:operator unspecified_bool_type() const;" \
@@ -2241,14 +2220,17 @@ SKIP_FUNCTION_MACROS = YES
# the path). If a tag file is not located in the directory in which doxygen is
# run, you must also specify the path to the tagfile here.
-TAGFILES = qt4.tag=http://developer.qt.nokia.com/doc/qt-4.8 \
- libstdc++.tag=http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen
+TAGFILES = "@QDOC_TAG_DIR@/qtcore/qtcore.tags=https://doc.qt.io/qt-5/" \
+ "@QDOC_TAG_DIR@/qtgui/qtgui.tags=https://doc.qt.io/qt-5/" \
+ "@QDOC_TAG_DIR@/qtwidgets/qtwidgets.tags=https://doc.qt.io/qt-5/" \
+ "@QDOC_TAG_DIR@/qtnetwork/qtnetwork.tags=https://doc.qt.io/qt-5/" \
+ "@QDOC_TAG_DIR@/qtxml/qtxml.tags=https://doc.qt.io/qt-5/"
# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
# tag file that is based on the input files it reads. See section "Linking to
# external documentation" for more information about the usage of tag files.
-GENERATE_TAGFILE = kdsoap.tag
+GENERATE_TAGFILE = "@DOXYGEN_OUTPUT_DIR@/kdsoap.tags"
# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
# the class index. If set to NO, only the inherited external classes will be
@@ -2262,7 +2244,7 @@ ALLEXTERNALS = NO
# listed.
# The default value is: YES.
-EXTERNAL_GROUPS = NO
+EXTERNAL_GROUPS = YES
# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
# the related pages index. If set to NO, only the current project's pages will
@@ -2304,7 +2286,7 @@ HIDE_UNDOC_RELATIONS = YES
# set to NO
# The default value is: NO.
-HAVE_DOT = NO
+HAVE_DOT = @HAVE_DOT@
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
# to run in parallel. When set to 0 doxygen will base this on the number of
@@ -2543,7 +2525,7 @@ DOT_GRAPH_MAX_NODES = 50
# Minimum value: 0, maximum value: 1000, default value: 0.
# This tag requires that the tag HAVE_DOT is set to YES.
-MAX_DOT_GRAPH_DEPTH = 0
+MAX_DOT_GRAPH_DEPTH = 1000
# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
# background. This is disabled by default, because dot on Windows does not seem
diff --git a/doc/config/doxygen.css b/docs/api/doxygen.css
similarity index 84%
rename from doc/config/doxygen.css
rename to docs/api/doxygen.css
index 761bb95..447c069 100644
--- a/doc/config/doxygen.css
+++ b/docs/api/doxygen.css
@@ -1,5 +1,4 @@
-span.blue
-{
- color: #4169E1;
-}
-
+span.blue
+{
+ color: #4169E1;
+}
diff --git a/images/footer.html b/docs/api/footer.html
similarity index 68%
rename from images/footer.html
rename to docs/api/footer.html
index 9cd8055..1da6aea 100644
--- a/images/footer.html
+++ b/docs/api/footer.html
@@ -1,7 +1,7 @@
<hr>
<div style="float: left;">
- <img src="kdab-small.png">
- <font style="font-weight: bold;">Klarälvdalens Datakonsult AB (KDAB)</font>
+ <img src="kdab-logo-22x22.png">
+ <font style="font-weight: bold;">© 2010-2022 Klarälvdalens Datakonsult AB (KDAB)</font>
<br>
"The Qt, C++ and OpenGL Experts"<br>
<a href="https://www.kdab.com/">https://www.kdab.com/</a>
@@ -10,6 +10,7 @@
<div style="text-align: right;" >
<img src="kdsoap-small.png" />
<a href="https://www.kdab.com/development-resources/qt-tools/kd-soap/">https://www.kdab.com/development-resources/qt-tools/kd-soap/</a><br>
+ $generatedby doxygen $doxygenversion<br>
</div>
</body>
diff --git a/doc/config/header.html b/docs/api/header.html
similarity index 98%
rename from doc/config/header.html
rename to docs/api/header.html
index d6e2bb7..11b6af3 100644
--- a/doc/config/header.html
+++ b/docs/api/header.html
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>$title</title>
-<link href="$relpath$doxygen.css" rel="stylesheet" type="text/css">
-<link href="$relpath$tabs.css" rel="stylesheet" type="text/css">
-</head><body>
-<table>
-<tr>
-<td valign="top"><h2><span class="blue">KD Soap</span></h2></td>
-<td> </td>
-<td valign="top"><a class="el" href="index.html">| Home |</a></td>
-<td> </td>
-<td valign="top"><a class="el" href="namespaces.html">| Namespaces |</a></td>
-<td> </td>
-<td valign="top"><a class="el" href="annotated.html">| Classes |</a></td>
-<td> </td>
-<td valign="top"><a class="el" href="files.html">| Files |</a></td>
-<td> </td>
-<td valign="top"><a class="el" href="dirs.html">| Directories |</a></td>
-</tr>
-</table>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<title>$title</title>
+<link href="$relpath$doxygen.css" rel="stylesheet" type="text/css">
+<link href="$relpath$tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<table>
+<tr>
+<td valign="top"><h2><span class="blue">KD Soap</span></h2></td>
+<td> </td>
+<td valign="top"><a class="el" href="index.html">| Home |</a></td>
+<td> </td>
+<td valign="top"><a class="el" href="namespaces.html">| Namespaces |</a></td>
+<td> </td>
+<td valign="top"><a class="el" href="annotated.html">| Classes |</a></td>
+<td> </td>
+<td valign="top"><a class="el" href="files.html">| Files |</a></td>
+<td> </td>
+<td valign="top"><a class="el" href="dirs.html">| Directories |</a></td>
+</tr>
+</table>
diff --git a/images/kdab-small.png b/docs/api/kdab-logo-22x22.png
similarity index 100%
rename from images/kdab-small.png
rename to docs/api/kdab-logo-22x22.png
diff --git a/images/xmldiagram2.png b/docs/api/xmldiagram2.png
similarity index 100%
rename from images/xmldiagram2.png
rename to docs/api/xmldiagram2.png
diff --git a/doc/kdsoap-server-design.odg b/docs/kdsoap-server-design.odg
similarity index 100%
rename from doc/kdsoap-server-design.odg
rename to docs/kdsoap-server-design.odg
diff --git a/doc/kdsoap-server-design.png b/docs/kdsoap-server-design.png
similarity index 100%
rename from doc/kdsoap-server-design.png
rename to docs/kdsoap-server-design.png
diff --git a/docs/manual/kdsoap.pdf b/docs/manual/kdsoap.pdf
new file mode 100644
index 0000000..a44e3bc
--- /dev/null
+++ b/docs/manual/kdsoap.pdf
@@ -0,0 +1,1407 @@
+%PDF-1.3
+%����
+4 0 obj
+<< /Type /Info
+/Producer (FOP 0.20.5rc2) >>
+endobj
+5 0 obj
+<< /Length 1296 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gatm:bAQ&q&Dd46Zuggd[;7@Z]1^kbBH+;Zii]HQJsIgCW'gt<A_2E=8ph'_V:cPc`96VI3ceoSqq^VpV_lQU7C4RXMuI'I>=?M7&hVU?&oEql]A9XMeTMVnRcqN^Y/48fbq`#RCpVu1d6)&@@OagfZ80A(,,6"bU)g7$%aeauCigR.K&m,,4IZ'4@u-b,gc^@M@&5t152L3O]K!1XXMnFNrr.?'C;fkIot!=%W5`rOXWNZn^DOYpMZ/Z[?UsBnBq/@L79<-iFHpBVZ:q%hh*"/0*Y4%Y*R%Z5iT+)iD.:QsdPtcjEHk$4hsuFkN=L*8ECUD\+X,/?_Le!uk/mdfX@]R*^u@DBM-EX]6B@4=1t]DIc6g68ME]c.b&)%VNE*+p3cD]gD0CZkc?TLifds^>^7X16:#`;2DnfPSC0?_`FWX`7@'6"Y3*$b^[cs%hQjZIOk9S&%A6R425u,Ja:XUFH;DO%8I)7aV+b_&[-_iER('Z`Z8(WSd]c$NFOJ,cXeoY/U%o*D+bLX@KlW'HWl&_5n$rh;f)4i6:CHS&eUg_2@Of8p[hVH59\Qn"fSi+Ze/dPIJ\$-u+ecfIoWW`ba/.bI?N'itRN2/2=jf#2.0?,jh;XK1p#hJN.fG*s.a14gLKW,^p5C`\N5YNp$V4U:\ZLM5`WB7&SGYK9&L9<[\;EcHqTc.AHMN.Mjq`+_g\YtPjo3/-%d!!kHU).2Fe^XDQ'4]?NA)Ncq0-;7L5<m)YT,rQG?mrIGl]J=k4"poW'*"8]2G1GOhdX=`#+#ORdie7]%Wa1)AQ<an2&Yfl2^0,-"jT\j+`jeW?9uH[Mr3RCin%[+D1?3grg&5EETq6NqbHIf/j+;jWt(PE-2%")%#MS[\J'j4/)Okt2Ea][CUH]-T.(p=*Sb)tEc?uJ)#XLUN5@N+@s.P^fe-YeX?Ogi+NAKAl<m`;4$C,C>_Wib!/DXe=YPZsR[q@S&(B6M;W!01s!p_j)k"G5=s&LnUl_,-Z3L!$10#bbgR$O-SVaFM-fH<PC[fQ)<3?;_Qo@EdXlKHlq)?P_9f(])c&J&"/]>:/2);@0%?+O1]Y:7T7g=.p@$0NK^^];<K]f]ZqDZGb,#jW@`>`Sb&BKMGH=Wh,-MuucKH0<[n+B(!^Dak2*V%ML%ph)]p62MH?,*XD9sXJ3gp9t6-UoVOo'_N5*66QP,:[=H<Be>F%f%2"Vh2BRE6NREVR;bN,:RB3G[k0SFtp,d_I!i`!`hM#q^"f)bA/o@`a@:"moiD:/OYLs,<^Tfp#g)gL<q#cZTirlCLd~>
+endstream
+endobj
+6 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 5 0 R
+>>
+endobj
+7 0 obj
+<< /Length 978 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gb"/j:N+r@(rl%?'L$Bp0\;?PfJuj`D60elMG2PWm>sVaW+j\6cu.`iq,cpW:l<s5BO>c;pH"VVjE^+DFu],rA)I-"3=79)MAMO[157b;@\G2n'H1:^#Q8FqN`,2[3qTP,O0#E`>k,iM_3@kJ&]%64jqdE;8Ojnf9oqg0-B[V&[qO%*/od#'NIH!Ii)^oPk^t*+p&sKUPE$`<]emjK,bNcR-h>"dT.(<tR$8\<hl:dU=L\bQjj^D1>dbfuHC]MJBBa(nbbI!D8ssYAd]u2f*=)r73Q.;?-0d;s-"sT'VH8(<#Y-uJEZ4#mS);]*%L1C(*fkDjP,*;5V"hA[#kXF^Ogig'qk:GYe_9_pTqUU2/*<@IAe`cO>L!.(Rd'#m8EN3C`14,MG8FpWku!j(no+k`Dhp%Qs-,l+o0@Ue5au!F8P>\%O[;4u6O.B;SfDGcS9</#6oB/6qt@%$%Hh3T^C&?RVKHT:;-M^e[paG!KiS+)jL2f`&CCDTj$1!BXM[3#S]S+<B:?TWE13Up3]GL'gR1p64):nF$f\Z+@4r)2?9:#`j_=h)MJf,d9!CD*.j1K$Ee`>W.d']C><G*t1($Sed%8[K#<#+X>cnOQZ+XV'r&G0T@92*8;ml#<!WhZjX\7?#ELabcDG@rAR-C7[7q#jHnb&).bf7K'3X:3fk-mj?cr=cb`189VCn)Cn)aqdn2NH?(lN_@or<:o'>12I9)$r+EHNht%r&-&>WPcoqd8q@MWTHub&nXFIC3OC1Cps-SD!1uSlR-G&BLONq$Gl]]&C=U!;::o'&EC!<BmdZ6h9AEo1VC9GA]&V#N9ZUQS?J*AC)so:I0SCSPqc(:<*=*&:j/Hj(f*]rC;j1K($nP*JR0SW9:3.[=NM?t.%?sC.%fegi\\0Fl7:Khs)0i>o4OJY1_02ifXP;W\iQ44Ma(N=f_baOHCdu<Q@TM^QrA\A_k*ss(e%04A)I+f.cuIB~>
+endstream
+endobj
+8 0 obj
+<</Type /XObject
+/Subtype /Image
+/Name /Im1
+/Length 2421
+/Width 419
+/Height 258
+/BitsPerComponent 8
+/ColorSpace /DeviceRGB
+/Filter [ /ASCII85Decode /FlateDecode ]
+>>
+stream
+Gb"0Nh/O]C'noN.JAF&Do/_I]!K?5tGoLE.TkR6/<)q)bn,BC'BgB[$Hgfj@"'F?^s8:W$^A9J_:A!Y_^4#sVrXj[eI/0=O?iO%(%`%VKr5#kGJ$+8.i(/>;\sKu)a.MX("$"<HL@0QV^B6I2qa5#aJ-F^aFQO(#gAOBOmXRkl3cqe?R*H@4BC:;\4?[fK%[b3_LX+ZUj#^f8C`P48UP@(L!Q-sAkfb&$TJM>JecA,uC$<b]0TK(ecJ/FF\7"OE*RMB6k\M89\T6oX*K[d[kfb&dZ"iLH*H7Eik\M8YJU6KceB\,rXBrCYe;jX3WSY'&l6cU5;m4nlorA'cW@.'rp"KJ)W5n77oa:fLX(UcOocjKYX#KAGohtmtWn6QFon*;:WH[Z"os4ZTW>FlGoudBbW9<HPlLtB-:_2)2l;n+C<_q5-lF-m#<KGVFlK8:><%l]Ll:2#t;K(!?lDFeT;6SC3l3@N>oaY9$IUaL$O3i%7QNf5<r*6@QD]hje:S</Wi+hrMAEnpTY#Fd`XF>WV$MDgUTfrNsY'OSI;;VC6;*?UCWNQ>mU7RY_eMdL=<fbD5lH90_WTRf*ol5Lle6=\ZqF&,3eLND7qG>!!lM[)AI4O5Iom"]Y^)6@DH8]A8h[Ofq4W&7@Y6WjZSr2d_#6[4kn&-F81BR$E(Leid0nJ*ED-0V_;W+['("Q>k(&1'X#qN&p$bWFY@"%^%!CM'nqTc=QH2oj$T,RE'[spL4_-oiVml+7=*VNAiIUDd0@3]pNG?<ZD[SRd2n*1V&ip)EmWm1YsX"H=qW8dknWgh6BFXUWTFf5&73Z>5_]$5Vq%LB//mP,fa1BQ%+9?b*7Uqjq6qXU"70/066\3-N]%8<Y%/5N9u"#HqRb,<bZJN;4SjT'FZ@!$N]3C]Pa(g:3AN`;n_#$"`gj40QLiRF^b/9S7++E\\b;&q8+7GUC-=%<[FFUP`N*Af1prSpdugn7M'O/pffK0W^()KkK+;K^qHe`h^Ee5`8FB+Rg>Q]**;0naVu%:^N'(u[#g[hqj\8N:&4.RmC8&e7rDMK.2"KYu;N@WZ`Zi;e"[Qp[ECplr?T9V[Ut4KiW5PGnWlc_u3.Pj6o<A*V&fYr]O:YIZ7.Xj/TTV(N**W)F*HW%5_Gl7BhKe`C0rFe[iL\eZiq%Q1n!GCjDVd=t_F)d$>cE;6U(!UHdB%Yg"%e4F:gFo9ocSTctl#G3$eWFn;8jOmKQI.gJ$SZUH4B,>^=_;'%A3of_(Xo^,Sdg`MG2R'8Dg@//!#o6Kq)K)UF_,BPX_b\hE?laBUiJ+oZXJS`L]N'0-"kB<$=*5Ha<ZQ&PY3l=KWrpZ8l3=JH3p(7\N^(.SPKp&ji3Sb2mqen^4?KQAcUR3(Z`cFem%R69>H?f1qWa#lU#SO`]&?(`"kHZ9)LbL!Jd'\uL:?GCY`q2oE*M-,(/Y;ShGa0$l.$B#O4>gjDKUEe/p1$Y<LmB>5[>2g;eHje<gSQ/e7jUae^\(HF]@=FFaKK@*E)[6\jHn.N[GgADA%T%K*b&Jqo"<U<5QK:8hlVmO)Tuf=H&tL,+PU7(VMk^E4WVk`9I?>($_BQWM9^MWS9n8%NSfVmMqRnis(LSH!I8m)J&.(EJ6Gb&?@>&\a"RY&F(H[Q9&/&OLgIBU5ftIV/@O`WriMMWdDirl6sKYl?72u3^b[5\taXRSKO:b>uR=rB*Y;2Q^)45WI`1@Q/uFsA7.TDCO&/c(78+X?1(V2"Qi`DQk.[IJJHZtjumiJ?kIOH\ZO-\/>XsUDq0\p"kC$C<Lj:q<aBTLe3SVMec!M+_<L6NDll2em%WqEVWtM*?L#Q!W4k9.V_7pSl>+;7lK[i4^,'T-*e<q6(Bt<(\a&bfhpkB(XST0:X*P9l<1akLX'ULVeAh]0X1)LXod,0]WomdooaQH_e0?]WqKfq_lD^.NI5g'bojCIm4rWpXH8?mHT*om5]c>M"%g>)!hN%um-NZK4?BNXcpAkb#&';?Hb5d<sk@@!R9n7lHUGA/3)SdfeBc0Hi$K*K.\dY8r!cY;g@q,-&"';Ff-<!,kE1M;n)YL-5Q`;FrC@uoUJU2RD;nk/NWTWFOoc""<HA#$p5;:HbGN_HfdfQ;CfB<qAUB4r)2sF`CErmSdQg%'6>69GWa6=H6.fr)=-gJ&'pB)a=&(U::QNO*^cde6EB*2aD0@n&+#6X*en(%U+VZLI1YLd(F7fqgRDqN+q(BUI8ce*U0[fI7AO4eCCWrPel-ge&44b*^d_tJ`Z0n;.3g\.@j#%2$8_O3CAF=%K"Ss9DDBB"I'R5eT"-4X.LPlm=bidg-Y3+."Y%To<f".!TZJE<1Y@!O(/=Itc[Q=o3-jdA)9GpX#'Ss9DDBB"I'R5eT"-4X/7mjIPXf3dh#!BAs9-gn22NrY^3f73b4rWN9%53:\%q<6T~>
+endstream
+endobj
+9 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 7 0 R
+/Annots 10 0 R
+>>
+endobj
+10 0 obj
+[
+11 0 R
+13 0 R
+14 0 R
+16 0 R
+17 0 R
+19 0 R
+20 0 R
+22 0 R
+23 0 R
+25 0 R
+26 0 R
+28 0 R
+29 0 R
+31 0 R
+32 0 R
+34 0 R
+35 0 R
+37 0 R
+38 0 R
+40 0 R
+41 0 R
+43 0 R
+44 0 R
+46 0 R
+47 0 R
+49 0 R
+50 0 R
+52 0 R
+53 0 R
+55 0 R
+56 0 R
+58 0 R
+59 0 R
+61 0 R
+62 0 R
+64 0 R
+]
+endobj
+11 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 72.0 569.912 131.44 559.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 12 0 R
+/H /I
+>>
+endobj
+13 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 145.94 569.912 153.44 559.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 12 0 R
+/H /I
+>>
+endobj
+14 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 558.912 195.16 548.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 15 0 R
+/H /I
+>>
+endobj
+16 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 209.66 558.912 217.16 548.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 15 0 R
+/H /I
+>>
+endobj
+17 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 547.912 214.87 537.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 18 0 R
+/H /I
+>>
+endobj
+19 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 229.37 547.912 236.87 537.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 18 0 R
+/H /I
+>>
+endobj
+20 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 536.912 143.07 526.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 21 0 R
+/H /I
+>>
+endobj
+22 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 157.57 536.912 165.07 526.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 21 0 R
+/H /I
+>>
+endobj
+23 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 72.0 525.912 202.55 515.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 24 0 R
+/H /I
+>>
+endobj
+25 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 217.05 525.912 224.55 515.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 24 0 R
+/H /I
+>>
+endobj
+26 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 514.912 135.43 504.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 27 0 R
+/H /I
+>>
+endobj
+28 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 149.93 514.912 157.43 504.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 27 0 R
+/H /I
+>>
+endobj
+29 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 72.0 503.912 231.44 493.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 30 0 R
+/H /I
+>>
+endobj
+31 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 245.94 503.912 253.44 493.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 30 0 R
+/H /I
+>>
+endobj
+32 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 492.912 171.28 482.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 33 0 R
+/H /I
+>>
+endobj
+34 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 185.78 492.912 193.28 482.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 33 0 R
+/H /I
+>>
+endobj
+35 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 481.912 176.83 471.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 36 0 R
+/H /I
+>>
+endobj
+37 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 191.33 481.912 198.83 471.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 36 0 R
+/H /I
+>>
+endobj
+38 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 72.0 470.912 142.82 460.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 39 0 R
+/H /I
+>>
+endobj
+40 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 157.32 470.912 164.82 460.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 39 0 R
+/H /I
+>>
+endobj
+41 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 459.912 237.07 449.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 42 0 R
+/H /I
+>>
+endobj
+43 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 251.57 459.912 259.07 449.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 42 0 R
+/H /I
+>>
+endobj
+44 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 448.912 222.1 438.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 45 0 R
+/H /I
+>>
+endobj
+46 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 236.6 448.912 244.1 438.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 45 0 R
+/H /I
+>>
+endobj
+47 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 72.0 437.912 231.15 427.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 48 0 R
+/H /I
+>>
+endobj
+49 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 245.65 437.912 253.15 427.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 48 0 R
+/H /I
+>>
+endobj
+50 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 426.912 145.44 416.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 51 0 R
+/H /I
+>>
+endobj
+52 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 159.94 426.912 167.44 416.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 51 0 R
+/H /I
+>>
+endobj
+53 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 415.912 232.36 405.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 54 0 R
+/H /I
+>>
+endobj
+55 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 246.86 415.912 254.36 405.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 54 0 R
+/H /I
+>>
+endobj
+56 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 404.912 201.81 394.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 57 0 R
+/H /I
+>>
+endobj
+58 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 216.31 404.912 223.81 394.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 57 0 R
+/H /I
+>>
+endobj
+59 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 96.0 393.912 285.13 383.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 60 0 R
+/H /I
+>>
+endobj
+61 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 299.63 393.912 307.13 383.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 60 0 R
+/H /I
+>>
+endobj
+62 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 72.0 382.912 137.27 372.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 63 0 R
+/H /I
+>>
+endobj
+64 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 151.77 382.912 159.27 372.912 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 63 0 R
+/H /I
+>>
+endobj
+65 0 obj
+<< /Length 2850 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gat%%h/h=/&qBX__<JkfRG'2V7#?6T3-EZ\9s.6dS(p]n#De$ae.g#VTOe#q#BH0d,n9&*16Z6u$Xefs/G90l]=E0q\bQ%Gn,bgJdjV[)-W-6^4\n:g0)"`uGo,)kg5imX]_%Q6cqAte+08Q#Fd2`RVkpl9piQ%LF7K5+fF.).\(P&?hP:$b`He/d#lN1VL9[AP@W->Wrj_lG05;a))_5CJag_b-U@1^LX1Z]9Wld9WTAJ]H.lm.:!$heCng^rXA8UGK+\;SVMl\t\:0NhW$h)MCN8Cml?Z1f#r7fIZTmL'.C2l4(rG=pWO.pGZiVtP4'O19H+nS.7=;8e\'XD6o\&*s!Wk:eAV`Ls2Uf5_XVH^L9k4^KHhSQDqS`H)%,P=oFOr,CdAA`$2,'sr`Cr3@'"?s)oLq53<-Fu!HHt%$fMMXFe-=NB@"[e?6aZEQUgSYY;XnFLr[>iDtOuSH&lWn++g<GkC`3Bq4U$>Si!2CYZUC<k(,tl^&Kq(6B7]W<6%:S`D"M;+d`PJ\m"e/EWq!rg<bEF].Vl%Rn1dt4**1T-j8#"36e@I]@>W.ON4j'9$pH([pW1(uLK1;j9;3[K=MFNs$m,HZ8[&!(Q6r@E[L*<Y3Q*i/?lcAq)4lGbf%Q'ajU<^9+&&X]a#!2h@g#6ZiKtuVZJ9D9Y"@s*WQKmp>NZhs#XbYO3R`.k^a3/.rgtb1ZDf.adnBJ:Z"J7EEFjVa3Vb;66O>GpnX3Pru6Be^tHB0Q'>\iX/5nI-g;.X5o"MJD.!nJR.Y>/"#KXe!0!>Zk+fTu$bB<Qet3&opIKeV)?%fV^k:1S^L1@mR;ed*&XNe9"'WAS=4<=JtU`@=3Sb_d0`J!b%_ID%dNGQ/?.:<BlCVfM<Zp,#k^JRMp<[]7CTp@^fkD)H]-BpkCKlr%`+NgW,qlG2g4-D)>9f!ZI62JbqI`EUuE?b:Qe`Fun:KEg03l4RPn&44f)[3Sp>)k3PN;%i2aS,596^WW1tdY<d#M"bm[!f.q7i%LoB(qtP-VJt1'))>iT:hq:ca=N"SZOe9k)HlDJhY>$@+HF>KdGcQR+gqPY]rf'O3.XjPo)A>G!P$kDX?PQ%Q>^ngC8TnbH1UQY;tGZB/[\<qm_HF?=Wt"8(UBH?D?#Qm_`3hn@XK^u7bf(I_t#gO7@-`GCb;'QNnbeGN!rY8.[tj[XCed7b_euIp,1T[RB&;!`Z,0i=NNfc=rc5JmTmQGP6Q[M#%1Kn+d[IqO7B.L%!SBMUSZXSc%(dAlEQRi3CFgZ[qo[2n6)c5W>Vm@P8s-p>@N/2S_3![<Z2('&<d]/.nK%@^=s5/R2*PEoTpY^+OVUbB)4YM?NbJZaA?\"QlX#G.Z3N@Va#s&.8-QV1^Ql`"g#>%A%bY)VtMlmR^1:SLk400(n)H\A"t7^6VLoe'eO1F\.=qtASO-`VX@*Ok8F#/X=0Af.Z/JUp;8;IRc)XZDIsiNYI-gKCb>QR\sUVP`aLQVq,aXoOhC=V'UIAR!.l8bO2MNZMoDaMlcU>m"c/),Qbu%tib'7MZN<0oKrc"V"IT7'6):K[Je5Em!o@W6Vf*E>*7c(B+p9t=!8)k,\Ym.+Y9u[4>Z]W=[1&g%IT68)JtrbgXK_d1L*lt_Q@L#M!iXiPA\ABG+'_>^DZ#bQ-mhn)M;87g%%JmY%t2XE[0PZl'&t+qO[,31/s_X7*kGO/Bbkrn[%UqV1<+obMo2D8Yf#*B$Iq(2a?D(>i9/AIhC&(;s8GTo<DZm$]sl[h5hEh8oQTDnH4bY5G_-,H?J8@C$LDIY&!`91&(9ep2E.sRIR?pd)KQpL_#XPhm_H993kllik`>e<MVcM<^O5n#W>g?!(jpMj1PPK8BqW@eose1o<gSK#U1ehm.iA6RY-Js2?=iL)qg-;SP&t#"U&PjBX+``eeQY[9Df',3L=A<+&80*;-:S%:6`i@R%/+Bc#&=Yfe=pb%'"DiL8J[#,jCL:UV&.UL@;IXbb!k)UT&/.^c@ljH"JQ#Ri0Y(7hLN-1#+mT:(kM&miNWouQ8YBW-'q=<Q0h(&,=<0O`-.A6<MMM+<[,AeNf=ip+A3I4.JKVQ7XE'BYMs>?ZaYj"bXBJt7P8&=gU/\9ZfUUA#aC:2aW1G*df*]W6k;F26D:m2TJn+=p3q--T8A,sN!N[_eSrKXf/CP7@>a=q&H;43n!Nl:1l]Ei_OcBC$LY=nB_Ns1X>3&5?c94a7,(D<)<mPB$,U0hudBZb<NaWguj!1Q8g..l0B6p=>N%UA2GOWnG0g5Tr@SFaikr$i1)_cYqi=a"W=#J#KZ-q_l)'i;8NjK%_&>2JhoFQCO'l9I!VL[%6M]IVSEtb3GF?6Pg4<)uVMHL#!IleBeOF9,&,:7"C9V+q4M21_tj"@W<bHcP>MYV_Tc'2&rEBqCGA*W>gC<]/$Q-Sn`UY/hre+X2Z5*N`[\0GKXYV_*jAjous:@=m"@j+OUPO^R%$(>-_$,TDNKu&5JhoJMB,,6L7nXHnZ_j^#?f>4l@ucDa/V</:1=eM>OJ"9E<"%5Rd>njA9U-C':bR&4,!$2.hnc?I0F/Z3)K#g%b>SLPs\K13BZ:lJ"cj-59IcV5h2:T>Fr.OB8A.-3+Z&qmNlVZDt:<"q"j@D^\uh=?)!K?4fL`7=`2l;5ZZH:b[2n7h+Kg'cF;<$Lq4g+Wd].E-s0TN)1*(Ni`<^lQjcc(.PCfkhPB+hCJ:sbl,m'#-\'D0PqO\_<ODc>l[.5UYb<$W`]">[ZkJ]mjOsfPK1/_JDM&m*a`gCqONHY6lq%_d]bI10[SH50prk%r]`-Jg@YsrL.Q9*?"%V?f)&577.4fOfMn,^8aNW^TQu>lhJFnE"2$'[j8~>
+endstream
+endobj
+66 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 65 0 R
+/Annots 67 0 R
+>>
+endobj
+67 0 obj
+[
+68 0 R
+]
+endobj
+68 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 298.65 393.661 404.75 383.661 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 69 0 R
+/H /I
+>>
+endobj
+70 0 obj
+<< /Length 1905 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gatm<9p=<i%))O>ka(T]U%L"<QVOhXg*Fp"ah!]#FF'T+g/:ub*KjU0s*Z>Z&g0]9oT7aYq&g:m!9+UGQeU'e:#Z=?n\+==ja2b_i;*4&n2?]#V>c3cU;5NlhVU9YOg`;b4o<?J*i9O+]c5f_!;(MPl@Q%)G9H5uPCVN)K(7Y=00TG8*%<?E-IJiV.LKiBG`1_$nFlGY!:hZU6h=hq<+qQJrf=O:2g71%1N<&j5>YcgAkAZ1hJ`MU45)C!kFu>eKQ$>gXt#1!Mk,5"U5)q'$8(JhoFos[d*igSWncI_DfRM?GoPRqFX#:^mRX1G006^:@?*DJ]O%4*-ZWSB*@Z6F^+Ue1a0f.IHFs$b$M@9#)D[HZTbmSE-W*R#3;8;R[=6kbhCH>:[!Fa&WlPQWGH+1F#=7MJ,h,&Xr_9+<9KZ)j]P1;Y:/Wa%6PB7+h:.d+E:nLDD$IKLi]Vh(MYBgOpjL1Y;cK'DEu#6\#764gVr)6Jr5"@33GNY\a'cQXD;E]@JE0\1$6`9I\iYH#PCbNh$BtBbg`^/BI6cpCd`f]/9_5r@Zsi%s:$;D3oNG&h(d,K[qK+]oE>XhndrAq>TX0K,"&prS24@P9I](Q**UaTAL?MFj@/(&Q.2lr9g;0(t6V(=iCen%gRf$%PK:m))`08B]29s3e"O;Ih>u-q555N(W^@-h8N]-_Ve($u8S'-\H(&)d30&sLX-5WmoHR;ir>YHYnd19!4I#'s(RR!7ciIUT@0%k5nZ)]S[Z[ItTfPEm1c&5%pT%,-TkP8`Lh$NNQ5=mc"3S'ek`8$R;`Q,H/_.OGr,aO;p2&Ef$_HX#m<pf4-?0AjKd)f)$\YD4^lUnS0]'`2a8;?()56,P<8<Uu6'gn:ifsHmd!gm7B_kGee]LJVgQ:$)9_mq,b?-\Es]q$SK6(AlaWP1/DCOBo-moWVI^/2L.U4I.#n^c9i6Y"etT7g]=-Q>8h8Y0)`aY7#`%E9b@2[AN4V=P^E2PA<3.In_CgU#@(C]La]44N**]SY#`$16lbmZcY+%Z%/upgRtD@nR[^0Em-6.j-)Dk0V].>ig[e")%1FNo9l0>1h"be?TLW[\L,\E3._i!jjnO""dFd0@ACb+Ys@.j]\<=5Ptg6[LeBI1pb%4q5FHM16#Mie='2M=Y<<EnE2Yd]j@5+,T/YXSRc)S]b4jE7?>Sn*<l@l#mn-'p*R/&Q4Hr9=c'k.#=ND=QBO/u4^(_6HUE>)joa-A9H*u;jh!U3'6&]KF'%SLG.\n4VWg>_2[+%:"AKNapaGo)?.uHtM.g&CK4VAr-Z`"i6RFtVfOSt)Jp-_+%;URs`=%]J2>#,2EaEj734X&k7=Aje[JS(PM(d:qW%eQU&k@!PInK$n>Q<gQeaJ$c-\NQ@auUm)+g[>9F*I\S'"cH4Bh#rIj83!bYW7>nP0$&?]BOm1^iO$G&FbG%kV-ho<ga]hHF+RGM:@kt\rE>r+/TM*17;.=V#+r8ek8tU\ec+:(<?(#"k:DA$QIN"n<,B$edi@P)_8J5`l8+:"Lc9k@(bq[de%oVaB"j!m`@:a4LBYP,cWUNm?$bp:C,MlSlj1(<IH;-&E)p`[[;p1lf>4_gi[OJ]!T9GX6-PDOEGgG,gLY+H'CANH8l9\egL<3^5)dec+OmEWSMa8`jLZkK:6KS0P'g5=n[*iVmJ=8Z4MVI%j;e]QmA'p%2bJXZBZ(oVM5>=l+ij'a78`V)90&]\!LhlQD=-hWNYP$_pal\OM7ref[GEqZX_[9@o[/UB%!Je+Ts7Z?-`/c^3"A*(lu-QfD!,V#lK.$(PWf!FKbCJqR\FR8?b\D:&P3;D&mt&s/0K;r=''SVrTFMFEZbMD,Ujnm_<W&`bpZ>;.\W)93jd_6d=SVe.h2[1X1^T99?EV%3a[0!BOV9VZ~>
+endstream
+endobj
+71 0 obj
+<</Type /XObject
+/Subtype /Image
+/Name /Im2
+/Length 1333
+/Width 200
+/Height 123
+/BitsPerComponent 8
+/ColorSpace /DeviceRGB
+/Filter [ /ASCII85Decode /FlateDecode ]
+>>
+stream
+Gb"0WMc/h2'L:(Gs0Me>83eJPaNL:<+bHJFJD<0=[ka]p"@Bs3a^4'6@+a#ocD0'/f"ZaF'oRQa>4q'Vd:W!QrE54&KgMJ8r:okGn*TL:qr8eD$NFU=<iac>cf^eB7f.8cZ5()'(5o"e.0p"'_C5gR\?7n1%+]3+on['Y=(^f>*+qAT1Nq_Z5BIXk-)\`(AAZuQ_sQh@XK1#jb(>b\$\p^GX0AaM]D_U&8mV5F;-fTs.[<W0f6`#13\#;6[]<64=riSlX49i>5<p,Um`LJof@SUb%hG0Gn]`LgKm_dMc"<I`&W3D8;(@j,/uJ7pip&"8It,48/>t)^@dhHEV=/LeS/1]Ip9$`I8nC++YLdR0XrL':X2=&P<Nk"W0]l3+?%mDYS'CbVcC$COcHqhb=dIRVJh\Xues.CgQV?Y1b9_:BgR5Z/Wn$Cjh&Z6?1/+Mp_f;3ea%)P>0m7,h@TS90e"Z=.4Hc-r\m:#A+Q+_tQ=pNr+'C;+g[1>o([B-Cm@(aF(V;St[#YZje*^m2RF2V$6gat\0("76P(BZ=0$AiDqZn>Pm<nU5h_O45ct1T7B><H(7\de(Af!kIRNon*Z.nZO/]gH.No`5UE7q\Un+TC(jg7[;a=J00Wtg2^PBJ(rR5\Z%BJ?!alSt0?N]N_+fp3m`[(D-L9^-u_?RuuHLD.F:(D/#4]*<lgO//Y(Fpg#\P:fulEZJ/HFpLYogQF8Td\?^=-V27[X/dc=0WNM!nrk7p\ZX]SG+!-Fd/O"X+j36@@e&$1,4,MBB%sbQ;,"%?Bnm6=)5DMkhXg=p/&='hc63BiPY@pFSt7q-V2'4.VlJ9^js<F_",S\<]84NZpS94WW-$Gt,`6?E3Z&9MHo0*T)``M/;)4CDJq/h$dSDrj6^bDaGmO4DB_Sg)$r`b\/XK,t6\Qau=7[*3/')fnA^?d&UYX4=k%@n2ZPbc/..)VpOQBf`he-tYdBk.p_X%oW=YBla;u4bImG$B"*[/f;m@ZYmC,MSsaV`j.)N=sq@PUNU.*$>;J<42Pc:MX1ZJ=bh]+gNIB9#TA@T.tC3)<D;AT^$S=mg#(]/Z"MMiofPqo(R[>Z!7GH(Hs_9IMBG&rN\iX0K]<T#G$#laik=L^24H0#jW%gE$i[4<BGg0m-JKQ^c5H73Qb^;>d@%[Q:7`S!t?L+CM6`;:Y"*fke[sf3jr?E\_QcZ3;uV3]nnK#0#O2.E]*d+:,KuM8S^Dn[2OP-KdA>Y+eObP4/:\%>niu/B[=1^udj@`OE0[\QiaWLXUrS\ZX+O.O-RbO6)rZ7?J6meGoD`q=Y=r!<<*"zzzzzzz!!!"\KRX"-$E#]~>
+endstream
+endobj
+72 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 70 0 R
+/Annots 73 0 R
+>>
+endobj
+73 0 obj
+[
+74 0 R
+75 0 R
+76 0 R
+77 0 R
+]
+endobj
+74 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 465.8 604.661 482.0 594.661 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://www.kdab.com/kdsoap/)
+/S /URI >>
+/H /I
+>>
+endobj
+75 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 87.0 593.661 222.0 583.661 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://www.kdab.com/kdsoap/)
+/S /URI >>
+/H /I
+>>
+endobj
+76 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 72.0 478.149 223.2 468.149 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://www.kdab.com/kdsoap/)
+/S /URI >>
+/H /I
+>>
+endobj
+77 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 72.0 341.637 263.65 331.637 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 78 0 R
+/H /I
+>>
+endobj
+79 0 obj
+<< /Length 1976 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+GatU4968iG&AII3E,qp6j1kf5B0&18EV!k5`3.Wsl5h&\P1WS66\&&+n%0]-!L0S'1Hfui+,Io(\%jU3I^NGY]NfheKL(E5Q4XJ=0u7iB"PkDl)ufeQY]t_?7"U(=-qS@hLC"=Z1jD;A'F#Qg<f=T/X6&@+%1P"=$C9u]%Q<e]b69k]6BhW[VC52RYhTD3?+f%"<q5T</<T3T/dQLgY;]4js)`\T&9d(+m<])p2l[O&?`6RRc\&ubjY,Ob*8o3=&ph9f"NKF@4JLL'174gn7Iecq7B=/&9BiZeI$>@![Z.6)VW-Hkau[C42n#p>etG1ejQP%64!D9jeZKXX@Z@Au7m;3[O.eF1.$,g%4CrU.OfQ1Z5/4=J;r26VAmQ8WQgt5ofLG>JUSs0@3$PU$'32_K'TN;*/sb6a3lDujGMF-6>G`Bd[p7cNeF>1TQcbe'MM=4"3]Pf/P**dZ12(%F[6n_,f4+4'kHf_11<2kk]ORsV2Yo\XRf.q&8B#d;82nt?inM;=^m3L?-Es@h@)]eiX4fp534TT+a,=Ae4YqCcr&Nam*&1u,%(Qa[QPh\18hi'r'pAd>;'$F``RXi+$#YE_P`\ZCKHlFSaDCuCM9^+0P1ZT0(n`-E8J'>VOYA]pqXg%s?RriT*YMS;9Fo5VeL6IjV.5C@P'_JuG&>KP&g>DsT"I'UD\ktJLHip*E&/"Q30NMUP:$VL19!'TT[VsI[>f?e&]lfg6QqmAX-.FXjk[W8bVn2VhNYJNEn66JFF%,h?8J;58RrM$2gn`2=mFu*fiG*Gjjhn1^IKQ7*))Y2'k2C[:=N:c%eAnGql:[5\/+G`!"kF,DpKJrs*/#$d"i?0n0oW+E*aZ@5;EdR<q,R?M/n9ejF<@RlT(ITMR0Rrh@%oKXt/?W.+5b4:E1p?%hH^/\3/+&S2Ek/R/4fd(r\uqSP^a?;]?-,&[AXSmPb#]E:#JK#L5B'mWhDk*1l\\jsd$%p7Lb=\SP]0VqX*=&1Udf5Bc-?=+@Lo^/kc12s`5@bHc,Zc.2M2D.u=5!f8g[\_M5?plliZheWoIMr7Y&]i(\S<OM5(#?OT"Kr:nplY3Ljk8=H/P@Db+\E>BW#")B?4<lqj[\?02"eS]Z3'IldK,2Hrm@LAmFfU>k)+l8XJ6;aP`S9?Xo(!3car^Kf/__)c=dl*G:CB)Q*3Ii(DKKAeoNcVeGggMs>_&o.>Qc*gee=5.B0Ed/ntOl5fM?=-Hm]W#g7GbdB;\7bd_nqV9/ffnNZ@$im\/[J=S^Z@ZH(Kph_bmnATdH9(Z%3sS&W(cs(&tW%?^+DB;O[3"]qaA(<u%)`5@u[7&c)qKK[_&9+pI9T[a%+bT'52U>t['%CuS/ZU8VWh:NbMjsuAqb+*N/=>e0NV,dS[Ss$1pRUL.g-S@sG/C&4a09)*(?%(9bENC)mi%Ti2+utr7Ma]FD;\nU-Zg,3L`qhZ=mB*r9%MUdai7Q6EXZ+?NMW/=7kF'N]D"6&B:D?UV(qRe0<_[6uHtr4sV`\_?T%*6=bMo$W08[a+XXSLqjAXo5(`G"hqX_^-]bh[9Mam%d*O:[n+E+c1J2L(;a%l7$FX;?PnlRdS?lk1p*Zp7D@40caib5B7TMj3h2.nsKV<@A7oH"mqbBYjk1],b?8a,/36=-Y5$Xls5bc>;Q+&=N5_X>Lg=]6SiVG:mpooS6S&u47=6Ys7EU`6]Xd>3Oh`r^V^Ga%+FhJusB/pbo`[_<>JFeYZfmJJK#5]_p_,`\jG)VQamHu\;G4u(`0N+'%>R`"4ef$iR:PBh?j+T#X6cq)1rO\XKJ_UNLVc*_HjBDt4EYbR1fmpZOG2.G[UXfI&!s36qZ%oYu-cPl\4:5900S365J)pp`qktSAuUda.Yb$2.`hM5-&=d]N^N("$W$tY&#WR2Y$a2aXmM.O)$__oke<ZtYQ#=6*5a$<=&60:%:>n8OXmSO'T,$dauiCqY/#'CI+IfUd+Y0d~>
+endstream
+endobj
+80 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 79 0 R
+>>
+endobj
+81 0 obj
+<< /Length 2167 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gat=,9mbVQ%)2U?kil[(dtH,XXRqacCS-&lD3o?-/3D2kD/kacQ(jK;h[^>K"*,*bR=4$%&Hk?#+Ma>qZh$,TP;:b#?Hl_f4nBX0rgpGeJ/5a)[Ko"YHK4o\s7#lbk09r)MFtXaZqr9EM%f&jkP@=m&ilP!<Z+s-h12>a2dW:WorZG,HfCP!;8bS0^=lVUQ?C/>WHUna23'Wn?\,03<EZ$\Wnrn=Ga/pB;pMIV,C?.A5ukuMI[%,@j9T&@3T?!aA]kWl(BVEFW`ITZ'nRa"QdsWgW4G\jRNusT\iQ&2G&l5i>JeINVN_tep4hd5X%C2E0cG4:Li31,O'1Pf\#m^`8b,:d9(9JVV%eKRj;PBLX=]HXg"(u5Xjh`$'&HWj7N+rN^iB/ClT7F'bC:[%2nWXl0Kt??G[hFLR$[U(]I:^D2ngBMd[h7tDEIkFQMhj0C]X58FXo8!"QC7]mMuD''&U/rOnlR2T]-oBlI@-.%V6K<*WT&4<pPq<2-b\4F&IXLjg=c;!S[R7aEiV86fnn_RBbU+(tST>0Wa==Yh<>F?Hf4"haH5ip$n7X1\[!!U$,:3aTP/V\`S_%D,qe=/WR"u?%,8m*JeBcI0KD!:q`o6MI:3DGkFU0"[5L`]^>F,o>`QPdgQ^j0HDu?!p$j`bEXmbAET;%[;Oq2P&.oO@'r0eMFf95/BQC:(DG@(haq)r&j.CPE3'B;I#k'jnEJe`qKSqRNa&1h1dZ&("icfh1:tEni7'p2b'i:8Z,Ctk8Zh,T-4WDoB^!%+Th3!b3Xu7MBc'rM]sLOPZ/&+^l:Q+h#kT?C9;rY-4![h\c#U2dML5NJq4oJN/IE:C>'.q\3,t.4NE=ht1T79qk='>D4!aC)<SP<cYWcd9iinZLAdGU$VQhRr+6G.A)d:-7jGU:5&8Z5CCg)DfG1+flh"t=chA^QshC-d'Bu?cUaNGTa3=bST%3D(I+nba-!c_7b[b`7&2tdrjNW'5m>&?(/V:qBjR]nFl`Pc@mC>"iiY;`35[SmeIS:o"I9\o/maH:/ARiUOn4&lo<.h\^ajq#B@;>'8Jm/,"<B`LArnqPQH=WG</)Fb&)@a>?iE6^<)Y/LPPgsAp8=jFb*?CEW(JZ0oa)qH]r9q&Wsc=5C?dM#q,m%ND3;\jYmiBKOs-D'B'i3467fOAo)m3eq,G1.h/.8`82Zg;ZLSJ[0nZog;=0-?nKW4]1fV/PMB[(+`6DGErHrF]u\Tu,'-C!5:b"i1i\)]UO25K3k@$7?`2EF8]!C!Z?!5W<bNQpJca99J\SO4Y,A5)Vb"T(JX\e9s1Q87W/K3k``=.eM)Z!hFc;..5.=cnVj'S,(=NA(i799;:pT@WiDoG"9N]CtSEQQZ=Hp>tdfSl,TU=5"jo`M^sHc(OAE>q/B#8\6rY6P`Y.\I4/eoIkTs^:#^EV6"Lp[5R=#p$r\*)^V^5"Ums7]rW7,j_"#\A5!B\Y>slZ5Xh?kL"g37eC$*tdk3[6@0[1A#"q?]-P.@8X9u\cFD>@ZAAG$-0*`h<%Dt)/fhJt'#rmujbBq"I*%)fSX6p`MD79MS3.O=WN0t'gNR/#Y5(u#Cd:kk\W.3#GD!k-+7*;H4X_QFoCjD*E63(Br!O``ahG26^L6?A7^9m5DI=u`U"TrB7f&>3EL]>_<_af8.0_ed1=TT12"hci0#qeAE@B#;"9;u/urlJM'(]l8`:A12i!6D#m.TgPrklN.CP^2%p=\^kWW+"h``#?hG_&5Oe[`RnKGe(Hq=^I@Z9_rS_\`C6EYTnG\)7q0gSSu;X#(_mMs(LPo=#JIV9T-eNq5jkh6$YXI]@DBE:pg^S6pI)9NiS`GV7:.O`G<[`FE,iE=@:$oN(-D+h"`J3OC^AGQI^OEp&I0sq/B7"(*SO`(^pgAr*td3#\:4?V<'kS!V%8!G`L!4S*O-o@9hF;e*_Eh:7Y]eW@s6Wmrp'BT$.&@Y'UPJ0BMmZLGcF=e^")eq.)-9`XsY<Mkf%T3?=\E1aL:@3D.+#%&827ZRs23[4or#J,*Up/q"UnJn+eM0P*&3urTF<S^Gt.7V(.c'*?Mk;:l8GFI>8]),t9Eh21>&SM-b;./u31/'gY8A9<P-&CNPH0$[VLD3Gip404tgm/1!?6PD^FAkjAQ`h7sOG(;ju)"Us+ZhLH/!WrE'\+1`K~>
+endstream
+endobj
+82 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 81 0 R
+/Annots 83 0 R
+>>
+endobj
+83 0 obj
+[
+84 0 R
+]
+endobj
+84 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 160.132 137.223 351.782 127.223 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 78 0 R
+/H /I
+>>
+endobj
+85 0 obj
+<< /Length 492 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gas1\9lIm&%))6_EWi@pL+]jp[V8+_VJ27FgXmZ$VQK%e8lGH]CFNYD@*0eafm`Y$P,DtI=\'lEm]pLhE*545b\`DKJ_tK(2rK67=B)SuiV2Nqf8,DL&b7@i-E8I&KbXXuVC=(USA](^BO,D,1#u>,<G\E\=:n$U$qProW1(S=#r\hcf2@EKWbB0cZ!S9[>rn:FO,edh]ITGm2UZaN"FGq:(solW+ji&@1Q/K;$&D0E#*i^K/dSk"#d?/u!P>Q.#)TIbgWIr(G=F\HiJ,H^L*k6Q$8Pq;DlQN3mjf[[Gm*L\kW/iPLP$#fKHkdhMP`s#7#<[,m^0dmE%j+OKIlJ^mE(j\:O*LX\pJr+Y1<4JbkU<EI#4glV/R3j:N7iq6?$pIOa"-,V0gk'd[S-Y4^pih$En6qs,9kkR'*QDMugHWE;C]f]GferYS3JOF0k(6/;MEr5A%Q/6!O`dWss3rAmrKNa$[U;OiN]QB^c7j7K8)~>
+endstream
+endobj
+86 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 85 0 R
+>>
+endobj
+87 0 obj
+<< /Length 2618 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gatm=h2gU)&V'O^Tss@h]8H8uh:lME9s.(8CX,0PFSe<roU9&g<%-H>s7[Os,B;e@HR[AF%d%[t%VLNd0CF&=eXs:N?WZQ,*@I=NR_`p)-:Je@l8]36J,VW84X>0?7V,W?AXPs*\r>6`'g8@^GTA4Sm8e^DICEL1qr]M&i)@#=YEJ)erWBb\M=Pf%M97*%M^jXna69.>Ns@RVY202;b4)pa@R'j4l'm<g]f_:GGTOtc%qB:q,O7C@s,+77!E"_&=Z]L37$K/)>#Bo;=lMjF?oaHsS4@e`6,*%6$8QL0b=?^q3rU`eI.-LF2qV7)c^qrMn<NGJJ$.(kiLY#LqB0"J,8'(ZL4PP,]8Id2psG/;r9_C7O0i07omd6L)PF+D!Dr>]DR<l%k[eg;p5<WujuTN?"*Y\0Gnk8?jVC(0r$'h`fEpF#:H]]qSf'&k3N7jjO[$CBEn%1/GjL.:*h9b\H4`:TG#*eINEWSV$`_%*^$maiRr[P5D;"#:b6RfnQ.[('!_u^p(P7<(&7eQU!M9#K.?3]?]Jim$pI)N4r6,nL#Yi<L\Mt'sJJH7=Heb4i-sGq:e(4[4W`W6MY\2X[m7#4h'YO?]:_KQFh7Z)-W;/,npj1l37kJXI]9j)c(&*g_KK\PbJX(2G2@Q-i(`jA(nXq4R)T`&%aoV2+d]9;9OqcJ]7ke@!p3m[NGO31H*+Y?NT%V[eMee.--LPQCH%I,R]!AT$5X%e)`d!%CICsNP<[cfU7;%Lm%geiZ\JP/m9ab'd,]:l%i`?>'rdl*rr?$OfM<ljadr?Q,?7PN6O,Xc6N$eY>I7/@][u"*a">W\b@aorX#(3p!K?'6YfhJT`n@i068!RBdqA$-YJe:lYYicpW_k`O`qs3i7N=-VQfPWp/2(?tCRXCtRq?N:J[r,pD-@S<WiZL`3Q97mE>p`cW2Bp#cH">_O_kSNfgOqi@Kuug)OV"H9+DHkSDjSY]]?mt_4bT`I+Z"9]j&]X]aH$mR72&?2GsZ8&RqM6Alu4iSK(/EP4VZKq78E$i\eF$o?&pL)Th1Q?[Gf;K]oDQpVg#t@bVg^Ks)J[Ah0r;U6K:>H?Dp_JM!jRoa64la,<\s&f99$ad3t&t%m^d3)[Gk540Ze.?G6f08F_%f>!>Wb+J<gF$39].W-cdORI]f*TeE!lL:-(+`%>)%#>:I0(KjJPjKpN4Veokc1a?41#!Umjh"0](4H!LcQf<VND,A99;ug#fP]?(D^'.$S[N32ikP$%*-h<,b_",I)]jFo%Sp(,<^C@C<i=cM<!uGZ(Sq(qdZ3KqN>',)"5TGKdR4[X'=[<CIf7R`H2j3jNm?jVC\(@,So6pZIMafKVrT$;R^Ok$Mj7]Y8.S3nVPU1T[jE8rl=5SHfVU7n*)Q+RePrQmLUk0p<KqHfc@9Jj2Y!&9(.;Lp%/;59]>s!1\:"/S!LsikjZNOFi.d/'K'E/1af;1N;.q2*&MV,2EkV#m/;_G,r5^STqbtc5ua8`P3aH?uLonpjMj6^-Y[#3JcEk[N[G>I],gHK0e-e[$6Uh@%!ir*fr)Ui*7A\&Ad1HDB8l4k+f?%_J4eS.)(OgCWEI:/Kf^19/;#P_:nq7tukJ^p&T]d/P-*3sgmjRL5J`Y)]sTaI9sSbq0cKEJ_Vgg_9QE-u&g#;4SB:=eFU%dZtd!Jcn%orV8(n0FV=@ScoH+tVkO3L`Z8#G=X"*E*g<*=[o77'%b/D]C`AS_4,oN-3?Zg%RQj<PK#(X5KAH645cgfdQ=nV=KUq2<D;B?9CE(2Qgmb_KZtm/'3VR4#5\V0=\94?ALcB@I@.u3Z!Y)fk#`GJk"V0X.6cPj/F)@BZL&gg,h'.C,6lNLGUUJA:n:q.6W<A93;KUgSS[)G=(VUb_&NhiMsZe'HZ"%1[uV40HqI3.V&L/)'IMVAg!]>VJ;kdLUIf#Ih3q6RQ$-\8Nt>sG\UO'$P0ND(HO2F-jU,iVO"ObHH&Ql80h@2J'(k?pm6+\4hU`ePa.UkD-\_l<`TpsChUsXP.f^3-7K<O?V+CC>iiqFa'd&9s.1+)*e-[lWM($*b9bI`._NGmM5f+(BeJ@TeN0kk^mA(ilC:W]IgF>g&dgs!-o9jUIV>tM.pd#0Qr">grpA⪻q;5MJU_!Zj*?Y2Ec:/ofg0(hLg"h5;5QuW4qROeZX8Xi:NcdS"A@ZXhY9jXus[F-/:Df'BPGOj!f15e8r\>FR^jpA?tT*!da$`f6bZ>Q$#`a#!6Zpj1k-H1jaZ4@YF<&obS,Q*s\`o?+],f]9Dr=p4ekef)jK&dohgRTQr!P)^=\I!#MZGTQu4UFJ5`+RUF!+ZJ<e'm+Sd9Rhfp';3E5eOqnGMRH901?.YSAM3q-#e:8+!G%l\-b]=$(>03r;&g$!-fsF'`b9_%#qfd-jQu]d$a.4S$QpsUu8V7^(Ta0qOB&4Mh5k0#dhT*C?3q.HW*J)CX?UnlAbiM%o?&aSHa#Wr`.lJY]]/FNgU.[`]\?`#-0D:s>@6hRQp%hrWM2:Yr@%GZ6AQ-M68'9p\jBVXm9(dZ:$79aR^.N>=W5^IYC!p;-FU%jg\P8jf=&;s6d3aFiUOiuOL-/=%%oo.M3Vcn6S=FV`;E#1ejATM>r<E9&/Y:,4~>
+endstream
+endobj
+88 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 87 0 R
+/Annots 89 0 R
+>>
+endobj
+89 0 obj
+[
+90 0 R
+92 0 R
+]
+endobj
+90 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 125.364 597.661 172.574 587.661 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 91 0 R
+/H /I
+>>
+endobj
+92 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 173.65 98.637 220.86 88.637 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 91 0 R
+/H /I
+>>
+endobj
+93 0 obj
+<< /Length 1950 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gau/XgQ(;NoY"TDnZja8n`5-:`(GAbQ@Z`R9Ebrk#<-cEZ`2c?P?&FXhm$Z=5&&KO+>K-NkFC2fk&Yr2T6rSiI%Ihr$fmqdl(L&"3(/lBq\es6cO&S>V-2g5VB-(rd&Di-S:$j>S58Po1+/23kNdsTmsC'FJ"C.f#:RkaB>/M;Rj*MtcL9'VLQaN#MunFemV_1B`ib5)B=e%uYSC`==1Be5PmRn/E0tI.UpBb:<tm;\@OZm2-FJP#\gN$kOrQJdNN26?.!+Ei7I(#4anZF>I!su/QIH(F=ZiknY,/Pd8n,6??jTYXql6HFe`45f..Vbfqm^.N4_&U2*/c&beZm*cj'/@OpJb5bk$n2;)cH]f96lCM,$s<i=,Y`@Zq^n>+cG#4A(j=bN"Z/::dg-fj3W%?!\Z/1qBII2.&3LZX2T08>KlHM5>ToYJRY[ILW0oj^4,'dpJ1$h031L-3"oiX2c+`flDA$FJW`68DNl7s9XW*Zb_`reaRKs7R5M[4^;M8R8"n/5p@JT$\=Wp[5GgGZ.R@qPTcj.Y*AWATjqU"nh3Fe5S66c5/M-[_J1oH9eeP?JQ;ge-?qWE^\BQuup&s5VJm43Wl_XeW;g*Na0!3ZqB<;q,_(+;o1pVC:&A6b_1rmTe6Ti^ROq"k]U:+/q5EYLBc=.!lf%e,8+@_eif9?7en<,a'"f65W%*o'lHe4n0[Ph0@;K(p7BQMgeCd&e?1qOd3l;e3Y=s!S1add/a4^JiE!^1(s,92C'YIKm,;dB\r?^_OtYj&7!hC6<@FpL=;S\ba9jC\C9Wu.X'R)CD2j/Wn<N.'b5klnt@L@-Zn\+=&?7NkB%;htA@U)+"Ob-I0'd8k]mCd;&`FKa6(PN<l3#CW9u0Yg@#FDZVI(bTI]mAH#t%L9s^9QqStY(&U3^:p?9\GQ41q6#!>7Lo.e,nUO[\2Vbk.PA9f92OoA2pOEndXR0M6,;LEn]gqID\plFhb>`WWS5S@M(DGC;8Qkl(cNn7+TJnmjob8u^.cm"ZWro%rq1pNdM2M.naE&J0LEE6^+-B!p\4\_U!Y,a4a0T0MpfuIIC'^onp_MTpJ),r\:+?fSN)F8j@8YUG2aX+4ioQ"^>sF1$G=UB^ia3@kRj$/@Rr@FHUo^W?MA/!g[^41.5I=EOM]\mO^&\[5VZTT),_n-kksS2%Tp/"SYq!_+NkF^82],-"5gNcg!dUaeI.HDVH\Zp$<i&-fRg_mlmZk+V0"V1N.N^WVXW&t(kXkE4I>M4<li_'k6J<EH#>%Q?DsfjC3l0]Y/n-'DJ$!dZ8:RAC?i70>2*$&>8l'Mf-&eP#*DY\/pddT$G+[GSONq>+H)Y59-_kPr*Uj99ek&FMo?)S"?m^l)Jn"hIeUsc&%rY_Zf@E/r%,8$fZ6de'cSMK[,[pt\:mSeD3l2oat/mSD%7%7.Z9G.*s(+*@AIZ8RNXpsH@4-p/d7?iYSF-/[?[;0AZ:H:QiuX&/BC)]VGmjc@X+>D_f8[JdoGJISfE!\/6-cZ&3'3T,m_.HTsV^!_!qtAdIg\_Y+AtYXVIg1A`8-%DCWhp',C>u&>@::V&i>(!'AI_U'qJ;02=*+pClc;WH&?QWQ!&X>@(jncMHot,?st!FB9)JOj-%-.c[1^-DOjKPQKJ?A.(>J>iSMGW%lI%\D?TG#1h$lO,o@'^/-E[33pQ+EGeZ[cV"Gd$]F^uf5Ci:_GIr6l\_W!cm>k5kh8n3026?!m<!:J=ELB2&!"4XNNOm_(g8G]j9DTh]TjVOH.F::LAQs-US`WW7.5ro"&X3qXIbl6_,4.81nlSKn0c3d('COPmTD4cn.8<c'=-&/5a-Er)+!NZ6N50YVY>^l0AoPUOMr9Wj%7YVST?=fGb$`"05buSQj_oIgp=dp@<I('XF8EE-G/iI-D;r"N`oN_';d83jnaE%qL09T=CuIs]jeFe`,:9Y"3QN-3<~>
+endstream
+endobj
+94 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 93 0 R
+>>
+endobj
+95 0 obj
+<< /Length 2752 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gat=,9691&&\cSp@/4929$?=CL7??%p;ZEXS_+lU.L4-%$jS#_Q7ioARI%[a"5P)g'M""T.S9E(5X0cg5Oe&ho9]F<pJ'QLI^n-$1&OhB0[2^uGkT_0s7kMhhLrE]H!-[5=Vc<tOSM2Vp"i(u5O\mA*B'NJhsNFA^Q6&>5'd%S-M3ng(YF#,QN[<5bJMn-\$<D\]O1-A.n)\Fi>u*;235AfGN6`9^\PjB+/Cm=6/?n&H2G@.Lsue7'G3#2gB_J,%YE[O78-s,57W8fo'TI1Ms=852(+;BCh-D#[SkA?4E_)pLfQC`32[h:\6p]LY'jX?;'"bM=h,Z2@Q]Qp:4$^%Yq++ZCr_;7s,K!Q^,[lUg71LZ[62=338OE+N'F)%\Foik\i7be!ZYaW\o:EGg1+-=;(fq".E3Z&WeH7eW6`Y@f;c":Pf$s1089Yrmdriql<\$`[oYf\pNg0ZnD>fVN<i,lA(@uIE%S,bFKc@L-(>AW)i$gY8>W=R/KO6.%1X(Xds!C60k4(gQ`e&ij-qGQ!NRQD>A'+=h@n_[geXHg"HT)mT3H1%.,(Gkd@Ln1S4<gQlFCH0m2.7j768@,)GhT'EN&/;KF@Y7aO5S3*HDrblRWRIQ6r$+<6=*NG,@<8gi[Eagp$4bd@l2k79f7mAqOfF)S1*&*)CD)kc\_8V,!d-hs:*MK^SmbFmf-E0IKR/kA3O?IR[i+L-=gZTTNa;*?E^Th4]Ht'k8ZEpaZ)-roLJNI>))<$09&U;sUU5JSSg1_LrrQ#_@Ms6nrdU3NQ4]Ft6:uJkWL<DHhT07[R'd@%8RS=#?DU+.L>uhm#;.:m1=c,Rh/Dc6E%Ml*M4EUD1&*<A;VpbY*+5-cd+WA"J<(U$&uP]=O0h&VrZ[&.q^4OT.u!9%)@Q6^%:eCEck#JT2C)E/]6AT]sti&4D>o\-:it@T*ZN&OmN;2V]Nd&K;#k)tu^DWK-0B6rH'^ENrLOg`(g<nE&m^8`\)`4ecf7YI"<4AE\Kr9gcep[5)qe,5d,ifP'A.o"IM18&WH-W7q*+_l_F^=:C.1OG1L;,f18h?>pRY7`V2Yg:2M^dEUXV$/=YlFL@4/$Fj=2_%EiH*2J3b:nT_f?>`/?(oiL)'#ntUcHg=@E5P^_3>esUn<l$!g(lL!C.M!l^mXoDpd)F]6QKQqk&(_eAJ:&W;I*/Y`@$g0)e0.>Kck^KJ'@^%d4(g@g!\\!L8&+T0K8U^`nXKMW#('BXBHS(c<ABa;',"&'$g/H=/s2U8##:-()&H7#U/hQqD-kN,(LIGT>;Nh*9jPt&k#5Y6H/,S9THi;lZ0oo+tL@_\h"oR/<BBCGMrREo3Ilp[u7O6j()ks+A89%@+2BTVMr]]!Ce$Mo's++98Dj;E2d<s6f[RbC&Y<AW\G(I2Y5B/"/!Kh"X?D>)se!XH7:F`h0<Q&`8OrC*BZ$dbV[LZFCR(bd$2O%>;5]#8KLrmc8'#h(!-6Aj/!j:G0b0`F9=n7#8c(I0T7hN/KEB*IDC.5a#53l&u^0q;o(mrhAK*0J5qN,W8op9E3rO]%srCKgQ8:M)n=5!Oq4]5F"q"?;$gakU/pNG5J(+rmJ"/XgWgTm$$A2<Sa5k,qo;J(=>7Bg-<M<DFP>IQO/gaLGTku7qC(k)(k/-hYbM_u/FcXl:(fdD)C^CZB;^+M&;njdhp'mKgtT\F-5W"8qV(@\>k>_p'`"hS,7=SF;FC6.iY6?[Pk]6ii-LjUMrX>siRtT?:NrF[JqB[*+&-!c]))htmI8ZTrIa.6.=[,?rcGn-!m8@;%g_AB#=4qCc@oBc/KmC_`FJQ*4q(=TT;EIecYePQaO`BGV+NspcW*'YLJ57P:6\*h*R_4.<Acdq<dmBDN^2S&j)J'RX0jToa4/Soe,?JdDn]qq2=SZ3Wd7;[W1/G7e_S'2]"T(8C_gZn*9Y"aKTF]Yq4:<8hU5<r^PUc(4:hcO=P;SrJtM4h:rupNP1U;d)W+mK-Cb.N$s8L1rdV]Y+NJuKj`iF%?.E\mip7NS_)ZAaU5Xqs@35;K7/\";nO1`nA9e[$i_KJW1k!%[MF2SjP*CQ>;[_S)Sgl/OTSbc`VO;n)'6NhP'ak>s98+T"o(R2_r"l??^1VMM/Y3u:C(b0fY3o=`_Jg=%mF([":<`g0/6*KGeD]_/`BKi86)6#cJm,#8MoeEkW+mNpb]D\;kOC[AOtC=k)9qV6b8GE^K:HZ!\<nmc`GfL8-Gr:L`>$\O\XX0;<419Re=ZLG5#)ET#dtkrIV;bV+\a@CG!f?>dAOSDY&(,;8utkSF@fr^``Sp.\df/5MI=F"/9'/jkZ,]m+L+A'*LhgkHKqm`garZiI!0(JJMT>JK'V2=!onrNcE556b+W*4k.:Q>as.3k8H*ZO<P*\pP+:orWD-DDndkl[2"-c7dbD\me*dNY2_nncKe6c+VPeFGO?,Qnph6t=bW-*:T`juF81$I#XY".Rc:-YQ$)/k>hDuM/#,k\%D.)VpQ,<l;rQ$ZsL`IZZNdZ\u0g0dqU+4oVD<Yj:Kj"TnB"qqo.d%t@FHidBWa81I-MpDpeX@%1R7T2G_TRgD5`n.]20QI<:P[^^T$Ld:lZ_f"C4EgEAS359Mo-s4o:uW>X_oojo,t;R6;0+s&A;TtT^_Wn^6EM<a+?Q<iT_0#;^\-FcNcI:-1@M3gVU5_[]$Umm0lR_07@3>I'Y`E&@87rXLJIN>1k@-%(9n$&p;oLW0Dptok>9WU')DIaL9H^(t3]3V>1Y\jTc7~>
+endstream
+endobj
+96 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 95 0 R
+>>
+endobj
+97 0 obj
+<< /Length 1522 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gat%#968iG&AII3?ui5/@j<8oJEWj8-#R!Gm5,l`VlBuXKLAR+67"$ArqB\2TWhC/O"26Xhr;$slj%sob^SEmrgg:t>n@O\5,[1K,kM(,$)^XfOL1Ii?WE'?WS,2Uj(A#aQ[niSouL`0o;Ec-4sqC_n.W]X'Q=g"dN$?P2d;G)TeVD;Lb^V,Ru7,,?iR\7E^aj_?beSk?_thSURbkt)@+h^I41r0T0ui!gjdE-2_ZO%^1U.`L\$@mJM)QMJNo['.bPT&lqRQh_7b-A3k6^M3J+Y*?mhLm<*C*M&ntP2jHE%8_MNR,+<!ikfZ2sXF6VCe8IlN+OJ?)'7<q3rm4[Vp@2XhDjt7(f'#l(Do/%9V!<VUE:IUa7,XmSeB;\*(m:0U9A:9\VYqK"Q0eotSNi#-<Eg>U#7^dF%ac&:"WlB\FACJ?"pc@ek'Kc'D]J*cLb4%NSSVt;BMt'uJ;JXZBO4?/SB7+OFA!+lk8bn&a58Q@Y539)aYb?MF?Ypo<G-b2@OMhk3i+g'cN[;NogWt(Z-'"V?6ItP(DImlF)5&[(9D0Qp\$oYu\+B";`%;poqE[H#n_1+E#SqP]kGjgRm%%Cgg&[n>lSNNZX\MFa.%3KPXkmC?=qg`bjj>?(&)?bB\t?qbNCXb:1kna?5c7a1SD<Ua-6[(KfaTM`+jeH;"(i_J.:4WF\Gk^?IHYL.^"sTiZl^qfB9kn(%,`7M[A_0PATKh2&G,;eiHNZb[D-Su8EY0qD@N'OWa99*[TD)K#X,,q=-Mg#$"VYGZ'hb-Nm-!+XConP)7C3\r:&Z>cA%k<OBH38WK4(1-qlic1$pKOROYlW_7a[bd^$EIXXHeYi\3F;O1R:lEnDk/85**O.!-!;`ZqVYd=npi/G;:fX1oPr$R!4#'PB#H(,GS!)@AX"0"AS>bJ),_QmPZ,AHQO.4%3Jk--[D^C+#KW@Y+G(Wagl"@](:/ok8N$L'rAYE*M0tJ5mS_0A+9.BLF)<1X"q3km$Sc>,ILc,Y1&\C)7uJokq5-]83Rm-Q@\s/=]h!3YSX\S#o["k8JH>08k$%ZmkdCSkT'@U2SJt9^-(j*S]b>A]UD%W<&/PZNV8sVo(gc5"QFEo>GphlNtI5d.#6]#$?X3)Rr\4C)YTVL$WR9AGPTu2c%2mF]UbLl`bXS9MFg$9c[K4P:NJ64OJ39YR*3='klE@P'dAAbNFtOEo4GLh^8F:6(L#48i6)0SWehD0^'Wpfn^F6N5-E2(>/tbd)6qaL.;'m>M7ji"3qDkMefg>FOJX"?f(@i1$#[Q\)6f:dr8q)RRApb%mNShM\S9*D,67!1obOL]*r$+0m)Eg;Xi'46/uD$o^>#&QX<d3,NL!*rF>k$aDhW<-/pj;Ekm3'_q,d:15\Yh$G;$]Q748r9N=<2,pDC*Z=+)7W^TSik7+PAK%Vcum*sOo->`!3<+bC,(MK<ji$HZUpMH'qa5n(Y>=#Ga(7'ndjkEI;"39j?)p%=os"S_Hs86Brn;@tTNsH7JDQHB6Ac)c@Y'*e~>
+endstream
+endobj
+98 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 97 0 R
+>>
+endobj
+99 0 obj
+<< /Length 2635 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gatm<9691&&\dR4n.okDbN35)%eo,9H<j/0`5sJD='7-lL4^)+-&F?AC-;=b!RV@"F$qI(a?_,"*s_`E\f2*+\A.n.rp'6Y.#>`b]1l3#5>0ue%g)\HXO7(C5.GnXQXLNfBccD^*+Vnf7V*1E9t"IEBGp0>rdOP!rp&=;1l1Osi;R[1#EST)M@8EO'8>0`O4,d5dbqhII_!1p`Gq"9N>5;a19RsF`r@kis%)WdT0N<?BM^Pb?M79T5n\7n2R4D1J,@^NS)DoVrm0N0[<E!:'k%\%?s&_]@C@V;Wk3S$f-S7'`OslS2g/%VEEq-b8aO3>>+Drj10?@$VNm>M=]'iD<.^T`rLh\iXG04;BZI_\=V+(OQ*!oG=>%dk0TC)CO31.fUhLF<_=d!+IJX\OSM5([n0E2\N7:Wt,n2Rq9*,?p441KL@eS5L]%M(S:![FXn]sH!n=gMccsOd;iE#ShdHRKkBh;&`NoJG(=6<p/>Z]K3O9laE"+ZCD!JV\)FZjHh?3ksu+nY7N,jOu'eV#Wn]MqmjSW+i2's2glj(\2if$Lt"g0C'?_uXI2&=jeU[5U%_%(0n._5#Aor^^ckSET\MZlDQk'7LS].(MTO\1qj4roL);Bm)'a:$Qk6D9gANC?=eSZ71q[>&Z$+#a*^9a)*5F-ZLIee7'QMM(d<HO0U#&e-IbVX')AcNl+18JP,=_X@FZU&2.@N;QU8W4Pn`8T09ngS_Xp#`GU#:7>\3;%+fMk3/pY?,fT;PQ#I>V=It8+`l3@/KbW6A4hW*k.'R=*Wl([7k2I2JkXX%W/BJJ2o#_;V1KkslCn:CA=*%pWlmagY+Oiuss$f1T)(jV6rP"].DTP%uI^%LChQPY"D90GH,g#Ds3/4D^[HTR%BC!,\gHHe<'@ZScOFmGLXWEM14@lU5S3kB;!feH"&Q&$OFV1l?e$ul1Ytot2c(L\I`3u$Qh5',qZ?4a*RKk@\@L;3o`H/$f8q3(XVKf]ZM]u:RRk"-Lou!8aj3>nC&pnGlflA.8_9K"rbq[*q)_+`-"Otj-j"]O1IF,!@<<\WdPm'kqZIPQQXGf"gMo&X[Yp+8dbr;`&c!.k^SYRn?%UjPWlGp9BBU\P07FRmQ1F;?Ub_FD9.<'c#\u8<NYcr_?Z>'lP<ZtDL_AES>!=[-X+<W%>]Gm>`O!t*g@++FtQ>*ZkDW$cQP'6kke\ID"S(LHMOQTYUA[A,p19fp&.5-]Zj9-F2N>WS'\"SIcg_6J>(5_/H?;)+k]I\m#76rI@Jc4BAFN]!-_&egnMPFl[+P[M:G"3!-#W;f&Cl"UTI[4n8!7H1I7,G3+Rup>V.l3#sbj$hd#X(TBkZdSj?sOO)VO>+ip`)TXHT48S@rI/92!i.WeIYj(\4@ulC5/1=)4SHc+(o&1=Eo+4'R3nHq^NXUe#tfuZ]9oST.^5TQX<U1G#GW+B'&[HmF'JlY*OrePJ:3L5"rNSA/+I5CH>%cWb(kBPmJ^4*K4^2V&A$=0ID\spX63)Ftpu,OS$:almn,R026L^fGo6bkI#DN-XSi'e!)^He@TQ)]Et,jV<&.@<j"1\?$,'ClmM/D__JVA.<k,7a^&EG)LOQcE.c^t-=LbP;&qLfY(`6hE^LD<5`5N#/T8n*Lda3(2&0\P2*qMNLX<Z3'7l_8^D\3[JUKW/(t0<%<\pq]4#ZK%J&TGfj]0,=9.NL]6leH?]R"#&417AD[H;*Z^T-M&T/47pqb]!\baUgIHr?6AGcYL`Z=Vk3?Tu&HRCfACM]A`OY8fN\=:ZB,j70)?^cnO\%a9@86Uu:)-dB_E0.nM06S#c[6o5"0n7@))q_kF68)i[#<e^k9l7Fb?=?A9<.6O<P0Ik7d4,[OkimPjAl/EI2WVcO$mQn7_3ao!8g.:r`A!SZ]o,(\!9QRm?4IQYSc%Q9_%@DfA1MneL^03O4CgOY9Yn+SDce[O&%pqo@%AU<*5<XDIo-2E%!c5Pp_HY"fE'@S.U"N%fbqiL->'D/iog.;.L\349m<i(0E1n2\3Q<%JW]c%t#\-6^?<1"ZWm=(A1q9gE%0@F^r)PU2^-McfZ1`Rs@p@l'pTQNljier?:<A%5O)cA%QN[A2ogAjj&V4jE!&[H+GS3a:?X.X&1$@'>_Q^FjXX/4rof=@Ca(13B`-98b8lc_$aCu7E_()</&r(aUl<EB84u,qZT)B5XiW,@c]bpWR)5F4Oh]21Lf`&k;I-Fb"7'Cp8??7upohKS_g88LIhD`o3IQ+EAI[k'3rpmnj[G,$#g!I*1%!10X`bVE8pc2uC>36:aeOr6FGG;MCI;H8I96N:o-".>PUMCkfVtpc9K3D9c*]RlV<Y"gUhmdX7/HRabJ>ZKqKN/oj=o\Q0_jE:,?b$N=7U=-4MNHaD`RN'q7!EHQ2i5bXG&9>cHR)D;#'YeNHg,q_geSQ'^K.e:'5%tRHhkel9t\TbaIY2GagaIT2MO`o;r']o!!G--#^5R$#;ni1!BAtb<\0irnP,T-p#<QMGM`2RreL0G/JZC(Pj(WZRt11[Rl@_XlU_o5,[f$G6.jJ$b$AYTKjC[(aY-j#qsBD$M=M0[NOI3HT7)RVeNGH.11QH%H/o+A<A^;]r\j4d9cq)mmuu"\<nkE%QTr1DLjFjV!j:h?3r~>
+endstream
+endobj
+100 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 99 0 R
+>>
+endobj
+101 0 obj
+<< /Length 2273 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+GauHL=`<(R&:WMDTr6Ho@R`J%\`et31ei9!WLXen>o9r7hGp>92EL1A7Jkh$&ujthQ?Jf_e-9a782D67S5X'eMs&t%*qbBY?/@2]Dmc70&&6VP)"9j1PF,;;Eo[+IFLf]^A+,(@P_@mj=t/,Q`/o/Q<cY/h9Aa?l3qiRB0&OHfM3mG^L7N#EP<cX)h:KjJH<o[d;EiT@]b@i_%alm:#R`t#r9>\9QW^>i$0CR,S:N0N##Y/OmFJG0'!9bVTWM4:Fo9Hckb@61kX=_fKl`cgLm,nA]$Ks&;P:;!<*C&sbR3O<-'g%*AL3hI/8EAqcY(fAX'Wq<,1X6*CK4k]F]r?8C2$i=c?B0P`VC%11*@'2el)PO8Vd@Cg8psZ^g:DNS)\4W\'U;'g/b4S7?\Ie)2W]_@gTZ)41P&=Oc$5R<-9]i7<WQ:l.?<M]hr2)rNPXYOJU^W$`NP^'#9QPFAf]Wl`-"QcSjO*T>]H3f^V`a_$l#TY*\MIm"l-&-2?L+p''EhmkZ>K/Q95k?+-".--J@]d8<G$(:]i0i%uP*&6g?;>m33dXX-$4a-L/Z&E&j17R=2!\07/uI7ro$8+]tZ?4po%@%A4;,I[9X'CShrTaq/D'-=`sI87q\,T]P'`a`&FH+QJ'gTm9-<h,Y6BR>$8ppa^nSFu:^M(%tK&%"m=`1M;=B(>flL3_tDin`Uq.nSNk_NZ<4"f7@E'*eJ'p`Ju2>g'0KhX3X;!h!.90k#O*O7RgN)M#+@d_mY9.'V*p]Unej>cJ+G*n<UYI`Z:Z6k_muKp<Qmb$!@:K[hFV.0?D4M)-H&d1T)QA\2,M7bK]pBngM8,E#SH9mKlj5`bO'K5sCVnWinqiU?p\%'*G;83qeS6D&pMD&crEPGlf67"@X)b.AO/0_$?3'fhg#'la+kXRR6W-hM`fhHtZ.SbLoM,f;jSbADTiB;q`b]tO5?V9LD"bt^I]M9n?_20pKZh&Dl.\(j,rGQ%7%c-$oiPDZ$:@,S<gMqW^18TirJ0f;IBcZ41#aQ0POTk">gc-kM%V/M]%a'VX1l>n/:3T`QdD.eNH*0Ur^L\B`"0!;BbWTG"bpJk8EkORSE<Gs%6a!iX7]eh$/(dM+H6$uXF@qp+gac4#RE.C=cV7Jj8C*&*t"Qn3XA[\rYZ@44MnLjj*<<4q0@5qiK(oHo1:nMOQE$t\53"E&m'L0RHQW7$dH`[,Dr1]G1+&uUi't37*[X#4*O?T6q9-@B)]DMKk6i@Bc\uph#r<oHT%TQc;ARX3U;lZj7@i;jHcth+BCB>l#_pZf*+\X\K[N&IBbNcDNZ1R?o`^6K0]bti4Z>ctt$QfSC,]o0!1c!`0ZC'C5:i;f?(Rjq<E[C"Rb@*ul(]MFWdiMj`Co"3QRVHV+kUAp'lYKSB]XA5I!B%,]H$6)8;l)@TO'S]&7G/k>B`GoPHAE$nXOLa:fuF@mit4"m3it:UN,US'R'df+-D$/i1>K#t,I5^I$mLC2B+R&.8C>m-Tg<RU*Xoc=G0rK/k83uB>q<AlO/]Lk`rRU<!M?qaF<:c.h5+YI--IK^Ygb<"&BcjMOX<PaWL7t9b%+lH%&6]p>8?@]%_ddHKI18C,=7YOZ1C&`4ocN*E*;BSHqFj<!g*9fU=W7B3d10NACg&fg;1k9C\^Zdd4CKLb]E9Xa_qNF-[)in[2Hh)L@JN#)6O4jU&r#5_@frK9J,X$RebV<Z:Y`b<tW#SCY4'dXA/;$R<LE)'leN&RusMg#a=b"K>u49W^dc+`sA-0UJ\L:gJ]=D<9OqSFt>LsTt)g^L<4tDo<<F&:OV2j4l%[U7@aN?_N.qb_\X\2;(AX21eAp6>FBBD=[6Y`,_8O$LdhE$\33*5ec6j_XTrjaWHL"N\\#ZX^Y!g.IrU9ko5JB`VtdtYYegPE/n#YI5I<(l:12G!O2W9X:P=7q#`O`D^M;ZAcUc!A.mMLmmIq;:-J1"q'b-adMuc^/IXmg6-&73cYr90DS3i5_J_fi'H7Lh"?9kEOQ%`d3Zcal=pkpc,DOVQqin-'SV=T7HG$:^sGXKR>Zl13C#4)Z6C54f[prQre?`A15^u*(kVrpnT7KAoVEH&^h!66dK\da%hRbs?O>4rA#PRm9Qi.02)`JB48KcQ"cYAsi!amPbkJ8if*g>,]S(WPmp8VTFIS$hZJp"FT`%"6fAprg;nS51o/<N2%]WfceRMm9A_VOq";pXO.jMaB<u:ls'Y+0;]Pk$^=h$uob&4o]*7>b%L,a5puFJj[D54if>8i4VlXD/fC\ds+2K~>
+endstream
+endobj
+102 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 101 0 R
+/Annots 103 0 R
+>>
+endobj
+103 0 obj
+[
+104 0 R
+]
+endobj
+104 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 90.6 202.663 174.2 192.663 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 105 0 R
+/H /I
+>>
+endobj
+106 0 obj
+<< /Length 2111 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+Gasaq968iG&AII3nC0KT#ss12Ao^F3:$SN-a(dE$\s%\9=CP!e$pi%eFSan,"@*$]8\*+ifHk^GfZ1H/^"od(hlOPp>a0L&kNp4=qc2jT^^3SaE/5Mf9Mh6IcAM\dJ2e!Z[]?IZgWf$F]>TP6kN6sLJin3]pkKk=NC2beRtL=q79WO5T/ePkf0ui`Z2+4lbEqt)rLF_*D"Eh[2*H@s]WOlPSiM9\Rh$04DN#2ePfiunhgnXTM;1sPgEKG.S*Z%>ljFFJ@3!I=a"#EB<LgHQ2K_H8F.kOh?t-1YX#4bI-9n_Q1iG=R7";ssp1i0a3(+AKV.HFYVpsRR\qtQ.mD;(RPTWajj54:cbBJMiHU.qpYWF$o#JQ89.$<7Cqn.u\#;P_=$Zf$8]k.d(C[+qVWa!/SpIl5^<jDq4QYBL<g9*/p*GNn=&gDaqCV&PO\^TV>q^in.PW4MJ+jUNn&BFL8%0%r+_M_nl,%:qgQ"bBs0`GP@DWsF4dkVIj&0cZ2O`Z:$)A,>^)9'b60JogC'<Q<"lCp=BJtSJMWeJb92ni@>?*i\%C(:VPYm5TR$W@inMP6Ka,=^UCWG\FB,6[3,iB1RO$0oQ]/\W^Yhl_I-MEIZ35"l0"UdYd=S5!renr]g]@MW=XQA0hTfKu/(?uQ`.4V/[>'*0rf_.[<[!HGAkY,8&(J05iNB<9O[VlcG/?;DSlVH@4EVJc.8D33=GXRKg.ehl\Pn&s=D%=_oZ7]KO%&s4$Md\$k7!8Y?sFC0-0J=Z>:H?jcYcFOqB`cJ@;$e0ku_)QI?7,YfkrXZYt"HLst*.>j1KoVKbqI-Ig8tcHGiniJ&m%.hn8aBROdOJaq;F"5>RWY73HVIfE7.97L`,(.%G5H:cM6c155$,],T+^o$f6(Xb'_BDQ%Fk<l8BnCJea*Ai4/gquc)"u0@:\&dZNiV>(0X6dZ?atX.@W?U0n+C6XF7<c1h2Mqd\up$X`TDo'Zc.he]YP'rar,0qgi<Ki">Yr2ahOo+,rP1):U%*M^%$oZ)tXARQJCiC96)U%0j-)\Rt6nEG/CM`T'rM.](C3rfOqd,AiERXE1m7-AH;HDdJ]tGC\/$QB3&6M,BkNB"hQtXK%8^l(42&92E*+dHBigO.,@i38<.L''ee2>k\lX%3Uq=IsLXdVKc1o<RZ!5C#s$&W9m0[iMJ)-,s>?S.2>ZJ5shB+F)+"d%s^G[j/>SRpXQr(L4Bd2)FdppHV5@B>@&3H>Vhu?+B[g((^t'ac/6s#])55GA&oO;,15;;,CT.&$s(Jr0@8jW=hJ=R&SK21ktisL7Uf_sEC37s+rEt@b;(Z\9]e=Y"=c\QYNZ53LI'hGGaIrXekihgYFE<=mJ=8e/iI]k5.+rQD"W'_jZjZuZTMegaFbgO*WH8lGTf$WgENXeL6F8p_`Vg=6lY/ZNsPH3U.5k0H!7COQEnHiH71L*(t/&:mYn88[ufjYYI_TD[hebg3A\C;pgG3"ELH(OOj^e["IqD9=3YFp/,D`AP\Y1mnYRFjnRD\JTup_>U(!!OeO4/_S\QJ6KXM=3f2DF4NY3KT'3j`mS"+@rXQ@ju7/rjb?4Z+S6+>Cl+9de+ot:]p,)`J4RnXA7CL`8"Ng\;;q>ZrXqd,Zn`pX"_LmpRkm1Tm1<+7q.Au+5*<rbbh,]q&Fi^u3(ORFWpn#])ls1[&]QfNR$'Um`2]nTVED>mq#b->k>/\D2iTm_B.n<\2f!A4c>^_W*PVTsk2_6@Xh,@t7_X6E4&m%Iu:Q^qHf101_:S%_UnT:h4a,A#=3"4=`6!ju(UW2TDhMc<^;,r-o`Rj*U:<+H#J!)4o7/#jJ:(m/p$^PhkZHk\q0Z]#\q*ckkA`n`g@Spbih>2jj)SN0NX.`=uXM6VH=)b'_c`Y+n41CT>9EQ84,Y*g\RGTDc-<Wjq6GuKt5q87en%Z#-8^0i.8pQB[_a*$8?esE#S,qHoh"G&-Q;00ag/`d1:;t4<pPl+BLY#"P1d$3`cC9;g1TWcOsl&.ktLEtTDb*ZIUGg''JC"&BB=lt13VdjVicK8M.blL?gLS(N2g>-3L@KO9ND?"pLIn,O@O"lM=1@ShEAeabuKTk$p49T%CG%%+rr'/Nj31^~>
+endstream
+endobj
+107 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 106 0 R
+>>
+endobj
+108 0 obj
+<< /Length 2136 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+GasaqhfIO1%"?N0Tr6/G9,,L2oqO0Eg2=BC]/@96f8!qHUF"XF,)`HL`V"^FM?F)Z<R[OHpjE?<!!GP`0CLQ3IZ;!_lt9J^h<urtDgr@FJbk(,*;Gqg"Gn3(R<O/Qra+Eh/T8eso;-ZE:/aC'JirR(\%[dXs)@9:Or&NmRS3)kn,BHG0O4Lk\=MG**UtJur+m%9X^2K;>uo3VYEZ#9=0*h_</p6I>rr,&^W,f!GIMeFIN'pKQM-575D&:Z^[OPEMWF"MZ:9u6`+`J+1G6'b=G,N@%_&4e#XN)*5\D@$_IdTu[V49L,9eRkY2DOh'Jq_,`rc\*0&$s#.!!prJsSjFa2PC#:VBa]E4cj,D61+S6a.ja@Ml>p!;AkiB+-V,CEQ/@*1'nG?+&e>@RQ'Qk0m2i?LFCqXH#3\6c[>.c1ReUZHXYhFnK<I4;/uK]^ZYJeeOcJ>B;,Oif<JPLX:8\`Wt(YUXeL#8<?Chmo`X`s'(<ma(moFM=O7q4]D1LHmVO#BNrmWhb&mUX4d*D&I0`T?)b*l`!ZfV[tl)+e.!EW.Sb76jhTsm'p,QtE/B5j43j%)0l<XAT9T@Jg-c7)glJ?NV3)i5m/S*mDV@j%COXcJ_EZa$(c1uD?q:4t:Y7Z:NjU/eL/S43"Wq-oFX@/NX)`dTW'Y7H^.gN=GH1LlRZX[-S^obWWS*a*D+V"M1$f&LS8e'kH"<FdF/n;P9,,`e@E/V55h``<PUK1Ib]6SP31VmU/>ZbA2,+&GZ".(R(i-$5Isj$tYoi%PSp@BK.;+dDR\CkG)9H.IH@c!f4[CcHK.rJ_6i4a^?JYSA')fB&=,WA6a^hAaH,h&PUG24*f\e<-IWRS0:;V+#MARV.iOJ"*PtNUi[AlQ90)Ml!igj'Bl`;=\%$Hs`'j,OK/U:aK?:P#>Q)bZP?>h0KO3F+e*r1'm"DaLiM!Jg1Z*)Mj'A=4,A6?n81RgmUiK.cj`P1fQ`7mT'eg8^r,Zh]@]9K;]hpV'tm12"qek'D,jdZV:a`!=Xg4>Jk7Z+Q6B%F4=]o.1ha[FuJ<Lmf`]V20h'O$<8")>90Me."[4Ibd#0a?3[T.=-"h@*5SJl<kpaBti;[nLr`HfTu^h3/!,"11]p-NaJrduKBi.G:u.M57.\qi2\R^d4J5nR/*o?aM[p:UWS=e9*_gkNIH*^r.Gtk^V(l5*@"EJ9?E/C@_Xl\rJgK%L%%Z&ErEdTcd;$23A`r(5JpKMnuer_oXOpq,Fg,`J^d+@lb^mG34X3KIr/(9MQs?+j(ZIB!YV8T?TZdR4g-ec*u8PJ4M"BE&0VSZaor.bQ3u6lo*H%p.+6N+B>9iLTDFU-`Q<:Ukr';iD@u]dX<8IgM<K8-l(A[=[s!`q9/-Lojnc^];:9Ulon@u!REgd9fQ<7hF^(C9`%c\r4*m&bYS\DG(t<q4B;(uZ-b0&+E7gV(EeH"F#/rAQ-q'9(fM4VdVYm\+orlNkY-b;2+G,tVI2q+Tcq"AjKX"Plb^:NU3%8%l2b-c=QoaGJ:'e;e.*a@n6NR]P:f&Df!;[cRI*[WOAO\D)D.<uk%ce\q4:!^c*=)mO"#Lco4LieE6C7u`kFNE>g*ggTWbIP2^PYOMcWZ@KW+"E?#Oo-1I%c9-A6,n._,A;4L+KoRW*8oERrH:P!a5.))`/DZ8ZbKBZ]OK0HUphg@FDAWeG\fD*G9t1p\LJ#'Rh6@hr/OROT0;3\gDBX$7/g]70HU)1V+)rOooT1Og'NmN/U6]K(eZ.bRu(H]hr'+hq^FB51,A*m*qaj"AHfaC&L]PbUoD_Fob2mgi1cam,hi%;BkLh.%!F;uthk#(?F=q@?K)<=rDp<99'1RlBA;,#SRkR7`&3-bbkYH`@Fil0fuRDFBP94gCtWg;O2T#P12<^mrp&P#CZC'/V/q[g=:c)%dnH*H^G<)hJd[d!$40@UnKOG6\cSP?L^39C@0raINF\W)-!^::Pq[#+@=pfk&2W?^rYV[E$L_;B:FIQu/;:+,.klL(HGHdW4ZV3XJJ<I94A:!'p%!9jd!`8>#[<VS4!/hAkfccH(,*dnlHb1diqh&s7XZ_AImM!;jUK+EdE"LScP;-NQ&.1aq+O5pp!jo?^jbOa71ChF>1m;BlrH+S3eT`W(rtA/P~>
+endstream
+endobj
+109 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 108 0 R
+/Annots 110 0 R
+>>
+endobj
+110 0 obj
+[
+111 0 R
+]
+endobj
+111 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 97.0 354.67 207.03 344.67 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (mailto:kdsoap-support@kdab.com)
+/S /URI >>
+/H /I
+>>
+endobj
+112 0 obj
+<< /Length 522 /Filter [ /ASCII85Decode /FlateDecode ]
+ >>
+stream
+GasIdb>,r/&A70V<kXSeeAQVl0q>1e88nPs2uu?`lV^BT*E!-\hm7#i@tQ1d'RA<:j.0=c>R!\7):41-:sO\!?3:NH^(bgP3>N@*819]qGRUe%L+l5oPVCC.!TF"%l)gR\Lm=U"[&UDVV>]bnePiN-(6u1trg#Ej>W5:0+-;3SYE,Yc/mGHTU,urd!Pd8T4W;0nPZPR4)1Hd)eCBl^T[TCM"j%ll=eTK&RIqHHg:F\f:R%_`9._KUFR&6[3K[:n=lZ_ZlU%F@oWB+-QVoo$GL<@LIk0XEJcjoSfN2',GJ9W305'J.LW`t/IlY4N.8*7l=*CJ?FUlYpOqg0Pm\;FEP5`7dcA4IGO<H[=#9+nr_;&"Tq,$pq:JK*X!T6s5J(.Z4EbInTS+,sVeakP@$R3G$I./fb?<md!7L!#@#\=\_`_"!f,`2m8JO[L%\-p=<g6iqCNm^WJ9@1qkau>Q>_gDfr&JhJf)7VI?*',$\cj*@aP<FZ?BgO6)lms=4fuF'!=7l`jb3np~>
+endstream
+endobj
+113 0 obj
+<< /Type /Page
+/Parent 1 0 R
+/MediaBox [ 0 0 499 709 ]
+/Resources 3 0 R
+/Contents 112 0 R
+>>
+endobj
+116 0 obj
+<<
+ /Title (\376\377\0\113\0\104\0\240\0\123\0\117\0\101\0\120\0\40\0\120\0\162\0\157\0\147\0\162\0\141\0\155\0\155\0\145\0\162\0\47\0\163\0\40\0\115\0\141\0\156\0\165\0\141\0\154)
+ /Parent 114 0 R
+ /Next 118 0 R
+ /A 115 0 R
+>> endobj
+118 0 obj
+<<
+ /Title (\376\377\0\124\0\141\0\142\0\154\0\145\0\40\0\157\0\146\0\40\0\103\0\157\0\156\0\164\0\145\0\156\0\164\0\163)
+ /Parent 114 0 R
+ /Prev 116 0 R
+ /Next 119 0 R
+ /A 117 0 R
+>> endobj
+119 0 obj
+<<
+ /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\61\0\56\0\240\0\111\0\156\0\164\0\162\0\157\0\144\0\165\0\143\0\164\0\151\0\157\0\156)
+ /Parent 114 0 R
+ /First 120 0 R
+ /Last 122 0 R
+ /Prev 118 0 R
+ /Next 123 0 R
+ /Count -3
+ /A 12 0 R
+>> endobj
+120 0 obj
+<<
+ /Title (\376\377\0\127\0\150\0\141\0\164\0\40\0\131\0\157\0\165\0\40\0\123\0\150\0\157\0\165\0\154\0\144\0\40\0\113\0\156\0\157\0\167)
+ /Parent 119 0 R
+ /Next 121 0 R
+ /A 15 0 R
+>> endobj
+121 0 obj
+<<
+ /Title (\376\377\0\124\0\150\0\145\0\40\0\123\0\164\0\162\0\165\0\143\0\164\0\165\0\162\0\145\0\40\0\157\0\146\0\40\0\124\0\150\0\151\0\163\0\40\0\115\0\141\0\156\0\165\0\141\0\154)
+ /Parent 119 0 R
+ /Prev 120 0 R
+ /Next 122 0 R
+ /A 18 0 R
+>> endobj
+122 0 obj
+<<
+ /Title (\376\377\0\127\0\150\0\141\0\164\0\47\0\163\0\40\0\156\0\145\0\170\0\164)
+ /Parent 119 0 R
+ /Prev 121 0 R
+ /A 21 0 R
+>> endobj
+123 0 obj
+<<
+ /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\62\0\56\0\240\0\113\0\104\0\240\0\123\0\117\0\101\0\120\0\240\0\61\0\40\0\101\0\120\0\111\0\40\0\111\0\156\0\164\0\162\0\157\0\144\0\165\0\143\0\164\0\151\0\157\0\156)
+ /Parent 114 0 R
+ /First 124 0 R
+ /Last 124 0 R
+ /Prev 119 0 R
+ /Next 129 0 R
+ /Count -3
+ /A 24 0 R
+>> endobj
+124 0 obj
+<<
+ /Title (\376\377\0\117\0\166\0\145\0\162\0\166\0\151\0\145\0\167)
+ /Parent 123 0 R
+ /First 126 0 R
+ /Last 128 0 R
+ /Count -2
+ /A 27 0 R
+>> endobj
+126 0 obj
+<<
+ /Title (\376\377\0\103\0\157\0\144\0\145\0\40\0\123\0\141\0\155\0\160\0\154\0\145)
+ /Parent 124 0 R
+ /Next 128 0 R
+ /A 125 0 R
+>> endobj
+128 0 obj
+<<
+ /Title (\376\377\0\103\0\157\0\156\0\143\0\145\0\160\0\164\0\163)
+ /Parent 124 0 R
+ /Prev 126 0 R
+ /A 127 0 R
+>> endobj
+129 0 obj
+<<
+ /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\63\0\56\0\240\0\123\0\171\0\156\0\143\0\150\0\162\0\157\0\156\0\157\0\165\0\163\0\40\0\166\0\163\0\56\0\40\0\101\0\163\0\171\0\156\0\143\0\150\0\162\0\157\0\156\0\157\0\165\0\163\0\40\0\103\0\141\0\154\0\154\0\163)
+ /Parent 114 0 R
+ /First 130 0 R
+ /Last 131 0 R
+ /Prev 123 0 R
+ /Next 132 0 R
+ /Count -2
+ /A 30 0 R
+>> endobj
+130 0 obj
+<<
+ /Title (\376\377\0\123\0\171\0\156\0\143\0\150\0\162\0\157\0\156\0\157\0\165\0\163\0\40\0\103\0\141\0\154\0\154\0\163)
+ /Parent 129 0 R
+ /Next 131 0 R
+ /A 33 0 R
+>> endobj
+131 0 obj
+<<
+ /Title (\376\377\0\101\0\163\0\171\0\156\0\143\0\150\0\162\0\157\0\156\0\157\0\165\0\163\0\40\0\103\0\141\0\154\0\154\0\163)
+ /Parent 129 0 R
+ /Prev 130 0 R
+ /A 36 0 R
+>> endobj
+132 0 obj
+<<
+ /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\64\0\56\0\240\0\123\0\117\0\101\0\120\0\40\0\110\0\145\0\141\0\144\0\145\0\162\0\163)
+ /Parent 114 0 R
+ /First 133 0 R
+ /Last 134 0 R
+ /Prev 129 0 R
+ /Next 137 0 R
+ /Count -3
+ /A 39 0 R
+>> endobj
+133 0 obj
+<<
+ /Title (\376\377\0\123\0\117\0\101\0\120\0\40\0\110\0\145\0\141\0\144\0\145\0\162\0\163\0\40\0\160\0\145\0\162\0\40\0\103\0\154\0\151\0\145\0\156\0\164\0\40\0\111\0\156\0\164\0\145\0\162\0\146\0\141\0\143\0\145)
+ /Parent 132 0 R
+ /Next 134 0 R
+ /A 42 0 R
+>> endobj
+134 0 obj
+<<
+ /Title (\376\377\0\123\0\117\0\101\0\120\0\40\0\110\0\145\0\141\0\144\0\145\0\162\0\163\0\40\0\146\0\157\0\162\0\40\0\123\0\151\0\156\0\147\0\154\0\145\0\40\0\103\0\141\0\154\0\154\0\163)
+ /Parent 132 0 R
+ /First 136 0 R
+ /Last 136 0 R
+ /Prev 133 0 R
+ /Count -1
+ /A 45 0 R
+>> endobj
+136 0 obj
+<<
+ /Title (\376\377\0\123\0\117\0\101\0\120\0\40\0\101\0\143\0\164\0\151\0\157\0\156)
+ /Parent 134 0 R
+ /A 135 0 R
+>> endobj
+137 0 obj
+<<
+ /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\65\0\56\0\240\0\125\0\163\0\151\0\156\0\147\0\40\0\127\0\123\0\104\0\114\0\40\0\164\0\157\0\40\0\107\0\145\0\156\0\145\0\162\0\141\0\164\0\145\0\40\0\103\0\154\0\151\0\145\0\156\0\164\0\40\0\101\0\120\0\111)
+ /Parent 114 0 R
+ /First 138 0 R
+ /Last 141 0 R
+ /Prev 132 0 R
+ /Next 142 0 R
+ /Count -4
+ /A 48 0 R
+>> endobj
+138 0 obj
+<<
+ /Title (\376\377\0\111\0\156\0\164\0\162\0\157\0\144\0\165\0\143\0\164\0\151\0\157\0\156)
+ /Parent 137 0 R
+ /Next 139 0 R
+ /A 51 0 R
+>> endobj
+139 0 obj
+<<
+ /Title (\376\377\0\125\0\163\0\151\0\156\0\147\0\40\0\153\0\144\0\167\0\163\0\144\0\154\0\62\0\143\0\160\0\160\0\40\0\143\0\157\0\144\0\145\0\40\0\147\0\145\0\156\0\145\0\162\0\141\0\164\0\157\0\162)
+ /Parent 137 0 R
+ /Prev 138 0 R
+ /Next 140 0 R
+ /A 54 0 R
+>> endobj
+140 0 obj
+<<
+ /Title (\376\377\0\125\0\163\0\151\0\156\0\147\0\40\0\164\0\150\0\145\0\40\0\107\0\145\0\156\0\145\0\162\0\141\0\164\0\145\0\144\0\40\0\103\0\157\0\144\0\145)
+ /Parent 137 0 R
+ /Prev 139 0 R
+ /Next 141 0 R
+ /A 57 0 R
+>> endobj
+141 0 obj
+<<
+ /Title (\376\377\0\125\0\163\0\151\0\156\0\147\0\40\0\153\0\144\0\167\0\163\0\144\0\154\0\62\0\143\0\160\0\160\0\40\0\143\0\157\0\144\0\145\0\40\0\147\0\145\0\156\0\145\0\162\0\141\0\164\0\157\0\162\0\40\0\167\0\151\0\164\0\150\0\40\0\121\0\115\0\141\0\153\0\145)
+ /Parent 137 0 R
+ /Prev 140 0 R
+ /A 60 0 R
+>> endobj
+142 0 obj
+<<
+ /Title (\376\377\0\101\0\160\0\160\0\145\0\156\0\144\0\151\0\170\0\240\0\101\0\56\0\240\0\121\0\46\0\101\0\40\0\163\0\145\0\143\0\164\0\151\0\157\0\156)
+ /Parent 114 0 R
+ /Prev 137 0 R
+ /A 63 0 R
+>> endobj
+143 0 obj
+<< /Type /Font
+/Subtype /Type1
+/Name /F11
+/BaseFont /Courier-Bold
+/Encoding /WinAnsiEncoding >>
+endobj
+144 0 obj
+<< /Type /Font
+/Subtype /Type1
+/Name /F1
+/BaseFont /Helvetica
+/Encoding /WinAnsiEncoding >>
+endobj
+145 0 obj
+<< /Type /Font
+/Subtype /Type1
+/Name /F5
+/BaseFont /Times-Roman
+/Encoding /WinAnsiEncoding >>
+endobj
+146 0 obj
+<< /Type /Font
+/Subtype /Type1
+/Name /F3
+/BaseFont /Helvetica-Bold
+/Encoding /WinAnsiEncoding >>
+endobj
+147 0 obj
+<< /Type /Font
+/Subtype /Type1
+/Name /F9
+/BaseFont /Courier
+/Encoding /WinAnsiEncoding >>
+endobj
+148 0 obj
+<< /Type /Font
+/Subtype /Type1
+/Name /F6
+/BaseFont /Times-Italic
+/Encoding /WinAnsiEncoding >>
+endobj
+149 0 obj
+<< /Type /Font
+/Subtype /Type1
+/Name /F7
+/BaseFont /Times-Bold
+/Encoding /WinAnsiEncoding >>
+endobj
+1 0 obj
+<< /Type /Pages
+/Count 16
+/Kids [6 0 R 9 0 R 66 0 R 72 0 R 80 0 R 82 0 R 86 0 R 88 0 R 94 0 R 96 0 R 98 0 R 100 0 R 102 0 R 107 0 R 109 0 R 113 0 R ] >>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 1 0 R
+ /Outlines 114 0 R
+ /PageMode /UseOutlines
+ >>
+endobj
+3 0 obj
+<<
+/Font << /F1 144 0 R /F11 143 0 R /F5 145 0 R /F3 146 0 R /F9 147 0 R /F6 148 0 R /F7 149 0 R >>
+/ProcSet [ /PDF /ImageC /Text ] /XObject <</Im1 8 0 R
+/Im2 71 0 R
+ >>
+>>
+endobj
+12 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+15 0 obj
+<<
+/S /GoTo
+/D [72 0 R /XYZ 67.0 578.661 null]
+>>
+endobj
+18 0 obj
+<<
+/S /GoTo
+/D [72 0 R /XYZ 67.0 473.149 null]
+>>
+endobj
+21 0 obj
+<<
+/S /GoTo
+/D [72 0 R /XYZ 67.0 271.637 null]
+>>
+endobj
+24 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+27 0 obj
+<<
+/S /GoTo
+/D [80 0 R /XYZ 67.0 570.661 null]
+>>
+endobj
+30 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+33 0 obj
+<<
+/S /GoTo
+/D [88 0 R /XYZ 67.0 358.661 null]
+>>
+endobj
+36 0 obj
+<<
+/S /GoTo
+/D [88 0 R /XYZ 67.0 242.149 null]
+>>
+endobj
+39 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+42 0 obj
+<<
+/S /GoTo
+/D [96 0 R /XYZ 67.0 516.661 null]
+>>
+endobj
+45 0 obj
+<<
+/S /GoTo
+/D [96 0 R /XYZ 67.0 97.451 null]
+>>
+endobj
+48 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+51 0 obj
+<<
+/S /GoTo
+/D [100 0 R /XYZ 67.0 613.661 null]
+>>
+endobj
+54 0 obj
+<<
+/S /GoTo
+/D [100 0 R /XYZ 67.0 262.149 null]
+>>
+endobj
+57 0 obj
+<<
+/S /GoTo
+/D [102 0 R /XYZ 67.0 534.661 null]
+>>
+endobj
+60 0 obj
+<<
+/S /GoTo
+/D [107 0 R /XYZ 67.0 432.963 null]
+>>
+endobj
+63 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+69 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+78 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+91 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+105 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+114 0 obj
+<<
+ /First 116 0 R
+ /Last 142 0 R
+>> endobj
+115 0 obj
+<<
+/S /GoTo
+/D [null /XYZ 0.0 0.0 null]
+>>
+endobj
+117 0 obj
+<<
+/S /GoTo
+/D [9 0 R /XYZ 67.0 631.661 null]
+>>
+endobj
+125 0 obj
+<<
+/S /GoTo
+/D [80 0 R /XYZ 67.0 530.149 null]
+>>
+endobj
+127 0 obj
+<<
+/S /GoTo
+/D [80 0 R /XYZ 67.0 227.527 null]
+>>
+endobj
+135 0 obj
+<<
+/S /GoTo
+/D [98 0 R /XYZ 67.0 458.209 null]
+>>
+endobj
+xref
+0 150
+0000000000 65535 f
+0000050947 00000 n
+0000051115 00000 n
+0000051208 00000 n
+0000000015 00000 n
+0000000074 00000 n
+0000001462 00000 n
+0000001568 00000 n
+0000002637 00000 n
+0000005257 00000 n
+0000005378 00000 n
+0000005650 00000 n
+0000051401 00000 n
+0000005785 00000 n
+0000005922 00000 n
+0000051460 00000 n
+0000006057 00000 n
+0000006194 00000 n
+0000051526 00000 n
+0000006329 00000 n
+0000006466 00000 n
+0000051592 00000 n
+0000006601 00000 n
+0000006738 00000 n
+0000051658 00000 n
+0000006873 00000 n
+0000007010 00000 n
+0000051717 00000 n
+0000007145 00000 n
+0000007282 00000 n
+0000051783 00000 n
+0000007417 00000 n
+0000007554 00000 n
+0000051842 00000 n
+0000007689 00000 n
+0000007826 00000 n
+0000051908 00000 n
+0000007961 00000 n
+0000008098 00000 n
+0000051974 00000 n
+0000008233 00000 n
+0000008370 00000 n
+0000052033 00000 n
+0000008505 00000 n
+0000008642 00000 n
+0000052099 00000 n
+0000008776 00000 n
+0000008911 00000 n
+0000052164 00000 n
+0000009046 00000 n
+0000009183 00000 n
+0000052223 00000 n
+0000009318 00000 n
+0000009455 00000 n
+0000052290 00000 n
+0000009590 00000 n
+0000009727 00000 n
+0000052357 00000 n
+0000009862 00000 n
+0000009999 00000 n
+0000052424 00000 n
+0000010134 00000 n
+0000010271 00000 n
+0000052491 00000 n
+0000010406 00000 n
+0000010543 00000 n
+0000013486 00000 n
+0000013609 00000 n
+0000013636 00000 n
+0000052550 00000 n
+0000013773 00000 n
+0000015771 00000 n
+0000017304 00000 n
+0000017427 00000 n
+0000017475 00000 n
+0000017652 00000 n
+0000017828 00000 n
+0000018004 00000 n
+0000052609 00000 n
+0000018139 00000 n
+0000020208 00000 n
+0000020316 00000 n
+0000022576 00000 n
+0000022699 00000 n
+0000022726 00000 n
+0000022865 00000 n
+0000023449 00000 n
+0000023557 00000 n
+0000026268 00000 n
+0000026391 00000 n
+0000026425 00000 n
+0000052668 00000 n
+0000026564 00000 n
+0000026699 00000 n
+0000028742 00000 n
+0000028850 00000 n
+0000031695 00000 n
+0000031803 00000 n
+0000033418 00000 n
+0000033526 00000 n
+0000036254 00000 n
+0000036363 00000 n
+0000038730 00000 n
+0000038856 00000 n
+0000038885 00000 n
+0000052727 00000 n
+0000039021 00000 n
+0000041226 00000 n
+0000041336 00000 n
+0000043566 00000 n
+0000043692 00000 n
+0000043721 00000 n
+0000043900 00000 n
+0000044515 00000 n
+0000052787 00000 n
+0000052841 00000 n
+0000044625 00000 n
+0000052901 00000 n
+0000044870 00000 n
+0000045071 00000 n
+0000045349 00000 n
+0000045551 00000 n
+0000045815 00000 n
+0000045964 00000 n
+0000046323 00000 n
+0000052967 00000 n
+0000046483 00000 n
+0000053034 00000 n
+0000046634 00000 n
+0000046768 00000 n
+0000047174 00000 n
+0000047360 00000 n
+0000047552 00000 n
+0000047829 00000 n
+0000048108 00000 n
+0000053101 00000 n
+0000048405 00000 n
+0000048541 00000 n
+0000048940 00000 n
+0000049097 00000 n
+0000049379 00000 n
+0000049620 00000 n
+0000049951 00000 n
+0000050171 00000 n
+0000050284 00000 n
+0000050393 00000 n
+0000050504 00000 n
+0000050618 00000 n
+0000050725 00000 n
+0000050837 00000 n
+trailer
+<<
+/Size 150
+/Root 2 0 R
+/Info 4 0 R
+>>
+startxref
+53168
+%%EOF
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index a223313..f1fb4f5 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,18 +1,22 @@
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-include(${QT_USE_FILE})
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
-if(Qt5Core_FOUND)
- find_package(Qt5Widgets REQUIRED)
- set(QT_QTWIDGETS_LIBRARY Qt5::Widgets)
-else()
- set(QT_QTWIDGETS_LIBRARY)
-endif()
+find_package(
+ Qt${Qt_VERSION_MAJOR} ${QT_MIN_VERSION}
+ COMPONENTS Widgets CONFIG
+ REQUIRED
+)
+list(APPEND QT_LIBRARIES Qt${Qt_VERSION_MAJOR}::Widgets)
-include(../KDSoapMacros.cmake)
+include(${CMAKE_BINARY_DIR}/KDSoap/KDSoapMacros.cmake)
include_directories(../src/ ../src/KDSoapClient/ ../src/KDSoapServer/)
-if(Qt5Widgets_FOUND)
- add_subdirectory(helloworld_client)
- add_subdirectory(helloworld_server)
- add_subdirectory(bank_gui)
-endif()
+
+add_subdirectory(helloworld_client)
+add_subdirectory(helloworld_server)
+add_subdirectory(bank_gui)
add_subdirectory(bank_wsdl)
diff --git a/examples/bank_gui/BLZService.wsdl b/examples/bank_gui/BLZService.wsdl
index 33a7b0a..dad7405 100644
--- a/examples/bank_gui/BLZService.wsdl
+++ b/examples/bank_gui/BLZService.wsdl
@@ -83,4 +83,4 @@
<http:address location="http://www.thomas-bayer.com/axis2/services/BLZService"></http:address>
</wsdl:port>
</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
diff --git a/examples/bank_gui/CMakeLists.txt b/examples/bank_gui/CMakeLists.txt
index 4fd18e5..778e431 100644
--- a/examples/bank_gui/CMakeLists.txt
+++ b/examples/bank_gui/CMakeLists.txt
@@ -1,12 +1,21 @@
-project(bank_gui)
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2019-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
-include_directories(${QT_QTGUI_INCLUDE_DIR})
+project(bank_gui)
set(bank_gui_SRCS bank_gui.cpp mainwindow.cpp)
-KDSOAP_GENERATE_WSDL(bank_gui_SRCS BLZService.wsdl)
-
-qt4_add_resources(bank_gui_SRCS resources.qrc)
+kdsoap_generate_wsdl(bank_gui_SRCS BLZService.wsdl)
-add_executable(bank_gui ${bank_gui_SRCS})
-target_link_libraries(bank_gui ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTWIDGETS_LIBRARY} kdsoap)
+add_executable(
+ bank_gui
+ ${bank_gui_SRCS} resources.qrc
+)
+target_link_libraries(
+ bank_gui ${QT_LIBRARIES} kdsoap
+)
diff --git a/examples/bank_gui/anim.mng b/examples/bank_gui/anim.mng
deleted file mode 100644
index 7da1f9d..0000000
Binary files a/examples/bank_gui/anim.mng and /dev/null differ
diff --git a/examples/bank_gui/bank_gui.cpp b/examples/bank_gui/bank_gui.cpp
index bccf104..122abb2 100644
--- a/examples/bank_gui/bank_gui.cpp
+++ b/examples/bank_gui/bank_gui.cpp
@@ -1,5 +1,15 @@
-#include <QApplication>
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2019-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
#include "mainwindow.h"
+#include <QApplication>
int main(int argc, char **argv)
{
diff --git a/examples/bank_gui/bank_gui.pro b/examples/bank_gui/bank_gui.pro
deleted file mode 100644
index dbab212..0000000
--- a/examples/bank_gui/bank_gui.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-include( $${TOP_SOURCE_DIR}/examples/examples.pri )
-
-HEADERS = mainwindow.h
-SOURCES = bank_gui.cpp mainwindow.cpp
-RESOURCES = resources.qrc
-KDWSDL = BLZService.wsdl
-
-# This is our only GUI program :)
-greaterThan(QT_MAJOR_VERSION, 4) {
- QT += widgets
-} else {
- QT += gui
-}
-CONFIG -= console
-macx: CONFIG += app_bundle
diff --git a/examples/bank_gui/mainwindow.cpp b/examples/bank_gui/mainwindow.cpp
index d24f1b4..953a5a7 100644
--- a/examples/bank_gui/mainwindow.cpp
+++ b/examples/bank_gui/mainwindow.cpp
@@ -1,82 +1,177 @@
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2019-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
#include "mainwindow.h"
+#include "wsdl_BLZService.h"
-#include <QPushButton>
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QHeaderView>
#include <QLabel>
+#include <QMessageBox>
#include <QMovie>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
+#include <QProgressBar>
+#include <QPushButton>
#include <QString>
-#include <QDebug>
-#include <QMessageBox>
+#include <QTableWidget>
+#include <QVBoxLayout>
-MainWindow::MainWindow( QWidget *parent ) : QWidget( parent )
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) // We enable C++17 with Qt6, and std::random_shuffle is gone in 17
+#include <random>
+#endif
+
+#include <algorithm>
+
+#define PARALLEL_REQUESTS 0
+
+enum Columns
+{
+ Code,
+ Name
+};
+
+MainWindow::MainWindow(QWidget *parent)
+ : QWidget(parent)
{
- mBtnSync = new QPushButton(tr("Sync Call"), this);
- mBtnAsync = new QPushButton(tr("Async Call"), this);
- mLblResult = new QLabel(tr("Result: "), this);
- mLblAnim = new QLabel(this);
+ setWindowTitle(tr("KDSoap test program"));
+ resize(600, 600);
+ mBtnSync = new QPushButton(tr("Sync Calls"), this);
+ mBtnAsync = new QPushButton(tr("Async Calls"), this);
- mMovAnim = new QMovie(QString::fromLatin1(":/animations/anim.mng"));
+ // found on https://www.thebankcodes.com/blz/bybankname.php
+ mBankCodes = QStringList {QStringLiteral("10020000"), QStringLiteral("20130600"), QStringLiteral("10090000"), QStringLiteral("55060611"),
+ QStringLiteral("64250040"), QStringLiteral("50310400"), QStringLiteral("50030000"), QStringLiteral("76069601"),
+ QStringLiteral("43051040"), QStringLiteral("71162355")};
+
+ mTableWidget = new QTableWidget(this);
+ mTableWidget->setRowCount(mBankCodes.count());
+ mTableWidget->setColumnCount(2);
+ mTableWidget->setHorizontalHeaderLabels({tr("Bank code"), tr("Bank name")});
+ mTableWidget->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
+ clearResults();
- QVBoxLayout *centralLayout = new QVBoxLayout(this);
- QHBoxLayout *btnsLayout = new QHBoxLayout();
- QHBoxLayout *lblsLayout = new QHBoxLayout();
+ mLblAnim = new QLabel(this);
+ auto animSizePolicy = mLblAnim->sizePolicy();
+ animSizePolicy.setRetainSizeWhenHidden(true);
+ mLblAnim->setSizePolicy(animSizePolicy);
- btnsLayout->addWidget( mBtnSync );
- btnsLayout->addWidget( mBtnAsync );
+ mMovAnim = new QMovie(QString::fromLatin1(":/animations/spinner.gif"), {}, this);
- lblsLayout->addWidget( mLblAnim );
- lblsLayout->addWidget( mLblResult );
+ QVBoxLayout *centralLayout = new QVBoxLayout(this);
+ QHBoxLayout *btnsLayout = new QHBoxLayout();
+ QHBoxLayout *progressLayout = new QHBoxLayout();
+ QHBoxLayout *lblsLayout = new QHBoxLayout();
- centralLayout->addLayout( btnsLayout );
- centralLayout->addLayout( lblsLayout );
+ btnsLayout->addWidget(mBtnSync);
+ btnsLayout->addWidget(mBtnAsync);
- mLblAnim->setMovie(mMovAnim);
- mMovAnim->start();
+ lblsLayout->addWidget(mTableWidget);
- connect(mBtnSync, SIGNAL(clicked()), this, SLOT(syncCall()));
- connect(mBtnAsync, SIGNAL(clicked()), this, SLOT(asyncCall()));
+ progressLayout->addWidget(mLblAnim);
- mService = new BLZService::BLZServiceSOAP11Binding(this);
+ centralLayout->addLayout(btnsLayout);
+ centralLayout->addLayout(progressLayout);
+ centralLayout->addLayout(lblsLayout);
- connect(mService, SIGNAL(getBankDone(TNS__GetBankResponseType)),
- this, SLOT(done(const TNS__GetBankResponseType&)));
+ mLblAnim->setMovie(mMovAnim);
+ mLblAnim->setFixedSize(66, 66);
- connect(mService, SIGNAL(getBankError(const KDSoapMessage&)),
- this, SLOT (doneError(const KDSoapMessage&)));
+ connect(mBtnSync, &QPushButton::clicked, this, &MainWindow::syncCalls);
+ connect(mBtnAsync, &QPushButton::clicked, this, &MainWindow::asyncCalls);
- nextBank();
+ mService = new BLZService::BLZServiceSOAP11Binding(this);
}
-void MainWindow::done(const TNS__GetBankResponseType &response)
+void MainWindow::clearResults()
{
- mLblResult->setText(tr("Bank found: \"%1\"").arg(response.details().bezeichnung()));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) // We enable C++17 with Qt6, and std::random_shuffle is gone in 17
+ std::random_device rd;
+ std::mt19937 g(rd());
+ std::shuffle(mBankCodes.begin(), mBankCodes.end(), g);
+#else
+ std::random_shuffle(mBankCodes.begin(), mBankCodes.end());
+#endif
+ for (int row = 0; row < mBankCodes.count(); ++row) {
+ auto *item = new QTableWidgetItem(mBankCodes.at(row));
+ mTableWidget->setItem(row, Columns::Code, item);
+
+ setBankName(row, QString());
+ }
}
-void MainWindow::doneError(const KDSoapMessage& error)
+void MainWindow::syncCalls()
{
- QMessageBox::warning(this, tr("Error making the SOAP call"), error.faultAsString());
+ clearResults();
+ mLblAnim->show();
+ mMovAnim->start();
+
+ TNS__GetBankType parameters;
+ for (int index = 0; index < mBankCodes.count(); ++index) {
+ parameters.setBlz(mBankCodes[index]);
+ auto response = mService->getBank(parameters);
+ if (!mService->lastError().isEmpty()) {
+ setBankName(index, tr("Error making the SOAP call: %1").arg(mService->lastError()));
+ } else {
+ setBankName(index, response.details().bezeichnung());
+ }
+ }
+
+ mMovAnim->stop();
+ mLblAnim->hide();
}
-void MainWindow::nextBank()
+void MainWindow::asyncCalls()
{
- // found on https://www.thebankcodes.com/blz/bybankname.php
- static const char* blzList[] = { "10020000", "20130600", "10090000" };
- static const int numEntries = sizeof(blzList) / sizeof(*blzList);
- mIndex = (mIndex + 1) % numEntries;
- mParameters.setBlz(QString::fromLatin1(blzList[mIndex]));
+ clearResults();
+ mLblAnim->show();
+ mMovAnim->start();
+#if PARALLEL_REQUESTS
+ for (int index = 0; index < mBankCodes.count(); ++index) {
+ createJob(index);
+ }
+#else
+ createJob(0);
+#endif
}
-void MainWindow::syncCall()
+void MainWindow::createJob(int index)
{
- auto response = mService->getBank(mParameters);
- mLblResult->setText( tr("Bank found: %1").arg(response.details().bezeichnung()));
- nextBank();
+ TNS__GetBankType parameters;
+ parameters.setBlz(mBankCodes[index]);
+ auto job = new BLZService::BLZServiceSOAP11BindingJobs::GetBankJob(mService, this);
+ job->setParameters(parameters);
+ job->start();
+ connect(job, &KDSoapJob::finished, this, [=]() {
+ if (job->isFault()) {
+ setBankName(index, tr("Error making the SOAP call: %1").arg(job->reply().faultAsString()));
+ } else {
+ done(index, job->resultParameters());
+ }
+ });
}
-void MainWindow::asyncCall()
+void MainWindow::setBankName(int row, const QString &text)
{
- mService->asyncGetBank(mParameters);
- nextBank();
+ auto *item = new QTableWidgetItem(text);
+ mTableWidget->setItem(row, Columns::Name, item);
}
+void MainWindow::done(int index, const TNS__GetBankResponseType &response)
+{
+ setBankName(index, response.details().bezeichnung());
+ if (index < mBankCodes.count() - 1) {
+#if !PARALLEL_REQUESTS
+ createJob(index + 1);
+#endif
+ } else {
+ mMovAnim->stop();
+ mLblAnim->hide();
+ }
+}
diff --git a/examples/bank_gui/mainwindow.h b/examples/bank_gui/mainwindow.h
index 0dfae8f..274fc25 100644
--- a/examples/bank_gui/mainwindow.h
+++ b/examples/bank_gui/mainwindow.h
@@ -1,41 +1,55 @@
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2019-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#include <QWidget>
-#include "KDSoapClientInterface.h"
-#include "KDSoapMessage.h"
-#include "wsdl_BLZService.h"
+
+namespace BLZService {
+class BLZServiceSOAP11Binding;
+}
+class TNS__GetBankResponseType;
QT_BEGIN_NAMESPACE
class QPushButton;
class QLabel;
+class QProgressBar;
class QMovie;
+class QTableWidget;
QT_END_NAMESPACE
-class MainWindow : public QWidget{
- Q_OBJECT
+class MainWindow : public QWidget
+{
+ Q_OBJECT
public:
- MainWindow(QWidget *parent = 0);
+ MainWindow(QWidget *parent = 0);
private slots:
- void syncCall();
- void asyncCall();
- void done(const TNS__GetBankResponseType& response);
- void doneError(const KDSoapMessage& error);
+ void syncCalls();
+ void asyncCalls();
+ void done(int index, const TNS__GetBankResponseType &response);
+ void createJob(int index);
private:
- void nextBank();
-
- QPushButton *mBtnAsync;
- QPushButton *mBtnSync;
- QLabel *mLblResult;
- QLabel *mLblAnim;
- QMovie *mMovAnim;
+ void setBankName(int row, const QString &text);
+ void clearResults();
- int mIndex = 0;
+ QPushButton *mBtnAsync;
+ QPushButton *mBtnSync;
+ QTableWidget *mTableWidget;
+ QLabel *mLblAnim;
+ QMovie *mMovAnim;
+ QStringList mBankCodes;
- BLZService::BLZServiceSOAP11Binding *mService;
- TNS__GetBankType mParameters;
+ BLZService::BLZServiceSOAP11Binding *mService;
};
#endif
diff --git a/examples/bank_gui/resources.qrc b/examples/bank_gui/resources.qrc
index a334fe2..041cc7c 100644
--- a/examples/bank_gui/resources.qrc
+++ b/examples/bank_gui/resources.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/animations">
- <file alias="anim.mng">anim.mng</file>
+ <file>spinner.gif</file>
</qresource>
- </RCC>
\ No newline at end of file
+ </RCC>
diff --git a/examples/bank_gui/spinner.gif b/examples/bank_gui/spinner.gif
new file mode 100644
index 0000000..0ca7ada
Binary files /dev/null and b/examples/bank_gui/spinner.gif differ
diff --git a/examples/bank_wsdl/BLZService.wsdl b/examples/bank_wsdl/BLZService.wsdl
index 33a7b0a..dad7405 100644
--- a/examples/bank_wsdl/BLZService.wsdl
+++ b/examples/bank_wsdl/BLZService.wsdl
@@ -83,4 +83,4 @@
<http:address location="http://www.thomas-bayer.com/axis2/services/BLZService"></http:address>
</wsdl:port>
</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>
diff --git a/examples/bank_wsdl/CMakeLists.txt b/examples/bank_wsdl/CMakeLists.txt
index 6bd1f7c..66add4a 100644
--- a/examples/bank_wsdl/CMakeLists.txt
+++ b/examples/bank_wsdl/CMakeLists.txt
@@ -1,8 +1,21 @@
-project( bank_wsdl )
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2019-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+project(bank_wsdl)
set(bank_wsdl_SRCS bank_wsdl.cpp)
-KDSOAP_GENERATE_WSDL(bank_wsdl_SRCS BLZService.wsdl)
+kdsoap_generate_wsdl(bank_wsdl_SRCS BLZService.wsdl)
-add_executable(bank_wsdl ${bank_wsdl_SRCS})
-target_link_libraries(bank_wsdl ${QT_QTCORE_LIBRARY} kdsoap)
+add_executable(
+ bank_wsdl
+ ${bank_wsdl_SRCS}
+)
+target_link_libraries(
+ bank_wsdl ${QT_LIBRARIES} kdsoap
+)
diff --git a/examples/bank_wsdl/bank_wsdl.cpp b/examples/bank_wsdl/bank_wsdl.cpp
index 573546c..d3bef92 100644
--- a/examples/bank_wsdl/bank_wsdl.cpp
+++ b/examples/bank_wsdl/bank_wsdl.cpp
@@ -1,6 +1,16 @@
-#include <QCoreApplication>
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2019-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
#include "KDSoapClientInterface.h"
#include "KDSoapMessage.h"
+#include <QCoreApplication>
#include <iostream>
@@ -10,16 +20,15 @@ int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
- const QString blz = QString::fromLatin1("20130600");
- std::cout << "Looking up the bank with BLZ code " << qPrintable(blz) << "..." << std::endl;
+ const QString bankCode = QString::fromLatin1("20130600");
+ std::cout << "Looking up the bank with code " << qPrintable(bankCode) << "..." << std::endl;
BLZService::BLZServiceSOAP11Binding service;
TNS__GetBankType getBankType;
- getBankType.setBlz(blz);
+ getBankType.setBlz(bankCode);
TNS__GetBankResponseType response = service.getBank(getBankType);
- std::cout << "\"" << qPrintable(response.details().bezeichnung()) << "\" in "
- << qPrintable(response.details().ort()) << std::endl;
+ std::cout << "\"" << qPrintable(response.details().bezeichnung()) << "\" in " << qPrintable(response.details().ort()) << std::endl;
return 0;
}
diff --git a/examples/bank_wsdl/bank_wsdl.pro b/examples/bank_wsdl/bank_wsdl.pro
deleted file mode 100644
index f459604..0000000
--- a/examples/bank_wsdl/bank_wsdl.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-include( $${TOP_SOURCE_DIR}/examples/examples.pri )
-
-HEADERS =
-SOURCES = bank_wsdl.cpp
-
-KDWSDL = BLZService.wsdl
-
diff --git a/examples/examples.pri b/examples/examples.pri
deleted file mode 100644
index 871ffa8..0000000
--- a/examples/examples.pri
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is included by all of the examples' *.pro files.
-
-# KDSOAPLIB is defined by the toplevel kdsoap.pro and stored into .qmake.cache
-isEmpty(KDSOAPLIB): error("KDSOAPLIB is empty. This should not happen, please check .qmake.cache at the toplevel")
-
-INCLUDEPATH += \
- $${TOP_SOURCE_DIR}/src \
- $${TOP_SOURCE_DIR}/src/KDSoapClient \
- $${TOP_SOURCE_DIR}/src/KDSoapServer \
- $${TOP_SOURCE_DIR}/examples/tools
-DEPENDPATH += \
- $${TOP_SOURCE_DIR}/src \
- $${TOP_SOURCE_DIR}/src/KDSoapClient \
- $${TOP_SOURCE_DIR}/src/KDSoapServer \
- $${TOP_SOURCE_DIR}/examples/tools
-LIBS += -L$${TOP_BUILD_DIR}/lib -l$$KDSOAPLIB
-!isEmpty(QMAKE_LFLAGS_RPATH):LIBS += $$QMAKE_LFLAGS_RPATH$${TOP_BUILD_DIR}/lib
-
-include($${TOP_SOURCE_DIR}/variables.pri)
-DEFINES -= QT_NO_CAST_FROM_ASCII
-
-include($${TOP_SOURCE_DIR}/kdwsdl2cpp.pri)
-
-# Assume command-line by default
-CONFIG += console
-QT -= gui
-macx:CONFIG -= app_bundle
diff --git a/examples/examples.pro b/examples/examples.pro
deleted file mode 100644
index d8d5296..0000000
--- a/examples/examples.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = helloworld_client helloworld_server bank_gui bank_wsdl
diff --git a/examples/helloworld_client/CMakeLists.txt b/examples/helloworld_client/CMakeLists.txt
index a49268f..4f0d049 100644
--- a/examples/helloworld_client/CMakeLists.txt
+++ b/examples/helloworld_client/CMakeLists.txt
@@ -1,13 +1,21 @@
-project(helloworld_client)
-
-include_directories(${QT_QTGUI_INCLUDE_DIR})
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
-set(helloworld_client_SRCS main.cpp)
+project(helloworld_client)
-set(helloworld_client_HRDS helloworld_client.h )
-qt4_wrap_cpp( helloworld_client_MOCS ${helloworld_client_HRDS} )
+set(helloworld_client_SRCS main.cpp helloworld_client.h)
-KDSOAP_GENERATE_WSDL(helloworld_client_SRCS helloworld.wsdl )
+kdsoap_generate_wsdl(helloworld_client_SRCS ../helloworld_server/helloworld.wsdl)
-add_executable(helloworld_client ${helloworld_client_SRCS} ${helloworld_client_MOCS} )
-target_link_libraries(helloworld_client ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTWIDGETS_LIBRARY} kdsoap)
+add_executable(
+ helloworld_client
+ ${helloworld_client_SRCS}
+)
+target_link_libraries(
+ helloworld_client ${QT_LIBRARIES} kdsoap
+)
diff --git a/examples/helloworld_client/helloworld.wsdl b/examples/helloworld_client/helloworld.wsdl
deleted file mode 100644
index 101593f..0000000
--- a/examples/helloworld_client/helloworld.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="HelloService"
- targetNamespace="http://www.ecerami.com/wsdl/HelloService.wsdl"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://www.ecerami.com/wsdl/HelloService.wsdl"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <message name="SayHelloRequest">
- <part name="msg" type="xsd:string"/>
- </message>
- <message name="SayHelloResponse">
- <part name="reply" type="xsd:string"/>
- </message>
-
- <portType name="Hello_PortType">
- <operation name="sayHello">
- <input message="tns:SayHelloRequest"/>
- <output message="tns:SayHelloResponse"/>
- </operation>
- </portType>
-
- <binding name="Hello_Binding" type="tns:Hello_PortType">
- <soap:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="sayHello" style="document">
- <soap:operation soapAction="sayHello"/>
- <input>
- <soap:body
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- namespace="urn:examples:helloservice"
- use="encoded"/>
- </input>
- <output>
- <soap:body
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
- namespace="urn:examples:helloservice"
- use="encoded"/>
- </output>
- </operation>
-</binding>
-
- <service name="Hello_Service">
- <documentation>WSDL File for HelloService</documentation>
- <port binding="tns:Hello_Binding" name="Hello_Port">
- <soap:address location="http://localhost:8081/hello" />
- </port>
- </service>
-</definitions>
-
diff --git a/examples/helloworld_client/helloworld_client.h b/examples/helloworld_client/helloworld_client.h
index 0bdfa1b..a202779 100644
--- a/examples/helloworld_client/helloworld_client.h
+++ b/examples/helloworld_client/helloworld_client.h
@@ -1,30 +1,40 @@
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2011-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
#ifndef HELLOWORLD_CLIENT_H
#define HELLOWORLD_CLIENT_H
#include "wsdl_helloworld.h"
-#include <QMainWindow>
+#include <QWidget>
QT_BEGIN_NAMESPACE
class QLineEdit;
class QTextBrowser;
QT_END_NAMESPACE
-class MainWindow : public QMainWindow
+class MainWindow : public QWidget
{
Q_OBJECT
public:
- explicit MainWindow(QWidget* parent=0);
+ explicit MainWindow(QWidget *parent = 0);
private Q_SLOTS:
void sayHello();
- void sayHelloDone(const QString& reply);
- void sayHelloError(const KDSoapMessage& fault);
+ void sayHelloDone(const QString &reply);
+ void sayHelloError(const KDSoapMessage &fault);
private:
Hello_Service m_service;
- QLineEdit* m_input;
- QTextBrowser* m_browser;
+ QLineEdit *m_input;
+ QTextBrowser *m_browser;
};
#endif // HELLOWORLD_CLIENT_H
diff --git a/examples/helloworld_client/helloworld_client.pro b/examples/helloworld_client/helloworld_client.pro
deleted file mode 100644
index 7b1db83..0000000
--- a/examples/helloworld_client/helloworld_client.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-WSDL_DIR = generated
-
-include( $${TOP_SOURCE_DIR}/examples/examples.pri )
-
-SOURCES = main.cpp
-HEADERS += helloworld_client.h
-
-KDWSDL = helloworld.wsdl
-
-CONFIG -= console
-
-greaterThan(QT_MAJOR_VERSION, 4) {
- QT += widgets
-} else {
- QT += gui
-}
-
-macx:CONFIG += app_bundle
-
diff --git a/examples/helloworld_client/main.cpp b/examples/helloworld_client/main.cpp
index 91347ed..f171ee5 100644
--- a/examples/helloworld_client/main.cpp
+++ b/examples/helloworld_client/main.cpp
@@ -1,3 +1,13 @@
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2011-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
#include "helloworld_client.h"
#include <QApplication>
@@ -7,38 +17,40 @@
#include <QTextBrowser>
#include <QVBoxLayout>
-MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
+MainWindow::MainWindow(QWidget *parent)
+ : QWidget(parent)
{
m_service.setEndPoint(QLatin1String("http://localhost:8081"));
m_service.setSoapVersion(KDSoapClientInterface::SOAP1_2);
- connect(&m_service, SIGNAL(sayHelloDone(QString)), this, SLOT(sayHelloDone(QString)));
- connect(&m_service, SIGNAL(sayHelloError(KDSoapMessage)), this, SLOT(sayHelloError(KDSoapMessage)));
- QWidget* central = new QWidget;
- QVBoxLayout* layout = new QVBoxLayout(central);
+ connect(&m_service, &Hello_Service::sayHelloDone, this, &MainWindow::sayHelloDone);
+ connect(&m_service, &Hello_Service::sayHelloError, this, &MainWindow::sayHelloError);
+ QVBoxLayout *layout = new QVBoxLayout(this);
m_browser = new QTextBrowser;
- QLabel* label = new QLabel;
+ QLabel *label = new QLabel;
label->setWordWrap(true);
label->setText(tr("<qt><p>This is a simple client/server demo. Start bin/helloworld_server separately on the commandline.</p>"
- "<p>Clicking "Send" will make a sayHello() soap call. To trigger an error, leave the input field empty and click "Send".</p>"));
+ "<p>Clicking "Send" will make a sayHello() soap call. To trigger an error, leave the input field empty and click "
+ ""Send".</p>"));
layout->addWidget(label);
layout->addWidget(m_browser);
- layout->setMargin(0);
- QWidget* w1 = new QWidget;
- QHBoxLayout* l1 = new QHBoxLayout(w1);
- l1->setMargin(0);
+ QWidget *w1 = new QWidget;
+ QHBoxLayout *l1 = new QHBoxLayout(w1);
+ l1->setContentsMargins(0, 0, 0, 0);
m_input = new QLineEdit;
l1->addWidget(m_input);
- QPushButton* pb1 = new QPushButton(tr("Send"));
+ QPushButton *pb1 = new QPushButton(tr("Send"));
l1->addWidget(pb1);
- connect(m_input, SIGNAL(returnPressed()), this, SLOT(sayHello()));
- connect(pb1, SIGNAL(clicked()), this, SLOT(sayHello()));
+ connect(m_input, &QLineEdit::returnPressed, this, &MainWindow::sayHello);
+ connect(pb1, &QAbstractButton::clicked, this, &MainWindow::sayHello);
layout->addWidget(w1);
- setCentralWidget(central);
+
+ m_input->setFocus();
}
void MainWindow::sayHello()
{
m_service.asyncSayHello(m_input->text().trimmed());
+ m_input->clear();
}
void MainWindow::sayHelloDone(const QString &reply)
@@ -51,7 +63,7 @@ void MainWindow::sayHelloError(const KDSoapMessage &fault)
m_browser->append(tr("Error from server: <font color=\"red\">%1</font>").arg(fault.faultAsString()));
}
-int main(int argc, char** argv)
+int main(int argc, char **argv)
{
QApplication app(argc, argv);
MainWindow mw;
diff --git a/examples/helloworld_server/CMakeLists.txt b/examples/helloworld_server/CMakeLists.txt
index f7c3437..6bb6d54 100644
--- a/examples/helloworld_server/CMakeLists.txt
+++ b/examples/helloworld_server/CMakeLists.txt
@@ -1,12 +1,22 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
project(helloworld_server)
set(KSWSDL2CPP_OPTION "-server")
-set(helloworld_server_SRCS main.cpp)
-set(helloworld_server_HDRS helloworld_server.h)
-
-KDSOAP_GENERATE_WSDL(helloworld_server_SRCS helloworld.wsdl)
+set(helloworld_server_SRCS main.cpp helloworld_serverobject.cpp)
-qt4_wrap_cpp( helloworld_server_MOCS ${helloworld_server_HDRS} )
+kdsoap_generate_wsdl(helloworld_server_SRCS helloworld.wsdl)
-add_executable(helloworld_server ${helloworld_server_SRCS} ${helloworld_server_MOCS} )
-target_link_libraries(helloworld_server ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} kdsoap kdsoap-server)
+add_executable(
+ helloworld_server
+ ${helloworld_server_SRCS}
+)
+target_link_libraries(
+ helloworld_server ${QT_LIBRARIES} kdsoap kdsoap-server
+)
diff --git a/examples/helloworld_server/helloworld.wsdl b/examples/helloworld_server/helloworld.wsdl
index 101593f..fe9b10f 100644
--- a/examples/helloworld_server/helloworld.wsdl
+++ b/examples/helloworld_server/helloworld.wsdl
@@ -5,23 +5,23 @@
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://www.ecerami.com/wsdl/HelloService.wsdl"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
+
<message name="SayHelloRequest">
<part name="msg" type="xsd:string"/>
</message>
<message name="SayHelloResponse">
<part name="reply" type="xsd:string"/>
</message>
-
+
<portType name="Hello_PortType">
<operation name="sayHello">
<input message="tns:SayHelloRequest"/>
<output message="tns:SayHelloResponse"/>
</operation>
</portType>
-
+
<binding name="Hello_Binding" type="tns:Hello_PortType">
- <soap:binding style="document"
+ <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="sayHello" style="document">
<soap:operation soapAction="sayHello"/>
@@ -39,7 +39,7 @@
</output>
</operation>
</binding>
-
+
<service name="Hello_Service">
<documentation>WSDL File for HelloService</documentation>
<port binding="tns:Hello_Binding" name="Hello_Port">
@@ -47,4 +47,3 @@
</port>
</service>
</definitions>
-
diff --git a/examples/helloworld_server/helloworld_server.h b/examples/helloworld_server/helloworld_server.h
deleted file mode 100644
index 434f731..0000000
--- a/examples/helloworld_server/helloworld_server.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef HELLOWORLD_SERVER_H
-#define HELLOWORLD_SERVER_H
-
-#include "wsdl_helloworld.h"
-#include "KDSoapServerObjectInterface.h"
-
-class ServerObject : public Hello_ServiceServerBase
-{
- Q_OBJECT
- Q_INTERFACES(KDSoapServerObjectInterface)
-public:
- ServerObject();
- ~ServerObject();
-
- QString sayHello(const QString& msg) override;
-};
-
-#endif // HELLOWORLD_SERVER_H
diff --git a/examples/helloworld_server/helloworld_server.pro b/examples/helloworld_server/helloworld_server.pro
deleted file mode 100644
index 7fab2d4..0000000
--- a/examples/helloworld_server/helloworld_server.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-KDWSDL_OPTIONS = -server
-WSDL_DIR = generated
-
-include( $${TOP_SOURCE_DIR}/examples/examples.pri )
-
-SOURCES = main.cpp
-HEADERS = helloworld_server.h
-
-KDWSDL = helloworld.wsdl
-
-LIBS += -L$${TOP_BUILD_DIR}/lib -l$$KDSOAPSERVERLIB
diff --git a/examples/helloworld_server/helloworld_serverobject.cpp b/examples/helloworld_server/helloworld_serverobject.cpp
new file mode 100644
index 0000000..af7a404
--- /dev/null
+++ b/examples/helloworld_server/helloworld_serverobject.cpp
@@ -0,0 +1,33 @@
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2011-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
+#include <QCoreApplication>
+
+#include "KDSoapServer.h"
+#include "helloworld_serverobject.h"
+#include <iostream>
+
+HelloWorldServerObject::HelloWorldServerObject()
+ : Hello_ServiceServerBase()
+{
+}
+
+HelloWorldServerObject::~HelloWorldServerObject()
+{
+}
+
+QString HelloWorldServerObject::sayHello(const QString &msg)
+{
+ if (msg.isEmpty()) {
+ setFault(QLatin1String("Client.Data"), QLatin1String("Empty message"), QLatin1String("HelloWorldServerObject"), tr("You must say something."));
+ return QString();
+ }
+ return tr("I'm helloworld_server and you said: %1").arg(msg);
+}
diff --git a/examples/helloworld_server/helloworld_serverobject.h b/examples/helloworld_server/helloworld_serverobject.h
new file mode 100644
index 0000000..57a1c67
--- /dev/null
+++ b/examples/helloworld_server/helloworld_serverobject.h
@@ -0,0 +1,28 @@
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2011-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
+#ifndef HELLOWORLD_SERVER_H
+#define HELLOWORLD_SERVER_H
+
+#include "KDSoapServerObjectInterface.h"
+#include "wsdl_helloworld.h"
+
+class HelloWorldServerObject : public Hello_ServiceServerBase
+{
+ Q_OBJECT
+ Q_INTERFACES(KDSoapServerObjectInterface)
+public:
+ HelloWorldServerObject();
+ ~HelloWorldServerObject();
+
+ QString sayHello(const QString &msg) override;
+};
+
+#endif // HELLOWORLD_SERVER_H
diff --git a/examples/helloworld_server/main.cpp b/examples/helloworld_server/main.cpp
index 80b728a..33194b2 100644
--- a/examples/helloworld_server/main.cpp
+++ b/examples/helloworld_server/main.cpp
@@ -1,41 +1,35 @@
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2011-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
#include <QCoreApplication>
#include "KDSoapServer.h"
-#include "helloworld_server.h"
+#include "helloworld_serverobject.h"
#include <iostream>
-ServerObject::ServerObject()
- : Hello_ServiceServerBase()
+class Server : public KDSoapServer
{
-}
-
-ServerObject::~ServerObject() {
-}
-
-QString ServerObject::sayHello(const QString& msg)
-{
- if (msg.isEmpty()) {
- setFault(QLatin1String("Client.Data"), QLatin1String("Empty message"),
- QLatin1String("ServerObject"), tr("You must say something."));
- return QString();
- }
- return tr("I'm helloworld_server and you said: %1").arg(msg);
-}
-
-class Server : public KDSoapServer {
public:
- QObject* createServerObject() override {
- return new ServerObject;
+ QObject *createServerObject() override
+ {
+ return new HelloWorldServerObject;
}
};
-int main(int argc, char** argv)
+int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
Server server;
server.setLogLevel(Server::LogEveryCall);
const bool listening = server.listen(QHostAddress::Any, 8081);
- if ( !listening ) {
+ if (!listening) {
std::cerr << "Cannot start server: " << qPrintable(server.errorString()) << std::endl;
return 1;
} else {
diff --git a/features/CMakeLists.txt b/features/CMakeLists.txt
index 2c56641..91b2882 100644
--- a/features/CMakeLists.txt
+++ b/features/CMakeLists.txt
@@ -1 +1,10 @@
-install(FILES kdsoap.prf DESTINATION ${INSTALL_DATADIR}/mkspecs/features )
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(NOT ${PROJECT_NAME}_QT6)
+ install(FILES kdsoap.prf DESTINATION ${INSTALL_DATADIR}/mkspecs/features)
+endif()
diff --git a/features/features.pro b/features/features.pro
deleted file mode 100644
index 5cdf80c..0000000
--- a/features/features.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-features.path = $$INSTALL_PREFIX/share/mkspecs/features
-features.files = *.prf
-
-INSTALLS += features
-
-OTHER_FILES = *.prf
diff --git a/features/kdsoap.prf b/features/kdsoap.prf
index e2ed167..e669d0b 100644
--- a/features/kdsoap.prf
+++ b/features/kdsoap.prf
@@ -1,3 +1,11 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
KDSOAP_MAJOR_VERSION = 1
: # copy from environment:
@@ -42,7 +50,7 @@ KDSOAP_MAJOR_VERSION = 1
}
LIBS += -L$${KDSOAPDIR_BUILD}/lib
LIBS += -lkdsoap$$KDSOAP_LIB_TYPE_SUFFIX$$KDSOAP_LIB_VERSION_SUFFIX
-
+
unix {
!isEmpty(QMAKE_LFLAGS_RPATH):LIBS += $$QMAKE_LFLAGS_RPATH$${KDSOAPDIR_BUILD}/lib
}
diff --git a/g++.pri b/g++.pri
deleted file mode 100644
index 761acc9..0000000
--- a/g++.pri
+++ /dev/null
@@ -1,36 +0,0 @@
-*-g++* {
- NORMAL_CFLAGS = -Wno-long-long
- win32-g++ {
- NORMAL_CFLAGS += -U__STRICT_ANSI__
- }
-
- NORMAL_CXXFLAGS = \
- -Wnon-virtual-dtor -Wundef -Wcast-align \
- -Wchar-subscripts -Wpointer-arith \
- -Wwrite-strings -Wformat -Wformat-security \
- -Wmissing-format-attribute -Woverloaded-virtual -std=c++11
-
- # -Wconversion gives too many warnings from Qt-4.4.3 with gcc-4.3.2 (was fine with gcc-4.2.4), so removing it
- # -Wpacked gives warnings with Qt 4.8, removed
-
- NORMAL_CFLAGS += -pedantic
-
- CONFIG(debug, debug|release) {
- NORMAL_CXXFLAGS += -O0 -g3
- NORMAL_CXXFLAGS -= -g
- }
- USABLE_CXXFLAGS = -Wold-style-cast
- HARD_CXXFLAGS = -Weffc++ -Wshadow
- PITA_CXXFLAGS = -Wunreachable-code
-
- QMAKE_CFLAGS += $$NORMAL_CFLAGS
- QMAKE_CXXFLAGS += $$NORMAL_CFLAGS $$NORMAL_CXXFLAGS
-
- kdab:QMAKE_CFLAGS_WARN_ON += $$NORMAL_CFLAGS -Werror
- kdab:QMAKE_CXXFLAGS_WARN_ON += $$NORMAL_CFLAGS $$NORMAL_CXXFLAGS -Werror
-
- #QMAKE_CXXFLAGS_WARN_ON += $$USABLE_CXXFLAGS
- #QMAKE_CXXFLAGS_WARN_ON += $$HARD_CXXFLAGS # headers must compile with this, code doesn't need to; needs patched Qt
- #QMAKE_CXXFLAGS_WARN_ON += $$PITA_CXXFLAGS # header would be nice, but it's probably pointless, due to noise from Qt and libstdc++
-
-}
diff --git a/genignore.py b/genignore.py
deleted file mode 100755
index 0750640..0000000
--- a/genignore.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-import os, stat
-
-# Run this on Linux.
-
-# This script, when run in KD Soap's source and build directory containing the results of a full
-# build, writes a list of files to be excluded from packaging to CPackIgnores.txt.
-# autogen reads that list and passes it to CPack.
-
-# You should re-generate CPackIgnores.txt before every release and also check that no new binary
-# slips through the cracks using
-# find . -type f -executable
-
-sourceDirectory = os.path.abspath( os.path.dirname( os.path.dirname( __file__ ) ) )
-
-def ignoredFiles():
- ret = []
- def findExecutables( top ):
- for f in os.listdir( top ):
- pathname = os.path.join( top, f )
- if stat.S_ISDIR( os.stat( pathname ).st_mode ):
- findExecutables( pathname )
- elif os.access( pathname, os.X_OK ):
- # The file is executable for us
- ret.append( pathname + '$' )
- # for OS X
- ret.append( pathname + '.app/' )
-
- # With one exception, the executables in those paths are binaries and we're making a SOURCE package.
- for path in [ 'unittests' ]:
- findExecutables( os.path.join( sourceDirectory, path ) )
- # The exception!
- def isGoodExclude(s): return not s.startswith( os.path.join( sourceDirectory, 'unittests/runTest.bat' ) )
- return sorted( filter( isGoodExclude, ret ) )
-
-f = open( 'CPackIgnores.txt', 'w')
-for ign in ignoredFiles():
- # write paths relative to the source dir, one per line
- f.write( ign[ len( sourceDirectory ) : ] + '\n' )
diff --git a/kdsoap.dsc b/kdsoap.dsc
deleted file mode 100644
index aa055f7..0000000
--- a/kdsoap.dsc
+++ /dev/null
@@ -1,10 +0,0 @@
-Format: 1.0
-Source: kdsoap
-Version: 1.9.1
-Binary: kdsoap
-Maintainer: Allen Winter <allen.winter@kdab.com>
-Architecture: any
-Build-Depends: debhelper (>=9), cdbs, cmake, libqt4-dev
-
-Files:
- 00000000000000000000000000000000 00000 kdsoap-1.9.1.tar.gz
diff --git a/kdsoap.pri b/kdsoap.pri
index 51bffcb..fe4264b 100644
--- a/kdsoap.pri
+++ b/kdsoap.pri
@@ -1,7 +1,15 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
# Not used by KDSoap itself. This is for use in other projects.
# Copy the file there, but backport any changes here.
-: # copy from environment:
+ # copy from environment:
isEmpty( KDSOAPDIR ):KDSOAPDIR="$$(KDSOAPDIR)"
!isEmpty( KDSOAPDIR ) {
unix {
diff --git a/kdsoap.pro b/kdsoap.pro
deleted file mode 100644
index 981bd40..0000000
--- a/kdsoap.pro
+++ /dev/null
@@ -1,119 +0,0 @@
-TEMPLATE = subdirs
-crosscompiling {
- module_kdwsdl2cpp.commands =
- module_kdwsdl2cpp.target = module_kdwsdl2cpp
- module_kdwsdl2cpp-make_default.commands = cd kdwsdl2cpp && $(MAKE)
- module_kdwsdl2cpp-make_default.target = module_kdwsdl2cpp-make_default
- module_kdwsdl2cpp-make_first.commands = cd kdwsdl2cpp && $(MAKE) first
- module_kdwsdl2cpp-make_first.target = module_kdwsdl2cpp-make_first
- module_kdwsdl2cpp-clean.commands = cd kdwsdl2cpp && $(MAKE) clean
- module_kdwsdl2cpp-clean.target = module_kdwsdl2cpp-clean
- module_kdwsdl2cpp-distclean.commands = cd kdwsdl2cpp && $(MAKE) distclean
- module_kdwsdl2cpp-distclean.target = module_kdwsdl2cpp-distclean
- module_kdwsdl2cpp-all.commands = cd kdwsdl2cpp && $(MAKE) all
- module_kdwsdl2cpp-all.target = module_kdwsdl2cpp-all
- module_kdwsdl2cpp-install_subtargets.commands = cd kdwsdl2cpp && $(MAKE) install
- module_kdwsdl2cpp-install_subtargets.target = module_kdwsdl2cpp-install_subtargets
- module_kdwsdl2cpp-uninstall_subtargets.commands = cd kdwsdl2cpp && $(MAKE) uninstall
- module_kdwsdl2cpp-uninstall_subtargets.target = module_kdwsdl2cpp-uninstall_subtargets
- QMAKE_EXTRA_TARGETS += module_kdwsdl2cpp module_kdwsdl2cpp-make_default module_kdwsdl2cpp-make_first module_kdwsdl2cpp-clean module_kdwsdl2cpp-all module_kdwsdl2cpp-distclean module_kdwsdl2cpp-install_subtargets module_kdwsdl2cpp-uninstall_subtargets
-} else {
- module_kdwsdl2cpp.subdir = kdwsdl2cpp
- SUBDIRS += module_kdwsdl2cpp
-}
-
-module_src.subdir = src
-module_src.target = module-src
-module_src.depends = module_kdwsdl2cpp
-module_testtools.subdir = testtools
-module_testtools.depends = module_src
-module_include.subdir = include
-module_include.depends = module_src
-module_unittests.subdir = unittests
-module_unittests.depends = module_src module_testtools
-module_examples.subdir = examples
-module_examples.depends = module_src
-
-SUBDIRS += module_src features module_include
-unittests: SUBDIRS += module_testtools module_unittests
-SUBDIRS += module_examples
-MAJOR_VERSION = 1 ### extract from $$VERSION
-
-unix:DEFAULT_INSTALL_PREFIX = /usr/local/KDAB/KDSoap-$$VERSION
-win32:DEFAULT_INSTALL_PREFIX = "C:\KDAB\KDSoap"-$$VERSION
-
-# for backw. compat. we still allow manual invocation of qmake using PREFIX:
-isEmpty( KDSOAP_INSTALL_PREFIX ): KDSOAP_INSTALL_PREFIX=$$PREFIX
-
-# if still empty we use the default:
-isEmpty( KDSOAP_INSTALL_PREFIX ): KDSOAP_INSTALL_PREFIX=$$DEFAULT_INSTALL_PREFIX
-
-# if the default was either set by configure or set by the line above:
-equals( KDSOAP_INSTALL_PREFIX, $$DEFAULT_INSTALL_PREFIX ){
- INSTALL_PREFIX=$$DEFAULT_INSTALL_PREFIX
- unix:message( "No install prefix given, using default of" $$DEFAULT_INSTALL_PREFIX (use configure.sh -prefix DIR to specify))
- !unix:message( "No install prefix given, using default of" $$DEFAULT_INSTALL_PREFIX (use configure -prefix DIR to specify))
-} else {
- INSTALL_PREFIX=$$KDSOAP_INSTALL_PREFIX
-}
-
-DEBUG_SUFFIX=""
-VERSION_SUFFIX=""
-CONFIG(debug, debug|release) {
- !unix: DEBUG_SUFFIX = d
-}
-!unix:!mac:!staticlib:VERSION_SUFFIX=$$MAJOR_VERSION
-
-KDSOAPLIB = kdsoap$$VERSION_SUFFIX$$DEBUG_SUFFIX
-KDSOAPSERVERLIB = kdsoap-server$$VERSION_SUFFIX$$DEBUG_SUFFIX
-KDWSDL2CPP_LIB = kdwsdl2cpp_lib$$DEBUG_SUFFIX
-
-message(Install prefix is $$INSTALL_PREFIX)
-message(This is KD Soap version $$VERSION)
-
-# This file is in the build directory (because "somecommand >> somefile" puts it there)
-QMAKE_CACHE = "$${OUT_PWD}/.qmake.cache"
-
-# Create a .qmake.cache file
-unix:MESSAGE = '\\'$$LITERAL_HASH\\' KDAB qmake cache file: following lines autogenerated during qmake run'
-!unix:MESSAGE = $$LITERAL_HASH' KDAB qmake cache file: following lines autogenerated during qmake run'
-
-system('echo $${MESSAGE} > $${QMAKE_CACHE}')
-
-TMP_SOURCE_DIR = $${PWD}
-TMP_BUILD_DIR = $${OUT_PWD}
-system('echo TOP_SOURCE_DIR=$${TMP_SOURCE_DIR} >> $${QMAKE_CACHE}')
-system('echo TOP_BUILD_DIR=$${TMP_BUILD_DIR} >> $${QMAKE_CACHE}')
-windows:INSTALL_PREFIX=$$replace(INSTALL_PREFIX, \\\\, /)
-system('echo INSTALL_PREFIX=$$INSTALL_PREFIX >> $${QMAKE_CACHE}')
-system('echo KDSOAPLIB=$$KDSOAPLIB >> $${QMAKE_CACHE}')
-system('echo KDSOAPSERVERLIB=$$KDSOAPSERVERLIB >> $${QMAKE_CACHE}')
-system('echo KDWSDL2CPP_LIB=$$KDWSDL2CPP_LIB >> $${QMAKE_CACHE}')
-
-# forward make test calls to unittests:
-test.target=test
-unittests {
-unix:!macx:test.commands=export LD_LIBRARY_PATH=\"$${OUT_PWD}/lib\":$$(LD_LIBRARY_PATH); (cd unittests && make test)
-macx:test.commands=export DYLD_LIBRARY_PATH=\"$${OUT_PWD}/lib\":$$(DYLD_LIBRARY_PATH); (cd unittests && make test)
-win32:test.commands=(cd unittests && $(MAKE) test)
-}
-test.depends = first
-QMAKE_EXTRA_TARGETS += test
-
-INSTALL_DOC_DIR = $$INSTALL_PREFIX/share/doc/KDSoap
-# install licenses:
-licenses.files = LICENSE.GPL.txt LICENSE.US.txt LICENSE.txt
-licenses.path = $$INSTALL_DOC_DIR
-INSTALLS += licenses
-
-# install readme:
-readme.files = README.txt
-readme.path = $$INSTALL_DOC_DIR
-INSTALLS += readme
-
-# install qmake project includes
-prifiles.files = kdsoap.pri kdwsdl2cpp.pri
-prifiles.path = $$INSTALL_DOC_DIR
-INSTALLS += prifiles
-
-OTHER_FILES += configure.sh configure.bat kdsoap.pri kdwsdl2cpp.pri doc/CHANGES*
diff --git a/kdwsdl2cpp.pri b/kdwsdl2cpp.pri
index 117b550..fb60bfe 100644
--- a/kdwsdl2cpp.pri
+++ b/kdwsdl2cpp.pri
@@ -1,3 +1,11 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
# User-configurable variables
isEmpty(WSDL_DIR):WSDL_DIR = .
isEmpty(WSDL_SOURCES_DIR):WSDL_SOURCES_DIR = $$WSDL_DIR
@@ -54,4 +62,3 @@ wsdl_dir_short = $$WSDL_DIR
contains(QMAKE_HOST.os,Windows):wsdl_dir_short ~= s,^.:,/,
contains(wsdl_dir_short, ^[/\\\\].*):INCLUDEPATH += $$WSDL_DIR
else:INCLUDEPATH += $$OUT_PWD/$$WSDL_DIR
-
diff --git a/kdwsdl2cpp/CMakeLists.txt b/kdwsdl2cpp/CMakeLists.txt
index 82418be..57ae152 100644
--- a/kdwsdl2cpp/CMakeLists.txt
+++ b/kdwsdl2cpp/CMakeLists.txt
@@ -1,78 +1,104 @@
-set(QT_USE_QTNETWORK TRUE)
-set(QT_USE_QTXML TRUE)
-include(${QT_USE_FILE})
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
-remove_definitions(-DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+find_package(
+ Qt${Qt_VERSION_MAJOR} ${QT_MIN_VERSION}
+ COMPONENTS Xml CONFIG
+ REQUIRED
+) #libkode requires Xml
+list(APPEND QT_LIBRARIES Qt${Qt_VERSION_MAJOR}::Xml)
+
+include_directories(libkode)
+
+remove_definitions(-DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_FOREACH)
set(SOURCES_LIB
- common/fileprovider.cpp
- common/messagehandler.cpp
- common/nsmanager.cpp
- common/parsercontext.cpp
- common/qname.cpp
- libkode/code.cpp
- libkode/enum.cpp
- libkode/style.cpp
- libkode/printer.cpp
- libkode/license.cpp
- libkode/file.cpp
- libkode/class.cpp
- libkode/function.cpp
- libkode/variable.cpp
- libkode/membervariable.cpp
- libkode/typedef.cpp
- libkode/statemachine.cpp
- schema/annotation.cpp
- schema/attribute.cpp
- schema/complextype.cpp
- schema/element.cpp
- schema/parser.cpp
- schema/simpletype.cpp
- schema/types.cpp
- schema/xmlelement.cpp
- schema/xsdtype.cpp
- schema/attributegroup.cpp
- schema/compositor.cpp
- schema/group.cpp
- wsdl/binding.cpp
- wsdl/bindingoperation.cpp
- wsdl/definitions.cpp
- wsdl/element.cpp
- wsdl/fault.cpp
- wsdl/import.cpp
- wsdl/message.cpp
- wsdl/operation.cpp
- wsdl/param.cpp
- wsdl/part.cpp
- wsdl/port.cpp
- wsdl/porttype.cpp
- wsdl/service.cpp
- wsdl/soapbinding.cpp
- wsdl/type.cpp
- wsdl/wsdl.cpp
- src/compiler.cpp
- src/converter.cpp
- src/converter_clientstub.cpp
- src/converter_complextype.cpp
- src/converter_serverstub.cpp
- src/converter_simpletype.cpp
- src/creator.cpp
- src/elementargumentserializer.cpp
- src/namemapper.cpp
- src/settings.cpp
- src/typemap.cpp
+ libkode/common/fileprovider.cpp
+ libkode/common/messagehandler.cpp
+ libkode/common/nsmanager.cpp
+ libkode/common/parsercontext.cpp
+ libkode/common/qname.cpp
+ libkode/code_generation/class.cpp
+ libkode/code_generation/code.cpp
+ libkode/code_generation/enum.cpp
+ libkode/code_generation/license.cpp
+ libkode/code_generation/file.cpp
+ libkode/code_generation/function.cpp
+ libkode/code_generation/include.cpp
+ libkode/code_generation/membervariable.cpp
+ libkode/code_generation/printer.cpp
+ libkode/code_generation/statemachine.cpp
+ libkode/code_generation/style.cpp
+ libkode/code_generation/typedef.cpp
+ libkode/code_generation/variable.cpp
+ libkode/schema/annotation.cpp
+ libkode/schema/attribute.cpp
+ libkode/schema/complextype.cpp
+ libkode/schema/element.cpp
+ libkode/schema/parser.cpp
+ libkode/schema/simpletype.cpp
+ libkode/schema/types.cpp
+ libkode/schema/xmlelement.cpp
+ libkode/schema/xsdtype.cpp
+ libkode/schema/attributegroup.cpp
+ libkode/schema/compositor.cpp
+ libkode/schema/group.cpp
+ wsdl/binding.cpp
+ wsdl/bindingoperation.cpp
+ wsdl/definitions.cpp
+ wsdl/element.cpp
+ wsdl/fault.cpp
+ wsdl/import.cpp
+ wsdl/message.cpp
+ wsdl/operation.cpp
+ wsdl/param.cpp
+ wsdl/part.cpp
+ wsdl/port.cpp
+ wsdl/porttype.cpp
+ wsdl/service.cpp
+ wsdl/soapbinding.cpp
+ wsdl/type.cpp
+ wsdl/wsdl.cpp
+ src/compiler.cpp
+ src/converter.cpp
+ src/converter_clientstub.cpp
+ src/converter_complextype.cpp
+ src/converter_serverstub.cpp
+ src/converter_simpletype.cpp
+ src/creator.cpp
+ src/elementargumentserializer.cpp
+ src/namemapper.cpp
+ src/settings.cpp
+ src/typemap.cpp
)
set(SOURCES_EXE src/main.cpp)
-add_library(kdwsdl2cpp_lib STATIC ${SOURCES_LIB})
-target_link_libraries(kdwsdl2cpp_lib ${QT_LIBRARIES})
+add_library(
+ kdwsdl2cpp_lib STATIC
+ ${SOURCES_LIB} schemas/schemas.qrc
+)
+target_link_libraries(
+ kdwsdl2cpp_lib ${QT_LIBRARIES}
+)
-add_executable(kdwsdl2cpp ${SOURCES_EXE})
-target_link_libraries(kdwsdl2cpp kdwsdl2cpp_lib ${QT_LIBRARIES})
+add_executable(
+ kdwsdl2cpp
+ ${SOURCES_EXE}
+)
+target_link_libraries(
+ kdwsdl2cpp kdwsdl2cpp_lib ${QT_LIBRARIES}
+)
+set_target_properties(kdwsdl2cpp PROPERTIES OUTPUT_NAME kdwsdl2cpp${${PROJECT_NAME}_LIBRARY_QTID})
-install(TARGETS kdwsdl2cpp EXPORT "KDSoapTargets"
- RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
- BUNDLE DESTINATION .
+install(
+ TARGETS kdwsdl2cpp
+ EXPORT "KDSoapTargets"
+ RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
+ BUNDLE DESTINATION .
)
diff --git a/kdwsdl2cpp/common/common.pro b/kdwsdl2cpp/common/common.pro
deleted file mode 100644
index 4ab7fc5..0000000
--- a/kdwsdl2cpp/common/common.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = lib
-TARGET = xmlcommon
-CONFIG += staticlib
-SOURCES = \
- fileprovider.cpp \
- messagehandler.cpp \
- nsmanager.cpp \
- parsercontext.cpp \
- qname.cpp
-
-HEADERS = fileprovider.h
-
-QT -= gui
-QT += xml
-
-INCLUDEPATH += $${TOP_SOURCE_DIR}/kdwsdl2cpp $${TOP_SOURCE_DIR}/kdwsdl2cpp/libxmlcommon
-
-include ($${TOP_SOURCE_DIR}/variables.pri)
-DEFINES -= QT_NO_CAST_TO_ASCII QBA_NO_CAST_TO_VOID QBA_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
diff --git a/kdwsdl2cpp/common/fileprovider.cpp b/kdwsdl2cpp/common/fileprovider.cpp
deleted file mode 100644
index 1f23554..0000000
--- a/kdwsdl2cpp/common/fileprovider.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "fileprovider.h"
-
-#include <QCoreApplication>
-#include <QEventLoop>
-#include <QFile>
-#include <QUrl>
-#include <QDebug>
-#include <QDir>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QTemporaryFile>
-#include "src/settings.h"
-
-#ifndef Q_OS_WIN
-#include <unistd.h>
-#endif
-
-static QHash<QUrl, QByteArray> fileProviderCache;
-
-
-FileProvider::FileProvider()
- : QObject( nullptr )
-{
-}
-
-void FileProvider::cleanUp()
-{
- if (!mFileName.isEmpty()) {
- QFile::remove( mFileName );
- mFileName = QString();
- }
-}
-
-bool FileProvider::get( const QUrl &url, QString &target )
-{
- if ( !mFileName.isEmpty() ) {
- cleanUp();
- }
-
- if (url.scheme() == QLatin1String("file")) {
- target = url.toLocalFile();
- return true;
- }
- if (url.scheme() == QLatin1String("qrc")) {
- target = QLatin1String(":") + url.path();
- return true;
- }
-
- const QStringList importPathList = Settings::self()->importPathList();
- Q_FOREACH (const QString& importPath, importPathList) {
- QDir importDir(importPath);
- QString path = importDir.absoluteFilePath(url.host() + QDir::separator() + url.path());
- if (QFile::exists(path)) {
- qDebug("Using import path '%s'", qPrintable(path));
- target = path;
- return true;
- }
- }
-
- if (Settings::self()->useLocalFilesOnly()) {
- qCritical("ERROR: Could not find the local file for '%s'", qPrintable(url.toEncoded()));
- qCritical("ERROR: Try to download the file using:");
- qCritical("ERROR: $ cd %s", qPrintable(importPathList.first()));
- qCritical("ERROR: $ wget -r %s", qPrintable(url.toEncoded()));
- qCritical("ERROR: Or use the -import-path argument to set the correct search path");
- QCoreApplication::exit(12);
- return false;
- }
-
- if ( target.isEmpty() ) {
- QTemporaryFile tmpFile;
- tmpFile.setAutoRemove(false);
- tmpFile.open();
- target = tmpFile.fileName();
- mFileName = target;
- }
-
- QByteArray data;
- const QHash<QUrl, QByteArray>::const_iterator it = fileProviderCache.constFind(url);
- if (it != fileProviderCache.constEnd()) {
- data = it.value();
- } else {
- qDebug("Downloading '%s'", url.toEncoded().constData());
-
- QNetworkAccessManager manager;
- QNetworkRequest request(url);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
- if (Settings::self()->certificateLoaded()) {
- QSslConfiguration sslConfig = request.sslConfiguration();
- sslConfig.setPrivateKey(Settings::self()->sslKey());
- sslConfig.setLocalCertificate(Settings::self()->certificate());
- sslConfig.setCaCertificates(Settings::self()->caCertificates());
- request.setSslConfiguration(sslConfig);
- }
-#endif
- QNetworkReply* job = manager.get(request);
-
- QEventLoop loop;
- connect(job, SIGNAL(finished()),
- &loop, SLOT(quit()));
- loop.exec();
-
- if (job->error()) {
- qWarning("Error downloading '%s': %s", url.toEncoded().constData(), qPrintable(job->errorString()));
- return false;
- }
-
- qDebug( "Download successful" );
- data = job->readAll();
- fileProviderCache[url] = data;
- }
-
- QFile file( mFileName );
- if ( !file.open( QIODevice::WriteOnly ) ) {
- qWarning() << "Unable to create" << mFileName << ":" << file.errorString();
- return false;
- }
-
- file.write( data );
- file.close();
-
- return true;
-}
-
-#include "moc_fileprovider.cpp"
diff --git a/kdwsdl2cpp/common/fileprovider.h b/kdwsdl2cpp/common/fileprovider.h
deleted file mode 100644
index d8c23ec..0000000
--- a/kdwsdl2cpp/common/fileprovider.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- This file is part of KDE
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef FILEPROVIDER_H
-#define FILEPROVIDER_H
-
-#include <QObject>
-
-#include <kode_export.h>
-
-QT_BEGIN_NAMESPACE
-class QUrl;
-QT_END_NAMESPACE
-
-class KXMLCOMMON_EXPORT FileProvider : QObject
-{
- Q_OBJECT
-
- public:
- FileProvider();
-
- bool get( const QUrl &url, QString &target );
- void cleanUp();
-
- private:
- QString mFileName;
-};
-
-#endif
diff --git a/kdwsdl2cpp/common/messagehandler.cpp b/kdwsdl2cpp/common/messagehandler.cpp
deleted file mode 100644
index 9ad9b45..0000000
--- a/kdwsdl2cpp/common/messagehandler.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "messagehandler.h"
-
-MessageHandler::MessageHandler()
-{
-}
-
-MessageHandler::~MessageHandler()
-{
-}
-
-void MessageHandler::warning( const QString &message )
-{
- qWarning( "Warning: %s", qPrintable( message ) );
-}
-
-void MessageHandler::error( const QString &message )
-{
- qWarning( "Error: %s", qPrintable( message ) );
-}
diff --git a/kdwsdl2cpp/common/messagehandler.h b/kdwsdl2cpp/common/messagehandler.h
deleted file mode 100644
index ab711d8..0000000
--- a/kdwsdl2cpp/common/messagehandler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef MESSAGEHANDLER_H
-#define MESSAGEHANDLER_H
-
-#include <QString>
-#include <kode_export.h>
-
-/**
- This class is an interface for the xml parsing classes
- to output messages ( warnings, errors ).
-
- When you want to use a custom MessageHandler, just derivate
- and pass it to the ParserContext of the parsing classes.
- */
-class KXMLCOMMON_EXPORT MessageHandler
-{
- public:
- /**
- Constructs a MessageHandler.
- */
- MessageHandler();
-
- /**
- Destroys the MessageHandler.
- */
- virtual ~MessageHandler();
-
- /**
- This method is called to indicate a warning.
- */
- virtual void warning( const QString &message );
-
- /**
- This method is called to indicate an error.
- */
- virtual void error( const QString &message );
-};
-
-#endif
-
diff --git a/kdwsdl2cpp/common/nsmanager.cpp b/kdwsdl2cpp/common/nsmanager.cpp
deleted file mode 100644
index b296059..0000000
--- a/kdwsdl2cpp/common/nsmanager.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "nsmanager.h"
-#include "parsercontext.h"
-
-#include <QDebug>
-#include <QDomElement>
-
-// maybe port to QXmlNamespaceSupport?
-
-NSManager::NSManager()
- : mContext(nullptr), mParentManager(nullptr)
-{
-}
-
-NSManager::NSManager( ParserContext* context, const QDomElement& child )
-{
- mContext = context;
- mParentManager = context->namespaceManager();
- mMap = mParentManager->mMap;
- mCurrentNamespace = mParentManager->mCurrentNamespace;
- enterChild(child);
- mContext->setNamespaceManager(this);
-}
-
-NSManager::~NSManager()
-{
- // Restore parent namespaces
- if (mContext) {
- mContext->setNamespaceManager(mParentManager);
-
- // Remember the prefixes used for the namespaces, even afterwards
- //qDebug() << this << "adding prefixes into parent manager" << mParentManager;
- mParentManager->addPrefixes( mMap );
- }
-}
-
-void NSManager::setCurrentNamespace( const QString& uri )
-{
- mCurrentNamespace = uri;
-}
-
-void NSManager::setPrefix( const QString &prefix, const QString &uri )
-{
- mMap.replace( prefix, uri );
-}
-
-QString NSManager::prefix( const QString &uri ) const
-{
- // Note that it's allowed to have two prefixes for the same namespace uri.
- // So we just pick one.
- QString pref = mMap.key( uri ); // linear search
- if (pref.isEmpty() && uri != "http://schemas.xmlsoap.org/wsdl/") {
- qWarning() << "WARNING: No prefix found for" << uri;
- }
- return pref;
-}
-
-QString NSManager::uri( const QString &prefix ) const
-{
- if (prefix.isEmpty())
- return mCurrentNamespace;
- return mMap.value( prefix );
-}
-
-void NSManager::splitName( const QString &qname, QString &prefix, QString &localname ) const
-{
- int pos = qname.indexOf( QLatin1Char(':') );
- if ( pos != -1 ) {
- prefix = qname.left( pos );
- localname = qname.mid( pos + 1 );
- } else {
- prefix = QString();
- localname = qname;
- }
-}
-
-QString NSManager::fullName( const QString &nameSpace, const QString &localname ) const
-{
- if ( prefix( nameSpace ).isEmpty() )
- return localname;
- else
- return prefix( nameSpace ) + QLatin1Char(':') + localname;
-}
-
-QString NSManager::fullName( const QName &name ) const
-{
- return fullName( name.nameSpace(), name.localName() );
-}
-
-QStringList NSManager::prefixes() const
-{
- return mMap.keys();
-}
-
-QMap<QString, QString> NSManager::prefixMap() const
-{
- return mMap;
-}
-
-void NSManager::addPrefixes(const QMap<QString, QString> &prefixes)
-{
- for (QMap<QString, QString>::const_iterator it = prefixes.constBegin() ; it != prefixes.constEnd() ; ++it) {
- const QString &prefix = it.key();
- const QString &ns = it.value();
- // Only write down this prefix if we don't have it yet
- // and if we don't have another prefix for this NS (this is mostly for backwards compat,
- // so that msexchange still uses TNS rather than 'M' or 'T'...)
- if (!mMap.contains(prefix) && mMap.key(ns).isEmpty())
- mMap.insert(prefix, ns);
- }
-}
-
-QStringList NSManager::soapEncNamespaces()
-{
- return QStringList() << QLatin1String("http://schemas.xmlsoap.org/soap/encoding/")
- << QLatin1String("http://www.w3.org/2003/05/soap-encoding");
-}
-
-QStringList NSManager::soapNamespaces()
-{
- return QStringList() << QLatin1String("http://schemas.xmlsoap.org/wsdl/soap/")
- << QLatin1String("http://schemas.xmlsoap.org/wsdl/soap12/");
-}
-
-QString NSManager::xmlNamespace()
-{
- return QLatin1String("http://www.w3.org/XML/1998/namespace");
-}
-
-void NSManager::reset()
-{
- mMap.clear();
-}
-
-void NSManager::dump() const
-{
- QMap<QString, QString>::ConstIterator it;
- for ( it = mMap.begin(); it != mMap.end(); ++it ) {
- qDebug( "%s\t%s", qPrintable( it.key() ), qPrintable( it.value() ) );
- }
-}
-
-QString NSManager::nameSpace(const QDomElement &element) const
-{
- if (!element.namespaceURI().isEmpty()) // namespace support was enabled in QDom: easy
- return element.namespaceURI();
-
- QString prefix, localname;
- splitName( element.tagName(), prefix, localname );
- return uri( prefix );
-}
-
-QString NSManager::localName(const QDomElement &element) const
-{
- if (!element.namespaceURI().isEmpty()) // namespace support was enabled in QDom: easy
- return element.localName();
-
- QString prefix, localname;
- splitName( element.tagName(), prefix, localname );
- return localname;
-}
-
-void NSManager::enterChild(const QDomElement &element)
-{
- const QDomNamedNodeMap attributes = element.attributes();
- for ( int i = 0; i < attributes.count(); ++i ) {
- QDomAttr attribute = attributes.item( i ).toAttr();
- if ( attribute.name().startsWith( QLatin1String("xmlns:") ) ) {
- QString prefix = attribute.name().mid( 6 );
- //if (prefix == "tns")
- // qDebug() << this << "enterChild: setting tns to" << attribute.value();
- setPrefix( prefix, attribute.value() );
- } else if ( attribute.name() == QLatin1String("xmlns") ) {
- setCurrentNamespace( attribute.value() );
- }
- }
-}
diff --git a/kdwsdl2cpp/common/nsmanager.h b/kdwsdl2cpp/common/nsmanager.h
deleted file mode 100644
index 8ee4404..0000000
--- a/kdwsdl2cpp/common/nsmanager.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef NSMANAGER_H
-#define NSMANAGER_H
-
-#include <QMap>
-#include <QStringList>
-
-#include <common/qname.h>
-#include <kode_export.h>
-QT_BEGIN_NAMESPACE
-class QDomElement;
-QT_END_NAMESPACE
-class ParserContext;
-
-class KXMLCOMMON_EXPORT NSManager
-{
- public:
- NSManager();
- // Called when entering a new XML element. We copy the current namespaces
- // from the context and add the ones defined by the new XML element.
- // Upon destruction, we restore the context.
- NSManager( ParserContext* context, const QDomElement& child );
- ~NSManager();
-
- void enterChild( const QDomElement& element );
-
- void setCurrentNamespace( const QString& uri );
- void setPrefix( const QString &prefix, const QString &uri );
-
- QString prefix( const QString &uri ) const;
- QString uri( const QString &prefix ) const;
-
- QString fullName( const QString &nameSpace, const QString &localname ) const;
- QString fullName( const QName &name ) const;
-
- QString nameSpace( const QDomElement& element ) const;
- QString localName( const QDomElement& element ) const;
-
- QStringList prefixes() const;
- QMap<QString, QString> prefixMap() const;
- void addPrefixes(const QMap<QString, QString>& prefixes);
-
- void reset();
-
- void dump() const;
-
- // Repository of namespaces
- static QStringList soapEncNamespaces();
- static QStringList soapNamespaces();
- static QString xmlNamespace();
-
- private:
- void splitName( const QString &qname, QString &prefix, QString &localname ) const;
-
- typedef QMultiMap<QString, QString> NSMap; // prefix -> URI
- NSMap mMap;
- QString mCurrentNamespace;
-
- ParserContext* mContext;
- NSManager* mParentManager;
-};
-
-#endif
diff --git a/kdwsdl2cpp/common/parsercontext.cpp b/kdwsdl2cpp/common/parsercontext.cpp
deleted file mode 100644
index 822a6ac..0000000
--- a/kdwsdl2cpp/common/parsercontext.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "parsercontext.h"
-#include "nsmanager.h"
-#include <QDebug>
-
-ParserContext::ParserContext()
- : mNamespaceManager( nullptr ),
- mMessageHandler( nullptr )
-{
-}
-
-ParserContext::~ParserContext()
-{
-}
-
-void ParserContext::setNamespaceManager( NSManager *manager )
-{
- mNamespaceManager = manager;
- //qDebug() << "ParserContext now points to" << manager << "tns=" << manager->uri("tns");
-}
-
-NSManager* ParserContext::namespaceManager() const
-{
- return mNamespaceManager;
-}
-
-void ParserContext::setMessageHandler( MessageHandler *handler )
-{
- mMessageHandler = handler;
-}
-
-MessageHandler* ParserContext::messageHandler() const
-{
- return mMessageHandler;
-}
-
-void ParserContext::setDocumentBaseUrl( const QUrl &url )
-{
- mDocumentBaseUrl = url;
-}
-
-void ParserContext::setDocumentBaseUrlFromFileUrl( const QUrl &url )
-{
- QString path = url.path();
- path.truncate( path.lastIndexOf('/') );
- QUrl newBaseUrl = url;
- newBaseUrl.setPath(path);
- //qDebug() << "New document base URL" << newBaseUrl;
- setDocumentBaseUrl( newBaseUrl );
-}
-
-QUrl ParserContext::documentBaseUrl() const
-{
- return mDocumentBaseUrl;
-}
diff --git a/kdwsdl2cpp/common/parsercontext.h b/kdwsdl2cpp/common/parsercontext.h
deleted file mode 100644
index 3afae1e..0000000
--- a/kdwsdl2cpp/common/parsercontext.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef PARSERCONTEXT_H
-#define PARSERCONTEXT_H
-
-#include <QUrl>
-#include <kode_export.h>
-
-class NSManager;
-class MessageHandler;
-
-/**
- A container class which is passed to XML parsing
- methods to provide additional contextual information.
- */
-class KXMLCOMMON_EXPORT ParserContext
-{
- public:
- /**
- Constructs a ParserContext.
- */
- ParserContext();
-
- /**
- Destroys the ParserContext.
- */
- virtual ~ParserContext();
-
- /**
- Sets the namespace handler for this context.
- */
- void setNamespaceManager( NSManager *manager );
-
- /**
- Returns the namespace handler of this context.
- */
- NSManager* namespaceManager() const;
-
- /**
- Sets the message handler for this context.
- */
- void setMessageHandler( MessageHandler *handler );
-
- /**
- Returns the message handler of this context.
- */
- MessageHandler* messageHandler() const;
-
- /**
- Sets the base URL where the document is located.
- */
- void setDocumentBaseUrl( const QUrl &url );
-
- /**
- Sets the base URL based on an actual document URL
- (i.e. set it to the parent directory)
- */
- void setDocumentBaseUrlFromFileUrl( const QUrl &url );
-
- /**
- Returns the document base url.
- */
- QUrl documentBaseUrl() const;
-
- private:
- NSManager *mNamespaceManager;
- MessageHandler *mMessageHandler;
- QUrl mDocumentBaseUrl;
-};
-
-#endif
-
diff --git a/kdwsdl2cpp/common/qname.cpp b/kdwsdl2cpp/common/qname.cpp
deleted file mode 100644
index 091cfa7..0000000
--- a/kdwsdl2cpp/common/qname.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "qname.h"
-#include <QDebug>
-
-QName::QName()
-{
-}
-
-QName::QName( const QString &name )
-{
- parse( name );
-}
-
-QName::QName( const QString &nameSpace, const QString &localName )
- : mNameSpace( nameSpace ), mLocalName( localName )
-{
- Q_ASSERT(!localName.contains(QLatin1Char(':')));
-}
-
-void QName::operator=( const QString &name )
-{
- parse( name );
-}
-
-QString QName::localName() const
-{
- return mLocalName;
-}
-
-QString QName::prefix() const
-{
- return mPrefix;
-}
-
-QString QName::qname() const
-{
- if ( mPrefix.isEmpty() )
- return mLocalName;
- else
- return mPrefix + QLatin1Char(':') + mLocalName;
-}
-
-void QName::setNameSpace( const QString &nameSpace )
-{
- mNameSpace = nameSpace;
-}
-
-QString QName::nameSpace() const
-{
- return mNameSpace;
-}
-
-bool QName::operator==( const QName &qname ) const
-{
- return (qname.nameSpace() == mNameSpace && qname.localName() == mLocalName);
-}
-
-bool QName::operator!=( const QName &qname ) const
-{
- return !operator==( qname );
-}
-
-bool QName::isEmpty() const
-{
- return (mNameSpace.isEmpty() && mLocalName.isEmpty());
-}
-
-void QName::parse( const QString &str )
-{
- int pos = str.indexOf( QLatin1Char(':') );
- if ( pos != -1 ) {
- mPrefix = str.left( pos );
- mLocalName = str.mid( pos + 1 );
- } else {
- mLocalName = str;
- }
- Q_ASSERT(!mLocalName.contains(QLatin1Char(':')));
-}
-
-QDebug operator <<(QDebug dbg, const QName &qn)
-{
- if (qn.prefix().isEmpty())
- dbg << "(" << qn.nameSpace() << "," << qn.localName() << ")";
- else
- dbg << qn.qname();
- return dbg;
-}
diff --git a/kdwsdl2cpp/common/qname.h b/kdwsdl2cpp/common/qname.h
deleted file mode 100644
index afb4463..0000000
--- a/kdwsdl2cpp/common/qname.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef QNAME_H
-#define QNAME_H
-
-#include <QString>
-#include <QList>
-#include <QHash>
-
-#include <kode_export.h>
-
-class KXMLCOMMON_EXPORT QName
-{
- public:
- typedef QList<QName> List;
-
- QName();
-
- // Create a QName with prefix+localname
- explicit QName( const QString &name );
-
- // Create a QName with namespace+localname
- QName( const QString &nameSpace, const QString &localName );
-
- void operator=( const QString &name );
-
- QString localName() const;
- QString prefix() const;
- QString qname() const;
-
- void setNameSpace( const QString &nameSpace );
- QString nameSpace() const;
-
- bool operator==( const QName& ) const;
- bool operator!=( const QName& ) const;
-
- bool isEmpty() const;
-
- private:
- void parse( const QString& );
-
- QString mNameSpace;
- QString mLocalName;
- QString mPrefix;
-};
-
-inline uint qHash(const QName& qn) { return qHash(qn.nameSpace())^qHash(qn.localName()); }
-
-QDebug operator<<(QDebug dbg, const QName &qn);
-
-#endif
diff --git a/kdwsdl2cpp/kdwsdl2cpp.pro b/kdwsdl2cpp/kdwsdl2cpp.pro
deleted file mode 100644
index c11d373..0000000
--- a/kdwsdl2cpp/kdwsdl2cpp.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS=libkode common schema wsdl src
-wsdl.depends = common schema
-src.depends = wsdl libkode
-
-# common should be "libxmlcommon" ideally, but the code uses #include "common/file.h" everywhere.
-# same for libwsdl
diff --git a/kdwsdl2cpp/kode_export.h b/kdwsdl2cpp/kode_export.h
index 7eb4565..5242857 100644
--- a/kdwsdl2cpp/kode_export.h
+++ b/kdwsdl2cpp/kode_export.h
@@ -1,3 +1,13 @@
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
/* We use static libs, no need for export macros */
#define KODE_EXPORT
#define KXMLCOMMON_EXPORT
diff --git a/kdwsdl2cpp/libkode/README b/kdwsdl2cpp/libkode/README
deleted file mode 100644
index 2da3b1b..0000000
--- a/kdwsdl2cpp/libkode/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a copy of libkode from https://github.com/cornelius/kode.git, last updated 18 August 2010
-Changes:
-* Removed automakefile.*
-* Ported to qmake
-* Many contributions to the code, applied upstream as well.
diff --git a/kdwsdl2cpp/libkode/class.cpp b/kdwsdl2cpp/libkode/class.cpp
deleted file mode 100644
index ef00ffa..0000000
--- a/kdwsdl2cpp/libkode/class.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
- Copyright (c) 2010 David Faure <dfaure@kdab.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "class.h"
-
-#include <QDebug>
-
-using namespace KODE;
-
-class Class::Private
-{
- public:
- Private()
- : mDPointer(),
- mUseSharedData( false ),
- mCanBeCopied( false )
- {
- }
-
- QString mName;
- QString mNameSpace;
- QString mExportDeclaration;
- QString mDPointer;
- bool mUseSharedData;
- bool mCanBeCopied;
- Function::List mFunctions;
- MemberVariable::List mMemberVariables;
- QStringList mIncludes;
- QStringList mForwardDeclarations;
- QStringList mHeaderIncludes;
- Class::List mBaseClasses;
- Typedef::List mTypedefs;
- Enum::List mEnums;
- QString mDocs;
- Class::List mNestedClasses;
- QString mParentClassName;
- QStringList mDeclMacros;
-};
-
-Class::Class()
- : d( new Private )
-{
-}
-
-Class::Class( const Class &other )
- : d( new Private )
-{
- *d = *other.d;
-}
-
-Class::Class( const QString &name, const QString &nameSpace )
- : d( new Private )
-{
- Q_ASSERT(!name.isEmpty());
- d->mName = name;
- d->mNameSpace = nameSpace;
-}
-
-Class::~Class()
-{
- delete d;
-}
-
-Class& Class::operator=( const Class &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
-
- return *this;
-}
-
-void Class::setName( const QString &name )
-{
- Q_ASSERT(!name.isEmpty());
- d->mName = name;
-}
-
-QString Class::name() const
-{
- return d->mName;
-}
-
-void Class::setNameSpace( const QString &nameSpace )
-{
- d->mNameSpace = nameSpace;
-}
-
-QString Class::nameSpace() const
-{
- return d->mNameSpace;
-}
-
-QString Class::qualifiedName() const
-{
- if (d->mNameSpace.isEmpty())
- return d->mName;
- return d->mNameSpace + QLatin1String("::") + d->mName;
-}
-
-void Class::setExportDeclaration( const QString &name )
-{
- addHeaderInclude( name.toLower() + "_export.h" );
- if ( name.contains( "/" ) ) {
- d->mExportDeclaration = name.split( "/" ).value( 1 );
- } else {
- d->mExportDeclaration = name;
- }
-}
-
-QString Class::exportDeclaration() const
-{
- return d->mExportDeclaration;
-}
-
-void Class::setUseDPointer( bool useDPointer, const QString& dPointer )
-{
- d->mDPointer = useDPointer ? dPointer : QString();
-}
-
-bool Class::useDPointer() const
-{
- return !d->mDPointer.isEmpty();
-}
-
-void Class::setUseSharedData( bool b, const QString& dPointer )
-{
- d->mUseSharedData = b;
- if ( b ) {
- setUseDPointer( true, dPointer );
- d->mCanBeCopied = true;
- }
-}
-
-bool Class::useSharedData() const
-{
- return d->mUseSharedData;
-}
-
-void Class::setCanBeCopied( bool b )
-{
- d->mCanBeCopied = b;
-}
-
-bool Class::canBeCopied() const
-{
- return d->mCanBeCopied;
-}
-
-void Class::addInclude( const QString &include,
- const QString &forwardDeclaration )
-{
- if ( !include.isEmpty() && !d->mIncludes.contains( include ) )
- d->mIncludes.append( include );
-
- if ( !forwardDeclaration.isEmpty() &&
- !d->mForwardDeclarations.contains( forwardDeclaration ) )
- d->mForwardDeclarations.append( forwardDeclaration );
-}
-
-void Class::addIncludes( const QStringList &files,
- const QStringList &forwardDeclarations )
-{
- for ( int i = 0; i < files.count(); ++i ) {
- if ( !d->mIncludes.contains( files[ i ] ) )
- if ( !files[ i ].isEmpty() )
- d->mIncludes.append( files[ i ] );
- }
-
- for ( int i = 0; i < forwardDeclarations.count(); ++i ) {
- if ( !d->mForwardDeclarations.contains( forwardDeclarations[ i ] ) )
- d->mForwardDeclarations.append( forwardDeclarations[ i ] );
- }
-}
-
-QStringList Class::includes() const
-{
- return d->mIncludes;
-}
-
-QStringList Class::forwardDeclarations() const
-{
- return d->mForwardDeclarations;
-}
-
-void Class::addHeaderInclude( const QString &include )
-{
- if ( include.isEmpty() )
- return;
-
- if ( !d->mHeaderIncludes.contains( include ) )
- d->mHeaderIncludes.append( include );
-}
-
-void Class::addHeaderIncludes( const QStringList &includes )
-{
- QStringList::ConstIterator it;
- for ( it = includes.constBegin(); it != includes.constEnd(); ++it )
- addHeaderInclude( *it );
-}
-
-QStringList Class::headerIncludes() const
-{
- return d->mHeaderIncludes;
-}
-
-void Class::addBaseClass( const Class &c )
-{
- d->mBaseClasses.append( c );
-}
-
-Class::List Class::baseClasses() const
-{
- return d->mBaseClasses;
-}
-
-void Class::addFunction( const Function &function )
-{
- d->mFunctions.append( function );
-}
-
-Function::List Class::functions() const
-{
- return d->mFunctions;
-}
-
-void Class::addMemberVariable( const MemberVariable &v )
-{
- d->mMemberVariables.append( v );
-}
-
-MemberVariable::List Class::memberVariables() const
-{
- return d->mMemberVariables;
-}
-
-void Class::addTypedef( const Typedef &typeDefinition )
-{
- d->mTypedefs.append( typeDefinition );
-}
-
-Typedef::List Class::typedefs() const
-{
- return d->mTypedefs;
-}
-
-void Class::addEnum( const Enum &enumValue )
-{
- d->mEnums.append( enumValue );
-}
-
-Enum::List Class::enums() const
-{
- return d->mEnums;
-}
-
-bool Class::hasEnum( const QString &name ) const
-{
- foreach( Enum e, d->mEnums ) {
- if ( e.name() == name ) return true;
- }
- return false;
-}
-
-bool Class::isValid() const
-{
- return !d->mName.isEmpty();
-}
-
-bool Class::hasFunction( const QString &functionName ) const
-{
- Function::List::ConstIterator it;
- for ( it = d->mFunctions.constBegin(); it != d->mFunctions.constEnd(); ++it ) {
- if ( (*it).name() == functionName )
- return true;
- }
-
- return false;
-}
-
-bool Class::isQObject() const
-{
- Function::List::ConstIterator it;
- for ( it = d->mFunctions.constBegin(); it != d->mFunctions.constEnd(); ++it ) {
- if ( (*it).access() & Function::Signal || (*it).access() & Function::Slot )
- return true;
- }
-
- return false;
-}
-
-void Class::setDocs( const QString &str )
-{
- d->mDocs = str;
-}
-
-QString Class::docs() const
-{
- return d->mDocs;
-}
-
-void Class::addNestedClass( const Class &nestedClass )
-{
- Class addedClass = nestedClass;
- addedClass.setParentClassName( name() );
-
- d->mNestedClasses.append( addedClass );
-}
-
-Class::List Class::nestedClasses() const
-{
- return d->mNestedClasses;
-}
-
-QString Class::parentClassName() const
-{
- return d->mParentClassName;
-}
-
-void Class::setParentClassName( const QString &parentClassName )
-{
- d->mParentClassName = parentClassName;
-}
-
-QString Class::dPointerName() const
-{
- return d->mDPointer;
-}
-
-////
-
-// Returns what a class depends on: its base class(es) and any by-value member var
-static QStringList dependenciesForClass( const Class& aClass, const QStringList& allClasses, const QStringList& excludedClasses )
-{
- QStringList lst;
- Q_FOREACH( const Class& baseClass, aClass.baseClasses() ) {
- const QString baseName = baseClass.qualifiedName();
- if ( !baseName.startsWith('Q') && !excludedClasses.contains( baseName ) )
- lst.append( baseClass.name() );
- }
- if (!aClass.useDPointer())
- {
- Q_FOREACH( const MemberVariable& member, aClass.memberVariables() ) {
- const QString type = member.type();
- if ( allClasses.contains( type ) ) {
- lst.append(type);
- }
- }
- }
-
- return lst;
-}
-
-static bool allKnown( const QStringList& deps, const QStringList& classNames )
-{
- Q_FOREACH(const QString& dep, deps) {
- if (!classNames.contains(dep)) {
- return false;
- }
- }
- return true;
-}
-
-static bool classLessThan(const Class& c1, const Class& c2)
-{
- return c1.qualifiedName() < c2.qualifiedName();
-}
-
-/**
- * This method sorts a list of classes in a way that the base class
- * of a class, as well as the classes it use by value in member vars,
- * always appear before the class itself.
- */
-static Class::List sortByDependenciesHelper( const Class::List &classes, const QStringList& excludedClasses )
-{
- Class::List allClasses( classes );
- std::sort(allClasses.begin(), allClasses.end(), classLessThan); // make result deterministic
-
- QStringList allClassNames;
- Q_FOREACH( const Class& c, allClasses )
- allClassNames.append( c.qualifiedName() );
-
- Class::List retval;
-
- QStringList classNames;
-
- // copy all classes without dependencies
- Class::List::Iterator it = allClasses.begin();
- while ( it != allClasses.end() ) {
- if ( dependenciesForClass( *it, allClassNames, excludedClasses ).isEmpty() ) {
- retval.append( *it );
- classNames.append( (*it).qualifiedName() );
-
- it = allClasses.erase( it );
- } else {
- ++it;
- }
- }
-
- while ( !allClasses.isEmpty() ) {
- const int currentCount = allClasses.count();
- // copy all classes which have a class from retval/classNames (i.e. already written out)
- // as base class - or as member variable
- for ( it = allClasses.begin(); it != allClasses.end(); ) {
-
- const QStringList deps = dependenciesForClass( *it, allClassNames, excludedClasses );
- if ( allKnown( deps, classNames ) ) {
- retval.append( *it );
- classNames.append( (*it).qualifiedName() );
-
- it = allClasses.erase( it );
- } else {
- ++it;
- }
- }
- if (allClasses.count() == currentCount) {
- // We didn't resolve anything this time around, so let's not loop forever
- qDebug() << "ERROR: Couldn't find class dependencies (base classes, member vars) for classes" << allClasses.classNames();
- Q_FOREACH(const Class& c, allClasses) {
- qDebug() << c.qualifiedName() << "depends on" << dependenciesForClass( c, allClassNames, excludedClasses );
- }
-
- return retval;
- }
- }
-
- return retval;
-}
-
-void ClassList::sortByDependencies( const QStringList& excludedClasses )
-{
- *this = sortByDependenciesHelper( *this, excludedClasses );
-}
-
-void ClassList::sortAlphabetically()
-{
- std::sort(begin(), end(), classLessThan);
-}
-
-ClassList::const_iterator ClassList::findClass(const QString &qualifiedName) const
-{
- ClassList::const_iterator it = begin();
- for (; it != end(); ++it)
- if ((*it).qualifiedName() == qualifiedName)
- break;
- return it;
-}
-
-QStringList KODE::ClassList::classNames() const
-{
- QStringList names;
- ClassList::const_iterator it = begin();
- for (; it != end(); ++it)
- names.append((*it).name());
- return names;
-}
-
-
-void KODE::ClassList::addClass(const Class& cl)
-{
- const QString qn = cl.qualifiedName();
- ClassList::iterator it = begin();
- for (; it != end(); ++it) {
- if ((*it).qualifiedName() == qn) {
- qWarning() << "ERROR: Already having a class called" << qn;
- }
- }
-
- *this += cl;
-}
-
-void KODE::Class::addDeclarationMacro(const QString ¯o)
-{
- d->mDeclMacros.append(macro);
-}
-
-QStringList KODE::Class::declarationMacros() const
-{
- return d->mDeclMacros;
-}
-
-void KODE::Class::setNamespaceAndName( const QString& name )
-{
- d->mName = name;
- d->mNameSpace.clear();
- while (d->mName.contains("::")) {
- const int pos = d->mName.indexOf("::");
- if (!d->mNameSpace.isEmpty())
- d->mNameSpace += QLatin1String("::");
- d->mNameSpace += d->mName.left(pos);
- d->mName = d->mName.mid(pos+2);
- }
-}
diff --git a/kdwsdl2cpp/libkode/class.h b/kdwsdl2cpp/libkode/class.h
deleted file mode 100644
index 03843eb..0000000
--- a/kdwsdl2cpp/libkode/class.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_CLASS_H
-#define KODE_CLASS_H
-
-#include <QtCore/QList>
-#include <QtCore/QStringList>
-
-#include "enum.h"
-#include "function.h"
-#include "membervariable.h"
-#include "typedef.h"
-
-#include <kode_export.h>
-
-namespace KODE {
-
-class ClassList;
-/**
- * This class abstracts a class object with functions,
- * member variables etc.
- */
-class KODE_EXPORT Class
-{
- public:
- typedef ClassList List;
-
- /**
- * Creates a new class object.
- */
- Class();
-
- /**
- * Creates a new class object from @param other.
- */
- Class( const Class &other );
-
- /**
- * Creates a new class object with a given @param name.
- *
- * @param nameSpace The namespace the class object should be part of.
- */
- Class( const QString &name, const QString &nameSpace = QString() );
-
- /**
- * Destroys the class object.
- */
- ~Class();
-
- /**
- * Assignment operator.
- */
- Class& operator=( const Class &other );
-
- /**
- * Returns whether this class object is valid.
- */
- bool isValid() const;
-
- /**
- * Sets the name of the class object, possibly splitting out the namespace part of it.
- * E.g. Foo::Bar will set namespace = Bar, class name = Foo.
- *
- * This will treat anything except the last substring, as a namespace.
- * So this is not suited for nested classes. Use Class(A::B, NS) for nested classes.
- */
- void setNamespaceAndName( const QString& name );
-
- /**
- * Sets the @param name of the class object.
- */
- void setName( const QString &name );
-
- /**
- * Returns the name of the class object.
- */
- QString name() const;
-
- /**
- * Sets the namespace the class object should be part of.
- */
- void setNameSpace( const QString &nameSpace );
-
- /**
- * Returns the namespace the class object is part of.
- */
- QString nameSpace() const;
-
- /**
- * Returns the fully qualified class name including namespaces, e.g. NS1::NS2::ClassName
- */
- QString qualifiedName() const;
-
- /**
- Set export declaration with given name. This adds an include of a file
- name_export.h and a prefix to class declaration of NAME_EXPORT.
- */
- void setExportDeclaration( const QString &name );
-
- /**
- Return name of export declaration.
- */
- QString exportDeclaration() const;
-
- /**
- * Sets whether the class object shall use a d-pointer to store
- * its member variables.
- */
- void setUseDPointer( bool useDPointer, const QString& dPointer = "d" );
-
- /**
- * Returns whether the class object uses a d-pointer.
- */
- bool useDPointer() const;
-
- /**
- * Returns the name of the d pointer.
- * Usually d, but can be set to something else to avoid clashes with a d() method for instance.
- */
- QString dPointerName() const;
-
- /**
- * Sets whether the class object shall use a QSharedDataPointer d-pointer
- * and a private class that derives from QSharedData.
- * This is for implicitly-shared value classes (classes that can be copied).
- *
- * Setting this to true automatically sets canBeCopied to true and useDPointer to true.
- */
- void setUseSharedData( bool b, const QString& dPointer = "d" );
-
- /**
- * Returns whether the class object uses a QSharedDataPointer d-pointer.
- */
- bool useSharedData() const;
-
- /**
- * Sets whether the class can be copied (generates a copy constructor
- * and an operator= implementations, in case a d pointer is used).
- */
- void setCanBeCopied( bool b );
-
- /**
- * Returns whether the class instances can be copied.
- */
- bool canBeCopied() const;
-
- /**
- * Adds an include to the class object.
- *
- * @param file The include file like 'qfile.h' which will be
- * printed as '#include <qfile.h>' in the header file.
- * @param forwardDeclaration The forward declaration like 'QFile'
- */
- void addInclude( const QString &file,
- const QString &forwardDeclaration = QString() );
-
- /**
- * Adds several includes to the class object.
- *
- * @param files A list of include files like 'qfile.h'
- * @param forwardDeclaration A list of forward declarations like 'QFile'
- */
- void addIncludes( const QStringList &files,
- const QStringList &forwardDeclarations = QStringList() );
-
- /**
- * Returns the list of includes.
- */
- QStringList includes() const;
-
- /**
- * Returns the list of forward declarations.
- */
- QStringList forwardDeclarations() const;
-
- /**
- * Adds a header include to the class object.
- *
- * @param file The header include file like 'qfile.h' which
- * will be printed as '#include "qfile.h"' in the
- * implementation.
- */
- void addHeaderInclude( const QString &file );
-
- /**
- * Adds a list of header includes to the class object.
- */
- void addHeaderIncludes( const QStringList &files );
-
- /**
- * Returns the list of header includes.
- */
- QStringList headerIncludes() const;
-
- /**
- * Adds a @param function to the class object.
- */
- void addFunction( const Function &function );
-
- /**
- * Returns the list of all functions.
- */
- Function::List functions() const;
-
- /**
- * Adds a member @param variable to the class object.
- */
- void addMemberVariable( const MemberVariable &variable );
-
- /**
- * Returns the list of all member variables.
- */
- MemberVariable::List memberVariables() const;
-
- /**
- * Adds a base class definition to the class object.
- *
- * @param baseClass A class object which describes the base class.
- */
- void addBaseClass( const Class &baseClass );
-
- /**
- * Returns the list of all base classes.
- */
- Class::List baseClasses() const;
-
- /**
- * Adds a typedef to the class object.
- */
- void addTypedef( const Typedef &typedefValue );
-
- /**
- * Returns the list of all typedefs.
- */
- Typedef::List typedefs() const;
-
- /**
- * Adds an enum to the class object.
- */
- void addEnum( const Enum &enumValue );
-
- /**
- * Returns the list of all enums.
- */
- Enum::List enums() const;
-
- /**
- * Returns true, if the enum with the given name already exists. Returns
- * false, if not.
- */
- bool hasEnum( const QString &name ) const;
-
- /**
- * Sets the @param documentation of the class object.
- */
- void setDocs( const QString &documentation );
-
- /**
- * Returns the documentation of the class object.
- */
- QString docs() const;
-
- /**
- * Returns whether the class object has a function with
- * the given @param name.
- */
- bool hasFunction( const QString &name ) const;
-
- /**
- * Returns whether the class object is a QObject.
- *
- * That's the case when one of its functions has the Signal
- * or Slot flag set.
- */
- bool isQObject() const;
-
- /**
- * Adds a nested class to this class.
- */
- void addNestedClass( const Class &nestedClass );
-
- /**
- * Return the list of all nested classes.
- */
- Class::List nestedClasses() const;
-
- /**
- * Return the name of the parent class name in a nested class.
- */
- QString parentClassName() const;
- /**
- * Set the name of the parent class in a nested class.
- */
- void setParentClassName( const QString &name );
-
- /**
- * Adds a declaration macro at the top of the class, like Q_PROPERTY(...)
- * or Q_INTERFACES(...).
- */
- void addDeclarationMacro( const QString& macro );
-
- /**
- * Returns the list of declaration macros added by addDeclarationMacro()
- */
- QStringList declarationMacros() const;
-
- private:
- class Private;
- Private* d;
-};
-
-class ClassList: public QList<Class>
-{
-public:
- /**
- * Sort the classes so that the result compiles, i.e. so that a class using another
- * (via member vars or via inheritance) is after it in the list.
- *
- * @param excludedClasses list of base classes which can be excluded from the search
- * for dependencies, usually because them come from underlying libraries.
- * All classes starting with Q are automatically excluded
- */
- void sortByDependencies( const QStringList& excludedClasses = QStringList() );
- // maybe we could have a bool ignoreUnknownClasses, too, for people who write bugfree code...
-
- void sortAlphabetically();
-
- void addClass(const Class& cl);
-
- QStringList classNames() const;
-
- const_iterator findClass(const QString& qualifiedName) const;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/code.cpp b/kdwsdl2cpp/libkode/code.cpp
deleted file mode 100644
index 896a01e..0000000
--- a/kdwsdl2cpp/libkode/code.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <QtCore/QStringList>
-
-#include "code.h"
-
-using namespace KODE;
-
-static int s_defaultIndentation = 2;
-
-class Code::Private
-{
- public:
- Private()
- : mIndent( 0 )
- {
- }
-
- QString mText;
- int mIndent;
-};
-
-Code::Code()
- : d( new Private )
-{
-}
-
-Code::Code( const Code &other )
- : d( new Private )
-{
- *d = *other.d;
-}
-
-Code::Code( int indent )
- : d( new Private )
-{
- d->mIndent = indent;
-}
-
-Code::~Code()
-{
- delete d;
-}
-
-Code& Code::operator=( const Code &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
-
- return *this;
-}
-
-void Code::clear()
-{
- d->mIndent = 0;
- d->mText.clear();
-}
-
-bool Code::isEmpty() const
-{
- return d->mText.isEmpty();
-}
-
-void Code::setIndent( int indent )
-{
- d->mIndent = indent;
-}
-
-void Code::indent()
-{
- d->mIndent += s_defaultIndentation;
-}
-
-void Code::unindent()
-{
- d->mIndent -= s_defaultIndentation;
- if ( d->mIndent < 0 )
- d->mIndent = 0;
-}
-
-QString Code::text() const
-{
- return d->mText;
-}
-
-void Code::addLine( const QString &line )
-{
- d->mText += spaces( d->mIndent );
- d->mText += line;
- d->mText += QLatin1Char('\n');
-}
-
-void Code::addLine( const char c )
-{
- d->mText += spaces( d->mIndent );
- d->mText += QLatin1Char(c);
- d->mText += QLatin1Char('\n');
-}
-
-void Code::newLine()
-{
- d->mText += QLatin1Char('\n');
-}
-
-QString Code::spaces( int count )
-{
- QString str;
- for ( int i = 0; i < count; ++i )
- str += QLatin1Char(' ');
-
- return str;
-}
-
-void Code::addBlock( const QString &block )
-{
- QStringList lines = block.split( QLatin1String("\n") );
- if ( !lines.isEmpty() && lines.last().isEmpty() ) {
- lines.pop_back();
- }
- QStringList::ConstIterator it;
- for ( it = lines.constBegin(); it != lines.constEnd(); ++it ) {
- if ( !(*it).isEmpty() )
- d->mText += spaces( d->mIndent );
-
- d->mText += *it;
- d->mText += QLatin1Char('\n');
- }
-}
-
-void Code::addBlock( const QString &block, int indent )
-{
- int tmp = d->mIndent;
- d->mIndent = indent;
- addBlock( block );
- d->mIndent = tmp;
-}
-
-void Code::addBlock( const Code &c )
-{
- addBlock( c.text() );
-}
-
-void Code::addWrappedText( const QString &txt )
-{
- int maxWidth = 80 - d->mIndent;
- int pos = 0;
- while ( pos < txt.length() ) {
- QString line = txt.mid( pos, maxWidth );
- addLine( line );
- pos += maxWidth;
- }
-}
-
-void Code::addFormattedText( const QString &text )
-{
- int maxWidth = 80 - d->mIndent;
- int lineLength = 0;
-
- QString line;
- const QStringList words = text.split( QLatin1Char(' '), QString::SkipEmptyParts );
-
- QStringList::ConstIterator it;
- for ( it = words.constBegin(); it != words.constEnd(); ++it ) {
- if ( (*it).length() + lineLength >= maxWidth ) {
- line = line.trimmed();
- addLine( line );
- line.truncate( 0 );
- lineLength = 0;
- }
-
- int pos = (*it).indexOf( QLatin1String("\n") );
- if ( pos != -1 ) {
- line += (*it).left( pos );
- line = line.trimmed();
- addLine( line );
-
- line = (*it).mid( pos + 1 ) + QLatin1Char(' ');
- lineLength = (*it).length() - pos;
- } else {
- line += *it + QLatin1Char(' ');
- lineLength += (*it).length() + 1;
- }
- }
-
- line = line.trimmed();
- addLine( line );
-}
-
-Code &Code::operator+=( const QString &str )
-{
- addLine( str );
- return *this;
-}
-
-Code &Code::operator+=( const QByteArray& str )
-{
- addLine( QString::fromLocal8Bit( str.data(), str.size() ) );
- return *this;
-}
-
-Code &Code::operator+=( const char *str )
-{
- addLine( QString::fromLocal8Bit( str ) );
- return *this;
-}
-
-Code &Code::operator+=( const char c )
-{
- addLine( c );
- return *this;
-}
-
-Code &Code::operator+=( const Code &code )
-{
- d->mText += code.d->mText;
- return *this;
-}
-
-void Code::setDefaultIndentation(int indent)
-{
- s_defaultIndentation = indent;
-}
-
-int Code::defaultIndentation()
-{
- return s_defaultIndentation;
-}
diff --git a/kdwsdl2cpp/libkode/code.h b/kdwsdl2cpp/libkode/code.h
deleted file mode 100644
index e0840af..0000000
--- a/kdwsdl2cpp/libkode/code.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_CODE_H
-#define KODE_CODE_H
-
-#include <kode_export.h>
-#include <QtCore/QString>
-
-namespace KODE {
-
-/**
- * This class encapsulates a code block.
- */
-class KODE_EXPORT Code
-{
- public:
- /**
- * Creates a new code block.
- */
- Code();
-
- /**
- * Creates a new code block from @param other.
- */
- Code( const Code &other );
-
- /**
- * Creates a new code block with the given @param indent.
- */
- Code( int indent );
-
- /**
- * Destroys the code block.
- */
- ~Code();
-
- /**
- * Assignment operator.
- */
- Code& operator=( const Code &other );
-
- /**
- * Clears all lines from the code block.
- */
- void clear();
-
- /**
- * Returns whether the code block is empty.
- */
- bool isEmpty() const;
-
- /**
- * Sets the @param indent of the code block.
- */
- void setIndent( int indent );
-
- /**
- * Indents the code block by one level.
- */
- void indent();
-
- /**
- * Unindents the code block by one level.
- */
- void unindent();
-
- /**
- * Returns the textual presentation of the code block.
- */
- QString text() const;
-
- /**
- * Adds the given @param line to the code block.
- */
- void addLine( const QString &line );
-
- /**
- * Adds the given @param line to the code block.
- */
- void addLine( const char line );
-
- /**
- * Adds the given @param block to the code block.
- * The current indent will be prepended before every line of the block.
- */
- void addBlock( const Code &block );
-
- /**
- * Adds the given @param block to the code block.
- * The current indent will be prepended before every line of the block.
- */
- void addBlock( const QString &block );
-
- /**
- * Adds the given @param block with the given indent
- * to the code block.
- */
- void addBlock( const QString &block, int indent );
-
- /**
- * Adds the given @param text to the code block and wrapps
- * it if it's too long.
- */
- void addWrappedText( const QString &text );
-
- /**
- * Adds the given @param text to the code block and wrapps
- * it at word boundaries if it's too long.
- */
- void addFormattedText( const QString &text );
-
- /**
- * Adds a new line to the code block.
- */
- void newLine();
-
- /**
- * Adds the given @param line to the code block
- * and appends a '\r\n' automatically.
- */
- Code &operator+=( const QString &line );
-
- /**
- * Adds the given @param line to the code block
- * and appends a '\r\n' automatically.
- */
- Code &operator+=( const QByteArray& line );
-
- /**
- * Adds the given @param line to the code block
- * and appends a '\r\n' automatically.
- */
- Code &operator+=( const char *line );
-
- /**
- * Adds the given @param line to the code block
- * and appends a '\r\n' automatically.
- */
- Code &operator+=( const char line );
-
- /**
- * Adds the given @param block to the code block.
- * @param block is supposed to be fully indented already
- * (otherwise, use addBlock)
- */
- Code &operator+=( const Code &block );
-
- /**
- * Returns a string filled up with spaces, depending on
- * the level @param count and the indent value.
- */
- static QString spaces( int count );
-
- /**
- * Sets the default indentation used by indent().
- */
- static void setDefaultIndentation( int indent );
-
- /**
- * Returns the default indentation used by indent().
- */
- static int defaultIndentation();
-
- private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/enum.cpp b/kdwsdl2cpp/libkode/enum.cpp
deleted file mode 100644
index ce63af6..0000000
--- a/kdwsdl2cpp/libkode/enum.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <QtCore/QStringList>
-
-#include "enum.h"
-
-using namespace KODE;
-
-class Enum::Private
-{
- public:
- Private()
- : mCombinable( false )
- {
- }
-
- QString mName;
- QStringList mEnums;
- bool mCombinable;
-};
-
-Enum::Enum()
- : d( new Private )
-{
-}
-
-Enum::Enum( const Enum &other )
- : d( new Private )
-{
- *d = *other.d;
-}
-
-Enum::Enum( const QString &name, const QStringList &enums, bool combinable )
- : d( new Private )
-{
- d->mName = name;
- d->mEnums = enums;
- d->mCombinable = combinable;
-}
-
-Enum::~Enum()
-{
- delete d;
-}
-
-Enum& Enum::operator=( const Enum &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
-
- return *this;
-}
-
-QString Enum::name() const
-{
- return d->mName;
-}
-
-QString Enum::declaration() const
-{
- QString retval( QLatin1String("enum ") + d->mName + QLatin1String(" {") );
- uint value = 0;
- QStringList::ConstIterator it;
- for ( it = d->mEnums.constBegin(); it != d->mEnums.constEnd(); ++it, ++value ) {
- if ( d->mCombinable ) {
- if ( it == d->mEnums.constBegin() )
- retval += QString::fromLatin1( " %1 = %2" ).arg( *it ).arg( 1 << value );
- else
- retval += QString::fromLatin1( ", %1 = %2" ).arg( *it ).arg( 1 << value );
- } else {
- if ( it == d->mEnums.constBegin() )
- retval += QLatin1Char(' ') + *it;
- else
- retval += QLatin1String(", ") + *it;
- }
- }
-
- retval += QLatin1String(" };");
-
- return retval;
-}
diff --git a/kdwsdl2cpp/libkode/enum.h b/kdwsdl2cpp/libkode/enum.h
deleted file mode 100644
index 70b2a21..0000000
--- a/kdwsdl2cpp/libkode/enum.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_ENUM_H
-#define KODE_ENUM_H
-
-#include <QtCore/QStringList>
-
-#include <kode_export.h>
-
-namespace KODE {
-
-class KODE_EXPORT Enum
-{
- public:
- typedef QList<Enum> List;
-
- /**
- * Creates a new enum.
- */
- Enum();
-
- /**
- * Creates a new enum from @param other.
- */
- Enum( const Enum &other );
-
- /**
- * Creates a new enum with the given name and enum values.
- *
- * @param name The name of the enum.
- * @param enums The values of the enum.
- * @param combinable If true the integer associations will be a power of two,
- * so the enum flags will be combinable.
- */
- Enum( const QString &name, const QStringList &enums, bool combinable = false );
-
- /**
- * Destroys the enum.
- */
- ~Enum();
-
- /**
- * Assignment operator.
- */
- Enum& operator=( const Enum &other );
-
- /**
- * Return name of enum.
- */
- QString name() const;
-
- /**
- * Returns the textual presentation of the enum.
- */
- QString declaration() const;
-
- private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/file.cpp b/kdwsdl2cpp/libkode/file.cpp
deleted file mode 100644
index dbf0935..0000000
--- a/kdwsdl2cpp/libkode/file.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <QtCore/QStringList>
-
-#include "file.h"
-#include <QDebug>
-
-using namespace KODE;
-
-class File::Private
-{
- public:
- Private()
- : mProject()
- {
- }
-
- QString mHeaderFilename;
- QString mImplFilename;
- QString mNameSpace;
- QString mProject;
- QStringList mCopyrightStrings;
- License mLicense;
- QStringList mIncludes;
- Class::List mClasses;
- Variable::List mFileVariables;
- Function::List mFileFunctions;
- Enum::List mFileEnums;
- QStringList mExternCDeclarations;
- Code mFileCode;
-};
-
-File::File()
- : d( new Private )
-{
-}
-
-File::File( const File &other )
- : d( new Private )
-{
- *d = *other.d;
-}
-
-File::~File()
-{
- delete d;
-}
-
-File& File::operator=( const File &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
-
- return *this;
-}
-
-void File::setFilename( const QString& filename )
-{
- d->mImplFilename = filename + ".cpp";
- d->mHeaderFilename = filename + ".h";
-}
-
-void File::setImplementationFilename( const QString &filename )
-{
- d->mImplFilename = filename;
-}
-
-void File::setHeaderFilename( const QString &filename )
-{
- d->mHeaderFilename = filename;
-}
-
-QString File::filenameHeader() const
-{
- if ( !d->mHeaderFilename.isEmpty() )
- return d->mHeaderFilename;
-
- if ( !d->mClasses.isEmpty() ) {
- QString className = d->mClasses[ 0 ].name();
- return className.toLower() + ".h";
- }
-
- return QString();
-}
-
-QString File::filenameImplementation() const
-{
- if ( !d->mImplFilename.isEmpty() )
- return d->mImplFilename;
-
- if ( !d->mClasses.isEmpty() ) {
- QString className = d->mClasses[ 0 ].name();
- return className.toLower() + ".cpp";
- }
-
- return QString();
-}
-
-void File::setNameSpace( const QString &nameSpace )
-{
- d->mNameSpace = nameSpace;
-}
-
-QString File::nameSpace() const
-{
- return d->mNameSpace;
-}
-
-void File::setProject( const QString &project )
-{
- if ( project.isEmpty() )
- return;
-
- d->mProject = project;
-}
-
-QString File::project() const
-{
- return d->mProject;
-}
-
-void File::addCopyright( int year, const QString &name, const QString &email )
-{
- QString str = "Copyright (c) " + QString::number( year ) + ' ' + name + " <"
- + email + '>';
-
- d->mCopyrightStrings.append( str );
-}
-
-QStringList File::copyrightStrings() const
-{
- return d->mCopyrightStrings;
-}
-
-void File::setLicense( const License &license )
-{
- d->mLicense = license;
-}
-
-License File::license() const
-{
- return d->mLicense;
-}
-
-void File::addInclude( const QString &_include )
-{
- QString include = _include;
- if ( !include.endsWith( ".h" ) )
- include.append( ".h" );
-
- if ( !d->mIncludes.contains( include ) )
- d->mIncludes.append( include );
-}
-
-QStringList File::includes() const
-{
- return d->mIncludes;
-}
-
-void File::insertClass( const Class &newClass )
-{
- Q_ASSERT(!newClass.name().isEmpty());
- Class::List::Iterator it;
- for ( it = d->mClasses.begin(); it != d->mClasses.end(); ++it ) {
- if ( (*it).qualifiedName() == newClass.qualifiedName() ) {
- // This happens often, probably due to usage of shared types
- //qDebug() << "WARNING: Already having class" << newClass.qualifiedName() << "in file" << filenameHeader() << filenameImplementation();
- it = d->mClasses.erase( it );
- d->mClasses.insert( it, newClass );
- return;
- }
- }
-
- d->mClasses.append( newClass );
-}
-
-Class::List File::classes() const
-{
- return d->mClasses;
-}
-
-bool File::hasClass( const QString &name )
-{
- Class::List::ConstIterator it;
- for ( it = d->mClasses.constBegin(); it != d->mClasses.constEnd(); ++it ) {
- if ( (*it).name() == name )
- break;
- }
-
- return it != d->mClasses.constEnd();
-}
-
-Class File::findClass( const QString &name )
-{
- Class::List::ConstIterator it;
- for ( it = d->mClasses.constBegin(); it != d->mClasses.constEnd(); ++it ) {
- if ( (*it).name() == name )
- return *it;
- }
-
- return Class();
-}
-
-void File::addFileVariable( const Variable &variable )
-{
- d->mFileVariables.append( variable );
-}
-
-Variable::List File::fileVariables() const
-{
- return d->mFileVariables;
-}
-
-void File::addFileFunction( const Function &function )
-{
- d->mFileFunctions.append( function );
-}
-
-Function::List File::fileFunctions() const
-{
- return d->mFileFunctions;
-}
-
-void File::addFileEnum( const Enum &enumValue )
-{
- d->mFileEnums.append( enumValue );
-}
-
-Enum::List File::fileEnums() const
-{
- return d->mFileEnums;
-}
-
-void File::addExternCDeclaration( const QString &externalCDeclaration )
-{
- d->mExternCDeclarations.append( externalCDeclaration );
-}
-
-QStringList File::externCDeclarations() const
-{
- return d->mExternCDeclarations;
-}
-
-void File::addFileCode( const Code &code )
-{
- d->mFileCode = code;
-}
-
-Code File::fileCode() const
-{
- return d->mFileCode;
-}
-
-void File::clearClasses()
-{
- d->mClasses.clear();
-}
-
-void File::clearFileFunctions()
-{
- d->mFileFunctions.clear();
-}
-
-void File::clearFileVariables()
-{
- d->mFileVariables.clear();
-}
-
-void File::clearCode()
-{
- clearClasses();
- clearFileFunctions();
- clearFileVariables();
-}
diff --git a/kdwsdl2cpp/libkode/file.h b/kdwsdl2cpp/libkode/file.h
deleted file mode 100644
index 960b06b..0000000
--- a/kdwsdl2cpp/libkode/file.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_FILE_H
-#define KODE_FILE_H
-
-#include "class.h"
-#include "code.h"
-#include "license.h"
-#include "variable.h"
-
-#include <kode_export.h>
-
-namespace KODE {
-
-/**
- * This class represents a file.
- */
-class KODE_EXPORT File
-{
- public:
- /**
- * Creates a new file.
- */
- File();
-
- /**
- * Creates a new file from @param other.
- */
- File( const File &other );
-
- /**
- * Destroys the file.
- */
- ~File();
-
- /**
- * Assignment operator.
- */
- File& operator=( const File &other );
-
- /**
- * Sets the filenames of both the .h and .cpp file.
- * The extensions will be automatically added.
- */
- void setFilename( const QString& baseName );
-
- /**
- * Sets the @param filename of the cpp file.
- */
- void setImplementationFilename( const QString &filename );
-
- /**
- * Sets the @param filename of the header file.
- */
- void setHeaderFilename( const QString &filename );
-
- /**
- Return filename of header file.
- */
- QString filenameHeader() const;
-
- /**
- Return filename of implementation file.
- */
- QString filenameImplementation() const;
-
- /**
- * Sets the name space of the file.
- */
- void setNameSpace( const QString &nameSpace );
-
- /**
- * Returns the name space of the file.
- */
- QString nameSpace() const;
-
- /**
- * Sets the @param project name of the file.
- */
- void setProject( const QString &project );
-
- /**
- * Returns the project name of the file.
- */
- QString project() const;
-
- /**
- * Add copyright statement to the file.
- *
- * @param year The year of participation.
- * @param name The name of the author.
- * @param email The email address of the author.
- */
- void addCopyright( int year, const QString &name, const QString &email );
-
- /**
- * Returns the list of all copyright statements.
- */
- QStringList copyrightStrings() const;
-
- /**
- * Sets the @param license of the file.
- */
- void setLicense( const License &license );
-
- /**
- * Returns the license of the file.
- */
- License license() const;
-
- /**
- * Adds an include to the file.
- */
- void addInclude( const QString &include );
-
- /**
- * Returns the list of all includes.
- */
- QStringList includes() const;
-
- /**
- * Inserts a class to the file.
- */
- void insertClass( const Class &newClass );
-
- /**
- * Returns a list of all classes.
- */
- Class::List classes() const;
-
- /**
- * Returns whether the file contains a class
- * with the given @param name.
- */
- bool hasClass( const QString &name );
-
- /**
- * Returns the class with the given @param name.
- */
- Class findClass( const QString &name );
-
- /**
- * Removes all classes from the file.
- */
- void clearClasses();
-
- /**
- * Removes all file functions from the file.
- */
- void clearFileFunctions();
-
- /**
- * Removes all file variables from the file.
- */
- void clearFileVariables();
-
- /**
- * Removes all file code from the file.
- */
- void clearCode();
-
- /**
- * Adds a file @param variable to the file.
- */
- void addFileVariable( const Variable &variable );
-
- /**
- * Returns the list of all file variables.
- */
- Variable::List fileVariables() const;
-
- /**
- * Adds a file @param function to the file.
- */
- void addFileFunction( const Function &function );
-
- /**
- * Returns the list of all file functions.
- */
- Function::List fileFunctions() const;
-
- /**
- * Adds a file enum to the file.
- */
- void addFileEnum( const Enum &enumValue );
-
- /**
- * Returns the list of all file enums.
- */
- Enum::List fileEnums() const;
-
- /**
- * Adds an external C declaration to the file.
- */
- void addExternCDeclaration( const QString &externalCDeclaration );
-
- /**
- * Returns the list of all external C declarations.
- */
- QStringList externCDeclarations() const;
-
- /**
- * Adds a file @param code block to the file.
- */
- void addFileCode( const Code &code );
-
- /**
- * Returns the file code block.
- */
- Code fileCode() const;
-
- private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/function.cpp b/kdwsdl2cpp/libkode/function.cpp
deleted file mode 100644
index 03d83c4..0000000
--- a/kdwsdl2cpp/libkode/function.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
- Copyright (c) 2009 David Faure <dfaure@kdab.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <QtCore/QStringList>
-#include <QtCore/QDebug>
-
-#include "function.h"
-
-using namespace KODE;
-
-class Function::Argument::ArgumentPrivate
-{
- public:
- QString declaration;
- QString defaultArgument;
-};
-
-Function::Argument::Argument( const QString &declaration,
- const QString &defaultArgument )
- : d( new ArgumentPrivate )
-{
- d->declaration = declaration;
- d->defaultArgument = defaultArgument;
-}
-
-Function::Argument::Argument( const Function::Argument &other )
- : d( new ArgumentPrivate )
-{
- *d = *other.d;
-}
-
-QString Function::Argument::headerDeclaration() const
-{
- if ( d->defaultArgument.isEmpty() ) {
- return d->declaration;
- } else {
- return d->declaration + QLatin1String(" = ") + d->defaultArgument;
- }
-}
-
-QString Function::Argument::bodyDeclaration() const
-{
- return d->declaration;
-}
-
-Function::Argument& Function::Argument::operator=( const Function::Argument &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
-
- return *this;
-}
-
-Function::Argument::~Argument()
-{
- delete d;
-}
-
-
-class Function::FunctionPrivate
-{
- public:
- FunctionPrivate()
- : mAccess( Public ), mIsConst( false ), mIsStatic( false ), mVirtualMode( NotVirtual )
- {
- }
-
- int mAccess;
- bool mIsConst;
- bool mIsStatic;
- QString mReturnType;
- QString mName;
- Argument::List mArguments;
- QStringList mInitializers;
- QString mBody;
- QString mDocs;
- Function::VirtualMode mVirtualMode;
-};
-
-Function::Function()
- : d( new FunctionPrivate )
-{
-}
-
-Function::Function( const Function &other )
- : d( new FunctionPrivate )
-{
- *d = *other.d;
-}
-
-Function::Function( const QString &name, const QString &returnType,
- int access, bool isStatic )
- : d( new FunctionPrivate )
-{
- d->mAccess = access;
- d->mIsStatic = isStatic;
- d->mName = name;
- setReturnType(returnType);
-}
-
-Function::~Function()
-{
- delete d;
-}
-
-Function& Function::operator=( const Function &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
-
- return *this;
-}
-
-void Function::setConst( bool isConst )
-{
- d->mIsConst = isConst;
-}
-
-bool Function::isConst() const
-{
- return d->mIsConst;
-}
-
-void Function::setStatic( bool isStatic )
-{
- d->mIsStatic = isStatic;
-}
-
-bool Function::isStatic() const
-{
- return d->mIsStatic;
-}
-
-void Function::addArgument( const Function::Argument &argument )
-{
- d->mArguments.append( argument );
-}
-
-void Function::addArgument( const QString &argument )
-{
- d->mArguments.append( Argument( argument ) );
-}
-
-void Function::setArgumentString( const QString &argumentString )
-{
- d->mArguments.clear();
-
- const QStringList arguments = argumentString.split( QLatin1String(",") );
- QStringList::ConstIterator it;
- for ( it = arguments.constBegin(); it != arguments.constEnd(); ++it ) {
- addArgument( *it );
- }
-}
-
-Function::Argument::List Function::arguments() const
-{
- return d->mArguments;
-}
-
-void Function::addInitializer( const QString &initializer )
-{
- d->mInitializers.append( initializer );
-}
-
-QStringList Function::initializers() const
-{
- return d->mInitializers;
-}
-
-void Function::setBody( const QString &body )
-{
- d->mBody = body;
-}
-
-void Function::setBody( const Code &body )
-{
- d->mBody = body.text();
-}
-
-void Function::addBodyLine( const QString &bodyLine )
-{
- d->mBody.append( bodyLine );
- if ( bodyLine.right( 1 ) != QLatin1String("\n") )
- d->mBody.append( QLatin1Char('\n') );
-}
-
-QString Function::body() const
-{
- return d->mBody;
-}
-
-void Function::setAccess( int access )
-{
- d->mAccess = access;
-}
-
-int Function::access() const
-{
- return d->mAccess;
-}
-
-QString Function::accessAsString() const
-{
- QString access;
-
- if ( d->mAccess & Public )
- access = QLatin1String("public");
- if ( d->mAccess & Protected )
- access = QLatin1String("protected");
- if ( d->mAccess & Private )
- access = QLatin1String("private");
-
- if ( d->mAccess & Signal )
- access = QLatin1String("Q_SIGNALS");
- if ( d->mAccess & Slot )
- access += QLatin1String(" Q_SLOTS");
-
- return access;
-}
-
-void Function::setReturnType( const QString &returnType )
-{
- Q_ASSERT(returnType != QLatin1String("*"));
- d->mReturnType = returnType;
-}
-
-QString Function::returnType() const
-{
- return d->mReturnType;
-}
-
-void Function::setName( const QString &name )
-{
- d->mName = name;
-}
-
-QString Function::name() const
-{
- return d->mName;
-}
-
-void Function::setDocs( const QString &docs )
-{
- d->mDocs = docs;
-}
-
-QString Function::docs() const
-{
- return d->mDocs;
-}
-
-bool Function::hasArguments() const
-{
- return !d->mArguments.isEmpty();
-}
-
-void Function::setVirtualMode( Function::VirtualMode v )
-{
- d->mVirtualMode = v;
-}
-
-Function::VirtualMode Function::virtualMode() const
-{
- return d->mVirtualMode;
-}
-
-QDebug operator<<(QDebug dbg, const Function &func)
-{
- dbg << func.name();
- return dbg;
-}
diff --git a/kdwsdl2cpp/libkode/function.h b/kdwsdl2cpp/libkode/function.h
deleted file mode 100644
index a887ec5..0000000
--- a/kdwsdl2cpp/libkode/function.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
- Copyright (c) 2009 David Faure <dfaure@kdab.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_FUNCTION_H
-#define KODE_FUNCTION_H
-
-#include <QtCore/QStringList>
-
-#include "code.h"
-
-#include <kode_export.h>
-
-namespace KODE {
-
-/**
- * This class represents a function.
- */
-class KODE_EXPORT Function
-{
- public:
- class Argument {
- public:
- typedef QList<Argument> List;
-
- Argument( const QString &declaration,
- const QString &defaultArgument = QString() );
- Argument( const Argument &other );
- ~Argument();
-
- Argument& operator=( const Argument &other );
- QString headerDeclaration() const;
- QString bodyDeclaration() const;
-
- private:
- class ArgumentPrivate;
- ArgumentPrivate *d;
- };
-
- typedef QList<Function> List;
-
- /**
- * The different access specifiers.
- *
- * @li Public - Public access
- * @li Protected - Protected access
- * @li Private - Private access
- * @li Signal - Qt Signal
- * @li Slot - Qt Slot
- */
- enum AccessSpecifier { Public = 1, Protected = 2, Private = 4, Signal = 8, Slot = 16 };
-
- /**
- * Creates a new function.
- */
- Function();
-
- /**
- * Creates a new function from @param other.
- */
- Function( const Function &other );
-
- /**
- * Creates a new function with the given @param name.
- *
- * @param returnType The return type.
- * @param access The access type (@see AccessSpecifier).
- * @param isStatic If true, the function is marked as static.
- */
- Function( const QString &name, const QString &returnType = QString(),
- int access = Public, bool isStatic = false );
-
- /**
- * Destroys the function.
- */
- ~Function();
-
- /**
- * Assignment operator.
- */
- Function& operator=( const Function &other );
-
- /**
- * Sets the @param name of the function.
- */
- void setName( const QString &name );
-
- /**
- * Returns the name of the function.
- */
- QString name() const;
-
- /**
- * Sets the return type of the function.
- */
- void setReturnType( const QString &returnType );
-
- /**
- * Returns the return type of the function.
- */
- QString returnType() const;
-
- /**
- * Sets whether the function is marked as const.
- */
- void setConst( bool isConst );
-
- /**
- * Returns whether the function is marked as const.
- */
- bool isConst() const;
-
- /**
- * Sets whether the function is marked as static.
- */
- void setStatic( bool isStatic );
-
- /**
- * Returns whether the function is marked as static.
- */
- bool isStatic() const;
-
- enum VirtualMode { NotVirtual, Virtual, PureVirtual, Override };
- /**
- * Sets whether the function is marked as virtual or pure virtual.
- */
- void setVirtualMode( VirtualMode v );
-
- /**
- * Returns whether the function is marked as virtual or pure virtual.
- */
- VirtualMode virtualMode() const;
-
- /**
- * Adds an @param argument to the function.
- */
- void addArgument( const Function::Argument &argument );
-
- /**
- * Adds an @param argument to the function.
- */
- void addArgument( const QString &argument );
-
- /**
- * Sets the complete argument string of the function.
- * This method does not support default values currently.
- */
- void setArgumentString( const QString &argumentString );
-
- /**
- * Returns the list of all arguments.
- * @param forImplementation if true, default values are omitted
- */
- Argument::List arguments() const;
-
- /**
- * @return whether the function has any arguments
- */
- bool hasArguments() const;
-
- /**
- * Adds an initializer to the function.
- */
- void addInitializer( const QString &initializer );
-
- /**
- * Returns the list of all initializers.
- */
- QStringList initializers() const;
-
- /**
- * Sets the @param body code of the function.
- */
- void setBody( const QString &body );
-
- /**
- * Sets the @param body code of the function.
- */
- void setBody( const Code &body );
-
- /**
- * Adds a @param line to the body code of the function.
- */
- void addBodyLine( const QString &line );
-
- /**
- * Returns the body code of the function.
- */
- QString body() const;
-
- /**
- * Sets the access @param specifier of the function.
- */
- void setAccess( int specifier );
-
- /**
- * Returns the access specifier of the function.
- */
- int access() const;
-
- /**
- * Returns access specifier of the function as string.
- */
- QString accessAsString() const;
-
- /**
- * Sets the @param documentation of the function.
- */
- void setDocs( const QString &documentation );
-
- /**
- * Returns the documentation of the function.
- */
- QString docs() const;
-
- private:
- class FunctionPrivate;
- FunctionPrivate *d;
-};
-
-}
-
-QDebug operator<<(QDebug dbg, const KODE::Function &func);
-
-#endif
diff --git a/kdwsdl2cpp/libkode/libkode.pro b/kdwsdl2cpp/libkode/libkode.pro
deleted file mode 100644
index 644adb6..0000000
--- a/kdwsdl2cpp/libkode/libkode.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-TEMPLATE = lib
-CONFIG += staticlib
-TARGET = kode
-SOURCES += \
- code.cpp \
- enum.cpp \
- style.cpp \
- printer.cpp \
- license.cpp \
- file.cpp \
- class.cpp \
- function.cpp \
- variable.cpp \
- membervariable.cpp \
- typedef.cpp \
- statemachine.cpp
-
-QT -= gui
-
-INCLUDEPATH += $${TOP_SOURCE_DIR}/kdwsdl2cpp
-
-include($${TOP_SOURCE_DIR}/variables.pri)
-DEFINES -= QT_NO_CAST_TO_ASCII QBA_NO_CAST_TO_VOID QBA_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
diff --git a/kdwsdl2cpp/libkode/license.cpp b/kdwsdl2cpp/libkode/license.cpp
deleted file mode 100644
index 3598468..0000000
--- a/kdwsdl2cpp/libkode/license.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "license.h"
-
-using namespace KODE;
-
-class License::Private
-{
- public:
- Private()
- : mType(License::NoLicense), mQtException( false )
- {
- }
-
- Type mType;
- bool mQtException;
-};
-
-License::License()
- : d( new Private )
-{
-}
-
-License::License( const License &other )
- : d( new Private )
-{
- *d = *other.d;
-}
-
-License::License( Type type )
- : d( new Private )
-{
- d->mType = type;
-}
-
-License::~License()
-{
- delete d;
-}
-
-License& License::operator=( const License &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
-
- return *this;
-}
-
-void License::setQtException( bool v )
-{
- d->mQtException = v;
-}
-
-QString License::text() const
-{
- QString txt;
-
- switch ( d->mType ) {
- case GPL:
- txt +=
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
- "the Free Software Foundation; either version 2 of the License, or\n"
- "(at your option) any later version.\n"
- "\n"
- "This program is distributed in the hope that it will be useful,\n"
- "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
- "GNU General Public License for more details.\n"
- "\n"
- "You should have received a copy of the GNU General Public License\n"
- "along with this program; if not, write to the Free Software\n"
- "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n" "USA.\n";
-
- if ( d->mQtException ) {
- txt += '\n';
- txt +=
- "As a special exception, permission is given to link this program\n"
- "with any edition of Qt, and distribute the resulting executable,\n"
- "without including the source code for Qt in the source distribution.\n";
- }
- break;
- case LGPL:
- txt +=
- "This library is free software; you can redistribute it and/or\n"
- "modify it under the terms of the GNU Library General Public\n"
- "License as published by the Free Software Foundation; either\n"
- "version 2 of the License, or (at your option) any later version.\n"
- "\n"
- "This library is distributed in the hope that it will be useful,\n"
- "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
- "Library General Public License for more details.\n"
- "\n"
- "You should have received a copy of the GNU Library General Public License\n"
- "along with this library; see the file COPYING.LIB. If not, write to\n"
- "the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n"
- "Boston, MA 02110-1301, USA.\n";
- break;
- case BSD:
- txt +=
- "Permission is hereby granted, free of charge, to any person obtaining\n"
- "a copy of this software and associated documentation files (the\n"
- "\"Software\"), to deal in the Software without restriction, including\n"
- "without limitation the rights to use, copy, modify, merge, publish,\n"
- "distribute, sublicense, and/or sell copies of the Software, and to\n"
- "permit persons to whom the Software is furnished to do so, subject to\n"
- "the following conditions:\n"
- "\n"
- "The above copyright notice and this permission notice shall be\n"
- "included in all copies or substantial portions of the Software.\n"
- "\n"
- "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n"
- "EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n"
- "MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\n"
- "IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR\n"
- "OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,\n"
- "ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n"
- "OTHER DEALINGS IN THE SOFTWARE.";
- break;
- case GeneratedNoRestriction:
- txt +=
- "You may use and relicense this generated file without restriction.";
- default:
- break;
- }
-
- return txt;
-}
diff --git a/kdwsdl2cpp/libkode/license.h b/kdwsdl2cpp/libkode/license.h
deleted file mode 100644
index 9e6da64..0000000
--- a/kdwsdl2cpp/libkode/license.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_LICENSE_H
-#define KODE_LICENSE_H
-
-#include <kode_export.h>
-
-#include <QtCore/QString>
-
-namespace KODE {
-
-/**
- * @brief Represent a license clause.
- * Use this class to setup a license clause for your generated file.
- *
- * @author Cornelius Schumacher <schumacher@kde.org>
- */
-class KODE_EXPORT License
-{
- public:
- /**
- * Possible types of licenses
- * @li GPL - The GNU General Public License.
- * @li LGPL - The GNU Lesser/Library General Public License.
- * @li BSD - Berkeley Software Distribution
- * @li GeneratedNoRestriction - Generated code with no restrictions.
- */
- enum Type {
- GPL,
- LGPL,
- BSD,
- GeneratedNoRestriction,
- NoLicense
- };
-
- /**
- * Creates a new license.
- */
- License();
-
- /**
- * Create a new license of the given @param type.
- */
- License( Type type );
-
- /**
- * Creates a new license from @param other.
- */
- License( const License &other );
-
- /**
- * Destroys the license.
- */
- ~License();
-
- /**
- * Assignment operator.
- */
- License& operator=( const License &other );
-
- /**
- * Sets whether a Qt expection should be appended to
- * the license statement.
- *
- * This is only useful for Qt3 based code.
- */
- void setQtException( bool useQtException );
-
- /**
- * Returns the textual presentation of the license.
- */
- QString text() const;
-
- private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/membervariable.cpp b/kdwsdl2cpp/libkode/membervariable.cpp
deleted file mode 100644
index 1b30722..0000000
--- a/kdwsdl2cpp/libkode/membervariable.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "membervariable.h"
-#include "style.h"
-
-using namespace KODE;
-
-class MemberVariable::Private
-{
- public:
-};
-
-MemberVariable::MemberVariable()
- : Variable(), d( nullptr )
-{
-}
-
-MemberVariable::MemberVariable( const MemberVariable &other )
- : Variable( other ), d( nullptr )
-{
- // *d = *other.d;
-}
-
-MemberVariable::MemberVariable( const QString &name, const QString &type,
- bool isStatic )
- : Variable( name, type, isStatic ), d( nullptr )
-{
- setName( memberVariableName( name ) );
-}
-
-MemberVariable::~MemberVariable()
-{
- delete d;
-}
-
-MemberVariable& MemberVariable::operator=( const MemberVariable &other )
-{
- if ( this == &other )
- return *this;
-
- Variable::operator=( other );
- // *d = *other.d;
-
- return *this;
-}
-
-QString MemberVariable::memberVariableName( const QString &name )
-{
- QString n;
-
- if ( name.isEmpty() ) {
- n = QLatin1String("mUndefined");
- } else if ( name.length() >= 2 && name[ 0 ] == QLatin1Char( 'm' ) &&
- ( name[ 1 ].toUpper() == name[ 1 ] ) ) {
- n = name;
- } else if ( name == QLatin1String("q") || name == QLatin1String("d") ) {
- n = name;
- } else {
- n = QLatin1String("m");
- n += name[ 0 ].toUpper();
- n += name.mid( 1 );
- }
-
- return Style::makeIdentifier(n);
-}
diff --git a/kdwsdl2cpp/libkode/membervariable.h b/kdwsdl2cpp/libkode/membervariable.h
deleted file mode 100644
index 60d3ce8..0000000
--- a/kdwsdl2cpp/libkode/membervariable.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_MEMBERVARIABLE_H
-#define KODE_MEMBERVARIABLE_H
-
-#include <QtCore/QList>
-#include <QtCore/QString>
-
-#include "variable.h"
-
-#include <kode_export.h>
-
-namespace KODE {
-
-/**
- * This class represents a member variable.
- *
- * It's basically a @see Variable with a
- * special formatted name.
- */
-class KODE_EXPORT MemberVariable : public Variable
-{
- public:
- typedef QList<MemberVariable> List;
-
- /**
- * Creates a new member variable.
- */
- MemberVariable();
-
- /**
- * Creates a new member variable from @param other.
- */
- MemberVariable( const MemberVariable &other );
-
- /**
- * Creates a new member variable of the given @param type
- * and with the given @param name.
- *
- * @param isStatic If true the variable is marked as static.
- */
- MemberVariable( const QString &name, const QString &type,
- bool isStatic = false );
-
- /**
- * Destroys the member variable.
- */
- ~MemberVariable();
-
- /**
- * Assignment operator.
- */
- MemberVariable& operator=( const MemberVariable &other );
-
- /**
- * Returns the name that will be used for a member variable.
- * This is the same result as creating a MemberVariable(inputName, someType) and extracting the name() afterwards.
- */
- static QString memberVariableName( const QString& inputName );
-
- private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/printer.cpp b/kdwsdl2cpp/libkode/printer.cpp
deleted file mode 100644
index 3fef33a..0000000
--- a/kdwsdl2cpp/libkode/printer.cpp
+++ /dev/null
@@ -1,1030 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
- Copyright (c) 2010 David Faure <dfaure@kdab.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <QtCore/QFile>
-#include <QtCore/QStringList>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTextStream>
-#include <QtCore/QFileInfo>
-#include <QDebug>
-
-#include "printer.h"
-
-using namespace KODE;
-
-class Printer::Private
-{
- public:
- Private( Printer *parent )
- : mParent( parent ),
- mCreationWarning( false ),
- mLabelsDefineIndent( true ),
- mIndentLabels( true ),
- mGenerator( "libkode" )
- {
- }
-
- void addLabel( Code& code, const QString& label );
- QString classHeader( const Class &classObject, bool publicMembers, bool nestedClass = false );
- QString classImplementation( const Class &classObject, bool nestedClass = false );
- void addFunctionHeaders( Code& code,
- const Function::List &functions,
- const QString &className,
- int access );
- QString formatType( const QString& type ) const;
-
- Printer *mParent;
- Style mStyle;
- bool mCreationWarning;
- bool mLabelsDefineIndent;
- bool mIndentLabels;
- QString mGenerator;
- QString mOutputDirectory;
- QString mSourceFile;
- QStringList mStatementsAfterIncludes;
-
- /**
- * @brief printCodeIntoFile
- * Writes the string passed through the code parameter to the file referenced
- * by the file parameter in the case if it differs from the content of the file pointed by the
- * file parameter.
- * @param code reference to a Code object which contents needs to be printed
- * @param file the target file in unopened state with filename set
- */
- void printCodeIntoFile( const Code &code, QFile *file );
-};
-
-void Printer::Private::addLabel( Code& code, const QString& label )
-{
- if ( !mIndentLabels )
- code.unindent();
- code += label;
- if ( !mIndentLabels )
- code.indent();
-}
-
-QString Printer::Private::formatType( const QString& type ) const
-{
- QString s = type;
- if ( s.endsWith( '*' ) || s.endsWith( '&' ) ) {
- if ( s.at( s.length() - 2 ) != ' ' ) {
- // Turn "Foo*" into "Foo *" for readability
- s.insert( s.length() - 1, ' ' );
- }
- } else {
- s += ' ';
- }
- return s;
-}
-
-QString Printer::Private::classHeader( const Class &classObject, bool publicMembers, bool nestedClass )
-{
- Code code;
-
- int numNamespaces = 0;
- if ( !classObject.nameSpace().isEmpty() ) {
- const QStringList nsList = classObject.nameSpace().split("::");
- Q_FOREACH(const QString& ns, nsList) {
- code += "namespace " + ns + " {";
- code.indent();
- ++numNamespaces;
- }
- }
-
- if ( nestedClass )
- code.indent();
-
- if ( !classObject.docs().isEmpty() ) {
- code += "/**";
- code.indent();
- code.addFormattedText( classObject.docs() );
- code.unindent();
- code += " */";
- }
-
- QString txt = "class ";
- if ( !classObject.exportDeclaration().isEmpty() ) {
- txt += classObject.exportDeclaration().toUpper() + "_EXPORT ";
- }
- txt += classObject.name();
-
- Class::List baseClasses = classObject.baseClasses();
- if ( !baseClasses.isEmpty() ) {
- txt += " : ";
- Class::List::ConstIterator it;
- for ( it = baseClasses.constBegin(); it != baseClasses.constEnd(); ++it ) {
- Class bc = *it;
-
- if ( it != baseClasses.constBegin() )
- txt +=", ";
-
- txt += "public ";
- if ( !bc.nameSpace().isEmpty() )
- txt += bc.nameSpace() + "::";
-
- txt += bc.name();
- }
- }
- code += txt;
-
- if( nestedClass ) {
- code.indent();
- code += '{';
- }
- else {
- code += '{';
- // We always want to indent here; so that Q_OBJECT and enums etc. are indented.
- // However with mIndentLabels=false, we'll unindent before printing out "public:".
- code.indent();
- }
-
- if ( classObject.isQObject() ) {
- code += "Q_OBJECT";
- code.newLine();
- }
- Q_FOREACH( const QString& declMacro, classObject.declarationMacros() ) {
- code += declMacro;
- code.newLine();
- }
-
- Class::List nestedClasses = classObject.nestedClasses();
- // Generate nestedclasses
- if ( !classObject.nestedClasses().isEmpty() ) {
- addLabel( code, "public:" );
-
- Class::List::ConstIterator it, itEnd = nestedClasses.constEnd();
- for ( it = nestedClasses.constBegin(); it != itEnd; ++it ) {
- code += classHeader( (*it), false, true );
- }
-
- code.newLine();
- }
-
- Typedef::List typedefs = classObject.typedefs();
- if ( typedefs.count() > 0 ) {
- addLabel( code, "public:" );
- if ( mLabelsDefineIndent )
- code.indent();
-
- Typedef::List::ConstIterator it;
- for ( it = typedefs.constBegin(); it != typedefs.constEnd(); ++it )
- code += (*it).declaration();
-
- if ( mLabelsDefineIndent )
- code.unindent();
- code.newLine();
- }
-
- Enum::List enums = classObject.enums();
- if ( enums.count() > 0 ) {
- addLabel( code, "public:" );
- if ( mLabelsDefineIndent )
- code.indent();
-
- Enum::List::ConstIterator it;
- for ( it = enums.constBegin(); it != enums.constEnd(); ++it )
- code += (*it).declaration();
-
- if ( mLabelsDefineIndent )
- code.unindent();
- code.newLine();
- }
-
- Function::List functions = classObject.functions();
-
- addFunctionHeaders( code, functions, classObject.name(), Function::Public );
-
- if ( classObject.canBeCopied() && classObject.useDPointer() && !classObject.memberVariables().isEmpty() ) {
- Function cc( classObject.name() );
- cc.addArgument( "const " + classObject.name() + '&' );
- Function op( "operator=", classObject.name() + '&' );
- op.addArgument( "const " + classObject.name() + '&' );
- Function::List list;
- list << cc << op;
- addFunctionHeaders( code, list, classObject.name(), Function::Public );
- }
-
- addFunctionHeaders( code, functions, classObject.name(), Function::Public | Function::Slot );
- addFunctionHeaders( code, functions, classObject.name(), Function::Signal );
- addFunctionHeaders( code, functions, classObject.name(), Function::Protected );
- addFunctionHeaders( code, functions, classObject.name(), Function::Protected | Function::Slot );
- addFunctionHeaders( code, functions, classObject.name(), Function::Private );
- addFunctionHeaders( code, functions, classObject.name(), Function::Private | Function::Slot );
-
- if ( !classObject.memberVariables().isEmpty() ) {
- Function::List::ConstIterator it;
- // Do we have any private function?
- bool hasPrivateFunc = false;
- bool hasPrivateSlot = false;
- for ( it = functions.constBegin(); it != functions.constEnd(); ++it ) {
- if ( (*it).access() == Function::Private ) {
- hasPrivateFunc = true;
- } else if ( (*it).access() == (Function::Private | Function::Slot) ) {
- hasPrivateSlot = true;
- }
- }
-
- if ( publicMembers )
- addLabel( code, "public:" );
- else if ( !hasPrivateFunc || hasPrivateSlot )
- addLabel( code, "private:" );
-
- if (mLabelsDefineIndent)
- code.indent();
-
- if ( classObject.useDPointer() && !classObject.memberVariables().isEmpty() ) {
- code += "class PrivateDPtr;";
- if ( classObject.useSharedData() )
- code += "QSharedDataPointer<PrivateDPtr> " + classObject.dPointerName() + ";";
- else
- code += "PrivateDPtr *" + classObject.dPointerName() + ";";
- } else {
- MemberVariable::List variables = classObject.memberVariables();
- MemberVariable::List::ConstIterator it2;
- for ( it2 = variables.constBegin(); it2 != variables.constEnd(); ++it2 ) {
- MemberVariable v = *it2;
-
- QString decl;
- if ( v.isStatic() )
- decl += "static ";
-
- decl += formatType( v.type() );
-
- decl += v.name() + ';';
-
- code += decl;
- }
- }
- if (mLabelsDefineIndent)
- code.unindent();
- }
-
- code.unindent();
- code += "};";
-
- for (int i = 0; i < numNamespaces; ++i) {
- code.unindent();
- code += "} // namespace end";
- }
-
- return code.text();
-}
-
-QString Printer::Private::classImplementation( const Class &classObject, bool nestedClass )
-{
- Code code;
-
- bool needNewLine = false;
-
- QString functionClassName = classObject.name();
- if (nestedClass)
- functionClassName.prepend( classObject.parentClassName() + QLatin1String("::") );
- else if ( !classObject.nameSpace().isEmpty() )
- functionClassName.prepend( classObject.nameSpace() + QLatin1String("::") );
-
- // Generate private class
- if ( classObject.useDPointer() && !classObject.memberVariables().isEmpty() ) {
- Class privateClass( functionClassName + "::PrivateDPtr" );
- if ( classObject.useSharedData() ) {
- privateClass.addBaseClass( Class("QSharedData") );
- }
- MemberVariable::List vars = classObject.memberVariables();
- MemberVariable::List::ConstIterator it;
- Function ctor("PrivateDPtr");
- bool hasInitializers = false;
- for ( it = vars.constBegin(); it != vars.constEnd(); ++it ) {
- const MemberVariable v = *it;
- privateClass.addMemberVariable( v );
- if ( !v.initializer().isEmpty() ) {
- ctor.addInitializer( v.name() + '(' + v.initializer() + ')' );
- hasInitializers = true;
- }
- }
- if ( hasInitializers )
- privateClass.addFunction( ctor );
- code += classHeader( privateClass, true /*publicMembers*/ );
- if ( hasInitializers )
- code += classImplementation( privateClass );
- }
-
- // Generate static vars
- MemberVariable::List vars = classObject.memberVariables();
- MemberVariable::List::ConstIterator itV;
- for ( itV = vars.constBegin(); itV != vars.constEnd(); ++itV ) {
- const MemberVariable v = *itV;
- if ( !v.isStatic() )
- continue;
-
- // ## I thought the static int foo = 42; syntax was not portable?
- code += v.type() + functionClassName + "::" + v.name() + " = " + v.initializer() + ';';
- needNewLine = true;
- }
-
- if ( needNewLine )
- code.newLine();
-
- Function::List functions = classObject.functions();
- Function::List::ConstIterator it;
- for ( it = functions.constBegin(); it != functions.constEnd(); ++it ) {
- Function f = *it;
-
- // Omit signals
- if ( f.access() == Function::Signal )
- continue;
- // Omit pure virtuals without a body
- if ( f.virtualMode() == Function::PureVirtual && f.body().isEmpty() )
- continue;
-
- code += mParent->functionSignature( f, functionClassName, true );
-
- QStringList inits = f.initializers();
- if ( classObject.useDPointer() && !classObject.memberVariables().isEmpty() &&
- f.name() == classObject.name() ) {
- inits.append( classObject.dPointerName() + "(new PrivateDPtr)" );
- }
- if ( !classObject.useDPointer() && f.name() == classObject.name()
- && f.arguments().isEmpty() ) {
- // Default constructor: add initializers for variables
- for ( itV = vars.constBegin(); itV != vars.constEnd(); ++itV ) {
- const MemberVariable v = *itV;
- if ( !v.initializer().isEmpty() ) {
- inits.append( v.name() + '(' + v.initializer() + ')' );
- }
- }
- }
-
- if (!inits.isEmpty()) {
- code.indent();
- code += ": " + inits.join( ", " );
- code.unindent();
- }
-
- code += '{';
- code.addBlock( f.body(), Code::defaultIndentation() );
-
- if ( classObject.useDPointer() && !classObject.useSharedData() &&
- !classObject.memberVariables().isEmpty() &&
- f.name() == '~' + classObject.name() ) {
- // Delete d pointer
- code.newLine();
- code.indent();
- code += "delete " + classObject.dPointerName() + ";";
- code += classObject.dPointerName() + " = nullptr;";
- code.unindent();
- }
- code += '}';
- code.newLine();
- }
-
- if ( classObject.useDPointer() && classObject.canBeCopied() && !classObject.memberVariables().isEmpty() ) {
-
- // print copy constructor
- Function cc( classObject.name() );
- cc.addArgument( "const " + functionClassName + "& other" );
-
- Code body;
- if ( !classObject.useSharedData() ) {
- body += classObject.dPointerName() + " = new PrivateDPtr;";
- body += "*" + classObject.dPointerName() + " = *other." + classObject.dPointerName() + ";";
- }
- cc.setBody( body );
-
- code += mParent->functionSignature( cc, functionClassName, true );
-
- // call copy constructor of base classes
- QStringList list;
- Class::List baseClasses = classObject.baseClasses();
- for ( int i = 0; i < baseClasses.count(); ++i ) {
- list.append( baseClasses[ i ].name() + "( other )" );
- }
- if ( classObject.useSharedData() ) {
- list.append( classObject.dPointerName() + "( other." + classObject.dPointerName() + " )" );
- }
- if ( !list.isEmpty() ) {
- code.indent();
- code += ": " + list.join( ", " );
- code.unindent();
- }
-
- code += '{';
- code.addBlock( cc.body(), Code::defaultIndentation() );
- code += '}';
- code.newLine();
-
- // print assignment operator
- Function op( "operator=", functionClassName + "& " );
- op.addArgument( "const " + functionClassName + "& other" );
-
- body.clear();
- body += "if ( this == &other )";
- body.indent();
- body += "return *this;";
- body.unindent();
- body.newLine();
- if ( classObject.useSharedData() )
- body += classObject.dPointerName() + " = other." + classObject.dPointerName() + ";";
- else
- body += "*" + classObject.dPointerName() + " = *other." + classObject.dPointerName() + ";";
- for ( int i = 0; i < baseClasses.count(); ++i ) {
- body += QLatin1String("* static_cast<") + baseClasses[i].name() + QLatin1String(" *>(this) = other;");
- }
-
- body.newLine();
- body += "return *this;";
- op.setBody( body );
-
- code += mParent->functionSignature( op, functionClassName, true );
- code += '{';
- code.addBlock( op.body(), Code::defaultIndentation() );
- code += '}';
- code.newLine();
- }
-
- // Generate nested class functions
- if( !classObject.nestedClasses().isEmpty() ) {
- foreach ( Class nestedClass, classObject.nestedClasses() ) {
- code += classImplementation( nestedClass, true );
- }
- }
-
- return code.text();
-}
-
-void Printer::Private::addFunctionHeaders( Code& code,
- const Function::List &functions,
- const QString &className,
- int access )
-{
- bool needNewLine = false;
- bool hasAccess = false;
-
- Function::List::ConstIterator it;
- for ( it = functions.constBegin(); it != functions.constEnd(); ++it ) {
- Function f = *it;
- if ( f.access() == access ) {
- if ( !hasAccess ) {
- addLabel( code, f.accessAsString() + ':' );
- hasAccess = true;
- }
- if ( mLabelsDefineIndent )
- code.indent();
- if ( !(*it).docs().isEmpty() ) {
- code += "/**";
- code.indent();
- code.addFormattedText( (*it).docs() );
- code.unindent();
- code += " */";
- }
- code += mParent->functionSignature( *it, className, false ) + ';';
- if ( mLabelsDefineIndent )
- code.unindent();
- needNewLine = true;
- }
- }
-
- if ( needNewLine )
- code.newLine();
-}
-
-
-
-Printer::Printer()
- : d( new Private( this ) )
-{
-}
-
-Printer::Printer( const Printer &other )
- : d( new Private( this ) )
-{
- *d = *other.d;
- d->mParent = this;
-}
-
-Printer::Printer( const Style &style )
- : d( new Private( this ) )
-{
- d->mStyle = style;
-}
-
-Printer::~Printer()
-{
- delete d;
-}
-
-Printer& Printer::operator=( const Printer &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
- d->mParent = this;
-
- return *this;
-}
-
-void Printer::setCreationWarning( bool v )
-{
- d->mCreationWarning = v;
-}
-
-void Printer::setGenerator( const QString &generator )
-{
- d->mGenerator = generator;
-}
-
-void Printer::setOutputDirectory( const QString &outputDirectory )
-{
- d->mOutputDirectory = outputDirectory;
-}
-
-void Printer::setSourceFile( const QString &sourceFile )
-{
- d->mSourceFile = sourceFile;
-}
-
-void Printer::setLabelsDefineIndent( bool b )
-{
- d->mLabelsDefineIndent = b;
-}
-
-void Printer::setIndentLabels( bool b )
-{
- d->mIndentLabels = b;
-}
-
-QString Printer::functionSignature( const Function &function,
- const QString &className,
- bool forImplementation )
-{
- QString s;
-
- if ( function.isStatic() && !forImplementation ) {
- s += "static ";
- }
-
- if ( function.virtualMode() != Function::NotVirtual && !forImplementation ) {
- s += "virtual ";
- }
-
- QString ret = function.returnType();
- if ( !ret.isEmpty() ) {
- s += d->formatType( ret );
- }
-
- if ( forImplementation )
- s += className + "::";
-
- s += function.name();
-
- s += '(';
- if ( function.hasArguments() ) {
- QStringList arguments;
- foreach( Function::Argument argument, function.arguments() ) {
- if ( !forImplementation ) {
- arguments.append( argument.headerDeclaration() );
- } else {
- arguments.append( argument.bodyDeclaration() );
- }
- }
- s += ' ' + arguments.join( ", " ) + ' ';
- }
- s += ')';
-
- if ( function.isConst() )
- s += " const";
-
- if ( function.virtualMode() == Function::Override && !forImplementation ) {
- s += " override";
- }
-
- if ( function.virtualMode() == Function::PureVirtual )
- s += " = 0";
-
- return s;
-}
-
-QString Printer::creationWarning() const
-{
- // Create warning about generated file
- QString str = "// This file is generated by " + d->mGenerator;
- if ( !d->mSourceFile.isEmpty() )
- str += " from " + d->mSourceFile;
-
- str += ".\n";
-
- str += "// All changes you do to this file will be lost.";
-
- return str;
-}
-
-QString Printer::licenseHeader( const File &file ) const
-{
- Code code;
-
- const QStringList copyrights = file.copyrightStrings();
- if (!file.project().isEmpty() || !copyrights.isEmpty() || !file.license().text().isEmpty())
- {
- code += "/*";
- code.setIndent( 4 );
-
- if (!file.project().isEmpty()) {
- code += "This file is part of " + file.project() + '.';
- code.newLine();
- }
-
- if ( !copyrights.isEmpty() ) {
- code.addBlock( copyrights.join( "\n" ) );
- code.newLine();
- }
-
- code.addBlock( file.license().text() );
- code.setIndent( 0 );
- code += "*/";
- }
-
- return code.text();
-}
-
-void Printer::setStatementsAfterIncludes(const QStringList &statements)
-{
- d->mStatementsAfterIncludes = statements;
-}
-
-static QStringList commonLeft(const QStringList& l1, const QStringList& l2) {
- QStringList r;
- const int l = qMin(l1.size(), l2.size());
- for ( int i = 0; i < l; ++i )
- if (l1.at(i) == l2.at(i))
- r.append(l1.at(i));
- else
- return r;
- return r;
-}
-
-void Printer::printHeader( const File &file )
-{
- Code out;
-
- if ( d->mCreationWarning )
- out += creationWarning();
-
- out.addBlock( licenseHeader( file ) );
-
- // Create include guard
- QString className = file.filenameHeader();
- QFileInfo headerInfo(className);
- className = headerInfo.fileName(); // remove path, keep only filename
- className.replace( '-', "_" );
-
- QString includeGuard;
- if ( !file.nameSpace().isEmpty() )
- includeGuard += file.nameSpace().toUpper() + '_';
-
- includeGuard += className.toUpper();
- includeGuard.replace( '.', "_" );
-
- out += "#ifndef " + includeGuard;
- out += "#define " + includeGuard;
-
- out.newLine();
-
- // Create includes
- QSet<QString> processed;
- const Class::List classes = file.classes();
- Q_FOREACH( const Class& cl, classes )
- {
- Q_ASSERT( !cl.name().isEmpty() );
- QStringList includes = cl.headerIncludes();
- if ( cl.useSharedData() )
- includes.append( "QtCore/QSharedData" );
- //qDebug() << "includes=" << includes;
- QStringList::ConstIterator it2;
- for ( it2 = includes.constBegin(); it2 != includes.constEnd(); ++it2 ) {
- if ( !processed.contains( *it2 ) ) {
- out += "#include <" + *it2 + '>';
- processed.insert( *it2 );
- }
- }
- }
-
- if ( !processed.isEmpty() )
- out.newLine();
-
- for ( const QString &statement : d->mStatementsAfterIncludes ) {
- out += statement;
- }
-
- // Create enums
- Enum::List enums = file.fileEnums();
- Enum::List::ConstIterator enumIt;
- for ( enumIt = enums.constBegin(); enumIt != enums.constEnd(); ++enumIt ) {
- out += (*enumIt).declaration();
- out.newLine();
- }
-
- // Create forward declarations
- processed.clear();
- Class::List::ConstIterator it;
- for ( it = classes.constBegin(); it != classes.constEnd(); ++it ) {
- const QStringList decls = (*it).forwardDeclarations();
- processed += decls.toSet();
- }
- QStringList fwdClasses = processed.toList();
- fwdClasses.sort();
- fwdClasses += QString(); //for proper closing of the namespace blocks below
-
- QStringList prevNS;
-
- Q_FOREACH( const QString& fwd, fwdClasses ) {
- //handle namespaces by opening and closing namespace blocks accordingly
- //the sorting will ensure sensible grouping
- const QStringList seg = fwd.split(QLatin1String("::"));
- const QStringList ns = seg.mid(0, seg.size() - 1);
- const QString clas = seg.isEmpty() ? QString() : seg.last();
- const QStringList common = commonLeft(ns, prevNS);
- for (int i = common.size(); i < prevNS.size(); ++i) {
- out.unindent();
- out += "}";
- out.newLine();
- }
- for (int i = common.size(); i < ns.size(); ++i) {
- out += "namespace " + ns.at(i) + " {";
- out.indent();
- }
-
- if (!clas.isNull()) {
- const bool isQtClass = clas.startsWith(QLatin1Char('Q')) && !clas.contains(QLatin1Char('_'));
- if (isQtClass)
- out += QLatin1String("QT_BEGIN_NAMESPACE");
- out += "class " + clas + ';';
- if (isQtClass)
- out += QLatin1String("QT_END_NAMESPACE");
- }
- prevNS = ns;
- }
-
- if ( !processed.isEmpty() )
- out.newLine();
-
-
- if ( !file.nameSpace().isEmpty() ) {
- out += "namespace " + file.nameSpace() + " {";
- out.newLine();
- }
-
- // Create content
- for ( it = classes.constBegin(); it != classes.constEnd(); ++it ) {
- out.addBlock( d->classHeader( *it, false ) );
- out.newLine();
- }
-
- if ( !file.nameSpace().isEmpty() ) {
- out += '}';
- out.newLine();
- }
-
- // Finish file
- out += "#endif";
-
-
- // Print to file
- QString filename = file.filenameHeader();
-
- if ( !d->mOutputDirectory.isEmpty() )
- filename.prepend( d->mOutputDirectory + '/' );
-
-// KSaveFile::simpleBackupFile( filename, QString(), ".backup" );
-
- QFile header( filename );
- d->printCodeIntoFile( out, &header );
-}
-
-void Printer::printImplementation( const File &file, bool createHeaderInclude )
-{
- Code out;
-
- if ( d->mCreationWarning )
- out += creationWarning();
-
- out.addBlock( licenseHeader( file ) );
-
- out.newLine();
-
- // Create includes
- if ( createHeaderInclude ) {
- out += "#include \"" + file.filenameHeader() + "\"";
- out.newLine();
- }
-
- QStringList includes = file.includes();
- QStringList::ConstIterator it2;
- for ( it2 = includes.constBegin(); it2 != includes.constEnd(); ++it2 )
- out += "#include <" + *it2 + '>';
-
- if ( !includes.isEmpty() )
- out.newLine();
-
- // Create class includes
- QStringList processed;
- Class::List classes = file.classes();
- Class::List::ConstIterator it;
- for ( it = classes.constBegin(); it != classes.constEnd(); ++it ) {
- QStringList includes = (*it).includes();
- QStringList::ConstIterator it2;
- for ( it2 = includes.constBegin(); it2 != includes.constEnd(); ++it2 ) {
- if ( !processed.contains( *it2 ) ) {
- out += "#include <" + *it2 + '>';
- processed.append( *it2 );
- }
- }
- }
-
- if ( !processed.isEmpty() )
- out.newLine();
-
- if ( !file.nameSpace().isEmpty() ) {
- out += "namespace " + file.nameSpace() + " {";
- out.newLine();
- }
-
- // 'extern "C"' declarations
- const QStringList externCDeclarations = file.externCDeclarations();
- if ( !externCDeclarations.isEmpty() ) {
- out += "extern \"C\" {";
- QStringList::ConstIterator it;
- for ( it = externCDeclarations.constBegin(); it != externCDeclarations.constEnd();
- ++it ) {
- out += *it + ';';
- }
- out += '}';
- out.newLine();
- }
-
- // File variables
- Variable::List vars = file.fileVariables();
- Variable::List::ConstIterator itV;
- for ( itV = vars.constBegin(); itV != vars.constEnd(); ++itV ) {
- Variable v = *itV;
- QString str;
- if ( v.isStatic() )
- str += "static ";
- str += v.type() + ' ' + v.name() + ';';
- out += str;
- }
-
- if ( !vars.isEmpty() )
- out.newLine();
-
- // File code
- if ( !file.fileCode().isEmpty() ) {
- out += file.fileCode();
- out.newLine();
- }
-
- // File functions
- Function::List funcs = file.fileFunctions();
- Function::List::ConstIterator itF;
- for ( itF = funcs.constBegin(); itF != funcs.constEnd(); ++itF ) {
- Function f = *itF;
- out += functionSignature( f );
- out += '{';
- out.addBlock( f.body(), Code::defaultIndentation() );
- out += '}';
- out.newLine();
- }
-
- // Classes
-#ifdef KDAB_DELETED
- bool containsQObject = false;
-#endif
- for ( it = classes.constBegin(); it != classes.constEnd(); ++it ) {
-#ifdef KDAB_DELETED
- if ( (*it).isQObject() )
- containsQObject = true;
-#endif
-
- QString str = d->classImplementation( *it );
- if ( !str.isEmpty() )
- out += d->classImplementation( *it );
- }
-
- if ( !file.nameSpace().isEmpty() ) {
- out += "}";
- out.newLine();
- }
-
- // KDAB: removed; 1) for removing .filename(), and 2) qmake would want moc_foo.cpp anyway
-#ifdef KDAB_DELETED
- if ( containsQObject ) {
- out.newLine();
- //out += "#include \"" + file.filename() + ".moc\"";
- }
-#endif
-
- // Print to file
- QString filename = file.filenameImplementation();
-
- if ( !d->mOutputDirectory.isEmpty() )
- filename.prepend( d->mOutputDirectory + '/' );
-
- QFile implementation( filename );
- d->printCodeIntoFile( out, &implementation );
-}
-
-void Printer::Private::printCodeIntoFile( const Code &code, QFile *file )
-{
- const QString outText = code.text();
- bool identical = true;
- if ( file->exists() ) {
- if ( !file->open( QIODevice::ReadOnly ) ) {
- qWarning( "Can't open '%s' for reading.", qPrintable( file->fileName() ) );
- return;
- }
-
- QTextStream fileReaderStream( file );
- fileReaderStream.setCodec( QTextCodec::codecForName("UTF-8") );
-
- QTextStream codeStream( outText.toUtf8() );
- QString fileLine, outLine;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
- while ( fileReaderStream.readLineInto( &fileLine ) && codeStream.readLineInto(&outLine) ) {
- if ( fileLine != outLine ) {
- identical = false;
- break;
- }
- }
-#else
- while ( !fileReaderStream.atEnd() && !codeStream.atEnd() ) {
- fileLine = fileReaderStream.readLine();
- outLine = codeStream.readLine();
- if ( fileLine != outLine ) {
- identical = false;
- break;
- }
- }
-#endif
-
- if ( identical )
- identical = fileReaderStream.atEnd() && codeStream.atEnd();
- file->close();
- } else {
- identical = false;
- }
-
- if ( !identical ) {
- if ( !file->open( QIODevice::WriteOnly ) ) {
- qWarning( "Can't open '%s' for writing.", qPrintable( file->fileName() ) );
- return;
- }
-
- QTextStream fileWriterStream( file );
- fileWriterStream.setCodec( QTextCodec::codecForName("UTF-8") );
- fileWriterStream << outText;
-
- file->close();
- } else {
- qDebug("Skip generating %s because its content did not change", qPrintable( file->fileName() ));
- }
-}
-
-#if 0 // TODO: port to cmake
-void Printer::printAutoMakefile( const AutoMakefile &am )
-{
- QString filename = "Makefile.am";
-
- if ( !d->mOutputDirectory.isEmpty() )
- filename.prepend( d->mOutputDirectory + '/' );
-
-// KSaveFile::simpleBackupFile( filename, QString(), ".backup" );
-
- QFile file( filename );
- if ( !file.open( QIODevice::WriteOnly ) ) {
- qWarning( "Can't open '%s' for writing.", qPrintable( filename ) );
- return;
- }
-
- QTextStream ts( &file );
-
- ts << am.text();
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/printer.h b/kdwsdl2cpp/libkode/printer.h
deleted file mode 100644
index 77728f5..0000000
--- a/kdwsdl2cpp/libkode/printer.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_PRINTER_H
-#define KODE_PRINTER_H
-
-#include "code.h"
-#include "file.h"
-#include "style.h"
-
-#include <kode_export.h>
-
-namespace KODE {
-
-/**
- * This class prints the abstract class definitions
- * as C++ code to a file.
- */
-class KODE_EXPORT Printer
-{
- public:
- /**
- * Creates a new printer.
- */
- Printer();
-
- /**
- * Creates a new printer from @param other.
- */
- Printer( const Printer &other );
-
- /**
- * Creates a new printer, which uses the given @param style
- * to format the C++ code.
- */
- Printer( const Style &style );
-
- /**
- * Destroys the printer.
- */
- virtual ~Printer();
-
- /**
- * Assignment operator.
- */
- Printer& operator=( const Printer &other );
-
- /**
- * Sets whether the implementation shall contain a comment
- * which warns about changing the C++ code manually.
- */
- void setCreationWarning( bool value );
-
- /**
- * Sets the name of the @param generator which shall be
- * included in the C++ code.
- */
- void setGenerator( const QString &generator );
-
- /**
- * Sets the directory where the decleration and implementation
- * files shall be stored. If now directory is set, the current
- * working directory is used.
- */
- void setOutputDirectory( const QString &outputDirectory );
-
- /**
- * Sets the name of the source file which is included in
- * the generator statement.
- */
- void setSourceFile( const QString &sourceFile );
-
- /**
- * Sets whether labels (public:, private: etc.) should define
- * an indentation level. I.e. they are indented and then their
- * contents are indented even more.
- */
- void setLabelsDefineIndent( bool b );
-
- /**
- * Sets whether labels should be indented.
- *
- * setIndentLabels(true) + setLabelsDefineIndent(false) -> label at same level as contents
- * setIndentLabels(false) + setLabelsDefineIndent(false) -> Qt coding style
- * setIndentLabels(true) + setLabelsDefineIndent(true) -> kdepim coding style, default here.
- * setIndentLabels(false) + setLabelsDefineIndent(true) -> doesn't really make sense.
- */
- void setIndentLabels( bool b );
-
- /**
- * Prints the header of the class definitions in @param file.
- */
- void printHeader( const File &file );
-
- /**
- * Prints the implementation of the class definitions in @param file.
- *
- * @param createHeaderInclude If true, the header for the declaration of
- * this implementation is included.
- */
- void printImplementation( const File &file, bool createHeaderInclude = true );
-
- /**
- * Prints a automake file as defined by @param autoMakefile.
- */
- //void printAutoMakefile( const AutoMakefile &autoMakefile );
-
- /**
- * Returns the function signature for the given @param function
- * with class name @param className.
- *
- * If @param forImplementation is true, the class qualifier
- * is part of the signature as well, and default args are removed.
- */
- QString functionSignature( const Function &function,
- const QString &className = QString(),
- bool forImplementation = false );
-
- /**
- * For #undef hacks for instance
- */
- void setStatementsAfterIncludes(const QStringList &statements);
-
- /**
- * @brief setVerbose enable/disable outputting verbose logs
- * @param verbose
- */
- void setVerbose( bool verbose );
-
- protected:
- /**
- * Returns the creation warning.
- *
- * Reimplement this method to provide a custom warning.
- */
- virtual QString creationWarning() const;
-
- /**
- * Returns the license header for the given @param file.
- *
- * Reimplement this method to provide a custom license
- * header.
- */
- virtual QString licenseHeader( const File &file ) const;
-
-
- private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/statemachine.cpp b/kdwsdl2cpp/libkode/statemachine.cpp
deleted file mode 100644
index 2dc40b5..0000000
--- a/kdwsdl2cpp/libkode/statemachine.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <QtCore/QMap>
-#include <QtCore/QStringList>
-
-#include "statemachine.h"
-
-using namespace KODE;
-
-class StateMachine::Private
-{
- public:
- QMap<QString,Code> mStateMap;
- QString mInitialState;
-};
-
-StateMachine::StateMachine()
- : d( new Private )
-{
-}
-
-StateMachine::StateMachine( const StateMachine &other )
- : d( new Private )
-{
- *d = *other.d;
-}
-
-StateMachine::~StateMachine()
-{
- delete d;
-}
-
-StateMachine& StateMachine::operator=( const StateMachine &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
-
- return *this;
-}
-
-void StateMachine::setState( const QString &state, const Code &code )
-{
- d->mStateMap.insert( state, code );
-
- if ( d->mInitialState.isEmpty() )
- d->mInitialState = state;
-}
-
-void StateMachine::setInitialState( const QString &state )
-{
- d->mInitialState = state;
-}
-
-Code StateMachine::stateDefinition() const
-{
- Code code;
-
- QStringList states;
- QMap<QString,Code>::ConstIterator it;
- for ( it = d->mStateMap.constBegin(); it != d->mStateMap.constEnd(); ++it ) {
- states.append( it.key() );
- }
-
- code += QLatin1String("enum State { ") + states.join( QLatin1String(", ") ) + QLatin1String(" };");
- code += QLatin1String("State state = ") + d->mInitialState + QLatin1Char(';');
-
- return code;
-}
-
-Code StateMachine::transitionLogic() const
-{
- Code code;
-
- code += QLatin1String("switch( state ) {");
- code.indent();
-
- QMap<QString,Code>::ConstIterator it;
- for ( it = d->mStateMap.constBegin(); it != d->mStateMap.constEnd(); ++it ) {
- code += QLatin1String("case ") + it.key() + QLatin1Char(':');
- code.indent();
- code.addBlock( it.value() );
- code += QLatin1String("break;");
- code.unindent();
- }
-
- code += QLatin1String("default:");
- code.indent();
- code += QLatin1String("break;");
- code.unindent();
-
- code.unindent();
- code += QLatin1String("}");
-
- return code;
-}
diff --git a/kdwsdl2cpp/libkode/statemachine.h b/kdwsdl2cpp/libkode/statemachine.h
deleted file mode 100644
index 216a99e..0000000
--- a/kdwsdl2cpp/libkode/statemachine.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_STATEMACHINE_H
-#define KODE_STATEMACHINE_H
-
-#include "code.h"
-
-#include <kode_export.h>
-
-namespace KODE {
-
-/**
- * This class represents a state machine.
- *
- * It can be used to create complex state machines
- * in an easy way.
- */
-class KODE_EXPORT StateMachine
-{
- public:
- /**
- * Creates a new state machine.
- */
- StateMachine();
-
- /**
- * Creates a new state machine from @param other.
- */
- StateMachine( const StateMachine &other );
-
- /**
- * Destroys the state machine.
- */
- ~StateMachine();
-
- /**
- * Assignment operator.
- */
- StateMachine& operator=( const StateMachine &other );
-
- /**
- * Sets the @param code for a special @param state.
- */
- void setState( const QString &state, const Code &code );
-
- /**
- * Sets the initial @param state, which is used when the
- * machine is started.
- */
- void setInitialState( const QString &state );
-
- /**
- * Returns the code for the state definitions.
- */
- Code stateDefinition() const;
-
- /**
- * Returns the code for the transition logic.
- */
- Code transitionLogic() const;
-
- private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/style.cpp b/kdwsdl2cpp/libkode/style.cpp
deleted file mode 100644
index fe1c11e..0000000
--- a/kdwsdl2cpp/libkode/style.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "style.h"
-
-using namespace KODE;
-
-class Style::Private
-{
- public:
-};
-
-Style::Style()
- : d( nullptr )
-{
-}
-
-Style::Style( const Style &/*other*/ )
- : d( nullptr )
-{
-// *d = *other.d;
-}
-
-Style::~Style()
-{
- delete d;
-}
-
-// cppcheck-suppress operatorEqVarError
-Style& Style::operator=( const Style &other )
-{
- if ( this == &other )
- return *this;
-
- // *d = *other,d;
-
- return *this;
-}
-
-QString Style::className( const QString &str )
-{
- Q_ASSERT(!str.isEmpty());
- QString cl = upperFirst( str );
- cl.replace(QLatin1Char('-'), QLatin1Char('_'));
- cl.replace(QLatin1Char(';'), QLatin1Char('_'));
- cl.replace(QLatin1Char(':'), QLatin1Char('_'));
- return cl;
-}
-
-QString Style::upperFirst( const QString &str )
-{
- if ( str.isEmpty() )
- return str;
-
- return str[ 0 ].toUpper() + str.mid( 1 );
-}
-
-QString Style::lowerFirst( const QString &str )
-{
- if ( str.isEmpty() )
- return str;
-
- return str[ 0 ].toLower() + str.mid( 1 );
-}
-
-QString Style::makeIdentifier( const QString &str )
-{
- Q_ASSERT(!str.isEmpty());
-
- QString identifier = str;
- identifier.replace( "-", "_" );
- identifier.replace( ".", "_" );
- identifier.replace( "/", "_" );
- identifier.replace( ":", "_" ); // xsd:int -> xsd_int (testcase: salesforce-partner.wsdl)
- identifier.replace( " ", "_" );
-
- // Can't start with a number, either.
- const int firstNum = identifier.at(0).digitValue();
- identifier = (firstNum != -1)? QLatin1Char('_') + identifier : identifier;
-
- return identifier;
-}
diff --git a/kdwsdl2cpp/libkode/style.h b/kdwsdl2cpp/libkode/style.h
deleted file mode 100644
index 33dfac3..0000000
--- a/kdwsdl2cpp/libkode/style.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_STYLE_H
-#define KODE_STYLE_H
-
-#include <kode_export.h>
-
-#include <QtCore/QString>
-
-namespace KODE {
-
-/**
- * This class encapsulates the style settings.
- *
- * You can reimplement it to give the generated code
- * a custom style.
- */
-class KODE_EXPORT Style
-{
- public:
- /**
- * Creates a new style.
- */
- Style();
-
- /**
- * Creates a new style from @param other.
- */
- Style( const Style &other );
-
- /**
- * Destroys the style.
- */
- virtual ~Style();
-
- /**
- * Assignment operator.
- */
- Style& operator=( const Style &other );
-
- /**
- * Converts the class name.
- *
- * The default implementation upper cases the first
- * character of the name.
- */
- /*virtual*/ Q_REQUIRED_RESULT static QString className( const QString &str );
-
- /**
- * Returns a new version of @param str with the first
- * character be uppercase.
- */
- Q_REQUIRED_RESULT static QString upperFirst( const QString &str );
-
- /**
- * Returns a new version of @param str with the first
- * character be lowercase.
- */
- Q_REQUIRED_RESULT static QString lowerFirst( const QString &str );
-
- /**
- * Returns a new version of @param str after making it suitable for usage
- * as a C++ identifier.
- */
- Q_REQUIRED_RESULT static QString makeIdentifier( const QString &str );
-
- private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/typedef.cpp b/kdwsdl2cpp/libkode/typedef.cpp
deleted file mode 100644
index 0c147a2..0000000
--- a/kdwsdl2cpp/libkode/typedef.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <QtCore/QString>
-
-#include "typedef.h"
-
-using namespace KODE;
-
-class Typedef::Private
-{
- public:
- QString mType;
- QString mAlias;
-};
-
-Typedef::Typedef()
- : d( new Private )
-{
-}
-
-Typedef::Typedef( const Typedef &other )
- : d( new Private )
-{
- *d = *other.d;
-}
-
-Typedef::Typedef( const QString &type, const QString &alias )
- : d( new Private )
-{
- d->mType = type;
- d->mAlias = alias;
-}
-
-Typedef::~Typedef()
-{
- delete d;
-}
-
-Typedef& Typedef::operator=( const Typedef &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
-
- return *this;
-}
-
-QString Typedef::declaration() const
-{
- return QLatin1String("typedef ") + d->mType + QLatin1Char(' ') + d->mAlias + QLatin1Char(';');
-}
diff --git a/kdwsdl2cpp/libkode/typedef.h b/kdwsdl2cpp/libkode/typedef.h
deleted file mode 100644
index 1c15433..0000000
--- a/kdwsdl2cpp/libkode/typedef.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- This file is part of KDE.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_TYPEDEF_H
-#define KODE_TYPEDEF_H
-
-#include <QtCore/QList>
-#include <QtCore/QString>
-
-#include <kode_export.h>
-
-namespace KODE {
-
-/**
- * This is an abstract class for typedefs.
- */
-class KODE_EXPORT Typedef
-{
- public:
- typedef QList<Typedef> List;
-
- /**
- * Creates a new typedef.
- */
- Typedef();
-
- /**
- * Creates a new typedef from @param other.
- */
- Typedef( const Typedef &other );
-
- /**
- * Creates a new typedef with the given @param type and
- * @param alias.
- */
- Typedef( const QString &type, const QString &alias );
-
- /**
- * Destroys the typedef.
- */
- ~Typedef();
-
- /**
- * Assignment operator.
- */
- Typedef& operator=( const Typedef &other );
-
- /**
- * Returns the textual presentation of the typedef.
- */
- QString declaration() const;
-
- private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/libkode/variable.cpp b/kdwsdl2cpp/libkode/variable.cpp
deleted file mode 100644
index 0170dcb..0000000
--- a/kdwsdl2cpp/libkode/variable.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <QtCore/QString>
-
-#include "membervariable.h"
-
-using namespace KODE;
-
-class Variable::Private
-{
- public:
- Private()
- : mIsStatic( false )
- {
- }
-
- QString mType;
- QString mName;
- bool mIsStatic;
- QString mInitializer;
-};
-
-Variable::Variable()
- : d( new Private )
-{
-}
-
-Variable::Variable( const Variable &other )
- : d( new Private )
-{
- *d = *other.d;
-}
-
-Variable::Variable( const QString &name, const QString &type, bool isStatic )
- : d( new Private )
-{
- d->mType = type;
- d->mIsStatic = isStatic;
-
- Q_ASSERT(!name.isEmpty());
-
- if ( name.isEmpty() ) {
- d->mName = QLatin1String("mUndefined");
- } else {
- d->mName = name;
- }
-}
-
-Variable::~Variable()
-{
- delete d;
-}
-
-Variable& Variable::operator=( const Variable &other )
-{
- if ( this == &other )
- return *this;
-
- *d = *other.d;
-
- return *this;
-}
-
-void Variable::setName( const QString &name )
-{
- d->mName = name;
-}
-
-QString Variable::name() const
-{
- return d->mName;
-}
-
-void Variable::setType( const QString &type )
-{
- d->mType = type;
-}
-
-QString Variable::type() const
-{
- return d->mType;
-}
-
-void Variable::setStatic( bool isStatic )
-{
- d->mIsStatic = isStatic;
-}
-
-bool Variable::isStatic() const
-{
- return d->mIsStatic;
-}
-
-void Variable::setInitializer( const QString &initializer )
-{
- d->mInitializer = initializer;
-}
-
-QString Variable::initializer() const
-{
- return d->mInitializer;
-}
diff --git a/kdwsdl2cpp/libkode/variable.h b/kdwsdl2cpp/libkode/variable.h
deleted file mode 100644
index b64b230..0000000
--- a/kdwsdl2cpp/libkode/variable.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- This file is part of kdepim.
-
- Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-#ifndef KODE_VARIABLE_H
-#define KODE_VARIABLE_H
-
-#include <QtCore/QStringList>
-
-#include <kode_export.h>
-
-namespace KODE {
-
-/**
- * This class represents a variable.
- */
-class KODE_EXPORT Variable
-{
- public:
- typedef QList<Variable> List;
-
- /**
- * Creates a new variable.
- */
- Variable();
-
- /**
- * Creates a new variable from @param other.
- */
- Variable( const Variable &other );
-
- /**
- * Creates a new variable of the given @param type and with the
- * given @param name.
- *
- * @param isStatic If true the variable is marked as static.
- */
- Variable( const QString &name, const QString &type, bool isStatic = false );
-
- /**
- * Destroys the variable.
- */
- virtual ~Variable();
-
- /**
- * Assignment operator.
- */
- Variable& operator=( const Variable &other );
-
- /**
- * Sets the @param type of the variable.
- */
- void setType( const QString &type );
-
- /**
- * Returns the type of the variable.
- */
- QString type() const;
-
- /**
- * Sets the @param name of the variable.
- */
- void setName( const QString &name );
-
- /**
- * Returns the name of the variable.
- */
- QString name() const;
-
- /**
- * Sets whether the variable is static.
- */
- void setStatic( bool isStatic );
-
- /**
- * Returns whether the variable is static.
- */
- bool isStatic() const;
-
- /**
- * Sets the initializer of the variable.
- */
- void setInitializer( const QString &initializer );
-
- /**
- * Returns the initializer of the variable.
- */
- QString initializer() const;
-
- private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/schema/annotation.cpp b/kdwsdl2cpp/schema/annotation.cpp
deleted file mode 100644
index d04837a..0000000
--- a/kdwsdl2cpp/schema/annotation.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2006 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "annotation.h"
-
-#include <common/qname.h>
-
-namespace XSD
-{
-
-class Annotation::Private
-{
-public:
- QDomElement mDomElement;
-};
-
-Annotation::Annotation()
- : d(new Private)
-{
-}
-
-Annotation::Annotation(const QDomElement &element)
- : d(new Private)
-{
- d->mDomElement = element;
-}
-
-Annotation::Annotation(const Annotation &other)
- : d(new Private)
-{
- *d = *other.d;
-}
-
-Annotation::~Annotation()
-{
- delete d;
-}
-
-Annotation &Annotation::operator=(const Annotation &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
-
- return *this;
-}
-void Annotation::setDomElement(const QDomElement &element)
-{
- d->mDomElement = element;
-}
-
-QDomElement Annotation::domElement() const
-{
- return d->mDomElement;
-}
-
-bool Annotation::isDocumentation() const
-{
- return QName(d->mDomElement.tagName()).localName() == QLatin1String("documentation");
-}
-
-bool Annotation::isAppinfo() const
-{
- return QName(d->mDomElement.tagName()).localName() == QLatin1String("appinfo");
-}
-
-QString Annotation::documentation() const
-{
- QString result;
-
- if (isDocumentation()) {
- result = d->mDomElement.text().trimmed();
- }
-
- return result;
-}
-
-QString Annotation::List::documentation() const
-{
- QString result;
-
- foreach (Annotation a, *this) {
- result.append(a.documentation());
- }
-
- return result;
-}
-
-}
diff --git a/kdwsdl2cpp/schema/annotation.h b/kdwsdl2cpp/schema/annotation.h
deleted file mode 100644
index c1b59fe..0000000
--- a/kdwsdl2cpp/schema/annotation.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2006 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef ANNOTATION_H
-#define ANNOTATION_H
-
-#include <QDomElement>
-#include <QList>
-#include <kode_export.h>
-
-namespace XSD
-{
-
-class SCHEMA_EXPORT Annotation
-{
-public:
- class List : public QList<Annotation>
- {
- public:
- QString documentation() const;
- };
-
- Annotation();
- Annotation(const QDomElement &element);
- Annotation(const Annotation &other);
- ~Annotation();
-
- Annotation &operator=(const Annotation &other);
-
- void setDomElement(const QDomElement &element);
- QDomElement domElement() const;
-
- bool isDocumentation() const;
- bool isAppinfo() const;
-
- QString documentation() const;
-
-private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/schema/attribute.cpp b/kdwsdl2cpp/schema/attribute.cpp
deleted file mode 100644
index ead26ad..0000000
--- a/kdwsdl2cpp/schema/attribute.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "attribute.h"
-
-namespace XSD
-{
-
-class Attribute::Private
-{
-public:
- Private()
- : mQualified(false), mUse(Optional)
- {}
-
- QName mType;
- QString mDocumentation;
- QString mDefaultValue;
- QString mFixedValue;
- bool mQualified;
- AttributeUse mUse;
- QName mReference;
-};
-
-Attribute::Attribute()
- : XmlElement(), d(new Private)
-{
-}
-
-Attribute::Attribute(const QString &nameSpace)
- : XmlElement(nameSpace), d(new Private)
-{
-}
-
-Attribute::Attribute(const Attribute &other)
- : XmlElement(other), d(new Private)
-{
- *d = *other.d;
-}
-
-Attribute::~Attribute()
-{
- delete d;
-}
-
-Attribute &Attribute::operator=(const Attribute &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
- XmlElement::operator=(other);
-
- return *this;
-}
-
-void Attribute::setType(const QName &type)
-{
- Q_ASSERT(!type.isEmpty());
- d->mType = type;
-}
-
-QName Attribute::type() const
-{
- return d->mType;
-}
-
-void Attribute::setDocumentation(const QString &documentation)
-{
- d->mDocumentation = documentation;
-}
-
-QString Attribute::documentation() const
-{
- return d->mDocumentation;
-}
-
-void Attribute::setDefaultValue(const QString &defaultValue)
-{
- d->mDefaultValue = defaultValue;
-}
-
-QString Attribute::defaultValue() const
-{
- return d->mDefaultValue;
-}
-
-void Attribute::setFixedValue(const QString &fixedValue)
-{
- d->mFixedValue = fixedValue;
-}
-
-QString Attribute::fixedValue() const
-{
- return d->mFixedValue;
-}
-
-void Attribute::setIsQualified(bool isQualified)
-{
- d->mQualified = isQualified;
-}
-
-bool Attribute::isQualified() const
-{
- return d->mQualified;
-}
-
-// https://www.w3.org/TR/xmlschema-0/#ref36
-void Attribute::setAttributeUse(AttributeUse use)
-{
- d->mUse = use;
-}
-
-Attribute::AttributeUse Attribute::attributeUse() const
-{
- return d->mUse;
-}
-
-void Attribute::setReference(const QName &reference)
-{
- Q_ASSERT(!reference.isEmpty());
- d->mReference = reference;
-}
-
-QName Attribute::reference() const
-{
- return d->mReference;
-}
-
-bool Attribute::isResolved() const
-{
- return !d->mType.isEmpty() || d->mReference.isEmpty();
-}
-
-void Attribute::List::dump()
-{
- Q_FOREACH (const Attribute &attr, *this) {
- qDebug() << attr.nameSpace() << attr.name();
- }
-}
-
-} // namespace XSD
-
-QDebug operator<<(QDebug dbg, const XSD::Attribute &attr)
-{
- dbg << attr.qualifiedName();
- return dbg;
-}
diff --git a/kdwsdl2cpp/schema/attribute.h b/kdwsdl2cpp/schema/attribute.h
deleted file mode 100644
index 3c3fc20..0000000
--- a/kdwsdl2cpp/schema/attribute.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef SCHEMA_ATTRIBUTE_H
-#define SCHEMA_ATTRIBUTE_H
-
-#include <QString>
-#include <QList>
-#include <QDebug>
-
-#include "xmlelement.h"
-#include <kode_export.h>
-
-namespace XSD
-{
-
-class SCHEMA_EXPORT Attribute : public XmlElement
-{
-public:
- class SCHEMA_EXPORT List : public QList<Attribute>
- {
- public:
- void dump();
- };
-
- Attribute();
- Attribute(const QString &nameSpace);
- Attribute(const Attribute &other);
- ~Attribute();
-
- Attribute &operator=(const Attribute &other);
-
- void setType(const QName &type);
- QName type() const;
-
- void setDocumentation(const QString &documentation);
- QString documentation() const;
-
- void setDefaultValue(const QString &defaultValue);
- QString defaultValue() const;
-
- void setFixedValue(const QString &fixedValue);
- QString fixedValue() const;
-
- void setIsQualified(bool isQualified);
- bool isQualified() const;
-
- enum AttributeUse { Optional, Required, Prohibited };
-
- void setAttributeUse(AttributeUse use);
- AttributeUse attributeUse() const;
-
- void setReference(const QName &reference);
- QName reference() const;
-
- bool isResolved() const;
-
-private:
- class Private;
- Private *d;
-};
-
-}
-
-SCHEMA_EXPORT QDebug operator<<(QDebug dbg, const XSD::Attribute &attr);
-
-#endif
diff --git a/kdwsdl2cpp/schema/attributegroup.cpp b/kdwsdl2cpp/schema/attributegroup.cpp
deleted file mode 100644
index 741d6ad..0000000
--- a/kdwsdl2cpp/schema/attributegroup.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- This file is part of KDE Schema Parser.
-
- Copyright (c) 2006 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include "attributegroup.h"
-
-namespace XSD
-{
-
-class AttributeGroup::Private
-{
-public:
- QName mReference;
- Attribute::List mAttributes;
-};
-
-AttributeGroup::AttributeGroup()
- : XmlElement(), d(new Private)
-{
-}
-
-AttributeGroup::AttributeGroup(const AttributeGroup &other)
- : XmlElement(other), d(new Private)
-{
- *d = *other.d;
-}
-
-AttributeGroup::~AttributeGroup()
-{
- delete d;
-}
-
-AttributeGroup &AttributeGroup::operator=(const AttributeGroup &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
-
- return *this;
-}
-
-void AttributeGroup::setReference(const QName &reference)
-{
- d->mReference = reference;
-}
-
-QName AttributeGroup::reference() const
-{
- return d->mReference;
-}
-
-void AttributeGroup::setAttributes(const Attribute::List &attributes)
-{
- d->mAttributes = attributes;
-}
-
-Attribute::List AttributeGroup::attributes() const
-{
- return d->mAttributes;
-}
-
-}
diff --git a/kdwsdl2cpp/schema/attributegroup.h b/kdwsdl2cpp/schema/attributegroup.h
deleted file mode 100644
index 8535a7d..0000000
--- a/kdwsdl2cpp/schema/attributegroup.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- This file is part of KDE Schema Parser.
-
- Copyright (c) 2006 Cornelius Schumacher <schumacher@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-#ifndef ATTRIBUTEGROUP_H
-#define ATTRIBUTEGROUP_H
-
-#include <schema/xmlelement.h>
-#include <schema/attribute.h>
-#include <common/qname.h>
-
-#include <kode_export.h>
-
-namespace XSD
-{
-
-class SCHEMA_EXPORT AttributeGroup : public XmlElement
-{
-public:
- typedef QList<AttributeGroup> List;
-
- AttributeGroup();
- AttributeGroup(const AttributeGroup &other);
- ~AttributeGroup();
-
- AttributeGroup &operator=(const AttributeGroup &other);
-
- void setReference(const QName &reference);
- QName reference() const;
-
- void setAttributes(const Attribute::List &attributes);
- Attribute::List attributes() const;
-
-private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/schema/complextype.cpp b/kdwsdl2cpp/schema/complextype.cpp
deleted file mode 100644
index 03cf095..0000000
--- a/kdwsdl2cpp/schema/complextype.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "complextype.h"
-#include <QDebug>
-
-namespace XSD
-{
-
-class ComplexType::Private
-{
-public:
- Private()
- : mAnonymous(false),
- mConflicting(false),
- mBaseDerivation(Restriction)
- {}
-
- QString mDocumentation;
-
- Element::List mElements;
- Attribute::List mAttributes;
- Group::List mGroups;
- AttributeGroup::List mAttributeGroups;
-
- bool mAnonymous;
- bool mConflicting;
-
- Derivation mBaseDerivation;
- QName mBaseTypeName;
- QName mArrayType;
- QList<QName> mDerivedTypes;
-};
-
-ComplexType::ComplexType(const QString &nameSpace)
- : XSDType(nameSpace), d(new Private)
-{
-}
-
-ComplexType::ComplexType()
- : XSDType(), d(new Private)
-{
-}
-
-ComplexType::ComplexType(const ComplexType &other)
- : XSDType(other), d(new Private)
-{
- *d = *other.d;
-}
-
-ComplexType::~ComplexType()
-{
- delete d;
-}
-
-ComplexType &ComplexType::operator=(const ComplexType &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
-
- return *this;
-}
-
-void ComplexType::setDocumentation(const QString &documentation)
-{
- d->mDocumentation = documentation;
-}
-
-QString ComplexType::documentation() const
-{
- return d->mDocumentation;
-}
-
-void ComplexType::setBaseTypeName(const QName &baseTypeName)
-{
- d->mBaseTypeName = baseTypeName;
-}
-
-QName ComplexType::baseTypeName() const
-{
- return d->mBaseTypeName;
-}
-
-void ComplexType::addDerivedType(const QName &derivedTypeName)
-{
- d->mDerivedTypes.append(derivedTypeName);
-}
-
-QList<QName> ComplexType::derivedTypes() const
-{
- return d->mDerivedTypes;
-}
-
-void ComplexType::setBaseDerivation(Derivation derivation)
-{
- d->mBaseDerivation = derivation;
-}
-
-ComplexType::Derivation ComplexType::baseDerivation() const
-{
- return d->mBaseDerivation;
-}
-
-bool ComplexType::isSimple() const
-{
- return false;
-}
-
-bool ComplexType::isPolymorphicBaseClass() const
-{
- return !isArray() && !d->mDerivedTypes.isEmpty() && d->mBaseTypeName.isEmpty();
-}
-
-void ComplexType::setArrayType(const QName &arrayType)
-{
- d->mArrayType = arrayType;
-}
-
-QName ComplexType::arrayType() const
-{
- return d->mArrayType;
-}
-
-bool ComplexType::isArray() const
-{
- return !arrayType().isEmpty();
-}
-
-void ComplexType::setAnonymous(bool anonymous)
-{
- d->mAnonymous = anonymous;
-}
-
-bool ComplexType::isAnonymous() const
-{
- return d->mAnonymous;
-}
-
-void ComplexType::setConflicting(bool conflicting)
-{
- d->mConflicting = conflicting;
-}
-
-bool ComplexType::isConflicting() const
-{
- return d->mConflicting;
-}
-
-void ComplexType::setElements(const Element::List &elements)
-{
- d->mElements = elements;
-}
-
-Element::List ComplexType::elements() const
-{
- return d->mElements;
-}
-
-void ComplexType::setGroups(const Group::List &groups)
-{
- d->mGroups = groups;
-}
-
-void ComplexType::addGroup(const Group &group)
-{
- d->mGroups.append(group);
-}
-
-Group::List ComplexType::groups() const
-{
- return d->mGroups;
-}
-
-void ComplexType::setAttributes(const Attribute::List &attributes)
-{
- d->mAttributes = attributes;
-}
-
-Attribute::List ComplexType::attributes() const
-{
- return d->mAttributes;
-}
-
-void ComplexType::addAttributeGroups(const AttributeGroup &attributeGroups)
-{
- d->mAttributeGroups.append(attributeGroups);
-}
-
-void ComplexType::setAttributeGroups(const AttributeGroup::List &attributeGroups)
-{
- d->mAttributeGroups = attributeGroups;
-}
-
-AttributeGroup::List ComplexType::attributeGroups() const
-{
- return d->mAttributeGroups;
-}
-
-void ComplexType::addAttribute(const Attribute &attribute)
-{
- d->mAttributes.append(attribute);
-}
-
-Attribute ComplexType::attribute(const QName &attrName) const
-{
- Q_FOREACH (const Attribute &attr, d->mAttributes) {
- if (attr.qualifiedName() == attrName) {
- return attr;
- }
- }
- return Attribute();
-}
-
-void ComplexType::addElement(const Element &element)
-{
- d->mElements.append(element);
-}
-
-bool ComplexType::isEmpty() const
-{
- return d->mAttributeGroups.isEmpty() && d->mGroups.isEmpty() && d->mAttributes.isEmpty() && d->mElements.isEmpty() && d->mBaseTypeName.isEmpty() && d->mArrayType.isEmpty();
-}
-
-ComplexType ComplexTypeList::complexType(const QName &qualifiedName) const
-{
- //qDebug() << "looking for" << typeName << "ns=" << typeName.nameSpace();
- foreach (const ComplexType &type, *this) {
- //qDebug() << type.nameSpace() << "qualifiedName=" << type.qualifiedName();
- if (qualifiedName == type.qualifiedName()) {
- return type;
- }
- }
- //qDebug() << "Complex type" << qualifiedName << "not found";
- return ComplexType();
-}
-
-ComplexTypeList::iterator ComplexTypeList::findComplexType(const QName &qualifiedName)
-{
- for (iterator it = begin(); it != end(); ++it)
- if ((*it).qualifiedName() == qualifiedName) {
- return it;
- }
- return end();
-}
-
-} // namespace XSD
-
-QDebug operator<<(QDebug dbg, const XSD::ComplexType &type)
-{
- dbg << type.qualifiedName();
- // dbg << type.attributes();
- return dbg;
-}
diff --git a/kdwsdl2cpp/schema/complextype.h b/kdwsdl2cpp/schema/complextype.h
deleted file mode 100644
index 1309a62..0000000
--- a/kdwsdl2cpp/schema/complextype.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef SCHEMA_COMPLEXTYPE_H
-#define SCHEMA_COMPLEXTYPE_H
-
-#include <QString>
-
-#include <schema/attribute.h>
-#include <schema/attributegroup.h>
-#include <schema/group.h>
-#include <schema/element.h>
-#include <schema/xsdtype.h>
-
-#include <common/qname.h>
-#include <kode_export.h>
-
-namespace XSD
-{
-class ComplexTypeList;
-
-class SCHEMA_EXPORT ComplexType : public XSDType
-{
-public:
- typedef ComplexTypeList List;
-
- typedef enum {
- Restriction,
- Extension
- } Derivation;
-
- ComplexType();
- ComplexType(const QString &nameSpace);
- ComplexType(const ComplexType &other);
- ~ComplexType();
-
- ComplexType &operator=(const ComplexType &other);
-
- void setDocumentation(const QString &documentation);
- QString documentation() const;
-
- bool isSimple() const override;
-
- // True if this is the base class for other (derived) complex types
- bool isPolymorphicBaseClass() const;
-
- void setAnonymous(bool anonymous);
- bool isAnonymous() const;
-
- void setConflicting(bool c);
- bool isConflicting() const;
-
- void setBaseDerivation(Derivation derivation);
- Derivation baseDerivation() const;
-
- void setBaseTypeName(const QName &baseTypeName);
- QName baseTypeName() const;
-
- void addDerivedType(const QName &derivedTypeName);
- QList<QName> derivedTypes() const;
-
- void setElements(const Element::List &elements);
- Element::List elements() const;
-
- void setGroups(const Group::List &groups);
- void addGroup(const Group &group);
- Group::List groups() const;
-
- void setAttributes(const Attribute::List &attributes);
- Attribute::List attributes() const;
- Attribute attribute(const QName &attrName) const;
-
- void addAttributeGroups(const AttributeGroup &attributeGroups);
- void setAttributeGroups(const AttributeGroup::List &attributeGroups);
- AttributeGroup::List attributeGroups() const;
-
- void setArrayType(const QName &arrayType);
- QName arrayType() const;
- bool isArray() const;
-
- void addAttribute(const Attribute &attribute);
- void addElement(const Element &element);
-
- bool isEmpty() const;
-
-private:
- class Private;
- Private *d;
-};
-
-class SCHEMA_EXPORT ComplexTypeList : public QList<ComplexType>
-{
-public:
- ComplexTypeList(const QList<ComplexType> &arg) : QList<ComplexType>(arg) {}
- ComplexTypeList() : QList<ComplexType>() {}
-
- // Readonly lookup, returns null type if not found
- ComplexType complexType(const QName &qualifiedName) const;
-
- // Mutable lookup (for making changes), returns end() if not found
- iterator findComplexType(const QName &qualifiedName);
-};
-
-} // namespace XSD
-
-SCHEMA_EXPORT QDebug operator<<(QDebug dbg, const XSD::ComplexType &type);
-
-#endif
diff --git a/kdwsdl2cpp/schema/compositor.cpp b/kdwsdl2cpp/schema/compositor.cpp
deleted file mode 100644
index 23c0627..0000000
--- a/kdwsdl2cpp/schema/compositor.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2006 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "compositor.h"
-
-namespace XSD
-{
-
-class Compositor::Private
-{
-public:
- Private()
- : mType(Invalid),
- mMinOccurs(1),
- mMaxOccurs(1)
- {}
-
- Type mType;
- QName::List mChildren;
- int mMinOccurs;
- int mMaxOccurs;
-};
-
-Compositor::Compositor()
- : d(new Private)
-{
-}
-
-Compositor::Compositor(Type type)
- : d(new Private)
-{
- d->mType = type;
-}
-
-Compositor::Compositor(const Compositor &other)
- : d(new Private)
-{
- *d = *other.d;
-}
-
-Compositor::~Compositor()
-{
- delete d;
-}
-
-Compositor &Compositor::operator=(const Compositor &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
-
- return *this;
-}
-
-bool Compositor::isValid() const
-{
- return d->mType != Invalid;
-}
-
-void Compositor::setMinOccurs(int minOccurs)
-{
- d->mMinOccurs = minOccurs;
-}
-
-int Compositor::minOccurs() const
-{
- return d->mMinOccurs;
-}
-
-void Compositor::setMaxOccurs(int maxOccurs)
-{
- d->mMaxOccurs = maxOccurs;
-}
-
-int Compositor::maxOccurs() const
-{
- return d->mMaxOccurs;
-}
-
-void Compositor::setType(Type type)
-{
- d->mType = type;
-}
-
-Compositor::Type Compositor::type() const
-{
- return d->mType;
-}
-
-void Compositor::addChild(const QName &child)
-{
- d->mChildren.append(child);
-}
-
-void Compositor::setChildren(const QName::List &children)
-{
- d->mChildren = children;
-}
-
-QName::List Compositor::children() const
-{
- return d->mChildren;
-}
-
-}
diff --git a/kdwsdl2cpp/schema/compositor.h b/kdwsdl2cpp/schema/compositor.h
deleted file mode 100644
index 488245c..0000000
--- a/kdwsdl2cpp/schema/compositor.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2006 Cornelius Schumacher <schumacher@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef SCHEMA_COMPOSITOR_H
-#define SCHEMA_COMPOSITOR_H
-
-#include <QString>
-#include <common/qname.h>
-#include <kode_export.h>
-
-namespace XSD
-{
-
-class SCHEMA_EXPORT Compositor
-{
-public:
- typedef QList<Compositor> List;
-
- enum Type {
- Invalid,
- Choice,
- Sequence,
- All
- };
-
- Compositor();
- Compositor(Type type);
- Compositor(const Compositor &other);
- ~Compositor();
-
- Compositor &operator=(const Compositor &other);
-
- bool isValid() const;
-
- void setMinOccurs(int minOccurs);
- int minOccurs() const;
- void setMaxOccurs(int maxOccurs);
- int maxOccurs() const;
-
- void setType(Type type);
- Type type() const;
-
- void addChild(const QName &childName);
- void setChildren(const QName::List &children);
- QName::List children() const;
-
-private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/schema/element.cpp b/kdwsdl2cpp/schema/element.cpp
deleted file mode 100644
index 6777029..0000000
--- a/kdwsdl2cpp/schema/element.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "element.h"
-#include <QDebug>
-
-namespace XSD
-{
-
-class Element::Private
-{
-public:
- Private()
- : mGroupId(0),
- mMinOccurs(1),
- mMaxOccurs(1),
- mQualified(false),
- mNillable(false),
- mHasSubstitutions(false),
- mOccurrence(0)
- {}
-
- QName mType;
- QString mDocumentation;
- int mGroupId;
- int mMinOccurs;
- int mMaxOccurs;
- bool mQualified;
- bool mNillable;
- bool mHasSubstitutions;
- QString mDefaultValue;
- QString mFixedValue;
- int mOccurrence;
- QName mReference;
- Compositor mCompositor;
-};
-
-Element::Element()
- : XmlElement(), d(new Private)
-{
-}
-
-Element::Element(const QString &nameSpace)
- : XmlElement(nameSpace), d(new Private)
-{
-}
-
-Element::Element(const Element &other)
- : XmlElement(other), d(new Private)
-{
- *d = *other.d;
-}
-
-Element::~Element()
-{
- delete d;
-}
-
-Element &Element::operator=(const Element &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
- XmlElement::operator=(other);
-
- return *this;
-}
-
-void Element::setType(const QName &type)
-{
- Q_ASSERT(!type.isEmpty());
- d->mType = type;
-}
-
-QName Element::type() const
-{
- return d->mType;
-}
-
-void Element::setDocumentation(const QString &documentation)
-{
- d->mDocumentation = documentation;
-}
-
-QString Element::documentation() const
-{
- return d->mDocumentation;
-}
-
-// unused
-void Element::setGroupId(int group)
-{
- d->mGroupId = group;
-}
-
-// unused
-int Element::groupId() const
-{
- return d->mGroupId;
-}
-
-void Element::setMinOccurs(int minOccurs)
-{
- d->mMinOccurs = minOccurs;
-}
-
-int Element::minOccurs() const
-{
- return d->mMinOccurs;
-}
-
-void Element::setMaxOccurs(int maxOccurs)
-{
- d->mMaxOccurs = maxOccurs;
-}
-
-int Element::maxOccurs() const
-{
- return d->mMaxOccurs;
-}
-
-void Element::setDefaultValue(const QString &defaultValue)
-{
- d->mDefaultValue = defaultValue;
-}
-
-QString Element::defaultValue() const
-{
- return d->mDefaultValue;
-}
-
-void Element::setFixedValue(const QString &fixedValue)
-{
- d->mFixedValue = fixedValue;
-}
-
-QString Element::fixedValue() const
-{
- return d->mFixedValue;
-}
-
-void Element::setIsQualified(bool isQualified)
-{
- d->mQualified = isQualified;
-}
-
-bool Element::isQualified() const
-{
- return d->mQualified;
-}
-
-void Element::setNillable(bool nillable)
-{
- d->mNillable = nillable;
-}
-
-bool Element::nillable() const
-{
- return d->mNillable;
-}
-
-void Element::setOccurrence(int occurrence)
-{
- d->mOccurrence = occurrence;
-}
-
-int Element::occurrence() const
-{
- return d->mOccurrence;
-}
-
-void Element::setReference(const QName &reference)
-{
- Q_ASSERT(!reference.isEmpty());
- d->mReference = reference;
-}
-
-QName Element::reference() const
-{
- return d->mReference;
-}
-
-bool Element::isResolved() const
-{
- return !d->mType.isEmpty() || d->mReference.isEmpty();
-}
-
-void Element::setCompositor(const Compositor &c)
-{
- d->mCompositor = c;
-}
-
-Compositor Element::compositor() const
-{
- return d->mCompositor;
-}
-
-void Element::setHasSubstitutions(bool hasSub)
-{
- d->mHasSubstitutions = hasSub;
-}
-
-bool Element::hasSubstitutions() const
-{
- return d->mHasSubstitutions;
-}
-
-Element ElementList::element(const QName &qualifiedName) const
-{
- const_iterator it = constBegin();
- for (; it != constEnd(); ++it)
- if ((*it).qualifiedName() == qualifiedName) {
- return *it;
- }
- //qDebug() << "Simple type" << qualifiedName << "not found";
- return Element();
-}
-
-ElementList::iterator ElementList::findElement(const QName &qualifiedName)
-{
- for (iterator it = begin(); it != end(); ++it)
- if ((*it).qualifiedName() == qualifiedName) {
- return it;
- }
- return end();
-
-}
-
-void ElementList::dump()
-{
- Q_FOREACH (const Element &element, *this) {
- qDebug() << element.nameSpace() << element.name();
- }
-}
-
-} // namespace XSD
-
-QDebug operator<<(QDebug dbg, const XSD::Element &element)
-{
- dbg << element.name();
- return dbg;
-}
diff --git a/kdwsdl2cpp/schema/element.h b/kdwsdl2cpp/schema/element.h
deleted file mode 100644
index e0633f5..0000000
--- a/kdwsdl2cpp/schema/element.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef SCHEMA_ELEMENT_H
-#define SCHEMA_ELEMENT_H
-
-#include <QList>
-#include <QString>
-
-#include "xmlelement.h"
-#include "compositor.h"
-#include <kode_export.h>
-
-namespace XSD
-{
-
-class ElementList;
-
-class SCHEMA_EXPORT Element : public XmlElement
-{
-public:
- typedef ElementList List;
-
- Element();
- Element(const QString &nameSpace);
- Element(const Element &other);
- ~Element();
-
- Element &operator=(const Element &other);
-
- void setType(const QName &type);
- QName type() const;
-
- void setDocumentation(const QString &documentation);
- QString documentation() const;
-
- void setGroupId(int group);
- int groupId() const;
-
- void setMinOccurs(int minOccurs);
- int minOccurs() const;
-
- void setMaxOccurs(int maxOccurs);
- int maxOccurs() const;
-
- void setDefaultValue(const QString &defaultValue);
- QString defaultValue() const;
-
- void setFixedValue(const QString &fixedValue);
- QString fixedValue() const;
-
- void setIsQualified(bool isQualified);
- bool isQualified() const;
-
- void setNillable(bool nillable);
- bool nillable() const;
-
- void setOccurrence(int occurrence);
- int occurrence() const;
-
- void setReference(const QName &reference);
- QName reference() const;
-
- bool isResolved() const;
-
- void setCompositor(const Compositor &);
- Compositor compositor() const;
-
- /**
- * Makes a note that this element has substitutions available.
- *
- * Example:
- * <xs:element name="Path" abstract="true" type="t:BasePathToElementType"/>
- * <xs:element name="FieldURI" type="t:PathToUnindexedFieldType" substitutionGroup="t:Path"/>
- * will note in the element "Path" that substitutions exist.
- */
- void setHasSubstitutions(bool hasSub);
- /**
- * @return true if this element is the base element of a substitution group.
- */
- bool hasSubstitutions() const;
-
-private:
- class Private;
- Private *d;
-};
-
-class SCHEMA_EXPORT ElementList : public QList<Element>
-{
-public:
- // Readonly lookup, returns null element if not found
- Element element(const QName &qualifiedName) const;
-
- // Mutable lookup (for making changes), returns end() if not found
- iterator findElement(const QName &qualifiedName);
-
- // For debugging
- void dump();
-};
-
-}
-
-SCHEMA_EXPORT QDebug operator<<(QDebug dbg, const XSD::Element &element);
-
-#endif
diff --git a/kdwsdl2cpp/schema/group.cpp b/kdwsdl2cpp/schema/group.cpp
deleted file mode 100644
index b0deb51..0000000
--- a/kdwsdl2cpp/schema/group.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- This file is part of KDE Schema Parser.
-
- Copyright (c) 2013 David Faure <david.faure@kdab.com>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-#include "group.h"
-
-namespace XSD
-{
-
-class Group::Private
-{
-public:
- QName mReference;
- Element::List mElements;
-};
-
-Group::Group()
- : XmlElement(), d(new Private)
-{
-}
-
-Group::Group(const Group &other)
- : XmlElement(other), d(new Private)
-{
- *d = *other.d;
-}
-
-Group::~Group()
-{
- delete d;
-}
-
-Group &Group::operator=(const Group &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
-
- return *this;
-}
-
-void Group::setReference(const QName &reference)
-{
- d->mReference = reference;
-}
-
-QName Group::reference() const
-{
- return d->mReference;
-}
-
-void Group::setElements(const Element::List &elements)
-{
- d->mElements = elements;
-}
-
-Element::List Group::elements() const
-{
- return d->mElements;
-}
-
-bool Group::isResolved() const
-{
- return !d->mElements.isEmpty() || d->mReference.isEmpty();
-}
-
-}
-
-QDebug operator<<(QDebug dbg, const XSD::Group &group)
-{
- dbg << group.qualifiedName();
- return dbg;
-}
diff --git a/kdwsdl2cpp/schema/group.h b/kdwsdl2cpp/schema/group.h
deleted file mode 100644
index 8857b00..0000000
--- a/kdwsdl2cpp/schema/group.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef GROUP_H
-#define GROUP_H
-
-#include <schema/xmlelement.h>
-#include <schema/element.h>
-#include <common/qname.h>
-#include <qdebug.h>
-
-#include <kode_export.h>
-
-namespace XSD
-{
-
-class SCHEMA_EXPORT Group : public XmlElement
-{
-public:
- typedef QList<Group> List;
-
- Group();
- Group(const Group &other);
- ~Group();
-
- Group &operator=(const Group &other);
-
- void setReference(const QName &reference);
- QName reference() const;
-
- void setElements(const Element::List &elements);
- Element::List elements() const;
-
- bool isResolved() const;
-
-private:
- class Private;
- Private *d;
-};
-
-}
-
-SCHEMA_EXPORT QDebug operator<<(QDebug dbg, const XSD::Group &group);
-
-#endif // GROUP_H
diff --git a/kdwsdl2cpp/schema/parser.cpp b/kdwsdl2cpp/schema/parser.cpp
deleted file mode 100644
index 2e1dcf8..0000000
--- a/kdwsdl2cpp/schema/parser.cpp
+++ /dev/null
@@ -1,1320 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2006 Michaël Larouche <michael.larouche@kdemail.net>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include <QDir>
-#include <QFile>
-#include <QUrl>
-#include <QXmlSimpleReader>
-#include <QtDebug>
-#include <QtCore/QLatin1String>
-
-#include <common/fileprovider.h>
-#include <common/messagehandler.h>
-#include <common/nsmanager.h>
-#include <common/parsercontext.h>
-#include "parser.h"
-
-static const QString XMLSchemaURI(QLatin1String("http://www.w3.org/2001/XMLSchema"));
-static const QString WSDLSchemaURI(QLatin1String("http://schemas.xmlsoap.org/wsdl/"));
-static const QString soapEncNs = QLatin1String("http://schemas.xmlsoap.org/soap/encoding/");
-static const QString soap12EncNs = QLatin1String("http://www.w3.org/2003/05/soap-encoding");
-
-namespace XSD
-{
-
-static bool stringToBoolean(const QString &str)
-{
- return str == QLatin1String("true") || str == QChar::fromLatin1('1');
-}
-
-class Parser::Private
-{
-public:
- QString mNameSpace;
- bool mDefaultQualifiedElements;
- bool mDefaultQualifiedAttributes;
-
- SimpleType::List mSimpleTypes;
- ComplexType::List mComplexTypes;
- Element::List mElements;
- Attribute::List mAttributes;
- Group::List mGroups;
- AttributeGroup::List mAttributeGroups;
- Annotation::List mAnnotations;
-
- QStringList mImportedSchemas;
- QStringList mIncludedSchemas;
-};
-
-Parser::Parser(ParserContext *context, const QString &nameSpace)
- : d(new Private)
-{
- d->mNameSpace = nameSpace;
- d->mDefaultQualifiedElements = false;
- d->mDefaultQualifiedAttributes = false;
- init(context);
-}
-
-Parser::Parser(const Parser &other)
- : d(new Private)
-{
- *d = *other.d;
-}
-
-Parser::~Parser()
-{
- clear();
- delete d;
-}
-
-Parser &Parser::operator=(const Parser &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
-
- return *this;
-}
-
-void Parser::clear()
-{
- d->mImportedSchemas.clear();
- d->mComplexTypes.clear();
- d->mSimpleTypes.clear();
- d->mElements.clear();
- d->mGroups.clear();
- d->mAttributes.clear();
- d->mAttributeGroups.clear();
-}
-
-void Parser::init(ParserContext *context)
-{
-#if 0
- if (!parseFile(context, ":/schema/XMLSchema.xsd")) {
- qWarning("Error parsing builtin file XMLSchema.xsd");
- }
-#else
- Q_UNUSED(context);
-#endif
-
- // From the XML schema XSD
- {
- Element schema(XMLSchemaURI);
- schema.setName(QLatin1String("schema"));
- schema.setType(QName(XMLSchemaURI, QLatin1String("anyType")));
- d->mElements.append(schema);
- }
- d->mImportedSchemas.append(XMLSchemaURI);
- d->mImportedSchemas.append(NSManager::xmlNamespace());
-
- // Define xml:lang, since we don't parse xml.xsd
- {
- Attribute langAttr(NSManager::xmlNamespace());
- langAttr.setName(QLatin1String("lang"));
- langAttr.setType(QName(XMLSchemaURI, QLatin1String("string")));
- d->mAttributes.append(langAttr);
- }
-}
-
-bool Parser::parseSchemaTag(ParserContext *context, const QDomElement &root)
-{
- QName name(root.tagName());
- if (name.localName() != QLatin1String("schema")) {
- qDebug() << "ERROR localName=" << name.localName();
- return false;
- }
-
- // Already done by caller when coming from type.cpp, but doesn't hurt to do twice
- context->namespaceManager()->enterChild(root);
-
- // This method can call itself recursively, so save/restore the member attribute.
- const QString oldNamespace = d->mNameSpace;
- const bool oldDefaultQualifiedElements = d->mDefaultQualifiedElements;
- const bool oldDefaultQualifiedAttributes = d->mDefaultQualifiedAttributes;
-
- if (root.hasAttribute(QLatin1String("targetNamespace"))) {
- d->mNameSpace = root.attribute(QLatin1String("targetNamespace"));
- }
-
- if (root.attribute(QLatin1String("elementFormDefault")) == QLatin1String("qualified")) {
- d->mDefaultQualifiedElements = true;
- }
-
- if (root.attribute(QLatin1String("attributeFormDefault")) == QLatin1String("qualified")) {
- d->mDefaultQualifiedAttributes = true;
- }
-
-// mTypesTable.setTargetNamespace( mNameSpace );
-
- QDomElement element = root.firstChildElement();
- while (!element.isNull()) {
- NSManager namespaceManager(context, element);
- const QName name(element.tagName());
- if (debugParsing()) {
- qDebug() << "Schema: parsing" << name.localName();
- }
- if (name.localName() == QLatin1String("import")) {
- parseImport(context, element);
- } else if (name.localName() == QLatin1String("element")) {
- addGlobalElement(parseElement(context, element, d->mNameSpace, element));
- } else if (name.localName() == QLatin1String("complexType")) {
- ComplexType ct = parseComplexType(context, element);
- d->mComplexTypes.append(ct);
- } else if (name.localName() == QLatin1String("simpleType")) {
- SimpleType st = parseSimpleType(context, element);
- d->mSimpleTypes.append(st);
- } else if (name.localName() == QLatin1String("attribute")) {
- addGlobalAttribute(parseAttribute(context, element, d->mNameSpace));
- } else if (name.localName() == QLatin1String("attributeGroup")) {
- d->mAttributeGroups.append(parseAttributeGroup(context, element, d->mNameSpace));
- } else if (name.localName() == QLatin1String("group")) {
- d->mGroups.append(parseGroup(context, element, d->mNameSpace));
- } else if (name.localName() == QLatin1String("annotation")) {
- d->mAnnotations = parseAnnotation(context, element);
- } else if (name.localName() == QLatin1String("include")) {
- parseInclude(context, element);
- } else {
- qWarning() << "Unsupported schema element" << name.localName();
- }
-
- element = element.nextSiblingElement();
- }
-
- d->mImportedSchemas.append(d->mNameSpace);
- d->mNameSpace = oldNamespace;
- d->mDefaultQualifiedElements = oldDefaultQualifiedElements;
- d->mDefaultQualifiedAttributes = oldDefaultQualifiedAttributes;
-
- return true;
-}
-
-void Parser::parseImport(ParserContext *context, const QDomElement &element)
-{
- // https://www.w3.org/TR/2004/REC-xmlschema-1-20041028/structures.html#layer2
- // The actual value of its namespace [attribute] indicates that the containing schema document may contain qualified references to schema components in that namespace (via one or more prefixes declared with namespace declarations in the normal way).
- QString expectedNamespace = element.attribute(QLatin1String("namespace"));
-
-
- QString location = element.attribute(QLatin1String("schemaLocation"));
-
- if (location.isEmpty()) {
- // Testcase: <s:import namespace="http://microsoft.com/wsdl/types/" /> in the WSDL at https://www.elogbook.org/logbookws/logbookifv3.asmx
-
- // When no schemaLocation [attribute] is present, the schema author is leaving the identification of that schema to the instance, application or user, via the mechanisms described below in Layer 3: Schema Document Access and Web-interoperability (§4.3).
- // 4.3.2 is especially crazy in terms of "do whatever you can or want"
- // Some implementations seem to just use the namespace as a schema location, let's try that
- if (!expectedNamespace.isEmpty()) {
- location = expectedNamespace;
- } else {
- return; // <import/> means nothing to us
- }
- }
-
- // don't import a schema twice
- if (d->mImportedSchemas.contains(location)) {
- return;
- } else {
- d->mImportedSchemas.append(location);
- }
-
- importSchema(context, location);
-}
-
-void Parser::parseInclude(ParserContext *context, const QDomElement &element)
-{
- QString location = element.attribute(QLatin1String("schemaLocation"));
-
- if (!location.isEmpty()) {
- // don't include a schema twice
- if (d->mIncludedSchemas.contains(location)) {
- return;
- } else {
- d->mIncludedSchemas.append(location);
- }
-
- includeSchema(context, location);
- } else {
- context->messageHandler()->warning(QString::fromLatin1("include tag found at (%1, %2) contains no schemaLocation tag.").arg(element.lineNumber(), element.columnNumber()));
- }
-}
-
-Annotation::List Parser::parseAnnotation(ParserContext *context, const QDomElement &element)
-{
- Annotation::List result;
-
- QDomElement child;
- for (child = element.firstChildElement(); !child.isNull();
- child = child.nextSiblingElement()) {
- NSManager namespaceManager(context, child);
- const QName name(child.tagName());
- if (name.localName() == QLatin1String("documentation")) {
- result.append(Annotation(child));
- } else if (name.localName() == QLatin1String("appinfo")) {
- result.append(Annotation(child));
- }
- }
-
- return result;
-}
-
-ComplexType Parser::parseComplexType(ParserContext *context, const QDomElement &element)
-{
- ComplexType newType(d->mNameSpace);
-
- newType.setName(element.attribute(QLatin1String("name")));
-
- if (debugParsing()) {
- qDebug() << "complexType:" << d->mNameSpace << newType.name();
- }
-
- if (element.hasAttribute(QLatin1String("mixed"))) {
- newType.setContentModel(XSDType::MIXED);
- }
-
- QDomElement childElement = element.firstChildElement();
-
- AttributeGroup::List attributeGroups;
- Group::List groups;
-
- while (!childElement.isNull()) {
- NSManager namespaceManager(context, childElement);
- const QName name(childElement.tagName());
- if (name.localName() == QLatin1String("all")) {
- all(context, childElement, newType);
- } else if (name.localName() == QLatin1String("sequence") || name.localName() == QLatin1String("choice")) {
- Element::List elems;
- parseCompositor(context, childElement, newType.nameSpace(), &elems, &groups);
- foreach (const Element &elem, elems) {
- newType.addElement(elem);
- }
- } else if (name.localName() == QLatin1String("attribute")) {
- newType.addAttribute(parseAttribute(context, childElement, d->mNameSpace));
- } else if (name.localName() == QLatin1String("attributeGroup")) {
- attributeGroups.append(parseAttributeGroup(context, childElement, d->mNameSpace));
- } else if (name.localName() == QLatin1String("group")) {
- groups.append(parseGroup(context, childElement, newType.nameSpace()));
- } else if (name.localName() == QLatin1String("anyAttribute")) {
- addAnyAttribute(context, childElement, newType);
- } else if (name.localName() == QLatin1String("complexContent")) {
- parseComplexContent(context, childElement, newType);
- } else if (name.localName() == QLatin1String("simpleContent")) {
- parseSimpleContent(context, childElement, newType);
- } else if (name.localName() == QLatin1String("annotation")) {
- Annotation::List annotations = parseAnnotation(context, childElement);
- newType.setDocumentation(annotations.documentation());
- newType.setAnnotations(annotations);
- } else {
- qWarning() << "Unsupported complextype element" << name.localName();
- }
-
- childElement = childElement.nextSiblingElement();
- }
-
- newType.setAttributeGroups(attributeGroups);
- newType.setGroups(groups);
-
- return newType;
-}
-
-void Parser::all(ParserContext *context, const QDomElement &element, ComplexType &ct)
-{
- QDomElement childElement = element.firstChildElement();
-
- while (!childElement.isNull()) {
- NSManager namespaceManager(context, childElement);
- const QName name(childElement.tagName());
- if (name.localName() == QLatin1String("element")) {
- ct.addElement(parseElement(context, childElement, ct.nameSpace(),
- childElement));
- } else if (name.localName() == QLatin1String("annotation")) {
- Annotation::List annotations = parseAnnotation(context, childElement);
- ct.setDocumentation(annotations.documentation());
- ct.setAnnotations(annotations);
- } else {
- qWarning() << "Unsupported all element" << name.localName();
- }
-
- childElement = childElement.nextSiblingElement();
- }
-}
-
-static int readMaxOccurs(const QDomElement &element)
-{
- const QString value = element.attribute(QLatin1String("maxOccurs"), QLatin1String("1"));
- if (value == QLatin1String("unbounded")) {
- return Parser::UNBOUNDED;
- } else {
- return value.toInt();
- }
-}
-
-void Parser::parseCompositor(ParserContext *context, const QDomElement &element, const QString &nameSpace, Element::List *elements, Group::List *groups)
-{
- const QName name(element.tagName());
- bool isChoice = name.localName() == QLatin1String("choice");
- bool isSequence = name.localName() == QLatin1String("sequence");
-
- Compositor compositor;
- if (isChoice) {
- compositor.setType(Compositor::Choice);
- } else if (isSequence) {
- compositor.setType(Compositor::Sequence);
- }
- compositor.setMinOccurs(element.attribute(QLatin1String("minOccurs"), QLatin1String("1")).toInt());
- compositor.setMaxOccurs(readMaxOccurs(element));
-
- if (isChoice || isSequence) {
- QDomElement childElement = element.firstChildElement();
-
- while (!childElement.isNull()) {
- NSManager namespaceManager(context, childElement);
- const QName csName(childElement.tagName());
- const QString localName = csName.localName();
- if (localName == QLatin1String("element")) {
- Element newElement;
- if (isChoice) {
- newElement = parseElement(context, childElement,
- nameSpace, element);
- } else {
- newElement = parseElement(context, childElement,
- nameSpace, childElement);
- }
- newElement.setCompositor(compositor);
- elements->append(newElement);
- compositor.addChild(csName);
- } else if (localName == QLatin1String("any")) {
- elements->append(parseAny(context, childElement, nameSpace));
- } else if (localName == QLatin1String("choice") || localName == QLatin1String("sequence")) {
- parseCompositor(context, childElement, nameSpace, elements, groups);
- } else if (localName == QLatin1String("group")) {
- groups->append(parseGroup(context, childElement, nameSpace));
- } else if (localName == QLatin1String("annotation")) {
- // Not implemented
- //Annotation::List annotations = parseAnnotation( context, childElement );
- //compositor.setDocumentation( annotations.documentation() );
- //compositor.setAnnotations( annotations );
- } else {
- qDebug() << "Unsupported element in" << name << ":" << csName;
- }
-
- childElement = childElement.nextSiblingElement();
- }
- }
-}
-
-Element Parser::parseElement(ParserContext *context,
- const QDomElement &element, const QString &nameSpace,
- const QDomElement &occurrenceElement)
-{
- Element newElement(nameSpace);
-
- newElement.setName(element.attribute(QLatin1String("name")));
- if (debugParsing()) {
- qDebug() << "newElement namespace=" << nameSpace << "name=" << newElement.name() << "defaultQualified=" << d->mDefaultQualifiedElements;
- }
-
- // https://www.w3.org/TR/xmlschema-0/#NS
- if (element.hasAttribute(QLatin1String("form"))) {
- newElement.setIsQualified(element.attribute(QLatin1String("form")) == QLatin1String("qualified"));
- } else {
- newElement.setIsQualified(d->mDefaultQualifiedElements);
- }
-
- if (element.hasAttribute(QLatin1String("ref"))) {
- QName reference(element.attribute(QLatin1String("ref")));
- reference.setNameSpace(context->namespaceManager()->uri(reference.prefix()));
- newElement.setReference(reference);
- }
-
- setOccurrenceAttributes(newElement, occurrenceElement);
-
- newElement.setDefaultValue(element.attribute(QLatin1String("default")));
- newElement.setFixedValue(element.attribute(QLatin1String("fixed")));
- newElement.setNillable(stringToBoolean(element.attribute(QLatin1String("nillable"))));
-
- if (element.hasAttribute(QLatin1String("type"))) {
- QName typeName(element.attribute(QLatin1String("type")).trimmed());
- typeName.setNameSpace(context->namespaceManager()->uri(typeName.prefix()));
- if (debugParsing()) {
- qDebug() << "typeName=" << typeName.qname() << "namespace=" << context->namespaceManager()->uri(typeName.prefix());
- }
- newElement.setType(typeName);
-
- if (element.hasAttribute(QLatin1String("substitutionGroup"))) {
- QName baseElementName(element.attribute(QLatin1String("substitutionGroup")));
- baseElementName.setNameSpace(context->namespaceManager()->uri(baseElementName.prefix()));
- XSD::Element::List::iterator ctit_base = d->mElements.findElement(baseElementName);
- if (ctit_base != d->mElements.end()) {
- XSD::Element &baseElem = *ctit_base;
- // Record that the base element has substitutions
- baseElem.setHasSubstitutions(true);
- // Its type will need a virtual method _kd_substitutionElementName so fill in the base type too.
- // (OK, we do that for each derived type, but well)
- const QName baseType = baseElem.type();
- setSubstitutionElementName(baseType, baseElem.qualifiedName());
- } else {
- qWarning() << "Element" << newElement.qualifiedName() << "uses undefined element as substitutionGroup" << baseElementName;
- }
-
- setSubstitutionElementName(typeName, newElement.qualifiedName());
- }
- } else {
- QDomElement childElement = element.firstChildElement();
-
- while (!childElement.isNull()) {
- NSManager namespaceManager(context, childElement);
- const QName childName(childElement.tagName());
- //qDebug() << "childName:" << childName.localName();
- if (childName.localName() == QLatin1String("complexType")) {
- ComplexType ct = parseComplexType(context, childElement);
-
- ct.setName(newElement.name());
- ct.setAnonymous(true);
- d->mComplexTypes.append(ct);
-
- if (debugParsing()) {
- qDebug() << " found nested complexType element, type name is now element name, i.e. " << ct.name() << "newElement.setType" << ct.qualifiedName();
- }
- newElement.setType(ct.qualifiedName());
- } else if (childName.localName() == QLatin1String("simpleType")) {
- SimpleType st = parseSimpleType(context, childElement);
-
- st.setName(newElement.name());
- d->mSimpleTypes.append(st);
-
- newElement.setType(st.qualifiedName());
- } else if (childName.localName() == QLatin1String("annotation")) {
- Annotation::List annotations = parseAnnotation(context, childElement);
- newElement.setDocumentation(annotations.documentation());
- newElement.setAnnotations(annotations);
- }
-
- childElement = childElement.nextSiblingElement();
- }
- }
-
- // Fixup elements without a type
- if (newElement.type().isEmpty() && newElement.reference().isEmpty()) {
- ComplexType ct;
- Q_ASSERT(!newElement.name().isEmpty());
- ct.setNameSpace(newElement.nameSpace());
- ct.setName(newElement.name());
- ct.setAnonymous(true);
- d->mComplexTypes.append(ct);
- newElement.setType(ct.qualifiedName());
- }
-
- return newElement;
-}
-
-void Parser::setSubstitutionElementName(const QName &typeName, const QName &elemName)
-{
- XSD::ComplexType::List::iterator ctit = d->mComplexTypes.findComplexType(typeName);
- if (ctit != d->mComplexTypes.end()) {
- // If this type already has an element name associated, they are aliases, any one will do.
- (*ctit).setSubstitutionElementName(elemName);
- } else {
- XSD::SimpleType::List::iterator stit = d->mSimpleTypes.findSimpleType(typeName);
- if (stit != d->mSimpleTypes.end()) {
- (*stit).setSubstitutionElementName(elemName);
- } else {
- qWarning() << "Element" << elemName << "uses undefined type" << typeName;
- }
- }
-}
-
-// Testcase: salesforce-partner.wsdl has <any namespace="##targetNamespace" [...]/>
-Element Parser::parseAny(ParserContext *, const QDomElement &element, const QString &nameSpace)
-{
- Element newElement(nameSpace);
- newElement.setName(QLatin1String("any"));
- QName anyType(QLatin1String("http://www.w3.org/2001/XMLSchema"), QLatin1String("any"));
- newElement.setType(anyType);
- setOccurrenceAttributes(newElement, element);
- return newElement;
-}
-
-void Parser::setOccurrenceAttributes(Element &newElement,
- const QDomElement &element)
-{
- newElement.setMinOccurs(element.attribute(QLatin1String("minOccurs"), QLatin1String("1")).toInt());
- newElement.setMaxOccurs(readMaxOccurs(element));
-}
-
-void Parser::addAnyAttribute(ParserContext *, const QDomElement &element, ComplexType &complexType)
-{
- Attribute newAttribute;
- newAttribute.setName(QLatin1String("anyAttribute"));
-
- newAttribute.setNameSpace(element.attribute(QLatin1String("namespace")));
-
- // ### Hmm, technically, this should be a list of anys, I think.
- newAttribute.setType(QName(XMLSchemaURI, QString::fromLatin1("anyType")));
-
- complexType.addAttribute(newAttribute);
-}
-
-Attribute Parser::parseAttribute(ParserContext *context,
- const QDomElement &element, const QString &nameSpace)
-{
- Attribute newAttribute;
-
- newAttribute.setName(element.attribute(QLatin1String("name")));
- newAttribute.setNameSpace(nameSpace);
-
- if (element.hasAttribute(QLatin1String("type"))) {
- // TODO pass nsmanager to QName so that it can resolve namespaces?
- QName typeName(element.attribute(QLatin1String("type")));
- typeName.setNameSpace(context->namespaceManager()->uri(typeName.prefix()));
- newAttribute.setType(typeName);
- }
-
- // https://www.w3.org/TR/xmlschema-0/#NS
- if (element.hasAttribute(QLatin1String("form"))) {
- newAttribute.setIsQualified(element.attribute(QLatin1String("form")) == QLatin1String("qualified"));
- } else {
- newAttribute.setIsQualified(d->mDefaultQualifiedAttributes);
- }
-
- if (element.hasAttribute(QLatin1String("ref"))) {
- QName reference(element.attribute(QLatin1String("ref")));
- reference.setNameSpace(context->namespaceManager()->uri(reference.prefix()));
- newAttribute.setReference(reference);
- }
-
- newAttribute.setDefaultValue(element.attribute(QLatin1String("default")));
- newAttribute.setFixedValue(element.attribute(QLatin1String("fixed")));
-
- if (element.hasAttribute(QLatin1String("use"))) {
- const QString use = element.attribute(QLatin1String("use"));
- if (use == QLatin1String("optional")) {
- newAttribute.setAttributeUse(Attribute::Optional);
- } else if (use == QLatin1String("required")) {
- newAttribute.setAttributeUse(Attribute::Required);
- } else if (use == QLatin1String("prohibited")) {
- qWarning("prohibited attributes are not supported"); // TODO skip parsing the attribute altogether
- newAttribute.setAttributeUse(Attribute::Prohibited);
- }
- }
-
- QDomElement childElement = element.firstChildElement();
-
- while (!childElement.isNull()) {
- NSManager namespaceManager(context, childElement);
- const QName childName(childElement.tagName());
- if (childName.localName() == QLatin1String("simpleType")) {
- SimpleType st = parseSimpleType(context, childElement);
- st.setName(newAttribute.name());
- d->mSimpleTypes.append(st);
-
- newAttribute.setType(st.qualifiedName());
- } else if (childName.localName() == QLatin1String("annotation")) {
- Annotation::List annotations = parseAnnotation(context, childElement);
- newAttribute.setDocumentation(annotations.documentation());
- newAttribute.setAnnotations(annotations);
- }
-
- childElement = childElement.nextSiblingElement();
- }
-
- if (newAttribute.type().isEmpty() && !element.hasAttribute(QLatin1String("ref"))) {
- // https://www.w3.org/TR/2004/REC-xmlschema-1-20041028/structures.html#element-attribute
- // says "otherwise the simple ur-type definition", which is anySimpleType
- newAttribute.setType(QName(XMLSchemaURI, QLatin1String("anySimpleType")));
- qDebug() << "found attribute" << newAttribute.name() << "without type and without ref, set to default" << newAttribute.type();
- }
-
- return newAttribute;
-}
-
-SimpleType Parser::parseSimpleType(ParserContext *context, const QDomElement &element)
-{
- SimpleType st(d->mNameSpace);
-
- st.setName(element.attribute(QLatin1String("name")));
-
- if (debugParsing()) {
- qDebug() << "simpleType:" << d->mNameSpace << st.name();
- }
-
- QDomElement childElement = element.firstChildElement();
-
- while (!childElement.isNull()) {
- NSManager namespaceManager(context, childElement);
- const QName name(childElement.tagName());
- if (name.localName() == QLatin1String("restriction")) {
- st.setSubType(SimpleType::TypeRestriction);
-
- QName typeName(childElement.attribute(QLatin1String("base")));
- typeName.setNameSpace(context->namespaceManager()->uri(typeName.prefix()));
- st.setBaseTypeName(typeName);
-
- parseRestriction(context, childElement, st);
- } else if (name.localName() == QLatin1String("union")) {
- st.setSubType(SimpleType::TypeUnion);
- // It means "the contents can be either one of my child elements, or one of the types listed in memberTypes".
- // For now we'll just use QVariant.
- // For more compile-time checking we would need to actually parse and store
- // the references to the possible types. And then generate methods for each;
- // but we won't have a good name for these methods, just some type name...
- // setSizebyno / setSizebystring reads weird.
- st.setBaseTypeName(QName(XMLSchemaURI, QString::fromLatin1("anyType"))); // to get QVariant
-
- } else if (name.localName() == QLatin1String("list")) {
- st.setSubType(SimpleType::TypeList);
- if (childElement.hasAttribute(QLatin1String("itemType"))) {
- QName typeName(childElement.attribute(QLatin1String("itemType")));
- if (!typeName.prefix().isEmpty()) {
- typeName.setNameSpace(context->namespaceManager()->uri(typeName.prefix()));
- } else {
- typeName.setNameSpace(st.nameSpace());
- }
- st.setListTypeName(typeName);
- } else {
- // Anonymous type
- QDomElement typeElement = childElement.firstChildElement();
- for (; !typeElement.isNull(); typeElement = typeElement.nextSiblingElement()) {
- NSManager namespaceManager(context, typeElement);
- const QName typeName(typeElement.tagName());
- //qDebug() << "childName:" << childName.localName();
- if (typeName.localName() == QLatin1String("complexType")) {
- ComplexType ctItem = parseComplexType(context, typeElement);
- ctItem.setName(st.name() + QLatin1String("ListItem")); // need to make something up, so that the classname looks good
- st.setListTypeName(ctItem.qualifiedName());
- d->mComplexTypes.append(ctItem);
- } else if (typeName.localName() == QLatin1String("simpleType")) {
- SimpleType stItem = parseSimpleType(context, typeElement);
- stItem.setName(st.name() + QLatin1String("ListItem")); // need to make something up, so that the classname looks good
- st.setListTypeName(stItem.qualifiedName());
- d->mSimpleTypes.append(stItem);
- } else {
- qDebug() << "ERROR: parseSimpleType: unhandled: " << typeName.localName() << "in list" << d->mNameSpace << st.name();
- }
- }
- }
- } else if (name.localName() == QLatin1String("annotation")) {
- Annotation::List annotations = parseAnnotation(context, childElement);
- st.setDocumentation(annotations.documentation());
- st.setAnnotations(annotations);
- }
-
- childElement = childElement.nextSiblingElement();
- }
-
- return st;
-}
-
-void Parser::parseRestriction(ParserContext *context, const QDomElement &element, SimpleType &st)
-{
- if (st.baseTypeName().isEmpty()) {
- qDebug("<restriction>: unknown BaseType");
- }
-
- QDomElement childElement = element.firstChildElement();
-
- while (!childElement.isNull()) {
- NSManager namespaceManager(context, childElement);
- const QName tagName(childElement.tagName());
- if (tagName.localName() == QLatin1String("annotation")) {
- // Skip annotations here.
- } else {
- SimpleType::FacetType ft = st.parseFacetId(tagName.localName());
- if (ft == SimpleType::NONE) {
- qDebug("<restriction>: %s is not a valid facet for the simple type '%s'", qPrintable(childElement.tagName()), qPrintable(st.name()));
- } else {
- st.setFacetValue(ft, childElement.attribute(QLatin1String("value")));
- }
- }
- childElement = childElement.nextSiblingElement();
- }
-}
-
-void Parser::parseComplexContent(ParserContext *context, const QDomElement &element, ComplexType &complexType)
-{
- QName typeName;
-
- complexType.setContentModel(XSDType::COMPLEX);
-
- QDomElement childElement = element.firstChildElement();
-
- while (!childElement.isNull()) {
- NSManager namespaceManager(context, childElement);
- const QName name(childElement.tagName());
-
- if (name.localName() == QLatin1String("restriction") || name.localName() == QLatin1String("extension")) {
- typeName = childElement.attribute(QLatin1String("base"));
- typeName.setNameSpace(context->namespaceManager()->uri(typeName.prefix()));
-
- // if the base soapenc:Array, then read the arrayType attribute, and possibly the desired name for the child elements
- // TODO check namespace is really soap-encoding
- if (typeName.localName() == QLatin1String("Array")) {
-
- QString typeStr;
- QString arrayElementStr;
- QDomElement arrayElement = childElement.firstChildElement();
- while (!arrayElement.isNull()) {
- NSManager namespaceManager(context, arrayElement);
- const QName tagName(arrayElement.tagName());
- if (context->namespaceManager()->uri(tagName.prefix()) == XMLSchemaURI) {
- const QString localName = tagName.localName();
- if (localName == QLatin1String("attribute")) {
- const QString prefix = context->namespaceManager()->prefix(WSDLSchemaURI);
- const QString attributeName = (prefix.isEmpty() ? QString::fromLatin1("arrayType") : prefix + QLatin1String(":arrayType"));
-
- typeStr = arrayElement.attribute(attributeName);
- if (typeStr.isEmpty()) {
- qWarning("ERROR: arrayType attribute missing in Array element.");
- }
- if (typeStr.endsWith(QLatin1String("[]"))) {
- typeStr.truncate(typeStr.length() - 2);
- }
- } else if (localName == QLatin1String("sequence")) { // detosagent-legacy.wsdl
- arrayElement = arrayElement.firstChildElement(); // go down
- }
- if (QName(arrayElement.tagName()).localName() == QLatin1String("element")) {
- arrayElementStr = arrayElement.attribute("name");
- if (localName == QLatin1String("sequence")) { // go up again
- arrayElement = arrayElement.parentNode().toElement();
- }
- }
- }
- arrayElement = arrayElement.nextSiblingElement();
- }
- if (typeStr.isEmpty()) {
- qWarning("ERROR: <attribute> element not found");
- } else {
- if (arrayElementStr.isEmpty()) {
- arrayElementStr = QLatin1String("items"); // we have to call it something...
- }
-
- QName arrayType(typeStr);
- arrayType.setNameSpace(context->namespaceManager()->uri(arrayType.prefix()));
- complexType.setArrayType(arrayType);
-
- Element items(complexType.nameSpace());
- items.setName(arrayElementStr);
- items.setType(arrayType);
- //items.setArrayType( arrayType );
- complexType.addElement(items);
-
- //qDebug() << complexType.name() << "is array of" << arrayType;
- }
-
- } else {
-
- if (typeName != QName(XMLSchemaURI, QString::fromLatin1("anyType"))) { // don't do this for anyType or Array
- complexType.setBaseTypeName(typeName);
- }
-
- QDomElement ctElement = childElement.firstChildElement();
- while (!ctElement.isNull()) {
- NSManager namespaceManager(context, ctElement);
- const QName name(ctElement.tagName());
-
- if (name.localName() == QLatin1String("all")) {
- all(context, ctElement, complexType);
- } else if (name.localName() == QLatin1String("sequence") || name.localName() == QLatin1String("choice")) {
- Element::List elems;
- Group::List groups;
- parseCompositor(context, ctElement, complexType.nameSpace(), &elems, &groups);
- foreach (const Element &elem, elems) {
- complexType.addElement(elem);
- }
- foreach (const Group &group, groups) {
- complexType.addGroup(group);
- }
- } else if (name.localName() == QLatin1String("attribute")) {
- complexType.addAttribute(parseAttribute(context, ctElement, complexType.nameSpace()));
- } else if (name.localName() == QLatin1String("anyAttribute")) {
- addAnyAttribute(context, ctElement, complexType);
- } else if (name.localName() == QLatin1String("attributeGroup")) {
- complexType.addAttributeGroups(parseAttributeGroup(context, ctElement, complexType.nameSpace()));
- } else {
- qWarning() << "Unsupported content element" << name.localName();
- }
-
- ctElement = ctElement.nextSiblingElement();
- }
- }
- }
-
- childElement = childElement.nextSiblingElement();
- }
- if (stringToBoolean(element.attribute(QLatin1String("mixed")))) {
- qDebug("<complexContent>: No support for mixed=true");
- }
-}
-
-void Parser::parseSimpleContent(ParserContext *context, const QDomElement &element, ComplexType &complexType)
-{
- complexType.setContentModel(XSDType::SIMPLE);
-
- QDomElement childElement = element.firstChildElement();
-
- while (!childElement.isNull()) {
- NSManager namespaceManager(context, childElement);
- const QName name(childElement.tagName());
- if (name.localName() == QLatin1String("restriction")) {
- SimpleType st(d->mNameSpace);
-
- if (childElement.hasAttribute(QLatin1String("base"))) {
- QName typeName(childElement.attribute(QLatin1String("base")));
- typeName.setNameSpace(context->namespaceManager()->uri(typeName.prefix()));
- st.setBaseTypeName(typeName);
- }
-
- parseRestriction(context, childElement, st);
- } else if (name.localName() == QLatin1String("extension")) {
- // This extension does not use the full model that can come in ComplexContent.
- // It uses the simple model. No particle allowed, only attributes
-
- if (childElement.hasAttribute(QLatin1String("base"))) {
- QName typeName(childElement.attribute(QLatin1String("base")));
- typeName.setNameSpace(context->namespaceManager()->uri(typeName.prefix()));
- complexType.setBaseTypeName(typeName);
-
- QDomElement ctElement = childElement.firstChildElement();
- while (!ctElement.isNull()) {
- NSManager namespaceManager(context, ctElement);
- const QName name(ctElement.tagName());
- if (name.localName() == QLatin1String("attribute")) {
- complexType.addAttribute(parseAttribute(context, ctElement, complexType.nameSpace()));
- }
-
- ctElement = ctElement.nextSiblingElement();
- }
- }
- }
-
- childElement = childElement.nextSiblingElement();
- }
-}
-
-void Parser::addGlobalElement(const Element &newElement)
-{
- //qDebug() << "Adding global element" << newElement.qualifiedName();
-
- // don't add elements twice
- bool found = false;
- for (int i = 0; i < d->mElements.count(); ++i) {
- if (d->mElements[ i ].qualifiedName() == newElement.qualifiedName()) {
- found = true;
- break;
- }
- }
-
- if (!found) {
- d->mElements.append(newElement);
- }
-}
-
-void Parser::addGlobalAttribute(const Attribute &newAttribute)
-{
- // don't add attributes twice
- bool found = false;
- for (int i = 0; i < d->mAttributes.count(); ++i) {
- if (d->mAttributes[ i ].qualifiedName() == newAttribute.qualifiedName()) {
- found = true;
- break;
- }
- }
-
- if (!found) {
- d->mAttributes.append(newAttribute);
- }
-}
-
-AttributeGroup Parser::parseAttributeGroup(ParserContext *context, const QDomElement &element, const QString &nameSpace)
-{
- Attribute::List attributes;
-
- AttributeGroup group;
-
- if (element.hasAttribute(QLatin1String("ref"))) {
- QName reference(element.attribute(QLatin1String("ref")));
- reference.setNameSpace(context->namespaceManager()->uri(reference.prefix()));
- group.setReference(reference);
- return group;
- }
-
- for (QDomElement e = element.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
- QName childName = QName(e.tagName());
- if (childName.localName() == QLatin1String("attribute")) {
- Attribute a = parseAttribute(context, e, nameSpace);
- addGlobalAttribute(a);
- attributes.append(a);
- }
- }
-
- if (!element.hasAttribute(QLatin1String("name"))) {
- qWarning() << "Attribute Group without reference nor name, invalid XML schema";
- }
-
- group.setName(element.attribute(QLatin1String("name")));
- group.setNameSpace(nameSpace);
- group.setAttributes(attributes);
-
- return group;
-}
-
-// <group> https://www.w3.org/TR/xmlschema-0/#ref17
-Group Parser::parseGroup(ParserContext *context, const QDomElement &element, const QString &nameSpace)
-{
- Element::List elements;
- Group group;
-
- if (element.hasAttribute(QLatin1String("ref"))) {
- QName reference(element.attribute(QLatin1String("ref")));
- reference.setNameSpace(context->namespaceManager()->uri(reference.prefix()));
- group.setReference(reference);
- return group;
- }
-
- for (QDomElement e = element.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
- QName childName(e.tagName());
- const QString localName = childName.localName();
- // can contain all, choice or sequence
- if (localName == QLatin1String("sequence") || localName == QLatin1String("choice")) {
- parseCompositor(context, e, nameSpace, &elements, nullptr /*can't nest groups*/);
- } else if (localName == QLatin1String("all")) {
- qWarning() << "Unsupported element in group:" << localName; // TODO
- } else {
- qWarning() << "Unexpected element in group:" << localName;
- }
- }
-
- const QString name = element.attribute(QLatin1String("name"));
- Q_ASSERT(!name.isEmpty());
- group.setName(name);
- group.setNameSpace(nameSpace);
- group.setElements(elements);
-
- return group;
-}
-
-QString Parser::targetNamespace() const
-{
- return d->mNameSpace;
-}
-
-static QUrl urlForLocation(ParserContext *context, const QString &location)
-{
- QUrl url(location);
- if ((url.scheme().isEmpty() || url.scheme() == QLatin1String("file"))) {
- QDir dir(location);
- if (dir.isRelative()) {
- url = context->documentBaseUrl();
- url.setPath(url.path() + QLatin1Char('/') + location);
- }
- }
- return url;
-}
-
-// Note: https://www.w3.org/TR/xmlschema-0/#schemaLocation paragraph 3 (for <import>) says
-// "schemaLocation is only a hint"
-void Parser::importSchema(ParserContext *context, const QString &location)
-{
- // Ignore this one, we don't need it
- if (location == QLatin1String("http://schemas.xmlsoap.org/wsdl/")) {
- return;
- }
-
- if (location.startsWith(QLatin1String("urn:"))) { // Can't download that :-)
- return;
- }
-
- FileProvider provider;
- QString fileName;
- const QUrl schemaLocation = urlForLocation(context, location);
- qDebug("importing schema at %s", schemaLocation.toEncoded().constData());
- if (provider.get(schemaLocation, fileName)) {
- QFile file(fileName);
- if (!file.open(QIODevice::ReadOnly)) {
- qDebug("Unable to open file %s", qPrintable(file.fileName()));
- return;
- }
-
- QXmlInputSource source(&file);
- QXmlSimpleReader reader;
- reader.setFeature(QLatin1String("http://xml.org/sax/features/namespace-prefixes"), true);
-
- QDomDocument doc(QLatin1String("kwsdl"));
- QString errorMsg;
- int errorLine, errorColumn;
- bool ok = doc.setContent(&source, &reader, &errorMsg, &errorLine, &errorColumn);
- if (!ok) {
- qDebug("Error[%d:%d] %s", errorLine, errorColumn, qPrintable(errorMsg));
- return;
- }
-
- QDomElement node = doc.documentElement();
-
- NSManager namespaceManager(context, node);
-
- const QName tagName(node.tagName());
- if (tagName.localName() == QLatin1String("schema")) {
- importOrIncludeSchema(context, node, schemaLocation);
- } else {
- qDebug("No schema tag found in schema file %s", schemaLocation.toEncoded().constData());
- }
-
- file.close();
-
- provider.cleanUp();
- }
-}
-
-// TODO: Try to merge import and include schema
-// The main difference is that <include> can only
-// "pull in definitions and declarations from a schema whose
-// target namespace is the same as the including schema's target namespace"
-void Parser::includeSchema(ParserContext *context, const QString &location)
-{
- FileProvider provider;
- QString fileName;
- const QUrl schemaLocation = urlForLocation(context, location);
- qDebug("including schema at %s", schemaLocation.toEncoded().constData());
- if (provider.get(schemaLocation, fileName)) {
- QFile file(fileName);
- if (!file.open(QIODevice::ReadOnly)) {
- qDebug("Unable to open file %s", qPrintable(file.fileName()));
- return;
- }
-
- QXmlInputSource source(&file);
- QXmlSimpleReader reader;
- reader.setFeature(QLatin1String("http://xml.org/sax/features/namespace-prefixes"), true);
-
- QDomDocument doc(QLatin1String("kwsdl"));
- QString errorMsg;
- int errorLine, errorColumn;
- bool ok = doc.setContent(&source, &reader, &errorMsg, &errorLine, &errorColumn);
- if (!ok) {
- qDebug("Error[%d:%d] %s", errorLine, errorColumn, qPrintable(errorMsg));
- return;
- }
-
- QDomElement node = doc.documentElement();
- NSManager namespaceManager(context, node);
- const QName tagName(node.tagName());
- if (tagName.localName() == QLatin1String("schema")) {
- // For include, targetNamespace must be the same as the current document.
- if (node.hasAttribute(QLatin1String("targetNamespace"))) {
- if (node.attribute(QLatin1String("targetNamespace")) != d->mNameSpace) {
- context->messageHandler()->error(QLatin1String("Included schema must be in the same namespace of the resulting schema."));
- return;
- }
- }
- importOrIncludeSchema(context, node, schemaLocation);
- } else {
- qDebug("No schema tag found in schema file %s", schemaLocation.toEncoded().constData());
- }
-
- file.close();
-
- provider.cleanUp();
- }
-}
-
-bool Parser::importOrIncludeSchema(ParserContext *context, const QDomElement &element, const QUrl &schemaLocation)
-{
- const QUrl oldBaseUrl = context->documentBaseUrl();
- context->setDocumentBaseUrlFromFileUrl(schemaLocation);
-
- const bool ret = parseSchemaTag(context, element);
-
- context->setDocumentBaseUrl(oldBaseUrl);
-
- return ret;
-}
-
-QString Parser::schemaUri()
-{
- return XMLSchemaURI;
-}
-
-Element Parser::findElement(const QName &name) const
-{
- foreach (const Element &e, d->mElements) {
- if (e.nameSpace() == name.nameSpace() && e.name() == name.localName()) {
- return e;
- }
- }
- qDebug() << "Element not found:" << name.nameSpace() << name.localName();
- return Element();
-}
-
-Group Parser::findGroup(const QName &name) const
-{
- foreach (const Group &g, d->mGroups) {
- if (g.nameSpace() == name.nameSpace() && g.name() == name.localName()) {
- return g;
- }
- }
- qDebug() << "Group not found:" << name.nameSpace() << name.localName();
- return Group();
-}
-
-Attribute Parser::findAttribute(const QName &name) const
-{
- foreach (const Attribute &attr, d->mAttributes) {
- if (attr.nameSpace() == name.nameSpace() && attr.name() == name.localName()) {
- return attr;
- }
- }
- qDebug() << "Attribute not found:" << name.nameSpace() << name.localName();
- return Attribute();
-}
-
-AttributeGroup Parser::findAttributeGroup(const QName &name) const
-{
- foreach (const AttributeGroup &g, d->mAttributeGroups) {
- if (g.nameSpace() == name.nameSpace() && g.name() == name.localName()) {
- return g;
- }
- }
- qDebug() << "Attribute Group not found:" << name.nameSpace() << name.localName();
- return AttributeGroup();
-}
-
-bool Parser::resolveForwardDeclarations()
-{
- const QName any(QLatin1String("http://www.w3.org/2001/XMLSchema"), QLatin1String("any"));
- //const QName anyType( "http://www.w3.org/2001/XMLSchema", "anyType" );
- for (int i = 0; i < d->mComplexTypes.count(); ++i) {
-
- ComplexType &complexType = d->mComplexTypes[i];
-
- Element::List elements = complexType.elements();
- //qDebug() << i << "looking at" << complexType << " " << elements.count() << "elements";
- Element::List finalElementList;
- for (int j = 0; j < elements.count(); ++j) {
- Element element = elements.at(j);
- //qDebug() << " " << element;
- if (!element.isResolved()) {
- Element resolvedElement = findElement(element.reference());
- if (resolvedElement.qualifiedName().isEmpty()) {
- qWarning("ERROR in %s: resolving element ref to '%s': not found!", qPrintable(complexType.qualifiedName().qname()), qPrintable(element.reference().qname()));
- d->mElements.dump();
- return false;
- } else {
- resolvedElement.setMinOccurs(element.minOccurs());
- resolvedElement.setMaxOccurs(element.maxOccurs());
- resolvedElement.setCompositor(element.compositor());
- element = resolvedElement;
- }
- }
- if (j > 0 && finalElementList.last().type() == any) {
- if (element.type() == any) {
- // Keep only one any. The alternative would be to implement namespace "filtering"...
- //qWarning("ERROR: two 'any' values in the same type %s", qPrintable(d->mComplexTypes[i].name()));
- //return false;
- continue;
- }
- // Hack for deserialization: keep "any" last.
- Element lastElem = finalElementList.takeLast();
- finalElementList.append(element);
- finalElementList.append(lastElem);
- } else {
- finalElementList.append(element);
- }
- }
-
- foreach (const Group &group, complexType.groups()) {
- if (!group.isResolved()) {
- const Group refGroup = findGroup(group.reference());
- if (!refGroup.isNull()) {
- //qDebug() << " resolved group" << group.reference() << "got these elements" << refGroup.elements();
- foreach (const Element &elem, refGroup.elements()) {
- Q_ASSERT(!elem.type().isEmpty());
- finalElementList.append(elem);
- }
- //qDebug() << " finalElementList" << finalElementList;
- }
- }
- }
- // groups were resolved, don't do it again if resolveForwardDeclarations() is called again
- complexType.setGroups(Group::List());
- complexType.setElements(finalElementList);
-
- Attribute::List attributes = complexType.attributes();
-
- for (int j = 0; j < attributes.count(); ++j) {
- const Attribute &attribute = attributes.at(j);
- if (!attribute.isResolved()) {
- Attribute refAttribute = findAttribute(attribute.reference());
- if (refAttribute.qualifiedName().isEmpty()) {
- qWarning("ERROR in %s: resolving attribute ref to '%s': not found!", qPrintable(d->mComplexTypes[i].qualifiedName().qname()), qPrintable(attribute.reference().qname()));
- d->mAttributes.dump();
- return false;
- } else {
- attributes[ j ] = refAttribute;
- }
- }
- }
- foreach (const AttributeGroup &group, complexType.attributeGroups()) {
- Q_ASSERT(!group.reference().isEmpty());
- AttributeGroup refAttributeGroup = findAttributeGroup(group.reference());
- Attribute::List groupAttributes = refAttributeGroup.attributes();
- foreach (const Attribute &ga, groupAttributes) {
- attributes.append(ga);
- }
- }
-
- // groups were resolved, don't do it again if resolveForwardDeclarations() is called again
- complexType.setAttributeGroups(AttributeGroup::List());
- complexType.setAttributes(attributes);
- }
- return true;
-}
-
-Types Parser::types() const
-{
- Types types;
-
- types.setSimpleTypes(d->mSimpleTypes);
- types.setComplexTypes(d->mComplexTypes);
- //qDebug() << "Parser::types: elements:";
- //d->mElements.dump();
- types.setElements(d->mElements);
- //types.setGroups( d->mGroups );
- types.setAttributes(d->mAttributes);
- //types.setAttributeGroups( d->mAttributeGroups );
-
- return types;
-}
-
-Annotation::List Parser::annotations() const
-{
- return d->mAnnotations;
-}
-
-bool Parser::debugParsing()
-{
- static bool s_debug = qgetenv("KDSOAP_DEBUG_PARSER").toInt();
- return s_debug;
-}
-
-}
diff --git a/kdwsdl2cpp/schema/parser.h b/kdwsdl2cpp/schema/parser.h
deleted file mode 100644
index 10d47aa..0000000
--- a/kdwsdl2cpp/schema/parser.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2006 Michaël Larouche <michael.larouche@kdemail.net>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef SCHEMA_PARSER_H
-#define SCHEMA_PARSER_H
-
-#include <QDomElement>
-#include <QList>
-#include <QFile>
-
-#include "types.h"
-#include "annotation.h"
-#include <kode_export.h>
-
-QT_BEGIN_NAMESPACE
-class QUrl;
-QT_END_NAMESPACE
-
-class ParserContext;
-
-namespace XSD
-{
-
-class SCHEMA_EXPORT Parser
-{
-public:
- enum { UNBOUNDED = 100000 };
-
- Parser(ParserContext *context, const QString &nameSpace = QString());
- Parser(const Parser &other);
- ~Parser();
-
- Parser &operator=(const Parser &other);
-
- Types types() const;
-
- Annotation::List annotations() const;
-
- bool parseSchemaTag(ParserContext *context, const QDomElement &element);
-
- QString targetNamespace() const;
-
- bool resolveForwardDeclarations();
-
- /**
- Returns the default schema URI.
- */
- static QString schemaUri();
-
- static bool debugParsing();
-
-private:
- void parseImport(ParserContext *context, const QDomElement &);
- /**
- * @brief Parse include element.
- * The <include> element must include a external schema within the same target namespace
- * of the current document. Use <import> if you want to refer to a external namespace.
- * @param context Current parser context.
- * @param element DOM element to parse.
- */
- void parseInclude(ParserContext *context, const QDomElement &element);
- void addGlobalElement(const Element &);
- void addGlobalAttribute(const Attribute &);
- AttributeGroup parseAttributeGroup(ParserContext *context, const QDomElement &, const QString &nameSpace);
- Group parseGroup(ParserContext *context, const QDomElement &, const QString &nameSpace);
-
- Annotation::List parseAnnotation(ParserContext *context, const QDomElement &);
- ComplexType parseComplexType(ParserContext *context, const QDomElement &);
-
- void all(ParserContext *context, const QDomElement &, ComplexType &);
- void parseCompositor(ParserContext *context, const QDomElement &element,
- const QString &nameSpace, Element::List *elements, Group::List *groups);
-
- void setOccurrenceAttributes(Element &newElement,
- const QDomElement &element);
-
- Element parseElement(ParserContext *context, const QDomElement &,
- const QString &nameSpace, const QDomElement &occurrenceElement);
- void setSubstitutionElementName(const QName &typeName, const QName &elemName);
-
- Attribute parseAttribute(ParserContext *context, const QDomElement &,
- const QString &nameSpace);
- Element parseAny(ParserContext *context, const QDomElement &, const QString &nameSpace);
- void addAnyAttribute(ParserContext *context, const QDomElement &, ComplexType &);
-
- SimpleType parseSimpleType(ParserContext *context, const QDomElement &);
- void parseRestriction(ParserContext *context, const QDomElement &, SimpleType &);
- void parseComplexContent(ParserContext *context, const QDomElement &, ComplexType &);
- void parseSimpleContent(ParserContext *context, const QDomElement &, ComplexType &);
-
- void importSchema(ParserContext *context, const QString &location);
- /**
- * @brief Read and include the given schema into the current schema.
- * @param context Current parser context.
- * @param location Schema location.
- */
- void includeSchema(ParserContext *context, const QString &location);
-
- bool importOrIncludeSchema(ParserContext *context, const QDomElement &element, const QUrl &schemaLocation);
-
- Element findElement(const QName &name) const;
- Group findGroup(const QName &name) const;
- Attribute findAttribute(const QName &name) const;
- AttributeGroup findAttributeGroup(const QName &name) const;
- void init(ParserContext *context);
- void clear();
-
- class Private;
- Private *d;
-};
-
-}
-
-#endif
-
diff --git a/kdwsdl2cpp/schema/schema.pro b/kdwsdl2cpp/schema/schema.pro
deleted file mode 100644
index 3c10c24..0000000
--- a/kdwsdl2cpp/schema/schema.pro
+++ /dev/null
@@ -1,40 +0,0 @@
-TEMPLATE = lib
-TARGET = xmlschema
-CONFIG += staticlib
-
-SOURCES = \
- annotation.cpp \
- attribute.cpp \
- complextype.cpp \
- element.cpp \
- parser.cpp \
- simpletype.cpp \
- types.cpp \
- xmlelement.cpp \
- xsdtype.cpp \
- attributegroup.cpp \
- compositor.cpp \
- group.cpp
-
-QT -= gui
-QT += xml
-
-INCLUDEPATH += $${TOP_SOURCE_DIR}/kdwsdl2cpp
-
-include($${TOP_SOURCE_DIR}/variables.pri)
-DEFINES -= QT_NO_CAST_TO_ASCII QBA_NO_CAST_TO_VOID QBA_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
-HEADERS += \
- annotation.h \
- attribute.h \
- complextype.h \
- element.h \
- parser.h \
- simpletype.h \
- types.h \
- xmlelement.h \
- xsdtype.h \
- attributegroup.h \
- compositor.h \
- group.h
-
diff --git a/kdwsdl2cpp/schema/schematest.cpp b/kdwsdl2cpp/schema/schematest.cpp
deleted file mode 100644
index 1c993ba..0000000
--- a/kdwsdl2cpp/schema/schematest.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <QFile>
-#include <QDebug>
-
-#include <schema/parser.h>
-
-#include <common/nsmanager.h>
-#include <common/messagehandler.h>
-#include <common/parsercontext.h>
-
-int main(int argc, char **argv)
-{
- if (argc != 2) {
- qDebug("Missing argument: filename of schema");
- return 1;
- }
-
- QString filename = argv[ 1 ];
-
- QFile file(filename);
-
- if (!file.open(QIODevice::ReadOnly)) {
- qDebug("Can't open file %s", qPrintable(file.fileName()));
- return 1;
- }
-
- NSManager namespaceManager;
- MessageHandler messageHandler;
- ParserContext context;
- context.setNamespaceManager(&namespaceManager);
- context.setMessageHandler(&messageHandler);
-
- XSD::Parser parser;
- if (!parser.parseFile(&context, file)) {
- qDebug() << "Error parsing file " << filename;
- return 1;
- }
-
- XSD::Types types = parser.types();
-
- const XSD::SimpleType::List simpleTypes = types.simpleTypes();
- for (int i = 0; i < simpleTypes.count(); ++i) {
- XSD::SimpleType t = simpleTypes[ i ];
- qDebug() << "SimpleType: " << t.name() << t.baseTypeName().qname()
- << t.subType();
- qDebug() << "FacetType: " << t.facetType();
- if (t.facetType() == XSD::SimpleType::ENUM) {
- qDebug() << " ENUMS " << t.facetEnums();
- }
- }
-
- const XSD::ComplexType::List complexTypes = types.complexTypes();
- for (int i = 0; i < complexTypes.count(); ++i) {
- qDebug("ComplexType: %s %s", qPrintable(complexTypes[ i ].name()), qPrintable(complexTypes[ i ].baseTypeName().qname()));
- const XSD::Element::List elements = complexTypes[ i ].elements();
- for (int j = 0; j < elements.count(); ++j) {
- qDebug("\tElement: %s %s", qPrintable(elements[ j ].name()), qPrintable(elements[ j ].type().qname()));
- }
- const XSD::Attribute::List attributes = complexTypes[ i ].attributes();
- for (int j = 0; j < attributes.count(); ++j) {
- qDebug("\tAttribute: %s %s", qPrintable(attributes[ j ].name()), qPrintable(attributes[ j ].type().qname()));
- }
- }
-
- const XSD::Element::List elements = types.elements();
- for (int i = 0; i < elements.count(); ++i) {
- qDebug("Element: %s %s", qPrintable(elements[ i ].name()), qPrintable(elements[ i ].type().qname()));
- foreach (XSD::Annotation a, elements[ i ].annotations()) {
- qDebug() << " Annotation:" << a.domElement().tagName();
- }
- }
-
- const XSD::Attribute::List attributes = types.attributes();
- for (int i = 0; i < attributes.count(); ++i) {
- qDebug("Attribute: %s %s", qPrintable(attributes[ i ].name()), qPrintable(attributes[ i ].type().qname()));
- }
-
- const XSD::AttributeGroup::List attributeGroups = types.attributeGroups();
- for (int i = 0; i < attributeGroups.count(); ++i) {
- qDebug("AttributeGroup: %s", qPrintable(attributeGroups[ i ].name()));
- }
-
- foreach (XSD::Annotation a, parser.annotations()) {
- qDebug() << "Annotation:" << a.domElement().tagName();
- }
-
- return 0;
-}
diff --git a/kdwsdl2cpp/schema/simpletype.cpp b/kdwsdl2cpp/schema/simpletype.cpp
deleted file mode 100644
index 3b26db3..0000000
--- a/kdwsdl2cpp/schema/simpletype.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "simpletype.h"
-#include <QDebug>
-
-namespace XSD
-{
-
-class SimpleType::Private
-{
-public:
- Private()
- : mFacetId(NONE), mAnonymous(false),
- mSubType(TypeRestriction)
- {}
-
- QString mDocumentation;
- QName mBaseTypeName;
- int mFacetId;
- bool mAnonymous;
- QStringList mEnums;
- SubType mSubType;
-
- QName mListTypeName;
-
- struct FacetValueType {
- FacetValueType()
- : length(0), wsp(PRESERVE), tot(0), frac(0)
- {}
- int length;
- struct LenRange {
- LenRange() : minlen(-1), maxlen(-1) {}
- int minlen, maxlen;
- } lenRange;
- WhiteSpaceType wsp;
- struct ValueRange {
- ValueRange() : maxinc(-1), mininc(-1), maxex(-1), minex(-1) {}
- int maxinc, mininc, maxex, minex;
- } valRange;
- int tot;
- int frac;
- QString pattern;
- };
-
- FacetValueType mFacetValue;
-};
-
-SimpleType::SimpleType()
- : XSDType(), d(new Private)
-{
-}
-
-SimpleType::SimpleType(const QString &nameSpace)
- : XSDType(nameSpace), d(new Private)
-{
-}
-
-SimpleType::SimpleType(const SimpleType &other)
- : XSDType(other), d(new Private)
-{
- *d = *other.d;
-}
-
-SimpleType::~SimpleType()
-{
- delete d;
-}
-
-SimpleType &SimpleType::operator=(const SimpleType &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
-
- return *this;
-}
-
-void SimpleType::setDocumentation(const QString &documentation)
-{
- d->mDocumentation = documentation;
-}
-
-QString SimpleType::documentation() const
-{
- return d->mDocumentation;
-}
-
-void SimpleType::setBaseTypeName(const QName &baseTypeName)
-{
- d->mBaseTypeName = baseTypeName;
-}
-
-QName SimpleType::baseTypeName() const
-{
- return d->mBaseTypeName;
-}
-
-void SimpleType::setSubType(SubType subType)
-{
- d->mSubType = subType;
-}
-
-SimpleType::SubType SimpleType::subType() const
-{
- return d->mSubType;
-}
-
-void SimpleType::setListTypeName(const QName &name)
-{
- d->mListTypeName = name;
-}
-
-QName SimpleType::listTypeName() const
-{
- return d->mListTypeName;
-}
-
-void SimpleType::setAnonymous(bool anonymous)
-{
- d->mAnonymous = anonymous;
-}
-
-bool SimpleType::isAnonymous() const
-{
- return d->mAnonymous;
-}
-
-SimpleType::FacetType SimpleType::parseFacetId(const QString &facet) const
-{
- if (d->mBaseTypeName.isEmpty()) {
- qDebug("parseFacetId: Unknown base type");
- return NONE;
- }
-
- if (facet == QLatin1String("length")) {
- return LENGTH;
- } else if (facet == QLatin1String("minLength")) {
- return MINLEN;
- } else if (facet == QLatin1String("maxLength")) {
- return MAXLEN;
- } else if (facet == QLatin1String("enumeration")) {
- return ENUM;
- } else if (facet == QLatin1String("whiteSpace")) {
- return WSP;
- } else if (facet == QLatin1String("pattern")) {
- return PATTERN;
- } else if (facet == QLatin1String("maxInclusive")) {
- return MAXINC;
- } else if (facet == QLatin1String("maxExclusive")) {
- return MAXEX;
- } else if (facet == QLatin1String("minInclusive")) {
- return MININC;
- } else if (facet == QLatin1String("minExclusive")) {
- return MINEX;
- } else if (facet == QLatin1String("totalDigits")) {
- return TOT;
- } else if (facet == QLatin1String("fractionDigits")) {
- return FRAC;
- } else {
- qDebug("Unknown facet: %s", qPrintable(facet));
- return NONE;
- }
-}
-
-void SimpleType::setFacetValue(FacetType ft, const QString &value)
-{
- d->mFacetId |= ft;
-
- if (ft == ENUM) {
- d->mEnums.append(value);
- } else if (ft == PATTERN) {
- d->mFacetValue.pattern = value;
- } else if (ft == WSP) {
- if (value == QLatin1String("preserve")) {
- d->mFacetValue.wsp = PRESERVE;
- } else if (value == QLatin1String("collapse")) {
- d->mFacetValue.wsp = COLLAPSE;
- } else if (value == QLatin1String("replace")) {
- d->mFacetValue.wsp = REPLACE;
- } else {
- qDebug("Invalid facet value for whitespace");
- return;
- }
- } else {
- const int number = value.toInt();
-
- if (ft == MAXEX) {
- d->mFacetValue.valRange.maxex = number;
- } else if (ft == MAXINC) {
- d->mFacetValue.valRange.maxinc = number;
- } else if (ft == MININC) {
- d->mFacetValue.valRange.mininc = number;
- } else if (ft == MINEX) {
- d->mFacetValue.valRange.minex = number;
- } else if (ft == LENGTH) {
- d->mFacetValue.length = number;
- } else if (ft == MINLEN) {
- d->mFacetValue.lenRange.minlen = number;
- } else if (ft == MAXLEN) {
- d->mFacetValue.lenRange.maxlen = number;
- } else if (ft == TOT) {
- d->mFacetValue.tot = number;
- } else if (ft == FRAC) {
- d->mFacetValue.frac = number;
- }
- }
-}
-
-int SimpleType::facetType() const
-{
- return d->mFacetId;
-}
-
-int SimpleType::facetLength() const
-{
- return d->mFacetValue.length;
-}
-
-int SimpleType::facetMinimumLength() const
-{
- return d->mFacetValue.lenRange.minlen;
-}
-
-int SimpleType::facetMaximumLength() const
-{
- return d->mFacetValue.lenRange.maxlen;
-}
-
-QStringList SimpleType::facetEnums() const
-{
- return d->mEnums;
-}
-
-SimpleType::WhiteSpaceType SimpleType::facetWhiteSpace() const
-{
- return d->mFacetValue.wsp;
-}
-
-int SimpleType::facetMinimumInclusive() const
-{
- return d->mFacetValue.valRange.mininc;
-}
-
-int SimpleType::facetMaximumInclusive() const
-{
- return d->mFacetValue.valRange.maxinc;
-}
-
-int SimpleType::facetMinimumExclusive() const
-{
- return d->mFacetValue.valRange.minex;
-}
-
-int SimpleType::facetMaximumExclusive() const
-{
- return d->mFacetValue.valRange.maxex;
-}
-
-int SimpleType::facetTotalDigits() const
-{
- return d->mFacetValue.tot;
-}
-
-int SimpleType::facetFractionDigits() const
-{
- return d->mFacetValue.frac;
-}
-
-QString SimpleType::facetPattern() const
-{
- return d->mFacetValue.pattern;
-}
-
-bool SimpleType::isRestriction() const
-{
- static QName XmlAnyType(QLatin1String("http://www.w3.org/2001/XMLSchema"), QLatin1String("any"));
- return d->mSubType == TypeRestriction && d->mBaseTypeName != XmlAnyType && !d->mBaseTypeName.isEmpty()
- && !(d->mFacetId & ENUM);
-}
-
-SimpleType SimpleTypeList::simpleType(const QName &qualifiedName) const
-{
- const_iterator it = constBegin();
- for (; it != constEnd(); ++it)
- if ((*it).qualifiedName() == qualifiedName) {
- return *it;
- }
- //qDebug() << "Simple type" << qualifiedName << "not found";
- return SimpleType();
-}
-
-SimpleTypeList::iterator SimpleTypeList::findSimpleType(const QName &qualifiedName)
-{
- for (iterator it = begin(); it != end(); ++it)
- if ((*it).qualifiedName() == qualifiedName) {
- return it;
- }
- return end();
-}
-
-}
diff --git a/kdwsdl2cpp/schema/simpletype.h b/kdwsdl2cpp/schema/simpletype.h
deleted file mode 100644
index 422d66f..0000000
--- a/kdwsdl2cpp/schema/simpletype.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef SCHEMA_SIMPLETYPE_H
-#define SCHEMA_SIMPLETYPE_H
-
-#include <QStringList>
-
-#include <common/qname.h>
-#include "xsdtype.h"
-#include <kode_export.h>
-
-namespace XSD
-{
-
-class SimpleTypeList;
-
-class SCHEMA_EXPORT SimpleType : public XSDType
-{
-public:
- typedef SimpleTypeList List;
-
- enum FacetType {
- NONE = 0,
- LENGTH = 1,
- MINLEN = 2,
- MAXLEN = 4,
- ENUM = 8,
- WSP = 16,
- MAXINC = 32,
- MININC = 64,
- MAXEX = 128,
- MINEX = 256,
- TOT = 512,
- FRAC = 1024,
- PATTERN = 2048
- };
-
- enum WhiteSpaceType {
- PRESERVE,
- REPLACE,
- COLLAPSE
- };
-
- enum SubType {
- TypeRestriction,
- TypeList,
- TypeUnion
- };
-
- SimpleType();
- SimpleType(const QString &nameSpace);
- SimpleType(const SimpleType &other);
- ~SimpleType();
-
- SimpleType &operator=(const SimpleType &other);
-
- void setDocumentation(const QString &documentation);
- QString documentation() const;
-
- void setBaseTypeName(const QName &baseTypeName);
- QName baseTypeName() const;
-
- void setSubType(SubType subType);
- SubType subType() const;
-
- void setListTypeName(const QName &name);
- QName listTypeName() const;
-
- void setAnonymous(bool anonymous);
- bool isAnonymous() const;
-
- FacetType parseFacetId(const QString &facet) const;
- void setFacetValue(FacetType ft, const QString &value);
-
- int facetType() const;
-
- int facetLength() const;
- int facetMinimumLength() const;
- int facetMaximumLength() const;
- QStringList facetEnums() const;
- WhiteSpaceType facetWhiteSpace() const;
- int facetMinimumInclusive() const;
- int facetMaximumInclusive() const;
- int facetMinimumExclusive() const;
- int facetMaximumExclusive() const;
- int facetTotalDigits() const;
- int facetFractionDigits() const;
- QString facetPattern() const;
-
- /**
- * Return true if this type is just a restriction of another type.
- * False for enums, and false if the base type is any.
- */
- bool isRestriction() const;
-
-private:
- class Private;
- Private *d;
-};
-
-class SCHEMA_EXPORT SimpleTypeList : public QList<SimpleType>
-{
-public:
- // Readonly lookup, returns null type if not found
- SimpleType simpleType(const QName &qualifiedName) const;
-
- // Mutable lookup (for making changes), returns end() if not found
- iterator findSimpleType(const QName &qualifiedName);
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/schema/types.cpp b/kdwsdl2cpp/schema/types.cpp
deleted file mode 100644
index 95da90a..0000000
--- a/kdwsdl2cpp/schema/types.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "types.h"
-
-#include <QDebug>
-
-namespace XSD
-{
-
-class Types::Private
-{
-public:
- SimpleType::List mSimpleTypes;
- ComplexType::List mComplexTypes;
- Element::List mElements;
- Attribute::List mAttributes;
-#if 0
- AttributeGroup::List mAttributeGroups;
- Group::List mGroups;
-#endif
-};
-
-Types::Types()
- : d(new Private)
-{
-}
-
-Types::Types(const Types &other)
- : d(new Private)
-{
- *d = *other.d;
-}
-
-Types::~Types()
-{
- delete d;
-}
-
-Types &Types::operator=(const Types &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
-
- return *this;
-}
-
-Types &Types::operator +=(const Types &other)
-{
- if (this == &other) {
- return *this;
- }
-
- d->mSimpleTypes += other.d->mSimpleTypes;
- d->mComplexTypes += other.d->mComplexTypes;
- d->mElements += other.d->mElements;
- d->mAttributes += other.d->mAttributes;
- // unused d->mAttributeGroups += other.d->mAttributeGroups;
- // unused d->mGroups += other.d->mGroups;
-
- return *this;
-}
-
-void Types::setSimpleTypes(const SimpleType::List &simpleTypes)
-{
- d->mSimpleTypes = simpleTypes;
-}
-
-SimpleType::List Types::simpleTypes() const
-{
- return d->mSimpleTypes;
-}
-
-void Types::setComplexTypes(const ComplexType::List &complexTypes)
-{
- d->mComplexTypes = complexTypes;
-}
-
-ComplexType::List Types::complexTypes() const
-{
- return d->mComplexTypes;
-}
-
-void Types::setElements(const Element::List &elements)
-{
- d->mElements = elements;
-}
-
-Element::List Types::elements() const
-{
- return d->mElements;
-}
-
-void Types::setAttributes(const Attribute::List &attributes)
-{
- d->mAttributes = attributes;
-}
-
-Attribute::List Types::attributes() const
-{
- return d->mAttributes;
-}
-
-#if 0
-void Types::setAttributeGroups(const AttributeGroup::List &attributeGroups)
-{
- d->mAttributeGroups = attributeGroups;
-}
-
-AttributeGroup::List Types::attributeGroups() const
-{
- return d->mAttributeGroups;
-}
-
-void Types::setGroups(const Group::List &groups)
-{
- d->mGroups = groups;
-}
-
-Group::List Types::groups() const
-{
- return d->mGroups;
-}
-
-ComplexType Types::complexType(const Element &element) const
-{
- return complexType(element.type());
-}
-#endif
-
-ComplexType Types::complexType(const QName &typeName) const
-{
- return d->mComplexTypes.complexType(typeName);
-}
-
-ComplexType Types::polymorphicBaseClass(const ComplexType &derivedType) const
-{
- if (derivedType.isPolymorphicBaseClass()) {
- return derivedType;
- }
- ComplexType base = complexType(derivedType.baseTypeName());
- if (!base.isNull()) {
- return polymorphicBaseClass(base); // recurse
- }
- return ComplexType();
-}
-
-SimpleType Types::simpleType(const QName &typeName) const
-{
- return d->mSimpleTypes.simpleType(typeName);
-}
-
-} // namespace XSD
diff --git a/kdwsdl2cpp/schema/types.h b/kdwsdl2cpp/schema/types.h
deleted file mode 100644
index 2e440f9..0000000
--- a/kdwsdl2cpp/schema/types.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef SCHEMA_TYPES_H
-#define SCHEMA_TYPES_H
-
-#include "complextype.h"
-#include "element.h"
-#include "simpletype.h"
-#include <kode_export.h>
-
-namespace XSD
-{
-
-class SCHEMA_EXPORT Types
-{
-public:
- Types();
- Types(const Types &other);
- ~Types();
-
- Types &operator=(const Types &other);
- Types &operator+=(const Types &other);
-
- void setSimpleTypes(const SimpleType::List &simpleTypes);
- SimpleType::List simpleTypes() const;
-
- void setComplexTypes(const ComplexType::List &complexTypes);
- ComplexType::List complexTypes() const;
-
- void setElements(const Element::List &elements);
- Element::List elements() const;
-
- void setAttributes(const Attribute::List &attributes);
- Attribute::List attributes() const;
-
- // unused void setAttributeGroups( const AttributeGroup::List &attributeGroups );
- // unused AttributeGroup::List attributeGroups() const;
-
- // unused void setGroups( const Group::List &groups );
- // unused Group::List groups() const;
-
- //ComplexType complexType( const Element & ) const;
- ComplexType complexType(const QName &) const;
-
- // Call this with derived complex type, to find the root of the hierarchy,
- // i.e. the type for which isPolymorphicBaseClass() returns true
- ComplexType polymorphicBaseClass(const ComplexType &derivedType) const;
-
- SimpleType simpleType(const QName &) const;
-
-private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/schema/xmlelement.cpp b/kdwsdl2cpp/schema/xmlelement.cpp
deleted file mode 100644
index 535dd71..0000000
--- a/kdwsdl2cpp/schema/xmlelement.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "xmlelement.h"
-
-namespace XSD
-{
-
-class XmlElement::Private
-{
-public:
- QString mName;
- QString mNameSpace;
-
- Annotation::List mAnnotations;
-};
-
-XmlElement::XmlElement()
- : d(new Private)
-{
-}
-
-XmlElement::XmlElement(const QString &nameSpace)
- : d(new Private)
-{
- d->mNameSpace = nameSpace;
-}
-
-XmlElement::XmlElement(const XmlElement &other)
- : d(new Private)
-{
- *d = *other.d;
-}
-
-XmlElement::~XmlElement()
-{
- delete d;
-}
-
-XmlElement &XmlElement::operator=(const XmlElement &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
-
- return *this;
-}
-
-bool XmlElement::isNull() const
-{
- return d->mName.isEmpty();
-}
-
-void XmlElement::setName(const QString &name)
-{
- d->mName = name;
-}
-
-QString XmlElement::name() const
-{
- return d->mName;
-}
-
-void XmlElement::setNameSpace(const QString &nameSpace)
-{
- d->mNameSpace = nameSpace;
-}
-
-QString XmlElement::nameSpace() const
-{
- return d->mNameSpace;
-}
-
-QName XmlElement::qualifiedName() const
-{
- return QName(d->mNameSpace, d->mName);
-}
-
-void XmlElement::addAnnotation(const Annotation &a)
-{
- d->mAnnotations.append(a);
-}
-
-void XmlElement::setAnnotations(const Annotation::List &l)
-{
- d->mAnnotations = l;
-}
-
-Annotation::List XmlElement::annotations() const
-{
- return d->mAnnotations;
-}
-
-}
diff --git a/kdwsdl2cpp/schema/xmlelement.h b/kdwsdl2cpp/schema/xmlelement.h
deleted file mode 100644
index 4ed8ebe..0000000
--- a/kdwsdl2cpp/schema/xmlelement.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef XMLELEMENT_H
-#define XMLELEMENT_H
-
-#include "annotation.h"
-
-#include <common/qname.h>
-#include <kode_export.h>
-
-#include <QString>
-
-namespace XSD
-{
-
-class SCHEMA_EXPORT XmlElement
-{
-public:
- XmlElement();
- XmlElement(const QString &nameSpace);
- XmlElement(const XmlElement &other);
- ~XmlElement();
-
- XmlElement &operator=(const XmlElement &other);
-
- bool isNull() const;
-
- void setName(const QString &name);
- QString name() const;
-
- void setNameSpace(const QString &nameSpace);
- QString nameSpace() const;
-
- QName qualifiedName() const;
-
- void addAnnotation(const Annotation &);
- void setAnnotations(const Annotation::List &);
- Annotation::List annotations() const;
-
-private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/schema/xsdtype.cpp b/kdwsdl2cpp/schema/xsdtype.cpp
deleted file mode 100644
index 27e093e..0000000
--- a/kdwsdl2cpp/schema/xsdtype.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "xsdtype.h"
-
-namespace XSD
-{
-
-class XSDType::Private
-{
-public:
- Private()
- : mContentModel(SIMPLE),
- mSubstitutionElementName()
- {}
-
- ContentModel mContentModel;
- QName mSubstitutionElementName;
-};
-
-XSDType::XSDType()
- : XmlElement(), d(new Private)
-{
-}
-
-XSDType::XSDType(const QString &nameSpace)
- : XmlElement(nameSpace), d(new Private)
-{
-}
-
-XSDType::XSDType(const XSDType &other)
- : XmlElement(other), d(new Private)
-{
- *d = *other.d;
-}
-
-XSDType::~XSDType()
-{
- delete d;
-}
-
-XSDType &XSDType::operator=(const XSDType &other)
-{
- if (this == &other) {
- return *this;
- }
-
- *d = *other.d;
-
- return *this;
-}
-
-void XSDType::setContentModel(ContentModel contentModel)
-{
- d->mContentModel = contentModel;
-}
-
-XSDType::ContentModel XSDType::contentModel() const
-{
- return d->mContentModel;
-}
-
-void XSDType::setSubstitutionElementName(const QName &name)
-{
- d->mSubstitutionElementName = name;
-}
-
-QName XSDType::substitutionElementName() const
-{
- return d->mSubstitutionElementName;
-}
-
-} // namespace XSD
diff --git a/kdwsdl2cpp/schema/xsdtype.h b/kdwsdl2cpp/schema/xsdtype.h
deleted file mode 100644
index 94962a7..0000000
--- a/kdwsdl2cpp/schema/xsdtype.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- This file is part of KDE Schema Parser
-
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- based on wsdlpull parser by Vivek Krishna
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef SCHEMA_XSDTYPE_H
-#define SCHEMA_XSDTYPE_H
-
-#include <QList>
-#include <QMap>
-#include <QString>
-
-#include <common/qname.h>
-#include <kode_export.h>
-
-#include "xmlelement.h"
-
-namespace XSD
-{
-
-class SCHEMA_EXPORT XSDType : public XmlElement
-{
-public:
- typedef QList<const XSDType *> List;
-
- enum ContentModel {
- SIMPLE = 0,
- COMPLEX,
- MIXED
- };
- /*
- enum
- {
- INVALID = 0,
- STRING = 1,
- INTEGER,
- INT,
- BYTE,
- UBYTE,
- POSINT,
- UINT,
- LONG,
- ULONG,
- SHORT,
- USHORT,
- DECIMAL,
- FLOAT,
- DOUBLE,
- BOOLEAN,
- TIME,
- DATETIME,
- DATE,
- TOKEN,
- QNAME,
- NCNAME,
- NMTOKEN,
- NMTOKENS,
- BASE64BIN,
- HEXBIN,
- ANY,
- ANYTYPE,
- ANYURI
- };
- */
- XSDType();
- XSDType(const QString &);
- XSDType(const XSDType &other);
- virtual ~XSDType();
-
- XSDType &operator=(const XSDType &other);
-
- void setContentModel(ContentModel contentModel);
- ContentModel contentModel() const;
-
- /**
- * Sets the name of the substitution element associated with this type.
- *
- * Example: <xs:element name="FieldURI" type="t:PathToUnindexedFieldType" substitutionGroup="t:Path"/>
- * will set the element name to "FieldURI" in the type "PathToUnindexedFieldType".
- *
- * @param name element name
- */
- void setSubstitutionElementName(const QName &name);
- /**
- * @return the substitution element name associated with this type, if any.
- */
- QName substitutionElementName() const;
-
- virtual bool isSimple() const
- {
- return true;
- }
-
-private:
- class Private;
- Private *d;
-};
-
-}
-
-#endif
diff --git a/kdwsdl2cpp/schemas/schemas.qrc b/kdwsdl2cpp/schemas/schemas.qrc
new file mode 100644
index 0000000..d90768c
--- /dev/null
+++ b/kdwsdl2cpp/schemas/schemas.qrc
@@ -0,0 +1,6 @@
+ <!DOCTYPE RCC><RCC version="1.0">
+ <qresource prefix="/libkode">
+ <file alias="soapenc-1.1.xsd">soapenc-1.1.xsd</file>
+ <file alias="soapenc-1.2.xsd">soapenc-1.2.xsd</file>
+ </qresource>
+ </RCC>
diff --git a/kdwsdl2cpp/schemas/soapenc-1.1.xsd b/kdwsdl2cpp/schemas/soapenc-1.1.xsd
new file mode 100644
index 0000000..99d84ca
--- /dev/null
+++ b/kdwsdl2cpp/schemas/soapenc-1.1.xsd
@@ -0,0 +1,535 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!-- Schema for the SOAP/1.1 encoding
+
+Portions © 2001 DevelopMentor.
+© 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
+
+This document is governed by the W3C Software License [1] as described in the FAQ [2].
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+
+1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+
+2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
+
+3. Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+Original W3C files; http://www.w3.org/2001/06/soap-encoding
+Changes made:
+ - reverted namespace to http://schemas.xmlsoap.org/soap/encoding/
+ - reverted root to only allow 0 and 1 as lexical values
+ - removed default value from root attribute declaration
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://schemas.xmlsoap.org/soap/encoding/"
+ targetNamespace="http://schemas.xmlsoap.org/soap/encoding/" >
+
+ <xs:attribute name="root" >
+ <xs:annotation>
+ <xs:documentation>
+ 'root' can be used to distinguish serialization roots from other
+ elements that are present in a serialization but are not roots of
+ a serialized value graph
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base='xs:boolean'>
+ <xs:pattern value='0|1' />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attributeGroup name="commonAttributes" >
+ <xs:annotation>
+ <xs:documentation>
+ Attributes common to all elements that function as accessors or
+ represent independent (multi-ref) values. The href attribute is
+ intended to be used in a manner like CONREF. That is, the element
+ content should be empty iff the href attribute appears
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="id" type="xs:ID" />
+ <xs:attribute name="href" type="xs:anyURI" />
+ <xs:anyAttribute namespace="##other" processContents="lax" />
+ </xs:attributeGroup>
+
+ <!-- Global Attributes. The following attributes are intended to be usable via qualified attribute names on any complex type referencing them. -->
+
+ <!-- Array attributes. Needed to give the type and dimensions of an array's contents, and the offset for partially-transmitted arrays. -->
+
+ <xs:simpleType name="arrayCoordinate" >
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+ <xs:attribute name="arrayType" type="xs:string" />
+ <xs:attribute name="offset" type="tns:arrayCoordinate" />
+
+ <xs:attributeGroup name="arrayAttributes" >
+ <xs:attribute ref="tns:arrayType" />
+ <xs:attribute ref="tns:offset" />
+ </xs:attributeGroup>
+
+ <xs:attribute name="position" type="tns:arrayCoordinate" />
+
+ <xs:attributeGroup name="arrayMemberAttributes" >
+ <xs:attribute ref="tns:position" />
+ </xs:attributeGroup>
+
+ <xs:group name="Array" >
+ <xs:sequence>
+ <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ </xs:sequence>
+ </xs:group>
+
+ <xs:element name="Array" type="tns:Array" />
+ <xs:complexType name="Array" >
+ <xs:annotation>
+ <xs:documentation>
+ 'Array' is a complex type for accessors identified by position
+ </xs:documentation>
+ </xs:annotation>
+ <xs:group ref="tns:Array" minOccurs="0" />
+ <xs:attributeGroup ref="tns:arrayAttributes" />
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:complexType>
+
+ <!-- 'Struct' is a complex type for accessors identified by name.
+ Constraint: No element may be have the same name as any other,
+ nor may any element have a maxOccurs > 1. -->
+
+ <xs:element name="Struct" type="tns:Struct" />
+
+ <xs:group name="Struct" >
+ <xs:sequence>
+ <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+ </xs:sequence>
+ </xs:group>
+
+ <xs:complexType name="Struct" >
+ <xs:group ref="tns:Struct" minOccurs="0" />
+ <xs:attributeGroup ref="tns:commonAttributes"/>
+ </xs:complexType>
+
+ <!-- 'Base64' can be used to serialize binary data using base64 encoding
+ as defined in RFC2045 but without the MIME line length limitation. -->
+
+ <xs:simpleType name="base64" >
+ <xs:restriction base="xs:base64Binary" />
+ </xs:simpleType>
+
+ <!-- Element declarations corresponding to each of the simple types in the
+ XML Schemas Specification. -->
+
+ <xs:element name="duration" type="tns:duration" />
+ <xs:complexType name="duration" >
+ <xs:simpleContent>
+ <xs:extension base="xs:duration" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="dateTime" type="tns:dateTime" />
+ <xs:complexType name="dateTime" >
+ <xs:simpleContent>
+ <xs:extension base="xs:dateTime" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+
+
+ <xs:element name="NOTATION" type="tns:NOTATION" />
+ <xs:complexType name="NOTATION" >
+ <xs:simpleContent>
+ <xs:extension base="xs:QName" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+
+ <xs:element name="time" type="tns:time" />
+ <xs:complexType name="time" >
+ <xs:simpleContent>
+ <xs:extension base="xs:time" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="date" type="tns:date" />
+ <xs:complexType name="date" >
+ <xs:simpleContent>
+ <xs:extension base="xs:date" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gYearMonth" type="tns:gYearMonth" />
+ <xs:complexType name="gYearMonth" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gYearMonth" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gYear" type="tns:gYear" />
+ <xs:complexType name="gYear" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gYear" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gMonthDay" type="tns:gMonthDay" />
+ <xs:complexType name="gMonthDay" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gMonthDay" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gDay" type="tns:gDay" />
+ <xs:complexType name="gDay" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gDay" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gMonth" type="tns:gMonth" />
+ <xs:complexType name="gMonth" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gMonth" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="boolean" type="tns:boolean" />
+ <xs:complexType name="boolean" >
+ <xs:simpleContent>
+ <xs:extension base="xs:boolean" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="base64Binary" type="tns:base64Binary" />
+ <xs:complexType name="base64Binary" >
+ <xs:simpleContent>
+ <xs:extension base="xs:base64Binary" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="hexBinary" type="tns:hexBinary" />
+ <xs:complexType name="hexBinary" >
+ <xs:simpleContent>
+ <xs:extension base="xs:hexBinary" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="float" type="tns:float" />
+ <xs:complexType name="float" >
+ <xs:simpleContent>
+ <xs:extension base="xs:float" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="double" type="tns:double" />
+ <xs:complexType name="double" >
+ <xs:simpleContent>
+ <xs:extension base="xs:double" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="anyURI" type="tns:anyURI" />
+ <xs:complexType name="anyURI" >
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="QName" type="tns:QName" />
+ <xs:complexType name="QName" >
+ <xs:simpleContent>
+ <xs:extension base="xs:QName" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+
+ <xs:element name="string" type="tns:string" />
+ <xs:complexType name="string" >
+ <xs:simpleContent>
+ <xs:extension base="xs:string" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="normalizedString" type="tns:normalizedString" />
+ <xs:complexType name="normalizedString" >
+ <xs:simpleContent>
+ <xs:extension base="xs:normalizedString" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="token" type="tns:token" />
+ <xs:complexType name="token" >
+ <xs:simpleContent>
+ <xs:extension base="xs:token" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="language" type="tns:language" />
+ <xs:complexType name="language" >
+ <xs:simpleContent>
+ <xs:extension base="xs:language" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="Name" type="tns:Name" />
+ <xs:complexType name="Name" >
+ <xs:simpleContent>
+ <xs:extension base="xs:Name" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="NMTOKEN" type="tns:NMTOKEN" />
+ <xs:complexType name="NMTOKEN" >
+ <xs:simpleContent>
+ <xs:extension base="xs:NMTOKEN" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="NCName" type="tns:NCName" />
+ <xs:complexType name="NCName" >
+ <xs:simpleContent>
+ <xs:extension base="xs:NCName" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="NMTOKENS" type="tns:NMTOKENS" />
+ <xs:complexType name="NMTOKENS" >
+ <xs:simpleContent>
+ <xs:extension base="xs:NMTOKENS" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ID" type="tns:ID" />
+ <xs:complexType name="ID" >
+ <xs:simpleContent>
+ <xs:extension base="xs:ID" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="IDREF" type="tns:IDREF" />
+ <xs:complexType name="IDREF" >
+ <xs:simpleContent>
+ <xs:extension base="xs:IDREF" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ENTITY" type="tns:ENTITY" />
+ <xs:complexType name="ENTITY" >
+ <xs:simpleContent>
+ <xs:extension base="xs:ENTITY" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="IDREFS" type="tns:IDREFS" />
+ <xs:complexType name="IDREFS" >
+ <xs:simpleContent>
+ <xs:extension base="xs:IDREFS" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ENTITIES" type="tns:ENTITIES" />
+ <xs:complexType name="ENTITIES" >
+ <xs:simpleContent>
+ <xs:extension base="xs:ENTITIES" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="decimal" type="tns:decimal" />
+ <xs:complexType name="decimal" >
+ <xs:simpleContent>
+ <xs:extension base="xs:decimal" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="integer" type="tns:integer" />
+ <xs:complexType name="integer" >
+ <xs:simpleContent>
+ <xs:extension base="xs:integer" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="nonPositiveInteger" type="tns:nonPositiveInteger" />
+ <xs:complexType name="nonPositiveInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:nonPositiveInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="negativeInteger" type="tns:negativeInteger" />
+ <xs:complexType name="negativeInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:negativeInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="long" type="tns:long" />
+ <xs:complexType name="long" >
+ <xs:simpleContent>
+ <xs:extension base="xs:long" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="int" type="tns:int" />
+ <xs:complexType name="int" >
+ <xs:simpleContent>
+ <xs:extension base="xs:int" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="short" type="tns:short" />
+ <xs:complexType name="short" >
+ <xs:simpleContent>
+ <xs:extension base="xs:short" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="byte" type="tns:byte" />
+ <xs:complexType name="byte" >
+ <xs:simpleContent>
+ <xs:extension base="xs:byte" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="nonNegativeInteger" type="tns:nonNegativeInteger" />
+ <xs:complexType name="nonNegativeInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:nonNegativeInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedLong" type="tns:unsignedLong" />
+ <xs:complexType name="unsignedLong" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedLong" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedInt" type="tns:unsignedInt" />
+ <xs:complexType name="unsignedInt" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedInt" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedShort" type="tns:unsignedShort" />
+ <xs:complexType name="unsignedShort" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedShort" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedByte" type="tns:unsignedByte" />
+ <xs:complexType name="unsignedByte" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedByte" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="positiveInteger" type="tns:positiveInteger" />
+ <xs:complexType name="positiveInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:positiveInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="anyType" />
+</xs:schema>
diff --git a/kdwsdl2cpp/schemas/soapenc-1.2.xsd b/kdwsdl2cpp/schemas/soapenc-1.2.xsd
new file mode 100644
index 0000000..58e257c
--- /dev/null
+++ b/kdwsdl2cpp/schemas/soapenc-1.2.xsd
@@ -0,0 +1,541 @@
+<!-- Schema defined in the SOAP Version 1.2 Part 2 specification
+ Recommendation at
+ http://www.w3.org/TR/2003/REC-soap12-part2-20030624/
+ $Id: soap-encoding.xsd,v 1.2 2006/12/20 20:45:52 ylafon Exp $
+
+ Copyright (C)2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
+ W3C viability, trademark, document use and software licensing rules
+ apply.
+ http://www.w3.org/Consortium/Legal/
+
+ This document is governed by the W3C Software License [1] as
+ described in the FAQ [2].
+
+ [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+ [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://www.w3.org/2003/05/soap-encoding"
+ targetNamespace="http://www.w3.org/2003/05/soap-encoding" >
+
+ <xs:attributeGroup name="commonAttributes" >
+ <xs:annotation>
+ <xs:documentation>
+ Attributes common to all elements that function as accessors or
+ represent independent (multi-ref) values. The ref attribute is
+ intended to be used in a manner like CONREF. That is, the element
+ content should be empty iff the ref attribute appears
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute ref="tns:id" />
+ <xs:anyAttribute namespace="##other" processContents="lax" />
+ </xs:attributeGroup>
+
+ <!-- Global Attributes. The following attributes are intended to be usable via qualified attribute names on any complex type referencing them. -->
+ <xs:attribute name="id" type="xs:ID" />
+ <xs:attribute name="ref" type="xs:IDREF" />
+
+ <xs:complexType name="Ref" >
+ <xs:attribute ref="tns:ref" use="required" />
+ </xs:complexType>
+
+ <xs:simpleType name="nodeType" >
+ <xs:restriction base="xs:token" >
+ <xs:enumeration value="simple" />
+ <xs:enumeration value="struct" />
+ <xs:enumeration value="array" />
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:attribute name="nodeType" type="tns:nodeType" />
+
+ <!-- Array attributes. Needed to give the type and dimensions of an array"s contents, and the offset for partially-transmitted arrays. -->
+
+ <xs:simpleType name="arraySizeBase" >
+ <xs:annotation>
+ <xs:documentation>
+ A list type that allows * and non negative integers. Used as the
+ base type for arraySize below.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:list>
+ <xs:simpleType>
+ <xs:union memberTypes="xs:nonNegativeInteger" >
+ <xs:simpleType>
+ <xs:restriction base="xs:token" >
+ <xs:enumeration value="*" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+ </xs:list>
+ </xs:simpleType>
+
+
+ <xs:simpleType name="arraySize" >
+ <xs:annotation>
+ <xs:documentation>
+ Pattern based restriction of the arraySizeBase list type. Used
+ as the type of the arraySize attribute. Restricts asterisk ( * )
+ to first list item only. Instances must contain at least an
+ asterisk ( * ) or a nonNegativeInteger. May contain other
+ nonNegativeIntegers as subsequent list items.
+ Valid instances include;
+
+ *
+ 1
+ * 2
+ 2 2
+ * 2 0
+
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="tns:arraySizeBase" >
+ <xs:pattern value="(\*|(\d+))(\s+\d+)*" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:attribute name="arraySize" type="tns:arraySize" />
+ <xs:attribute name="itemType" type="xs:QName" />
+
+ <xs:attributeGroup name="arrayAttributes" >
+ <xs:attribute ref="tns:arraySize" />
+ <xs:attribute ref="tns:itemType" />
+ </xs:attributeGroup>
+
+ <!-- 'Base64' can be used to serialize binary data using base64 encoding
+ as defined in RFC2045 but without the MIME line length limitation. -->
+
+ <xs:simpleType name="base64" >
+ <xs:restriction base="xs:base64Binary" />
+ </xs:simpleType>
+
+ <!-- Element declarations corresponding to each of the simple types in the
+ XML Schemas Specification. -->
+
+ <xs:element name="duration" type="tns:duration" />
+ <xs:complexType name="duration" >
+ <xs:simpleContent>
+ <xs:extension base="xs:duration" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="dateTime" type="tns:dateTime" />
+ <xs:complexType name="dateTime" >
+ <xs:simpleContent>
+ <xs:extension base="xs:dateTime" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="time" type="tns:time" />
+ <xs:complexType name="time" >
+ <xs:simpleContent>
+ <xs:extension base="xs:time" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="date" type="tns:date" />
+ <xs:complexType name="date" >
+ <xs:simpleContent>
+ <xs:extension base="xs:date" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gYearMonth" type="tns:gYearMonth" />
+ <xs:complexType name="gYearMonth" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gYearMonth" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gYear" type="tns:gYear" />
+ <xs:complexType name="gYear" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gYear" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gMonthDay" type="tns:gMonthDay" />
+ <xs:complexType name="gMonthDay" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gMonthDay" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gDay" type="tns:gDay" />
+ <xs:complexType name="gDay" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gDay" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gMonth" type="tns:gMonth" />
+ <xs:complexType name="gMonth" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gMonth" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="boolean" type="tns:boolean" />
+ <xs:complexType name="boolean" >
+ <xs:simpleContent>
+ <xs:extension base="xs:boolean" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="base64Binary" type="tns:base64Binary" />
+ <xs:complexType name="base64Binary" >
+ <xs:simpleContent>
+ <xs:extension base="xs:base64Binary" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="hexBinary" type="tns:hexBinary" />
+ <xs:complexType name="hexBinary" >
+ <xs:simpleContent>
+ <xs:extension base="xs:hexBinary" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="float" type="tns:float" />
+ <xs:complexType name="float" >
+ <xs:simpleContent>
+ <xs:extension base="xs:float" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="double" type="tns:double" />
+ <xs:complexType name="double" >
+ <xs:simpleContent>
+ <xs:extension base="xs:double" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="anyURI" type="tns:anyURI" />
+ <xs:complexType name="anyURI" >
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="QName" type="tns:QName" />
+ <xs:complexType name="QName" >
+ <xs:simpleContent>
+ <xs:extension base="xs:QName" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="string" type="tns:string" />
+ <xs:complexType name="string" >
+ <xs:simpleContent>
+ <xs:extension base="xs:string" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="normalizedString" type="tns:normalizedString" />
+ <xs:complexType name="normalizedString" >
+ <xs:simpleContent>
+ <xs:extension base="xs:normalizedString" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="token" type="tns:token" />
+ <xs:complexType name="token" >
+ <xs:simpleContent>
+ <xs:extension base="xs:token" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="language" type="tns:language" />
+ <xs:complexType name="language" >
+ <xs:simpleContent>
+ <xs:extension base="xs:language" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="Name" type="tns:Name" />
+ <xs:complexType name="Name" >
+ <xs:simpleContent>
+ <xs:extension base="xs:Name" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="NMTOKEN" type="tns:NMTOKEN" />
+ <xs:complexType name="NMTOKEN" >
+ <xs:simpleContent>
+ <xs:extension base="xs:NMTOKEN" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="NCName" type="tns:NCName" />
+ <xs:complexType name="NCName" >
+ <xs:simpleContent>
+ <xs:extension base="xs:NCName" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="decimal" type="tns:decimal" />
+ <xs:complexType name="decimal" >
+ <xs:simpleContent>
+ <xs:extension base="xs:decimal" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="integer" type="tns:integer" />
+ <xs:complexType name="integer" >
+ <xs:simpleContent>
+ <xs:extension base="xs:integer" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="nonPositiveInteger" type="tns:nonPositiveInteger" />
+ <xs:complexType name="nonPositiveInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:nonPositiveInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="negativeInteger" type="tns:negativeInteger" />
+ <xs:complexType name="negativeInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:negativeInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="long" type="tns:long" />
+ <xs:complexType name="long" >
+ <xs:simpleContent>
+ <xs:extension base="xs:long" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="int" type="tns:int" />
+ <xs:complexType name="int" >
+ <xs:simpleContent>
+ <xs:extension base="xs:int" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="short" type="tns:short" />
+ <xs:complexType name="short" >
+ <xs:simpleContent>
+ <xs:extension base="xs:short" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="byte" type="tns:byte" />
+ <xs:complexType name="byte" >
+ <xs:simpleContent>
+ <xs:extension base="xs:byte" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="nonNegativeInteger" type="tns:nonNegativeInteger" />
+ <xs:complexType name="nonNegativeInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:nonNegativeInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedLong" type="tns:unsignedLong" />
+ <xs:complexType name="unsignedLong" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedLong" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedInt" type="tns:unsignedInt" />
+ <xs:complexType name="unsignedInt" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedInt" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedShort" type="tns:unsignedShort" />
+ <xs:complexType name="unsignedShort" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedShort" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedByte" type="tns:unsignedByte" />
+ <xs:complexType name="unsignedByte" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedByte" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="positiveInteger" type="tns:positiveInteger" />
+ <xs:complexType name="positiveInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:positiveInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="anyType" />
+
+ <!--
+ For compatibility with XML 1.0 the following element declaration
+ and associated complex type definition should NOT be used as
+ its type is only applicable to attributes in XML 1.0. It is
+ provided here for completenes.
+ -->
+ <xs:element name="NMTOKENS" type="tns:NMTOKENS" />
+ <xs:complexType name="NMTOKENS" >
+ <xs:simpleContent>
+ <xs:extension base="xs:NMTOKENS" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <!--
+ For compatibility with XML 1.0 the following element declaration
+ and associated complex type definition should NOT be used as
+ its type is only applicable to attributes in XML 1.0. It is
+ provided here for completenes.
+ -->
+ <xs:element name="ID" type="tns:ID" />
+ <xs:complexType name="ID" >
+ <xs:simpleContent>
+ <xs:extension base="xs:ID" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <!--
+ For compatibility with XML 1.0 the following element declaration
+ and associated complex type definition should NOT be used as
+ its type is only applicable to attributes in XML 1.0. It is
+ provided here for completenes.
+ -->
+ <xs:element name="IDREF" type="tns:IDREF" />
+ <xs:complexType name="IDREF" >
+ <xs:simpleContent>
+ <xs:extension base="xs:IDREF" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <!--
+ For compatibility with XML 1.0 the following element declaration
+ and associated complex type definition should NOT be used as
+ its type is only applicable to attributes in XML 1.0. It is
+ provided here for completenes.
+ -->
+ <xs:element name="ENTITY" type="tns:ENTITY" />
+ <xs:complexType name="ENTITY" >
+ <xs:simpleContent>
+ <xs:extension base="xs:ENTITY" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <!--
+ For compatibility with XML 1.0 the following element declaration
+ and associated complex type definition should NOT be used as
+ its type is only applicable to attributes in XML 1.0. It is
+ provided here for completenes.
+ -->
+ <xs:element name="IDREFS" type="tns:IDREFS" />
+ <xs:complexType name="IDREFS" >
+ <xs:simpleContent>
+ <xs:extension base="xs:IDREFS" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <!--
+ For compatibility with XML 1.0 the following element declaration
+ and associated complex type definition should NOT be used as
+ its type is only applicable to attributes in XML 1.0. It is
+ provided here for completenes.
+ -->
+ <xs:element name="ENTITIES" type="tns:ENTITIES" />
+ <xs:complexType name="ENTITIES" >
+ <xs:simpleContent>
+ <xs:extension base="xs:ENTITIES" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+</xs:schema>
diff --git a/kdwsdl2cpp/src/compiler.cpp b/kdwsdl2cpp/src/compiler.cpp
index e0e4cbf..3edf043 100644
--- a/kdwsdl2cpp/src/compiler.cpp
+++ b/kdwsdl2cpp/src/compiler.cpp
@@ -1,25 +1,12 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
*/
#include <QCoreApplication>
-#include <QFile>
#include <QDebug>
+#include <QFile>
#include <wsdl/wsdl.h>
@@ -47,7 +34,7 @@ void Compiler::run()
void Compiler::download()
{
- FileProvider provider;
+ FileProvider provider(Settings::self()->useLocalFilesOnly());
QString fileName;
if (provider.get(Settings::self()->wsdlUrl(), fileName)) {
@@ -59,15 +46,11 @@ void Compiler::download()
return;
}
- //qDebug() << "parsing" << fileName;
- QXmlInputSource source(&file);
- QXmlSimpleReader reader;
- reader.setFeature(QLatin1String("http://xml.org/sax/features/namespace-prefixes"), true);
-
+ // qDebug() << "parsing" << fileName;
QString errorMsg;
int errorLine, errorCol;
QDomDocument doc;
- if (!doc.setContent(&source, &reader, &errorMsg, &errorLine, &errorCol)) {
+ if (!doc.setContent(&file, false, &errorMsg, &errorLine, &errorCol)) {
qDebug("%s at (%d,%d)", qPrintable(errorMsg), errorLine, errorCol);
QCoreApplication::exit(2);
return;
@@ -98,6 +81,7 @@ void Compiler::parse(const QDomElement &element)
context.setDocumentBaseUrl(QUrl(Settings::self()->wsdlBaseUrl()));
Definitions definitions;
+ definitions.setUseLocalFilesOnly(Settings::self()->useLocalFilesOnly());
definitions.setWantedService(Settings::self()->wantedService());
if (definitions.loadXML(&context, element)) {
diff --git a/kdwsdl2cpp/src/compiler.h b/kdwsdl2cpp/src/compiler.h
index 7c44c1a..2cbed67 100644
--- a/kdwsdl2cpp/src/compiler.h
+++ b/kdwsdl2cpp/src/compiler.h
@@ -1,20 +1,7 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_COMPILER_H
@@ -23,8 +10,7 @@
#include <QDomElement>
#include <QObject>
-namespace KWSDL
-{
+namespace KWSDL {
class Compiler : public QObject
{
diff --git a/kdwsdl2cpp/src/converter.cpp b/kdwsdl2cpp/src/converter.cpp
index 18c6bdc..99d685b 100644
--- a/kdwsdl2cpp/src/converter.cpp
+++ b/kdwsdl2cpp/src/converter.cpp
@@ -1,8 +1,14 @@
-#include "settings.h"
-#include "elementargumentserializer.h"
+/*
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
+*/
+
#include "converter.h"
-#include <libkode/style.h>
+#include "elementargumentserializer.h"
+#include "settings.h"
#include <QDebug>
+#include <code_generation/style.h>
using namespace KWSDL;
@@ -27,14 +33,14 @@ QString namespaceString(const QString &ns)
if (ns == QLatin1String("http://www.w3.org/2001/XMLSchema")) {
return QLatin1String("KDSoapNamespaceManager::xmlSchema2001()");
}
- //qDebug() << "got namespace" << ns;
+ // qDebug() << "got namespace" << ns;
// TODO register into KDSoapNamespaceManager? This means generating code in the clientinterface ctor...
return QLatin1String("QString::fromLatin1(\"") + ns + QLatin1String("\")");
}
Converter::Converter()
- : mQObject(KODE::Class(QLatin1String("QObject"))),
- mKDSoapServerObjectInterface(KODE::Class(QLatin1String("KDSoapServerObjectInterface")))
+ : mQObject(KODE::Class(QLatin1String("QObject")))
+ , mKDSoapServerObjectInterface(KODE::Class(QLatin1String("KDSoapServerObjectInterface")))
{
}
@@ -54,8 +60,7 @@ void Converter::setWSDL(const WSDL &wsdl)
// overwrite with prefixes from settings
Settings::NSMapping mapping = Settings::self()->namespaceMapping();
- Settings::NSMapping::Iterator it;
- for (it = mapping.begin(); it != mapping.end(); ++it) {
+ for (auto it = mapping.begin(); it != mapping.end(); ++it) {
mNSManager.setPrefix(it.value(), it.key());
}
@@ -81,9 +86,10 @@ class TypeCollector
{
public:
TypeCollector(XSD::Types &allTypes, const QSet<QName> &usedTypes)
- : m_allTypes(allTypes),
- m_allUsedTypes(usedTypes)
- {}
+ : m_allTypes(allTypes)
+ , m_allUsedTypes(usedTypes)
+ {
+ }
// In case of inheritance, the parser simply set the base class in the derived class.
// We need to register the other way round (list of derived classes in a base class)
@@ -93,16 +99,15 @@ public:
void registerDerivedClasses()
{
XSD::ComplexType::List complexTypes = m_allTypes.complexTypes();
- Q_FOREACH (const XSD::ComplexType &derivedType, complexTypes) {
+ for (const XSD::ComplexType &derivedType : qAsConst(complexTypes)) {
const QName base = derivedType.baseTypeName();
if (!base.isEmpty()) {
// Look for the base class and register type. Linear search, maybe we should use a QHash...
- for (int i = 0; i < complexTypes.count(); ++i) {
- XSD::ComplexType &t = complexTypes[i];
- if (base == t.qualifiedName())
- //qDebug() << "Adding derived type" << derivedType.name() << "to base" << base;
+ for (XSD::ComplexType &complexType : complexTypes) {
+ if (base == complexType.qualifiedName())
+ // qDebug() << "Adding derived type" << derivedType.name() << "to base" << base;
{
- t.addDerivedType(derivedType.qualifiedName());
+ complexType.addDerivedType(derivedType.qualifiedName());
}
}
}
@@ -115,28 +120,31 @@ public:
QSet<QName> typesToProcess = m_allUsedTypes;
do {
m_alsoUsedTypes.clear();
- Q_FOREACH (const QName &typeName, typesToProcess) {
+ for (const QName &typeName : qAsConst(typesToProcess)) {
if (typeName.isEmpty()) {
continue;
}
if (typeMap.isBuiltinType(typeName)) {
continue;
}
- //qDebug() << "used type:" << typeName;
+ // qDebug() << "used type:" << typeName;
XSD::ComplexType complexType = m_allTypes.complexType(typeName);
if (!complexType.name().isEmpty()) { // found it as a complex type
fixupComplexType(complexType);
usedComplexTypes.insert(typeName, complexType);
addDependency(complexType.baseTypeName());
- Q_FOREACH (const QName &derivedTypeName, complexType.derivedTypes()) {
+ const auto derivedTypes = complexType.derivedTypes();
+ for (const QName &derivedTypeName : derivedTypes) {
addDependency(derivedTypeName);
}
- Q_FOREACH (const XSD::Element &element, complexType.elements()) {
+ const auto elements = complexType.elements();
+ for (const XSD::Element &element : elements) {
addDependency(element.type());
}
- Q_FOREACH (const XSD::Attribute &attribute, complexType.attributes()) {
+ const auto attributes = complexType.attributes();
+ for (const XSD::Attribute &attribute : attributes) {
addDependency(attribute.type());
}
addDependency(complexType.arrayType());
@@ -176,14 +184,14 @@ private:
QName uppercaseType(type.nameSpace(), upperlize(type.name()));
XSD::ComplexType upperType = usedComplexTypes.value(uppercaseType);
if (!upperType.isNull()) {
- //qDebug() << "FIXUP: found" << uppercaseType << "already in usedComplexTypes";
+ // qDebug() << "FIXUP: found" << uppercaseType << "already in usedComplexTypes";
type.setConflicting(true);
}
} else {
QName lowercaseType(type.nameSpace(), lowerlize(type.name()));
XSD::ComplexType lowerType = usedComplexTypes.value(lowercaseType);
if (!lowerType.isNull()) {
- //qDebug() << "FIXUP: found" << lowercaseType << "already in usedComplexTypes";
+ // qDebug() << "FIXUP: found" << lowercaseType << "already in usedComplexTypes";
usedComplexTypes.remove(lowercaseType);
lowerType.setConflicting(true);
usedComplexTypes.insert(lowercaseType, lowerType);
@@ -198,20 +206,24 @@ private:
class MessageCollector
{
public:
- MessageCollector() {}
+ MessageCollector()
+ {
+ }
QSet<QName> collectMessages(const WSDL &wsdl)
{
- Q_FOREACH (const Service &service, wsdl.definitions().services()) {
- Q_FOREACH (const Port &port, service.ports()) {
+ const Service::List services = wsdl.definitions().services();
+ for (const Service &service : services) {
+ const Port::List ports = service.ports();
+ for (const Port &port : ports) {
Binding binding = wsdl.findBinding(port.bindingName());
- //portTypeNames.insert( binding.portTypeName() );
- //qDebug() << "binding" << port.bindingName() << binding.name() << "port type" << binding.portTypeName();
+ // portTypeNames.insert( binding.portTypeName() );
+ // qDebug() << "binding" << port.bindingName() << binding.name() << "port type" << binding.portTypeName();
PortType portType = wsdl.findPortType(binding.portTypeName());
const Operation::List operations = portType.operations();
- //qDebug() << "portType" << portType.name() << operations.count() << "operations";
- Q_FOREACH (const Operation &operation, operations) {
- //qDebug() << " operation" << operation.operationType() << operation.name();
+ // qDebug() << "portType" << portType.name() << operations.count() << "operations";
+ for (const Operation &operation : qAsConst(operations)) {
+ // qDebug() << " operation" << operation.operationType() << operation.name();
switch (operation.operationType()) {
case Operation::OneWayOperation:
addMessage(operation.input().message());
@@ -228,10 +240,12 @@ public:
if (binding.type() == Binding::SOAPBinding) {
const SoapBinding soapBinding(binding.soapBinding());
const SoapBinding::Operation op = soapBinding.operations().value(operation.name());
- Q_FOREACH (const SoapBinding::Header &header, op.inputHeaders()) {
+ const SoapBinding::Headers inputHeaders = op.inputHeaders();
+ for (const SoapBinding::Header &header : inputHeaders) {
addMessage(header.message());
}
- Q_FOREACH (const SoapBinding::Header &header, op.outputHeaders()) {
+ const SoapBinding::Headers outputHeaders = op.outputHeaders();
+ for (const SoapBinding::Header &header : outputHeaders) {
addMessage(header.message());
}
}
@@ -240,6 +254,7 @@ public:
}
return m_usedMessageNames;
}
+
private:
void addMessage(const QName &messageName)
{
@@ -248,7 +263,6 @@ private:
}
QSet<QName> m_usedMessageNames;
-
};
void Converter::cleanupUnusedTypes()
@@ -267,28 +281,29 @@ void Converter::cleanupUnusedTypes()
qDebug() << types.simpleTypes().count() << "simple types";
qDebug() << types.elements().count() << "elements";
- //Q_FOREACH(const XSD::Element& elem, types.elements()) {
+ // for (const XSD::Element& elem : types.elements()) {
// qDebug() << "element:" << elem.qualifiedName();
//}
- //Q_FOREACH(const XSD::ComplexType& complexType, types.complexTypes()) {
+ // for (const XSD::ComplexType& complexType : types.complexTypes()) {
// qDebug() << "complex type:" << complexType.qualifiedName();
//}
}
MessageCollector messageCollector;
QSet<QName> usedMessageNames = messageCollector.collectMessages(mWSDL);
- //QSet<QName> portTypeNames;
+ // QSet<QName> portTypeNames;
// Keep only the messages in usedMessageNames
QSet<QName> usedTypes;
QSet<QString> usedTypesStrings; // for debug
QSet<QName> usedElementNames;
Message::List newMessages;
- Q_FOREACH (const QName &messageName, usedMessageNames) {
- //qDebug() << "used message:" << messageName;
+ for (const QName &messageName : qAsConst(usedMessageNames)) {
+ // qDebug() << "used message:" << messageName;
Message message = mWSDL.findMessage(messageName);
newMessages.append(message);
- Q_FOREACH (const Part &part, message.parts()) {
+ const Part::List messageParts = message.parts();
+ for (const Part &part : messageParts) {
if (!part.type().isEmpty()) {
usedTypes.insert(part.type());
usedTypesStrings.insert(part.type().qname());
@@ -308,7 +323,7 @@ void Converter::cleanupUnusedTypes()
}
}
- //qDebug() << "usedTypes:" << usedTypesStrings.toList();
+ // qDebug() << "usedTypes:" << usedTypesStrings.toList();
// keep only the types used in these messages
TypeCollector collector(types, usedTypes);
@@ -348,7 +363,7 @@ void Converter::cleanupUnusedTypes()
qDebug() << types.complexTypes().count() << "complex types";
qDebug() << types.simpleTypes().count() << "simple types";
qDebug() << types.elements().count() << "elements";
- //Q_FOREACH(const XSD::ComplexType& complexType, types.complexTypes()) {
+ // for (const XSD::ComplexType& complexType : types.complexTypes()) {
// qDebug() << "complex type:" << complexType.qualifiedName();
//}
}
@@ -380,27 +395,28 @@ void Converter::convertTypes()
XSD::SimpleType::List simpleTypes = types.simpleTypes();
qDebug() << "Converting" << simpleTypes.count() << "simple types";
- for (int i = 0; i < simpleTypes.count(); ++i) {
- convertSimpleType(&(simpleTypes[ i ]), simpleTypes);
+ for (const XSD::SimpleType &simpleType : qAsConst(simpleTypes)) {
+ convertSimpleType(&simpleType, simpleTypes);
}
XSD::ComplexType::List complexTypes = types.complexTypes();
qDebug() << "Converting" << complexTypes.count() << "complex types";
- for (int i = 0; i < complexTypes.count(); ++i) {
- convertComplexType(&(complexTypes[ i ]));
+ for (const XSD::ComplexType &complexType : qAsConst(complexTypes)) {
+ convertComplexType(&complexType);
}
}
// Helper for clientstub and serverstub
-KODE::Code Converter::serializePart(const Part &part, const QString &localVariableName, const QString &varName, bool append)
+KODE::Code Converter::serializePart(const Part &part, const QString &localVariableName, const QString &nilVariableName, const QString &varName,
+ bool append)
{
bool qualified, nillable;
const QName elemName = elementNameForPart(part, &qualified, &nillable);
- ElementArgumentSerializer serializer(mTypeMap, part.type(), part.element(), localVariableName);
+ ElementArgumentSerializer serializer(mTypeMap, part.type(), part.element(), localVariableName, nilVariableName);
serializer.setElementName(elemName);
serializer.setOutputVariable(varName, append);
serializer.setIsQualified(qualified);
serializer.setNillable(nillable);
- serializer.setOmitIfEmpty(false); // Don't omit entire parts, this especially breaks the wrappers for RPC messages
- return serializer.generate();
+ serializer.setOptional(false); // Don't omit entire parts, this especially breaks the wrappers for RPC messages
+ return serializer.generateSerializationCode();
}
diff --git a/kdwsdl2cpp/src/converter.h b/kdwsdl2cpp/src/converter.h
index 907a18d..a2a4483 100644
--- a/kdwsdl2cpp/src/converter.h
+++ b/kdwsdl2cpp/src/converter.h
@@ -1,30 +1,17 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_CONVERTER_H
#define KWSDL_CONVERTER_H
+#include <QSet>
+#include <code_generation/class.h>
#include <common/nsmanager.h>
-#include <libkode/class.h>
#include <schema/parser.h>
#include <wsdl/wsdl.h>
-#include <QSet>
#include "namemapper.h"
#include "typemap.h"
@@ -35,26 +22,27 @@
#define COMMENT QLatin1String("// ") + Converter::shortenFilename(QLatin1String(__FILE__)) + QLatin1String(":") + QString::number(__LINE__)
#endif
-namespace KWSDL
-{
+namespace KWSDL {
class Converter
{
public:
-
- struct DefaultAttributeValue
- {
- DefaultAttributeValue(bool isBuiltin = false, const QString& value = QString()):
- mIsBuiltin(isBuiltin),
- mValue(value) { }
-
- bool mIsBuiltin;
- QString mValue;
-
- bool isNull() const {
- return mValue.isNull();
- }
- };
+ struct DefaultAttributeValue
+ {
+ DefaultAttributeValue(bool isBuiltin = false, const QString &value = QString())
+ : mIsBuiltin(isBuiltin)
+ , mValue(value)
+ {
+ }
+
+ bool mIsBuiltin;
+ QString mValue;
+
+ bool isNull() const
+ {
+ return mValue.isNull();
+ }
+ };
Converter();
@@ -67,7 +55,6 @@ public:
static QString shortenFilename(const QString &path);
private:
-
void cleanupUnusedTypes();
void convertTypes();
@@ -83,20 +70,23 @@ private:
void convertClientInputMessage(const Operation &, const Binding &, KODE::Class &);
void convertClientOutputMessage(const Operation &, const Binding &, KODE::Class &);
void clientAddOneArgument(KODE::Function &callFunc, const Part &part, KODE::Class &newClass);
- void clientAddArguments(KODE::Function &callFunc, const Message &message, KODE::Class &newClass, const Operation &operation, const Binding &binding);
+ void clientAddArguments(KODE::Function &callFunc, const Message &message, KODE::Class &newClass, const Operation &operation,
+ const Binding &binding);
bool clientAddAction(KODE::Code &code, const Binding &binding, const QString &operationName);
- void clientGenerateMessage(KODE::Code &code, const Binding &binding, const Message &message, const Operation &operation, bool varsAreMembers = false);
- void addMessageArgument(KODE::Code &code, const SoapBinding::Style &bindingStyle, const Part &part, const QString &localVariableName, const QByteArray &messageName, bool varIsMember = false);
+ void clientGenerateMessage(KODE::Code &code, const Binding &binding, const Message &message, const Operation &operation,
+ bool varsAreMembers = false);
+ void addMessageArgument(KODE::Code &code, const SoapBinding::Style &bindingStyle, const Part &part, const QString &localVariableName,
+ const QByteArray &messageName, bool varIsMember = false);
void createHeader(const SoapBinding::Header &header, KODE::Class &newClass);
void addJobResultMember(KODE::Class &jobClass, const Part &part, const QString &varName, const QStringList &inputGetters);
- KODE::Code serializePart(const Part &part, const QString &localVariableName, const QString &varName, bool append);
- KODE::Code demarshalVarHelper(const QName &type, const QName &elementType, const QString &variableName, const QString &qtTypeName, const QString &soapValueVarName, bool optional) const;
- KODE::Code demarshalVar(const QName &type, const QName &elementType, const QString &variableName, const QString &typeName, const QString &soapValueVarName, bool optional, bool usePointer) const;
- KODE::Code demarshalArrayVar(const QName &type, const QString &variableName, const QString &qtTypeName, bool optional) const;
+ KODE::Code serializePart(const Part &part, const QString &localVariableName, const QString &nilVariableName, const QString &varName, bool append);
+
void addVariableInitializer(KODE::MemberVariable &variable) const;
// Implements default values processing ONLY for attributes
- QString generateMemberVariable(const QString &rawName, const QString &typeName, const QString &inputTypeName, KODE::Class &newClass, XSD::Attribute::AttributeUse, bool usePointer, bool polymorphic, const DefaultAttributeValue& defaultValue = DefaultAttributeValue());
+ QString generateMemberVariable(const QString &rawName, const QString &typeName, const QString &inputTypeName, KODE::Class &newClass,
+ XSD::Attribute::AttributeUse, bool usePointer, bool polymorphic,
+ const DefaultAttributeValue &defaultValue = DefaultAttributeValue());
QString listTypeFor(const QString &itemTypeName, KODE::Class &newClass);
KODE::Code deserializeRetVal(const KWSDL::Part &part, const QString &replyMsgName, const QString &qtRetType, const QString &varName) const;
@@ -105,10 +95,9 @@ private:
// Server Stub
void convertServerService();
- void generateServerMethod(KODE::Code &code, const Binding &binding, const Operation &operation,
- KODE::Class &newClass, bool first);
- void generateDelayedReponseMethod(const QString &methodName, const QString &retInputType,
- const Part &retPart, KODE::Class &newClass, const Binding &binding, const Message &outputMessage);
+ void generateServerMethod(KODE::Code &code, const Binding &binding, const Operation &operation, KODE::Class &newClass, bool first);
+ void generateDelayedReponseMethod(const QString &methodName, const QString &retInputType, const Part &retPart, KODE::Class &newClass,
+ const Binding &binding, const Message &outputMessage);
SoapBinding::Style soapStyle(const Binding &binding) const;
diff --git a/kdwsdl2cpp/src/converter_clientstub.cpp b/kdwsdl2cpp/src/converter_clientstub.cpp
index 3d94178..11ffe77 100644
--- a/kdwsdl2cpp/src/converter_clientstub.cpp
+++ b/kdwsdl2cpp/src/converter_clientstub.cpp
@@ -1,8 +1,15 @@
+/*
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
+*/
+
#include "converter.h"
-#include <libkode/style.h>
+#include "elementargumentserializer.h"
#include "settings.h"
-#include <QDebug>
#include <QCoreApplication>
+#include <QDebug>
+#include <code_generation/style.h>
using namespace KWSDL;
@@ -23,8 +30,9 @@ static Part::List selectedParts(const Binding &binding, const Message &message,
const QString selectedPart = input ? op.input().part() : op.output().part();
if (!selectedPart.isEmpty()) {
Part::List selected;
- Q_FOREACH (const Part &part, message.parts()) {
- if (part.name() == selectedPart) { // support for <soap:body parts="MoveFolderResult"/> (msexchange)
+ const Part::List parts = message.parts();
+ for (const Part &part : parts) {
+ if (part.name() == selectedPart) { // support for <soap:body parts="MoveFolderResult"/> (msexchange)
selected << part;
}
}
@@ -67,13 +75,14 @@ static SoapBinding::Headers getOutputHeaders(const Binding &binding, const QStri
bool Converter::convertClientService()
{
KODE::Class::List bindingClasses;
- Q_FOREACH (const Service &service, mWSDL.definitions().services()) {
+ const Service::List services = mWSDL.definitions().services();
+ for (const Service &service : services) {
Q_ASSERT(!service.name().isEmpty());
QSet<QName> uniqueBindings = mWSDL.uniqueBindings(service);
- //qDebug() << "Looking at" << service.name() << uniqueBindings;
+ // qDebug() << "Looking at" << service.name() << uniqueBindings;
- Q_FOREACH (const QName &bindingName, uniqueBindings) {
+ for (const QName &bindingName : qAsConst(uniqueBindings)) {
const Binding binding = mWSDL.findBinding(bindingName);
QString className = KODE::Style::className(service.name());
@@ -132,6 +141,7 @@ bool Converter::convertClientService()
KODE::Function ctor(newClass.name());
ctor.addArgument(KODE::Function::Argument(QLatin1String("QObject* _parent"), QLatin1String("nullptr")));
ctor.addInitializer(QLatin1String("QObject(_parent)"));
+ ctor.setExplicit(true);
KODE::Function dtor(QLatin1Char('~') + newClass.name());
KODE::Code ctorCode, dtorCode;
@@ -176,7 +186,7 @@ bool Converter::convertClientService()
getEndPoint.setDocs(QLatin1String("Return the end point that will be used."));
newClass.addFunction(getEndPoint);
}
- //setSoapVersion() method
+ // setSoapVersion() method
{
KODE::Function setSoapVersion(QLatin1String("setSoapVersion"), QLatin1String("void"));
setSoapVersion.addArgument(QLatin1String("KDSoapClientInterface::SoapVersion soapVersion"));
@@ -187,7 +197,7 @@ bool Converter::convertClientService()
"version can be KDSoapClientInterface::SOAP1_1 or KDSoapClientInterface::SOAP1_2"));
newClass.addFunction(setSoapVersion);
}
- //soapVersion() method
+ // soapVersion() method
{
KODE::Function getSoapVersion(QLatin1String("soapVersion"), QLatin1String("KDSoapClientInterface::SoapVersion"));
getSoapVersion.setConst(true);
@@ -239,12 +249,14 @@ bool Converter::convertClientService()
lastError.setDocs(QLatin1String("Return the error from the last blocking call.\nEmpty if no error."));
newClass.addFunction(lastError);
}
- //soapError() signal
+ // soapError() signal
{
KODE::Function errorSignal(QLatin1String("soapError"), QLatin1String("void"), KODE::Function::Signal);
errorSignal.addArgument(QLatin1String("const QString& method"));
errorSignal.addArgument(QLatin1String("const KDSoapMessage& fault"));
- errorSignal.setDocs(QLatin1String("This signal is emitted whenever a SOAP call failed, for a central processing of all SOAP errors.\nmethod is the name of the method (or operation) that returned the fault, for instance \"addContact\"."));
+ errorSignal.setDocs(
+ QLatin1String("This signal is emitted whenever a SOAP call failed, for a central processing of all SOAP errors.\nmethod is the "
+ "name of the method (or operation) that returned the fault, for instance \"addContact\"."));
newClass.addFunction(errorSignal);
}
@@ -263,14 +275,17 @@ bool Converter::convertClientService()
// clientInterface() methods
{
- KODE::Function clientInterface(QLatin1String("clientInterface"), QLatin1String("const KDSoapClientInterface*"), KODE::Function::Public);
+ KODE::Function clientInterface(QLatin1String("clientInterface"), QLatin1String("const KDSoapClientInterface*"),
+ KODE::Function::Public);
clientInterface.setConst(true);
KODE::Code code;
code += "if (!d_ptr->m_clientInterface) {";
code.indent();
const QByteArray encoded = webserviceLocation.toEncoded();
- code += QLatin1String("const QString endPoint = !d_ptr->m_endPoint.isEmpty() ? d_ptr->m_endPoint : QString::fromLatin1(\"") + QString::fromLatin1(encoded.data(), encoded.size()) + QLatin1String("\");");
- code += QLatin1String("const QString messageNamespace = QString::fromLatin1(\"") + mWSDL.definitions().targetNamespace() + QLatin1String("\");");
+ code += QLatin1String("const QString endPoint = !d_ptr->m_endPoint.isEmpty() ? d_ptr->m_endPoint : QString::fromLatin1(\"")
+ + QString::fromLatin1(encoded.data(), encoded.size()) + QLatin1String("\");");
+ code += QLatin1String("const QString messageNamespace = QString::fromLatin1(\"") + mWSDL.definitions().targetNamespace()
+ + QLatin1String("\");");
code += "d_ptr->m_clientInterface = new KDSoapClientInterface(endPoint, messageNamespace);";
if (soapStyle(binding) == SoapBinding::DocumentStyle) {
code += "d_ptr->m_clientInterface->setStyle( KDSoapClientInterface::DocumentStyle );";
@@ -284,13 +299,16 @@ bool Converter::convertClientService()
code += "}";
code += "return d_ptr->m_clientInterface;";
clientInterface.setBody(code);
- clientInterface.setDocs(QLatin1String("Returns the underlying KDSoapClientInterface instance, which allows to access setCookieJar, lastResponseHeaders, etc."));
+ clientInterface.setDocs(QLatin1String(
+ "Returns the underlying KDSoapClientInterface instance, which allows to access setCookieJar, lastResponseHeaders, etc."));
newClass.addFunction(clientInterface);
}
{
- KODE::Function mutableClientInterface(QLatin1String("clientInterface"), QLatin1String("KDSoapClientInterface*"), KODE::Function::Public);
+ KODE::Function mutableClientInterface(QLatin1String("clientInterface"), QLatin1String("KDSoapClientInterface*"),
+ KODE::Function::Public);
KODE::Code code;
- code += QLatin1String("return const_cast<KDSoapClientInterface*>( const_cast< const ") + newClass.name() + QLatin1String("*>( this )->clientInterface() );");
+ code += QLatin1String("return const_cast<KDSoapClientInterface*>( const_cast< const ") + newClass.name()
+ + QLatin1String("*>( this )->clientInterface() );");
mutableClientInterface.setBody(code);
newClass.addFunction(mutableClientInterface);
}
@@ -298,197 +316,218 @@ bool Converter::convertClientService()
SoapBinding::Headers soapHeaders;
PortType portType = mWSDL.findPortType(binding.portTypeName());
- //qDebug() << portType.name();
+ // qDebug() << portType.name();
const Operation::List operations = portType.operations();
- Q_FOREACH (const Operation &operation, operations) {
+ for (const Operation &operation : operations) {
Operation::OperationType opType = operation.operationType();
switch (opType) {
case Operation::OneWayOperation:
case Operation::RequestResponseOperation: // the standard case
- // sync method
- if (!convertClientCall(operation, binding, newClass)) {
- return false;
+ if (!Settings::self()->skipSync()) {
+ // sync method
+ if (!convertClientCall(operation, binding, newClass)) {
+ return false;
+ }
+ }
+
+ if (!Settings::self()->skipAsync()) {
+ // async method
+ convertClientInputMessage(operation, binding, newClass);
+ convertClientOutputMessage(operation, binding, newClass);
+ // TODO fault
}
- // async method
- convertClientInputMessage(operation, binding, newClass);
- convertClientOutputMessage(operation, binding, newClass);
- // TODO fault
break;
case Operation::SolicitResponseOperation:
- convertClientOutputMessage(operation, binding, newClass);
- convertClientInputMessage(operation, binding, newClass);
- // TODO fault
+ if (!Settings::self()->skipAsync()) {
+ convertClientOutputMessage(operation, binding, newClass);
+ convertClientInputMessage(operation, binding, newClass);
+ // TODO fault
+ }
break;
case Operation::NotificationOperation:
- convertClientOutputMessage(operation, binding, newClass);
+ if (!Settings::self()->skipAsync()) {
+ convertClientOutputMessage(operation, binding, newClass);
+ }
break;
}
// Collect message parts used as headers
- Q_FOREACH (const SoapBinding::Header &header, getInputHeaders(binding, operation.name())) {
+ const SoapBinding::Headers inputHeaders = getInputHeaders(binding, operation.name());
+ for (const SoapBinding::Header &header : inputHeaders) {
if (!soapHeaders.contains(header)) {
soapHeaders.append(header);
}
}
} // end of for each operation
- Q_FOREACH (const SoapBinding::Header &header, soapHeaders) {
+ for (const SoapBinding::Header &header : qAsConst(soapHeaders)) {
createHeader(header, newClass);
}
bindingClasses.append(newClass);
mHeaderMethods.clear();
- QString jobsNamespace = nameSpace;
- if (uniqueBindings.count() > 1) {
- // Multiple bindings: use <Service>::<Binding>Jobs as namespace for the job classes
- jobsNamespace += "::" + KODE::Style::className(bindingName.localName()) + "Jobs";
- }
-
- // for each operation, create a job class
- Q_FOREACH (const Operation &operation, operations) {
- Operation::OperationType opType = operation.operationType();
- if (opType != Operation::SolicitResponseOperation && opType != Operation::RequestResponseOperation) {
- continue;
+ if (!Settings::self()->skipAsyncJobs()) {
+ QString jobsNamespace = nameSpace;
+ if (uniqueBindings.count() > 1) {
+ // Multiple bindings: use <Service>::<Binding>Jobs as namespace for the job classes
+ jobsNamespace += "::" + KODE::Style::className(bindingName.localName()) + "Jobs";
}
- const QString operationName = operation.name();
- KODE::Class jobClass(KODE::Style::className(operation.name()) + QLatin1String("Job"), jobsNamespace);
- if (mClasses.findClass(jobClass.qualifiedName()) != mClasses.constEnd()) {
- jobClass.setName(KODE::Style::className(className /*binding name*/ + jobClass.name()));
- }
- jobClass.addInclude(QString(), fullyQualified(newClass));
- jobClass.addHeaderInclude(QLatin1String("KDSoapClient/KDSoapJob.h"));
- if (!Settings::self()->exportDeclaration().isEmpty()) {
- jobClass.setExportDeclaration(Settings::self()->exportDeclaration());
- }
+ // for each operation, create a job class
+ for (const Operation &operation : qAsConst(operations)) {
+ Operation::OperationType opType = operation.operationType();
+ if (opType != Operation::SolicitResponseOperation && opType != Operation::RequestResponseOperation) {
+ continue;
+ }
- jobClass.addBaseClass(KODE::Class(QLatin1String("KDSoapJob")));
+ const QString operationName = operation.name();
+ KODE::Class jobClass(KODE::Style::className(operation.name()) + QLatin1String("Job"), jobsNamespace);
+ if (mClasses.findClass(jobClass.qualifiedName()) != mClasses.constEnd()) {
+ jobClass.setName(KODE::Style::className(className /*binding name*/ + jobClass.name()));
+ }
+ jobClass.addInclude(QString(), fullyQualified(newClass));
+ jobClass.addHeaderInclude(QLatin1String("KDSoapClient/KDSoapJob.h"));
+ if (!Settings::self()->exportDeclaration().isEmpty()) {
+ jobClass.setExportDeclaration(Settings::self()->exportDeclaration());
+ }
- KODE::MemberVariable serviceVar(QLatin1String("service"), fullyQualified(newClass) + QLatin1Char('*'));
- jobClass.addMemberVariable(serviceVar);
+ jobClass.addBaseClass(KODE::Class(QLatin1String("KDSoapJob")));
- KODE::Function ctor(jobClass.name());
- ctor.addArgument(KODE::Function::Argument(QString::fromLatin1("%1* service").arg(fullyQualified(newClass))));
- ctor.addArgument(KODE::Function::Argument(QLatin1String("QObject* _parent"), QLatin1String("nullptr")));
- ctor.addInitializer(QLatin1String("KDSoapJob(_parent)"));
- ctor.addInitializer(QLatin1String("mService(service)"));
+ KODE::MemberVariable serviceVar(QLatin1String("service"), fullyQualified(newClass) + QLatin1Char('*'));
+ jobClass.addMemberVariable(serviceVar);
- const Message message = mWSDL.findMessage(operation.input().message());
- Q_FOREACH (const Part &part, selectedParts(binding, message, operation, true /*input*/)) {
- const QString partName = part.name();
- ctor.addInitializer(KODE::MemberVariable::memberVariableName(partName) + "()");
- }
+ KODE::Function ctor(jobClass.name());
+ ctor.addArgument(KODE::Function::Argument(QString::fromLatin1("%1* service").arg(fullyQualified(newClass))));
+ ctor.addArgument(KODE::Function::Argument(QLatin1String("QObject* _parent"), QLatin1String("nullptr")));
+ ctor.setExplicit(true);
+ ctor.addInitializer(QLatin1String("KDSoapJob(_parent)"));
+ ctor.addInitializer(QLatin1String("mService(service)"));
- const Message outputMsg = mWSDL.findMessage(operation.output().message());
+ const Message message = mWSDL.findMessage(operation.input().message());
+ for (const Part &part : selectedParts(binding, message, operation, true /*input*/)) {
+ const QString partName = part.name();
+ ctor.addInitializer(KODE::MemberVariable::memberVariableName(partName) + "()");
+ jobClass.addHeaderIncludes(mTypeMap.headerIncludes(part.type()));
+ }
- Q_FOREACH (const Part &part, selectedParts(binding, outputMsg, operation, false /*output*/)) {
- const QString varName = mNameMapper.escape(QLatin1String("result") + upperlize(part.name()));
- ctor.addInitializer(KODE::MemberVariable::memberVariableName(varName) + "()");
- }
+ const Message outputMsg = mWSDL.findMessage(operation.output().message());
- jobClass.addFunction(ctor);
-
- QStringList inputGetters;
-
- Q_FOREACH (const Part &part, selectedParts(binding, message, operation, true /*input*/)) {
- const QString varType = mTypeMap.localType(part.type(), part.element());
- const KODE::MemberVariable member(part.name(), varType);
- jobClass.addMemberVariable(member);
-
- KODE::Function setter(QLatin1String("set") + mNameMapper.escape(upperlize(part.name())), QLatin1String("void"));
- setter.addArgument(mTypeMap.localInputType(part.type(), part.element()) + QLatin1String(" arg0"));
- KODE::Code sc;
- sc += QString::fromLatin1("%1 = arg0;").arg(member.name());
- setter.setBody(sc);
- jobClass.addFunction(setter);
-
- const QString getterName = mNameMapper.escape(lowerlize(part.name()));
- inputGetters.append(getterName);
- KODE::Function getter(getterName, varType);
- getter.setConst(true);
- KODE::Code gc;
- gc += QString::fromLatin1("return %1;").arg(member.name());
- getter.setBody(gc);
- jobClass.addFunction(getter);
- }
+ for (const Part &part : selectedParts(binding, outputMsg, operation, false /*output*/)) {
+ const QString varName = mNameMapper.escape(QLatin1String("result") + upperlize(part.name()));
+ ctor.addInitializer(KODE::MemberVariable::memberVariableName(varName) + "()");
+ jobClass.addHeaderIncludes(mTypeMap.headerIncludes(part.type()));
+ }
- KODE::Function doStart(QLatin1String("doStart"), QLatin1String("void"), KODE::Function::Protected);
- doStart.setVirtualMode(KODE::Function::Override);
- KODE::Code doStartCode;
- const bool hasAction = clientAddAction(doStartCode, binding, operationName);
- clientGenerateMessage(doStartCode, binding, message, operation, /*use members=*/true);
+ jobClass.addFunction(ctor);
+
+ QStringList inputGetters;
+
+ for (const Part &part : selectedParts(binding, message, operation, true /*input*/)) {
+ const QString varType = mTypeMap.localType(part.type(), part.element());
+ const KODE::MemberVariable member(part.name(), varType);
+ jobClass.addMemberVariable(member);
+
+ KODE::Function setter(QLatin1String("set") + mNameMapper.escape(upperlize(part.name())), QLatin1String("void"));
+ setter.addArgument(mTypeMap.localInputType(part.type(), part.element()) + QLatin1String(" arg0"));
+ KODE::Code sc;
+ sc += QString::fromLatin1("%1 = arg0;").arg(member.name());
+ setter.setBody(sc);
+ jobClass.addFunction(setter);
+
+ const QString getterName = mNameMapper.escape(lowerlize(part.name()));
+ inputGetters.append(getterName);
+ KODE::Function getter(getterName, varType);
+ getter.setConst(true);
+ KODE::Code gc;
+ gc += QString::fromLatin1("return %1;").arg(member.name());
+ getter.setBody(gc);
+ jobClass.addFunction(getter);
+ }
- QString callLine = QString::fromLatin1("KDSoapPendingCall pendingCall = mService->clientInterface()->asyncCall(QLatin1String(\"%1\"), message").arg(operationName);
- if (hasAction) {
- callLine += QLatin1String(", action");
- }
- callLine += QLatin1String(", requestHeaders()");
- callLine += QLatin1String(");");
- doStartCode += callLine;
-
- doStartCode += "KDSoapPendingCallWatcher *watcher = new KDSoapPendingCallWatcher(pendingCall, this);";
- doStartCode += "QObject::connect(watcher, SIGNAL(finished(KDSoapPendingCallWatcher*)),\n"
- " this, SLOT(slotFinished(KDSoapPendingCallWatcher*)));";
- doStart.setBody(doStartCode);
- jobClass.addFunction(doStart);
-
- KODE::Function slot(QLatin1String("slotFinished"), QLatin1String("void"), KODE::Function::Private | KODE::Function::Slot);
- slot.addArgument(QLatin1String("KDSoapPendingCallWatcher* watcher"));
- KODE::Code slotCode;
- slotCode += QLatin1String("watcher->deleteLater();");
- slotCode += QLatin1String("KDSoapMessage _reply = watcher->returnMessage();");
- const Part::List outputParts = selectedParts(binding, outputMsg, operation, false /*input*/);
- const SoapBinding::Headers outputHeaders = getOutputHeaders(binding, operationName);
-
- if (!outputParts.isEmpty() || !outputHeaders.isEmpty()) {
- slotCode += QLatin1String("if (!_reply.isFault()) {") + COMMENT;
- slotCode.indent();
-
- if (!outputParts.isEmpty()) {
- if (soapStyle(binding) == SoapBinding::RPCStyle /*adds a wrapper*/) {
- Q_ASSERT(outputParts.count() == 1);
- // Protect the call to .at(0) below
- slotCode += "if (_reply.childValues().isEmpty()) {";
- slotCode.indent();
- slotCode += "_reply.setFault(true);" + COMMENT;
- slotCode += "_reply.addArgument(QString::fromLatin1(\"faultcode\"), QString::fromLatin1(\"Server.EmptyResponse\"));";
- slotCode += QLatin1String("return;");
- slotCode.unindent();
- slotCode += "}";
-
- slotCode += QLatin1String("_reply = _reply.childValues().at(0);") + COMMENT;
+ KODE::Function doStart(QLatin1String("doStart"), QLatin1String("void"), KODE::Function::Protected);
+ doStart.setVirtualMode(KODE::Function::Override);
+ KODE::Code doStartCode;
+ const bool hasAction = clientAddAction(doStartCode, binding, operationName);
+ clientGenerateMessage(doStartCode, binding, message, operation, /*use members=*/true);
+
+ QString callLine =
+ QString::fromLatin1("KDSoapPendingCall pendingCall = mService->clientInterface()->asyncCall(QLatin1String(\"%1\"), message")
+ .arg(operationName);
+ if (hasAction) {
+ callLine += QLatin1String(", action");
+ }
+ callLine += QLatin1String(", requestHeaders()");
+ callLine += QLatin1String(");");
+ doStartCode += callLine;
+
+ doStartCode += "KDSoapPendingCallWatcher *watcher = new KDSoapPendingCallWatcher(pendingCall, this);";
+ doStartCode += "QObject::connect(watcher, &KDSoapPendingCallWatcher::finished,\n"
+ " this, &"
+ + jobClass.name() + "::slotFinished);";
+ doStart.setBody(doStartCode);
+ jobClass.addFunction(doStart);
+
+ KODE::Function slot(QLatin1String("slotFinished"), QLatin1String("void"), KODE::Function::Private | KODE::Function::Slot);
+ slot.addArgument(QLatin1String("KDSoapPendingCallWatcher* watcher"));
+ KODE::Code slotCode;
+ slotCode += QLatin1String("watcher->deleteLater();");
+ slotCode += QLatin1String("KDSoapMessage _reply = watcher->returnMessage();");
+ const Part::List outputParts = selectedParts(binding, outputMsg, operation, false /*input*/);
+ const SoapBinding::Headers outputHeaders = getOutputHeaders(binding, operationName);
+
+ if (!outputParts.isEmpty() || !outputHeaders.isEmpty()) {
+ slotCode += QLatin1String("if (!_reply.isFault()) {") + COMMENT;
+ slotCode.indent();
+
+ if (!outputParts.isEmpty()) {
+ if (soapStyle(binding) == SoapBinding::RPCStyle /*adds a wrapper*/) {
+ Q_ASSERT(outputParts.count() == 1);
+ // Protect the call to .at(0) below
+ slotCode += "if (_reply.childValues().isEmpty()) {";
+ slotCode.indent();
+ slotCode += "_reply.setFault(true);" + COMMENT;
+ slotCode += "_reply.addArgument(QString::fromLatin1(\"faultcode\"), QString::fromLatin1(\"Server.EmptyResponse\"));";
+ slotCode += QLatin1String("return;");
+ slotCode.unindent();
+ slotCode += "}";
+
+ slotCode += QLatin1String("_reply = _reply.childValues().at(0);") + COMMENT;
+ }
+
+ for (const Part &part : qAsConst(outputParts)) {
+ const QString varName = mNameMapper.escape(QLatin1String("result") + upperlize(part.name()));
+ const KODE::MemberVariable member(varName, QString());
+ slotCode.addBlock(
+ deserializeRetVal(part, QLatin1String("_reply"), mTypeMap.localType(part.type(), part.element()), member.name()));
+
+ addJobResultMember(jobClass, part, varName, inputGetters);
+ }
}
+ for (const SoapBinding::Header &header : qAsConst(outputHeaders)) {
+ const QName messageName = header.message();
+ const QString partName = header.part();
+ const Message message = mWSDL.findMessage(messageName);
+ const Part part = message.partByName(partName);
- Q_FOREACH (const Part &part, outputParts) {
- const QString varName = mNameMapper.escape(QLatin1String("result") + upperlize(part.name()));
+ const QString varName = QLatin1String("resultHeader") + upperlize(part.name());
const KODE::MemberVariable member(varName, QString());
- slotCode.addBlock(deserializeRetVal(part, QLatin1String("_reply"), mTypeMap.localType(part.type(), part.element()), member.name()));
-
+ const QString getHeader =
+ QString::fromLatin1("watcher->returnHeaders().header(QLatin1String(\"%1\"), QLatin1String(\"%2\"))")
+ .arg(part.element().localName(), part.element().nameSpace());
+ slotCode.addBlock(deserializeRetVal(part, getHeader, mTypeMap.localType(part.type(), part.element()), member.name()));
addJobResultMember(jobClass, part, varName, inputGetters);
}
- }
- Q_FOREACH (const SoapBinding::Header &header, outputHeaders) {
- const QName messageName = header.message();
- const QString partName = header.part();
- const Message message = mWSDL.findMessage(messageName);
- const Part part = message.partByName(partName);
-
- const QString varName = QLatin1String("resultHeader") + upperlize(part.name());
- const KODE::MemberVariable member(varName, QString());
- const QString getHeader = QString::fromLatin1("watcher->returnHeaders().header(QLatin1String(\"%1\"), QLatin1String(\"%2\"))").arg(part.element().localName(), part.element().nameSpace());
- slotCode.addBlock(deserializeRetVal(part, getHeader, mTypeMap.localType(part.type(), part.element()), member.name()));
- addJobResultMember(jobClass, part, varName, inputGetters);
- }
- slotCode.unindent();
- slotCode += QLatin1String("}");
- }
- slotCode += QLatin1String("emitFinished(_reply, watcher->returnHeaders());");
- slot.setBody(slotCode);
- jobClass.addFunction(slot);
+ slotCode.unindent();
+ slotCode += QLatin1String("}");
+ }
+ slotCode += QLatin1String("emitFinished(_reply, watcher->returnHeaders());");
+ slot.setBody(slotCode);
+ jobClass.addFunction(slot);
- mClasses.addClass(jobClass);
- } // end of for each operation (job creation)
+ mClasses.addClass(jobClass);
+ } // end of for each operation (job creation)
+ } // end if async job API creation is not skipped
} // end of for each port
} // end of for each service
@@ -510,10 +549,10 @@ void Converter::clientAddOneArgument(KODE::Function &callFunc, const Part &part,
{
const QString lowerName = lowerlize(part.name());
const QString argType = mTypeMap.localInputType(part.type(), part.element());
- //qDebug() << "localInputType" << part.type().qname() << part.element().qname() << "->" << argType;
+ // qDebug() << "localInputType" << part.type().qname() << part.element().qname() << "->" << argType;
if (argType != QLatin1String("void")) {
QString def;
- if (part.type().isEmpty()) { // element (document style)
+ if (part.type().isEmpty()) { // element (document style)
// If the complex type is empty, we need it for serialization,
// but we don't need the app to see it, so give it a default value.
// Example:
@@ -522,7 +561,7 @@ void Converter::clientAddOneArgument(KODE::Function &callFunc, const Part &part,
const XSD::ComplexType ctype = mWSDL.findComplexType(element.type());
if (!ctype.isNull() && ctype.isEmpty()) {
def = mTypeMap.localType(part.type(), part.element()) + QLatin1String("()");
- //def += "/* " + element.type().qname() + " is empty */";
+ // def += "/* " + element.type().qname() + " is empty */";
}
}
@@ -532,10 +571,11 @@ void Converter::clientAddOneArgument(KODE::Function &callFunc, const Part &part,
newClass.addHeaderIncludes(mTypeMap.headerIncludes(part.type()));
}
-void Converter::clientAddArguments(KODE::Function &callFunc, const Message &message, KODE::Class &newClass, const Operation &operation, const Binding &binding)
+void Converter::clientAddArguments(KODE::Function &callFunc, const Message &message, KODE::Class &newClass, const Operation &operation,
+ const Binding &binding)
{
const Part::List parts = selectedParts(binding, message, operation, true /*input*/);
- Q_FOREACH (const Part &part, parts) {
+ for (const Part &part : parts) {
clientAddOneArgument(callFunc, part, newClass);
}
}
@@ -568,22 +608,26 @@ QName Converter::elementNameForPart(const Part &part, bool *qualified, bool *nil
}
}
-void Converter::addMessageArgument(KODE::Code &code, const SoapBinding::Style &bindingStyle, const Part &part, const QString &localVariableName, const QByteArray &messageName, bool varIsMember)
+void Converter::addMessageArgument(KODE::Code &code, const SoapBinding::Style &bindingStyle, const Part &part, const QString &localVariableName,
+ const QByteArray &messageName, bool varIsMember)
{
- const QString partname = varIsMember ? QLatin1Char('m') + upperlize(localVariableName) : mNameMapper.escape(lowerlize(localVariableName));
+ const QString partname =
+ varIsMember ? KODE::MemberVariable::memberVariableName(localVariableName) : mNameMapper.escape(lowerlize(localVariableName));
+ const QString nilPartname = varIsMember ? KODE::MemberVariable::memberVariableName(localVariableName + "_nil") : partname + "_nil";
// In document style, the "part" is directly added as arguments
// See https://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
if (bindingStyle == SoapBinding::DocumentStyle) {
- code.addBlock(serializePart(part, partname, messageName, false));
+ code.addBlock(serializePart(part, partname, nilPartname, messageName, false));
} else {
const QString argType = mTypeMap.localType(part.type(), part.element());
if (argType != QLatin1String("void")) {
- code.addBlock(serializePart(part, partname, messageName + ".childValues()", true));
+ code.addBlock(serializePart(part, partname, nilPartname, messageName + ".childValues()", true));
}
}
}
-void Converter::clientGenerateMessage(KODE::Code &code, const Binding &binding, const Message &message, const Operation &operation, bool varsAreMembers)
+void Converter::clientGenerateMessage(KODE::Code &code, const Binding &binding, const Message &message, const Operation &operation,
+ bool varsAreMembers)
{
code += "KDSoapMessage message;";
@@ -595,7 +639,7 @@ void Converter::clientGenerateMessage(KODE::Code &code, const Binding &binding,
} else {
code += "message.setUse(KDSoapMessage::LiteralUse);";
}
- //qDebug() << "input headers:" << op.inputHeaders().count();
+ // qDebug() << "input headers:" << op.inputHeaders().count();
if (!op.input().nameSpace().isEmpty()) {
code += "message.setNamespaceUri(QString::fromLatin1(\"" + op.input().nameSpace() + "\"));";
@@ -604,13 +648,14 @@ void Converter::clientGenerateMessage(KODE::Code &code, const Binding &binding,
bool isBuiltin = false;
- Q_FOREACH (const Part &part, selectedParts(binding, message, operation, true /*input*/)) {
+ for (const Part &part : selectedParts(binding, message, operation, true /*input*/)) {
isBuiltin = isBuiltin || mTypeMap.isBuiltinType(part.type(), part.element());
addMessageArgument(code, soapStyle(binding), part, part.name(), "message", varsAreMembers);
}
if (soapStyle(binding) == SoapBinding::DocumentStyle && message.parts().size() > 1 && isBuiltin) {
- qWarning("A Document style cannot be formed with multiple parts of builtin type (eg : multiple parts xsd:string), please correct your WSDL file");
+ qWarning(
+ "A Document style cannot be formed with multiple parts of builtin type (eg : multiple parts xsd:string), please correct your WSDL file");
}
}
@@ -626,7 +671,8 @@ KODE::Code Converter::deserializeRetVal(const KWSDL::Part &part, const QString &
const bool isComplex = mTypeMap.isComplexType(part.type(), part.element());
const bool isPolymorphic = mTypeMap.isPolymorphic(part.type(), part.element());
if (isBuiltin) {
- code += varName + QLatin1String(" = ") + mTypeMap.deserializeBuiltin(part.type(), part.element(), replyMsgName, qtRetType) + QLatin1String(";") + COMMENT;
+ code += varName + QLatin1String(" = ") + mTypeMap.deserializeBuiltin(part.type(), part.element(), replyMsgName, qtRetType)
+ + QLatin1String(";") + COMMENT;
} else if (isComplex) {
const QString op = isPolymorphic ? "->" : ".";
code += varName + op + QLatin1String("deserialize(") + replyMsgName + QLatin1String(");") + COMMENT;
@@ -652,7 +698,8 @@ bool Converter::convertClientCall(const Operation &operation, const Binding &bin
KODE::Code code;
const bool hasAction = clientAddAction(code, binding, operation.name());
clientGenerateMessage(code, binding, inputMessage, operation);
- QString callLine = QLatin1String("d_ptr->m_lastReply = clientInterface()->call(QLatin1String(\"") + operation.name() + QLatin1String("\"), message");
+ QString callLine =
+ QLatin1String("d_ptr->m_lastReply = clientInterface()->call(QLatin1String(\"") + operation.name() + QLatin1String("\"), message");
if (hasAction) {
callLine += QLatin1String(", action");
}
@@ -697,7 +744,8 @@ bool Converter::convertClientCall(const Operation &operation, const Binding &bin
code += retType + QLatin1String(" ret;"); // local var
code += QLatin1String("const KDSoapValue val = d_ptr->m_lastReply.childValues().at(0);") + COMMENT;
- code += demarshalVar(retPart.type(), retPart.element(), QLatin1String("ret"), retType, "val", false, false);
+ ElementArgumentSerializer serializer(mTypeMap, retPart.type(), retPart.element(), QLatin1String("ret"), QString());
+ code += serializer.demarshalVariable("val");
code += "return ret;";
}
}
@@ -711,7 +759,7 @@ bool Converter::convertClientCall(const Operation &operation, const Binding &bin
code.unindent();
Q_ASSERT(soapStyle(binding) == SoapBinding::DocumentStyle); // RPC with multiple return values? impossible, we generate a single wrapper
- Q_FOREACH (const Part &part, outParts) {
+ for (const Part &part : qAsConst(outParts)) {
const QString argType = mTypeMap.localType(part.type(), part.element());
Q_ASSERT(!argType.isEmpty());
const QString lowerName = lowerlize(part.name());
@@ -730,46 +778,46 @@ bool Converter::convertClientCall(const Operation &operation, const Binding &bin
}
// Generate async call method
-void Converter::convertClientInputMessage(const Operation &operation,
- const Binding &binding, KODE::Class &newClass)
+void Converter::convertClientInputMessage(const Operation &operation, const Binding &binding, KODE::Class &newClass)
{
QString operationName = operation.name();
KODE::Function asyncFunc(QLatin1String("async") + upperlize(operationName), QLatin1String("void"), KODE::Function::Public);
asyncFunc.setDocs(QString::fromLatin1("Asynchronous call to %1.\n"
"Remember to connect to %2 and %3.\n"
"Deprecated, use %4 instead.")
- .arg(operation.name())
- .arg(lowerlize(operationName) + QLatin1String("Done"))
- .arg(lowerlize(operationName) + QLatin1String("Error"))
- .arg(upperlize(operationName) + QLatin1String("Job")));
+ .arg(operation.name())
+ .arg(lowerlize(operationName) + QLatin1String("Done"))
+ .arg(lowerlize(operationName) + QLatin1String("Error"))
+ .arg(upperlize(operationName) + QLatin1String("Job")));
const Message message = mWSDL.findMessage(operation.input().message());
clientAddArguments(asyncFunc, message, newClass, operation, binding);
KODE::Code code;
const bool hasAction = clientAddAction(code, binding, operation.name());
clientGenerateMessage(code, binding, message, operation);
- QString callLine = QLatin1String("KDSoapPendingCall pendingCall = clientInterface()->asyncCall(QLatin1String(\"") + operationName + QLatin1String("\"), message");
+ QString callLine = QLatin1String("KDSoapPendingCall pendingCall = clientInterface()->asyncCall(QLatin1String(\"") + operationName
+ + QLatin1String("\"), message");
if (hasAction) {
callLine += QLatin1String(", action");
}
callLine += QLatin1String(");");
code += callLine;
- if (operation.operationType() == Operation::RequestResponseOperation ||
- operation.operationType() == Operation::OneWayOperation) {
+ if (operation.operationType() == Operation::RequestResponseOperation || operation.operationType() == Operation::OneWayOperation) {
const QString finishedSlotName = QLatin1String("_kd_slot") + upperlize(operationName) + QLatin1String("Finished");
code += "KDSoapPendingCallWatcher *watcher = new KDSoapPendingCallWatcher(pendingCall, this);";
- code += QLatin1String("QObject::connect(watcher, SIGNAL(finished(KDSoapPendingCallWatcher*)),\n"
- " this, SLOT(") + finishedSlotName + QLatin1String("(KDSoapPendingCallWatcher*)));");
+ code += QLatin1String("QObject::connect(watcher, &KDSoapPendingCallWatcher::finished,\n"
+ " this, &")
+ + newClass.name() + QLatin1String("::")
+ + finishedSlotName + QLatin1String(");");
asyncFunc.setBody(code);
newClass.addFunction(asyncFunc);
}
}
// Generate signals and the result slot, for async calls
-void Converter::convertClientOutputMessage(const Operation &operation,
- const Binding &binding, KODE::Class &newClass)
+void Converter::convertClientOutputMessage(const Operation &operation, const Binding &binding, KODE::Class &newClass)
{
// result signal
const QString operationName = lowerlize(operation.name());
@@ -791,7 +839,7 @@ void Converter::convertClientOutputMessage(const Operation &operation,
// If one output message is used by two input messages, don't define
// it twice.
// DF: what if the arguments are different? ...
- //if ( newClass.hasFunction( respSignal.name() ) )
+ // if ( newClass.hasFunction( respSignal.name() ) )
// return;
KODE::Code slotCode;
@@ -810,7 +858,7 @@ void Converter::convertClientOutputMessage(const Operation &operation,
const Message message = mWSDL.findMessage(operation.output().message());
const Part::List parts = selectedParts(binding, message, operation, false /*output*/);
- Q_FOREACH (const Part &part, parts) {
+ for (const Part &part : parts) {
const QString partType = mTypeMap.localType(part.type(), part.element());
if (partType.isEmpty()) {
qWarning("Skipping part '%s'", qPrintable(part.name()));
@@ -843,7 +891,7 @@ void Converter::convertClientOutputMessage(const Operation &operation,
}
// Forward declaration of element class
- //newClass.addIncludes( QStringList(), mTypeMap.forwardDeclarationsForElement( part.element() ) );
+ // newClass.addIncludes( QStringList(), mTypeMap.forwardDeclarationsForElement( part.element() ) );
}
}
@@ -876,7 +924,7 @@ void Converter::createHeader(const SoapBinding::Header &header, KODE::Class &new
const QString argType = mTypeMap.localInputType(part.type(), part.element());
const QString methodSig = methodName + QLatin1Char('(') + argType + QLatin1Char(')');
if (mHeaderMethods.contains(methodSig)) {
- return; // already have it (testcase: Services.wsdl)
+ return; // already have it (testcase: Services.wsdl)
}
mHeaderMethods.insert(methodSig);
@@ -932,4 +980,3 @@ void Converter::addJobResultMember(KODE::Class &jobClass, const Part &part, cons
getter.setBody(gc);
jobClass.addFunction(getter);
}
-
diff --git a/kdwsdl2cpp/src/converter_complextype.cpp b/kdwsdl2cpp/src/converter_complextype.cpp
index 4c66841..896f49a 100644
--- a/kdwsdl2cpp/src/converter_complextype.cpp
+++ b/kdwsdl2cpp/src/converter_complextype.cpp
@@ -1,7 +1,13 @@
+/*
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
+*/
+
#include "converter.h"
-#include "settings.h"
#include "elementargumentserializer.h"
-#include <libkode/style.h>
+#include "settings.h"
+#include <code_generation/style.h>
#include <QDebug>
@@ -33,63 +39,53 @@ static bool usePointerForElement(const XSD::Element &elem, const KODE::Class &ne
qDebug() << "Using pointer for optional type" << typeName << "used inside itself";
}
// Optional "Foo" in class "Foo" - can't just have a value and bool, we need a pointer, to avoid infinite recursion
- //use == XSD::Attribute::Required;
+ // use == XSD::Attribute::Required;
return true;
}
return polymorphic;
}
-static QString pointerStorageType(const QString &typeName)
+static void generateDefaultAttributeValueCode(KODE::Code &result, const QString &typeName, const Converter::DefaultAttributeValue &defaultValue)
{
- if (typeName == "QString" || typeName == "bool") {
- qWarning() << "Should not happen: polymorphic" << typeName;
- Q_ASSERT(0);
- }
+ result += "{";
+ result.indent();
- return "QSharedPointer<" + typeName + '>';
-}
-
-static void generateDefaultAttributeValueCode(KODE::Code& result, const QString& typeName, const Converter::DefaultAttributeValue& defaultValue)
-{
- result += "{";
- result.indent();
-
- if (!defaultValue.mIsBuiltin) {
- result += typeName + " defaultValue;";
- result += "defaultValue.deserialize(KDSoapValue(QString(), \"" + defaultValue.mValue + "\"));";
- result += "return defaultValue;";
- } else {
- result += "const QString defaultValueFromWsdl(\"" + defaultValue.mValue + "\");";
- if (typeName == "KDDateTime") {
- result += "KDDateTime defaultDateTime = KDDateTime::fromDateString(defaultValueFromWsdl);";
- result += "if (defaultDateTime.toDateString() != defaultValueFromWsdl) {";
- result.indent();
- result += "qDebug(\"Can't convert to " + typeName + " from " + defaultValue.mValue + "\");";
- result += "Q_ASSERT(!\"Can't convert to " + typeName + " from " + defaultValue.mValue + "\");";
- result.unindent();
- result += "}";
- result += "return defaultDateTime;";
+ if (!defaultValue.mIsBuiltin) {
+ result += typeName + " defaultValue;";
+ result += "defaultValue.deserialize(KDSoapValue(QString(), \"" + defaultValue.mValue + "\"));";
+ result += "return defaultValue;";
} else {
- result += "const QVariant tmp(defaultValueFromWsdl);";
- result += "if(!tmp.canConvert<" + typeName + ">())";
- result += "{";
- result.indent();
- result += "qDebug(\"Can't convert to " + typeName + " from " + defaultValue.mValue + "\");";
- result += "Q_ASSERT(!\"Can't convert to " + typeName + " from " + defaultValue.mValue + "\");";
- result.unindent();
- result += "}";
- result += "return tmp.value<" + typeName + ">();";
+ result += "const QString defaultValueFromWsdl(\"" + defaultValue.mValue + "\");";
+ if (typeName == "KDDateTime") {
+ result += "KDDateTime defaultDateTime = KDDateTime::fromDateString(defaultValueFromWsdl);";
+ result += "if (defaultDateTime.toDateString() != defaultValueFromWsdl) {";
+ result.indent();
+ result += "qDebug(\"Can't convert to " + typeName + " from " + defaultValue.mValue + "\");";
+ result += "Q_ASSERT(!\"Can't convert to " + typeName + " from " + defaultValue.mValue + "\");";
+ result.unindent();
+ result += "}";
+ result += "return defaultDateTime;";
+ } else {
+ result += "const QVariant tmp(defaultValueFromWsdl);";
+ result += "if(!tmp.canConvert<" + typeName + ">())";
+ result += "{";
+ result.indent();
+ result += "qDebug(\"Can't convert to " + typeName + " from " + defaultValue.mValue + "\");";
+ result += "Q_ASSERT(!\"Can't convert to " + typeName + " from " + defaultValue.mValue + "\");";
+ result.unindent();
+ result += "}";
+ result += "return tmp.value<" + typeName + ">();";
+ }
}
- }
- result.unindent();
- result += "}";
+ result.unindent();
+ result += "}";
}
void Converter::convertComplexType(const XSD::ComplexType *type)
{
// An empty type is still useful, in document mode: it serializes the element name
- //if ( type->isEmpty() )
+ // if ( type->isEmpty() )
// return;
const QString className(mTypeMap.localType(type->qualifiedName()));
@@ -107,7 +103,7 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
}
// subclass handling
- if (!type->baseTypeName().isEmpty()) { // this class extends something
+ if (!type->baseTypeName().isEmpty()) { // this class extends something
/**
* A class can't subclass basic type (e.g. int, unsigned char), so we
* add setValue() and value() methods to access the base type.
@@ -128,7 +124,8 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
if (mTypeMap.isComplexType(baseName)) {
newClass.addBaseClass(typeName);
} else {
- const QString variableName = generateMemberVariable("value", typeName, inputTypeName, newClass, XSD::Attribute::Required, false, false);
+ const QString variableName =
+ generateMemberVariable("value", typeName, inputTypeName, newClass, XSD::Attribute::Required, false, false);
// convenience constructor
KODE::Function conctor(upperlize(newClass.name()));
@@ -154,7 +151,7 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
// elements in the complex type
const XSD::Element::List elements = type->elements();
- Q_FOREACH (const XSD::Element &elemIt, elements) {
+ for (const XSD::Element &elemIt : elements) {
if (elemIt.type().isEmpty()) {
qDebug() << "ERROR: Element from" << *type << "with no type:" << elemIt << "(skipping)";
@@ -177,12 +174,13 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
QString typeName = mTypeMap.localType(elemIt.type());
Q_ASSERT(!typeName.isEmpty());
- if (typeName != QLatin1String("void")) { // void means empty element, probably just here for later extensions (testcase: SetPasswordResult in salesforce)
+ if (typeName != QLatin1String("void")) { // void means empty element, probably just here for later extensions (testcase: SetPasswordResult in
+ // salesforce)
QString inputTypeName = mTypeMap.localInputType(elemIt.type(), QName());
bool isList = false;
if (elemIt.maxOccurs() > 1 || elemIt.compositor().maxOccurs() > 1) {
- QString itemType = mTypeMap.isPolymorphic(elemIt.type()) ? pointerStorageType(typeName) : typeName;
+ QString itemType = mTypeMap.isPolymorphic(elemIt.type()) ? ElementArgumentSerializer::pointerStorageType(typeName) : typeName;
typeName = listTypeFor(itemType, newClass);
inputTypeName = QLatin1String("const ") + typeName + QLatin1String("&");
isList = true;
@@ -191,9 +189,9 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
QString arrayTypeName = mTypeMap.localType(type->arrayType());
Q_ASSERT(!arrayTypeName.isEmpty());
if (mTypeMap.isPolymorphic(type->arrayType())) {
- arrayTypeName = pointerStorageType(arrayTypeName);
+ arrayTypeName = ElementArgumentSerializer::pointerStorageType(arrayTypeName);
}
- //qDebug() << "array of" << attribute.arrayType() << "->" << arrayTypeName;
+ // qDebug() << "array of" << attribute.arrayType() << "->" << arrayTypeName;
typeName = listTypeFor(arrayTypeName, newClass);
if (!mTypeMap.isBasicType(type->arrayType())) {
newClass.addInclude(QString(), arrayTypeName); // add forward declaration
@@ -218,8 +216,8 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
}
// attributes in the complex type
- XSD::Attribute::List attributes = type->attributes();
- Q_FOREACH (const XSD::Attribute &attribute, attributes) {
+ const XSD::Attribute::List attributes = type->attributes();
+ for (const XSD::Attribute &attribute : attributes) {
QString typeName, inputTypeName;
typeName = mTypeMap.localType(attribute.type());
@@ -228,12 +226,13 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
continue;
}
inputTypeName = mTypeMap.localInputType(attribute.type(), QName());
- //qDebug() << "Attribute" << attribute.name();
+ // qDebug() << "Attribute" << attribute.name();
bool isBuiltin = mTypeMap.isBuiltinType(attribute.type());
QString value = attribute.defaultValue();
DefaultAttributeValue defaultValue(isBuiltin, value);
- generateMemberVariable(KODE::Style::makeIdentifier(attribute.name()), typeName, inputTypeName, newClass, attribute.attributeUse(), false, false, defaultValue);
+ generateMemberVariable(KODE::Style::makeIdentifier(attribute.name()), typeName, inputTypeName, newClass, attribute.attributeUse(), false,
+ false, defaultValue);
// include header
newClass.addIncludes(QStringList(), mTypeMap.forwardDeclarations(attribute.type()));
@@ -244,10 +243,10 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
const QString newClassName = newClass.name();
- KODE::Function ctor(/*upperlize*/(newClassName));
+ KODE::Function ctor(/*upperlize*/ (newClassName));
newClass.addFunction(ctor);
- KODE::Function dtor(QLatin1Char('~') + /*upperlize*/(newClassName));
+ KODE::Function dtor(QLatin1Char('~') + /*upperlize*/ (newClassName));
if (!type->derivedTypes().isEmpty()) {
dtor.setVirtualMode(KODE::Function::Virtual);
}
@@ -298,14 +297,16 @@ void Converter::convertComplexType(const XSD::ComplexType *type)
}
// Called for each element and for each attribute of a complex type, as well as for the base class "value".
-QString Converter::generateMemberVariable(const QString &rawName, const QString &typeName, const QString &inputTypeName, KODE::Class &newClass, XSD::Attribute::AttributeUse use, bool usePointer, bool polymorphic, const Converter::DefaultAttributeValue& defaultValue)
+QString Converter::generateMemberVariable(const QString &rawName, const QString &typeName, const QString &inputTypeName, KODE::Class &newClass,
+ XSD::Attribute::AttributeUse use, bool usePointer, bool polymorphic,
+ const Converter::DefaultAttributeValue &defaultValue)
{
const bool optional = (use == XSD::Attribute::Optional);
const bool prohibited = (use == XSD::Attribute::Prohibited);
const KODE::Function::AccessSpecifier access = (prohibited) ? KODE::Function::Private : KODE::Function::Public;
// member variable
- const QString storageType = usePointer ? pointerStorageType(typeName) : typeName;
+ const QString storageType = usePointer ? ElementArgumentSerializer::pointerStorageType(typeName) : typeName;
KODE::MemberVariable variable(rawName, storageType);
if (usePointer && !optional) {
variable.setInitializer("new " + typeName);
@@ -314,7 +315,10 @@ QString Converter::generateMemberVariable(const QString &rawName, const QString
}
newClass.addMemberVariable(variable);
+ KODE::MemberVariable nilVariable(rawName + "_nil", "bool");
+
const QString variableName = QLatin1String("d_ptr->") + variable.name();
+ const QString nilVariableName = QLatin1String("d_ptr->") + nilVariable.name();
const QString upperName = upperlize(rawName);
const QString lowerName = lowerlize(rawName);
const QString memberName = mNameMapper.escape(lowerName);
@@ -330,7 +334,6 @@ QString Converter::generateMemberVariable(const QString &rawName, const QString
getterSoapValue.setConst(true);
newClass.addFunction(getterSoapValue);
} else if (optional || prohibited) {
- KODE::MemberVariable nilVariable(rawName + "_nil", "bool");
nilVariable.setInitializer("true");
newClass.addMemberVariable(nilVariable);
}
@@ -345,11 +348,12 @@ QString Converter::generateMemberVariable(const QString &rawName, const QString
if (polymorphic) {
code += variableName + QLatin1String(" = ") + storageType + QLatin1Char('(') + argName + QLatin1String("._kd_clone());");
} else {
- code += variableName + QLatin1String(" = ") + storageType + QLatin1String("(new ") + typeName + QLatin1Char('(') + argName + QLatin1String("));");
+ code += variableName + QLatin1String(" = ") + storageType + QLatin1String("(new ") + typeName + QLatin1Char('(') + argName
+ + QLatin1String("));");
}
} else {
if (optional) {
- code += variableName + "_nil = false;" + COMMENT;
+ code += nilVariableName + " = false;" + COMMENT;
}
code += variableName + QLatin1String(" = ") + argName + QLatin1Char(';');
}
@@ -400,7 +404,7 @@ QString Converter::generateMemberVariable(const QString &rawName, const QString
} else if (optional) {
if (Settings::self()->optionalElementType() == Settings::ERawPointer) {
KODE::Code getterCode;
- getterCode += QLatin1String("if (!") + variableName + QLatin1String("_nil)");
+ getterCode += QLatin1String("if (!") + nilVariableName + QLatin1Char(')');
getterCode.indent();
if (defaultValue.isNull()) {
getterCode += QLatin1String("return &") + variableName + QLatin1Char(';');
@@ -412,32 +416,31 @@ QString Converter::generateMemberVariable(const QString &rawName, const QString
getterCode.indent();
if (defaultValue.isNull()) {
- getterCode += "return 0;";
+ getterCode += "return 0;";
} else {
- generateDefaultAttributeValueCode(getterCode, typeName, defaultValue);
+ generateDefaultAttributeValueCode(getterCode, typeName, defaultValue);
}
getter.setBody(getterCode);
getter.setDocs("Ownership is not transferred, clients shall not delete the pointer.");
} else if (Settings::self()->optionalElementType() == Settings::EBoostOptional) {
KODE::Code getterCode;
- getterCode += QLatin1String("if (!") + variableName + QLatin1String("_nil)");
+ getterCode += QLatin1String("if (!") + nilVariableName + QLatin1Char(')');
getterCode.indent();
getterCode += QLatin1String("return ") + variableName + QLatin1Char(';');
getterCode.unindent();
getterCode += QLatin1String("else");
getterCode.indent();
- if (defaultValue.isNull())
- {
- getterCode += "return boost::optional<" + typeName + " >();";
+ if (defaultValue.isNull()) {
+ getterCode += "return boost::optional<" + typeName + " >();";
} else {
- generateDefaultAttributeValueCode(getterCode, typeName, defaultValue);
+ generateDefaultAttributeValueCode(getterCode, typeName, defaultValue);
}
getter.setBody(getterCode);
} else if (Settings::self()->optionalElementType() == Settings::EStdOptional) {
KODE::Code getterCode;
- getterCode += QLatin1String("if (!") + variableName + QLatin1String("_nil)");
+ getterCode += QLatin1String("if (!") + nilVariableName + QLatin1Char(')');
getterCode.indent();
getterCode += QLatin1String("return ") + variableName + QLatin1Char(';');
getterCode.unindent();
@@ -461,7 +464,7 @@ QString Converter::generateMemberVariable(const QString &rawName, const QString
if (usePointer) {
checkerCode += QLatin1String("return ") + variableName + QLatin1String(".isNull() == false;");
} else {
- checkerCode += QLatin1String("return ") + variableName + QLatin1String("_nil == false;");
+ checkerCode += QLatin1String("return ") + nilVariableName + QLatin1String(" == false;");
}
KODE::Function checker(QLatin1String("hasValueFor") + upperName, QLatin1String("bool"), access);
@@ -480,80 +483,13 @@ static KODE::Code demarshalNameTest(const QName &type, const QString &tagName, b
if (type.nameSpace() == XMLSchemaURI && (type.localName() == QLatin1String("any"))) {
demarshalCode += QString::fromLatin1(*first ? "" : "else ") + QLatin1String("{") + COMMENT;
} else {
- demarshalCode += QString::fromLatin1(*first ? "" : "else ") + QLatin1String("if (_name == QLatin1String(\"") + tagName + QLatin1String("\")) {") + COMMENT;
+ demarshalCode +=
+ QString::fromLatin1(*first ? "" : "else ") + QLatin1String("if (_name == QLatin1String(\"") + tagName + QLatin1String("\")) {") + COMMENT;
}
*first = false;
return demarshalCode;
}
-// Low-level helper for demarshalVar, doesn't handle the polymorphic case (so it can be called for lists of polymorphics)
-KODE::Code Converter::demarshalVarHelper(const QName &type, const QName &elementType, const QString &variableName, const QString &qtTypeName, const QString &soapValueVarName, bool optional) const
-{
- KODE::Code code;
- if (mTypeMap.isTypeAny(type)) {
- code += variableName + QLatin1String(" = ") + soapValueVarName + QLatin1String(";") + COMMENT;
- } else if (mTypeMap.isBuiltinType(type, elementType)) {
- code += variableName + QLatin1String(" = ") + mTypeMap.deserializeBuiltin(type, elementType, soapValueVarName, qtTypeName) + QLatin1String(";") + COMMENT;
- } else if (mTypeMap.isComplexType(type, elementType)) {
- code += variableName + QLatin1String(".deserialize(") + soapValueVarName + QLatin1String(");") + COMMENT;
- } else {
- code += variableName + QLatin1String(".deserialize(") + soapValueVarName + QLatin1String(");") + COMMENT;
- }
- if (optional) {
- code += variableName + QLatin1String("_nil = false;") + COMMENT;
- }
- return code;
-}
-
-// Helper method for the generation of the deserialize() method, also used by convertClientCall
-KODE::Code Converter::demarshalVar(const QName &type, const QName &elementType, const QString &variableName, const QString &qtTypeName, const QString &soapValueVarName, bool optional, bool usePointer) const
-{
- const bool isPolymorphic = mTypeMap.isPolymorphic(type, elementType);
- if (usePointer || isPolymorphic) {
- const QString storageType = pointerStorageType(qtTypeName);
- KODE::Code code;
- code += variableName + "_as_kdsoap_value = " + soapValueVarName + ";" + COMMENT;
- code += "if (!" + variableName + ")";
- code.indent();
- code += variableName + " = " + storageType + "(new " + qtTypeName + ");" + COMMENT;
- code.unindent();
- code += variableName + QLatin1String("->deserialize(") + soapValueVarName + QLatin1String(");") + COMMENT;
- return code;
- } else {
- return demarshalVarHelper(type, elementType, variableName, qtTypeName, soapValueVarName, optional);
- }
-}
-
-KODE::Code Converter::demarshalArrayVar(const QName &type, const QString &variableName, const QString &qtTypeName, bool optional) const
-{
- KODE::Code code;
- if (mTypeMap.isTypeAny(type)) { // KDSoapValue doesn't support temp vars [still true?]. This special-casing is ugly though.
- code += variableName + QLatin1String(".append(val);");
- } else {
- // we need a temp var in case of deserialize()
- // [TODO: we could merge demarshalVar into this code, to avoid the temp var in other cases]
- QString tempVar;
- if (variableName.startsWith(QLatin1String("d_ptr->"))) {
- tempVar = variableName.mid(7) + QLatin1String("Temp");
- } else {
- tempVar = variableName + QLatin1String("Temp");
- }
- code += qtTypeName + QLatin1String(" ") + tempVar + QLatin1String(";") + COMMENT;
- code.addBlock(demarshalVarHelper(type, QName(), tempVar, qtTypeName, "val", false));
- QString toAppend = tempVar;
- const bool isPolymorphic = mTypeMap.isPolymorphic(type);
- if (isPolymorphic) {
- const QString storageType = pointerStorageType(qtTypeName);
- toAppend = storageType + "(new " + qtTypeName + "(" + tempVar + "))";
- }
- code += variableName + QLatin1String(".append(") + toAppend + QLatin1String(");") + COMMENT;
- if (optional) {
- code += variableName + QLatin1String("_nil = false;") + COMMENT;
- }
- }
- return code;
-}
-
void Converter::createComplexTypeSerializer(KODE::Class &newClass, const XSD::ComplexType *type)
{
newClass.addInclude(QLatin1String("KDSoapClient/KDSoapNamespaceManager.h"));
@@ -584,24 +520,32 @@ void Converter::createComplexTypeSerializer(KODE::Class &newClass, const XSD::Co
if (type->baseTypeName() != XmlAnyType && !type->baseTypeName().isEmpty() && !type->isArray()) {
const QName baseName = type->baseTypeName();
+
const QString typeName = mTypeMap.localType(baseName);
KODE::MemberVariable variable(QLatin1String("value"), typeName);
const QString variableName = QLatin1String("d_ptr->") + variable.name();
+ const QString nilVariableName = QLatin1String("d_ptr->") + variable.name() + "_nil";
+
+ ElementArgumentSerializer serializer(mTypeMap, baseName, QName(), variableName, nilVariableName);
if (mTypeMap.isComplexType(baseName)) {
+ // This is different from ElementArgumentSerializer because we're calling BaseClass::serialize
marshalCode += QLatin1String("KDSoapValue mainValue = ") + typeName + QLatin1String("::serialize(valueName);") + COMMENT;
- marshalCode += QLatin1String("mainValue.setType(") + typeArgs + QLatin1String(");");
demarshalCode += typeName + "::deserialize(mainValue);";
} else {
if (mTypeMap.isBuiltinType(baseName)) {
- marshalCode += QLatin1String("KDSoapValue mainValue = ") + mTypeMap.serializeBuiltin(baseName, QName(), variableName, "valueName", type->nameSpace(), type->name()) + QLatin1String(";") + COMMENT;
+ marshalCode += QLatin1String("KDSoapValue mainValue = ")
+ + mTypeMap.serializeBuiltin(baseName, QName(), variableName, "valueName", type->nameSpace(), type->name()) + QLatin1String(";")
+ + COMMENT;
} else {
marshalCode += QLatin1String("KDSoapValue mainValue = ") + variableName + QLatin1String(".serialize(valueName);") + COMMENT;
- marshalCode += QLatin1String("mainValue.setType(") + typeArgs + QLatin1String(");");
}
- demarshalCode += demarshalVar(baseName, QName(), variableName, typeName, QLatin1String("mainValue"), false, false);
+ demarshalCode += serializer.demarshalVariable(QLatin1String("mainValue"));
}
+ if (!mTypeMap.isBuiltinType(baseName)) {
+ marshalCode += QLatin1String("mainValue.setType(") + typeArgs + QLatin1String(");");
+ }
} else {
marshalCode += QLatin1String("KDSoapValue mainValue(valueName, QVariant(), ") + typeArgs + QLatin1String(");") + COMMENT;
}
@@ -628,9 +572,8 @@ void Converter::createComplexTypeSerializer(KODE::Class &newClass, const XSD::Co
if (elements.at(0).isQualified()) {
marshalCode += QLatin1String("mainValue.setQualified(true);") + COMMENT;
}
- demarshalCode += "for (int argNr = 0; argNr < args.count(); ++argNr) {";
+ demarshalCode += "for (const KDSoapValue& val : qAsConst(args)) {";
demarshalCode.indent();
- demarshalCode += "const KDSoapValue& val = args.at(argNr);";
demarshalCode += "const QString _name = val.name();";
} else {
// The Q_UNUSED is not necessarily true in case of attributes, but who cares.
@@ -643,30 +586,35 @@ void Converter::createComplexTypeSerializer(KODE::Class &newClass, const XSD::Co
}
Q_ASSERT(elements.count() == 1);
const XSD::Element elem = elements.first();
- const QString variableName = QLatin1String("d_ptr->") + KODE::MemberVariable::memberVariableName(elem.name()); // always d_ptr->mEntries, actually
+ const QString variableName =
+ QLatin1String("d_ptr->") + KODE::MemberVariable::memberVariableName(elem.name()); // always d_ptr->mEntries, actually
+ const QString nilVariableName = QLatin1String("d_ptr->") + KODE::MemberVariable::memberVariableName(elem.name() + "_nil");
const QName arrayType = type->arrayType();
const QString typeName = mTypeMap.localType(arrayType);
- marshalCode += QLatin1String("args.setArrayType(QString::fromLatin1(\"") + arrayType.nameSpace() + QLatin1String("\"), QString::fromLatin1(\"") + arrayType.localName() + QLatin1String("\"));");
+ marshalCode += QLatin1String("args.setArrayType(QString::fromLatin1(\"") + arrayType.nameSpace()
+ + QLatin1String("\"), QString::fromLatin1(\"") + arrayType.localName() + QLatin1String("\"));");
marshalCode += QLatin1String("for (int i = 0; i < ") + variableName + QLatin1String(".count(); ++i) {") + COMMENT;
marshalCode.indent();
const QString nameSpace = elem.nameSpace();
- ElementArgumentSerializer serializer(mTypeMap, arrayType, QName(), variableName + QLatin1String(".at(i)"));
+ ElementArgumentSerializer serializer(mTypeMap, arrayType, QName(), variableName + QLatin1String(".at(i)"), QString());
serializer.setElementName(QName(nameSpace, QLatin1String("item")));
serializer.setOutputVariable("args", true);
serializer.setIsQualified(elem.isQualified());
serializer.setNillable(elem.nillable());
- serializer.setOmitIfEmpty(false); // if not set, not in array
- marshalCode.addBlock(serializer.generate());
+ serializer.setOptional(false); // if not set, not in array
+ marshalCode.addBlock(serializer.generateSerializationCode());
marshalCode.unindent();
marshalCode += '}';
- demarshalCode.addBlock(demarshalArrayVar(arrayType, variableName, typeName, isElementOptional(elem)));
+ ElementArgumentSerializer deserializer(mTypeMap, arrayType, QName(), variableName, nilVariableName);
+ deserializer.setOptional(isElementOptional(elem));
+ demarshalCode.addBlock(deserializer.demarshalArray("val"));
} else {
bool first = true;
- Q_FOREACH (const XSD::Element &elem, elements) {
+ for (const XSD::Element &elem : qAsConst(elements)) {
const QString elemName = elem.name();
const QString typeName = mTypeMap.localType(elem.type());
@@ -674,18 +622,18 @@ void Converter::createComplexTypeSerializer(KODE::Class &newClass, const XSD::Co
Q_ASSERT(typeName != QLatin1String("void")); // removed earlier in this file
const QString variableName = QLatin1String("d_ptr->") + KODE::MemberVariable::memberVariableName(elemName);
+ const QString nilVariableName = QLatin1String("d_ptr->") + KODE::MemberVariable::memberVariableName(elemName + "_nil");
demarshalCode.addBlock(demarshalNameTest(elem.type(), elemName, &first));
demarshalCode.indent();
- ElementArgumentSerializer serializer(mTypeMap, elem.type(), QName(), variableName);
+ ElementArgumentSerializer serializer(mTypeMap, elem.type(), QName(), variableName, nilVariableName);
serializer.setOutputVariable("args", true);
serializer.setIsQualified(elem.isQualified());
- serializer.setNillable(elem.nillable());
const QName qualName = elem.qualifiedName();
if (elem.maxOccurs() > 1 || elem.compositor().maxOccurs() > 1) {
- //const QString typePrefix = mNSManager.prefix( elem.type().nameSpace() );
+ // const QString typePrefix = mNSManager.prefix( elem.type().nameSpace() );
QString localVariableName = variableName + QLatin1String(".at(i)");
@@ -695,33 +643,34 @@ void Converter::createComplexTypeSerializer(KODE::Class &newClass, const XSD::Co
serializer.setLocalVariableName(localVariableName);
if (elem.hasSubstitutions())
serializer.setDynamicElementName(localVariableName + "->_kd_substitutionElementName()",
- localVariableName + "->_kd_substitutionElementNameSpace()",
- qualName);
+ localVariableName + "->_kd_substitutionElementNameSpace()", qualName);
else {
serializer.setElementName(qualName);
}
- serializer.setOmitIfEmpty(false); // if not set, not in array
+ serializer.setOptional(false); // if not set, not in array
- marshalCode.addBlock(serializer.generate());
+ marshalCode.addBlock(serializer.generateSerializationCode());
marshalCode.unindent();
marshalCode += '}';
- demarshalCode.addBlock(demarshalArrayVar(elem.type(), variableName, typeName, isElementOptional(elem)));
+ ElementArgumentSerializer deserializer(mTypeMap, elem.type(), QName(), variableName, nilVariableName);
+ deserializer.setOptional(isElementOptional(elem));
+ demarshalCode.addBlock(deserializer.demarshalArray("val"));
} else {
const bool optional = isElementOptional(elem);
if (elem.hasSubstitutions())
serializer.setDynamicElementName(variableName + "->_kd_substitutionElementName()",
- variableName + "->_kd_substitutionElementNameSpace()",
- qualName);
+ variableName + "->_kd_substitutionElementNameSpace()", qualName);
else {
serializer.setElementName(qualName);
}
- serializer.setOmitIfEmpty(optional);
+ serializer.setOptional(optional);
const bool usePointer = usePointerForElement(elem, newClass, mTypeMap, false);
serializer.setUsePointer(usePointer);
- marshalCode.addBlock(serializer.generate());
+ serializer.setNillable(elem.nillable());
+ marshalCode.addBlock(serializer.generateSerializationCode());
- demarshalCode.addBlock(demarshalVar(elem.type(), QName(), variableName, typeName, "val", optional, usePointer));
+ demarshalCode.addBlock(serializer.demarshalVariable("val"));
}
demarshalCode.unindent();
@@ -739,33 +688,31 @@ void Converter::createComplexTypeSerializer(KODE::Class &newClass, const XSD::Co
marshalCode += "KDSoapValueList attribs;";
demarshalCode += "const QList<KDSoapValue> attribs = args.attributes();";
- demarshalCode += "for (int attrNr = 0; attrNr < attribs.count(); ++attrNr) {";
+ demarshalCode += "for (const KDSoapValue& val : qAsConst(attribs)) {";
demarshalCode.indent();
- demarshalCode += "const KDSoapValue& val = attribs.at(attrNr);";
demarshalCode += "const QString _name = val.name();";
bool first = true;
- Q_FOREACH (const XSD::Attribute &attribute, attributes) {
+ for (const XSD::Attribute &attribute : qAsConst(attributes)) {
const QString attrName = attribute.name();
if (attrName.isEmpty()) {
continue;
}
const QString variableName = QLatin1String("d_ptr->") + KODE::MemberVariable::memberVariableName(attrName);
+ const QString nilVariableName = QLatin1String("d_ptr->") + KODE::MemberVariable::memberVariableName(attrName + "_nil");
demarshalCode.addBlock(demarshalNameTest(attribute.type(), attrName, &first));
demarshalCode.indent();
- ElementArgumentSerializer serializer(mTypeMap, attribute.type(), QName(), variableName);
+ ElementArgumentSerializer serializer(mTypeMap, attribute.type(), QName(), variableName, nilVariableName);
serializer.setElementName(attribute.qualifiedName());
serializer.setOutputVariable("attribs", true);
serializer.setIsQualified(attribute.isQualified());
serializer.setNillable(false);
- serializer.setOmitIfEmpty(attribute.attributeUse() == XSD::Attribute::Optional || attribute.attributeUse() == XSD::Attribute::Prohibited);
- marshalCode.addBlock(serializer.generate());
+ serializer.setOptional(attribute.attributeUse() == XSD::Attribute::Optional || attribute.attributeUse() == XSD::Attribute::Prohibited);
+ marshalCode.addBlock(serializer.generateSerializationCode());
- const QString typeName = mTypeMap.localType(attribute.type());
- Q_ASSERT(!typeName.isEmpty());
- demarshalCode.addBlock(demarshalVar(attribute.type(), QName(), variableName, typeName, "val", attribute.attributeUse() == XSD::Attribute::Optional, false));
+ demarshalCode.addBlock(serializer.demarshalVariable("val"));
demarshalCode.unindent();
demarshalCode += "}";
diff --git a/kdwsdl2cpp/src/converter_serverstub.cpp b/kdwsdl2cpp/src/converter_serverstub.cpp
index 5d1a332..ceb827e 100644
--- a/kdwsdl2cpp/src/converter_serverstub.cpp
+++ b/kdwsdl2cpp/src/converter_serverstub.cpp
@@ -1,20 +1,28 @@
+/*
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
+*/
+
#include "converter.h"
+#include "elementargumentserializer.h"
#include "settings.h"
-#include <libkode/style.h>
-#include <QSet>
#include <QDebug>
+#include <QSet>
+#include <code_generation/style.h>
using namespace KWSDL;
void Converter::convertServerService()
{
- Q_FOREACH (const Service &service, mWSDL.definitions().services()) {
+ const Service::List services = mWSDL.definitions().services();
+ for (const Service &service : services) {
Q_ASSERT(!service.name().isEmpty());
QSet<QName> uniqueBindings = mWSDL.uniqueBindings(service);
- Q_FOREACH (const QName &bindingName, uniqueBindings) {
- //qDebug() << "binding" << bindingName;
+ for (const QName &bindingName : qAsConst(uniqueBindings)) {
+ // qDebug() << "binding" << bindingName;
const Binding binding = mWSDL.findBinding(bindingName);
QString className = KODE::Style::className(service.name());
@@ -53,10 +61,10 @@ void Converter::convertServerService()
body.addLine("const QByteArray method = _request.name().toLatin1();");
PortType portType = mWSDL.findPortType(binding.portTypeName());
- //qDebug() << portType.name();
+ // qDebug() << portType.name();
bool first = true;
const Operation::List operations = portType.operations();
- Q_FOREACH (const Operation &operation, operations) {
+ for (const Operation &operation : operations) {
const Operation::OperationType opType = operation.operationType();
switch (opType) {
case Operation::OneWayOperation:
@@ -73,7 +81,7 @@ void Converter::convertServerService()
body += "else {";
body.indent();
}
- body += "KDSoapServerObjectInterface::processRequest(_request, _response, _soapAction);" + COMMENT;
+ body += "KDSoapServerObjectInterface::processRequest(_request, _response, _soapAction);" + COMMENT;
if (!first) {
body.unindent();
body += "}";
@@ -121,7 +129,7 @@ void Converter::generateServerMethod(KODE::Code &code, const Binding &binding, c
const Part &part = parts.at(partNum);
const QString lowerName = lowerlize(part.name());
const QString argType = mTypeMap.localType(part.type(), part.element());
- //qDebug() << "localInputType" << part.type().qname() << part.element().qname() << "->" << argType;
+ // qDebug() << "localInputType" << part.type().qname() << part.element().qname() << "->" << argType;
if (argType != "void") {
const QString varName = mNameMapper.escape(lowerName);
@@ -134,11 +142,13 @@ void Converter::generateServerMethod(KODE::Code &code, const Binding &binding, c
if (partNum > 0) {
soapValueVarName += QString::number(partNum + 1);
}
- code += QString::fromLatin1("const KDSoapValue %1 = %2.childValues().at(%3);").arg(soapValueVarName, requestVarName).arg(partNum) + COMMENT;
+ code += QString::fromLatin1("const KDSoapValue %1 = %2.childValues().at(%3);").arg(soapValueVarName, requestVarName).arg(partNum)
+ + COMMENT;
}
// what if there's more than one?
- code.addBlock(demarshalVar(part.type(), part.element(), varName, argType, soapValueVarName, false, false));
+ ElementArgumentSerializer serializer(mTypeMap, part.type(), part.element(), varName, varName + "_nil");
+ code.addBlock(serializer.demarshalVariable(soapValueVarName));
inputVars += varName;
newClass.addIncludes(mTypeMap.headerIncludes(part.type()), mTypeMap.forwardDeclarationsForElement(part.element()));
@@ -149,7 +159,8 @@ void Converter::generateServerMethod(KODE::Code &code, const Binding &binding, c
const Part::List outParts = outputMessage.parts();
if (outParts.count() > 1) {
qWarning("ERROR: multiple output parameters are not supported (operation %s) - please file"
- "an issue on github with your wsdl file", qPrintable(operation.name()));
+ "an issue on github with your wsdl file",
+ qPrintable(operation.name()));
virtualMethod.setReturnType("void /*UNSUPPORTED*/");
} else if (outParts.isEmpty()) {
code += "this->" + lowerlize(operationName) + '(' + inputVars.join(", ") + ");" + COMMENT;
@@ -157,14 +168,14 @@ void Converter::generateServerMethod(KODE::Code &code, const Binding &binding, c
} else {
QString retType;
QString retInputType;
- //bool isBuiltin = false;
- //bool isComplex = false;
+ // bool isBuiltin = false;
+ // bool isComplex = false;
Part retPart;
- Q_FOREACH (const Part &outPart, outParts /* only one */) {
+ for (const Part &outPart : qAsConst(outParts) /* only one */) {
retType = mTypeMap.localType(outPart.type(), outPart.element());
retInputType = mTypeMap.localInputType(outPart.type(), outPart.element());
- //isBuiltin = mTypeMap.isBuiltinType( outPart.type(), outPart.element() );
- //isComplex = mTypeMap.isComplexType( outPart.type(), outPart.element() );
+ // isBuiltin = mTypeMap.isBuiltinType( outPart.type(), outPart.element() );
+ // isComplex = mTypeMap.isComplexType( outPart.type(), outPart.element() );
retPart = outPart;
}
const QString methodCall = methodName + '(' + inputVars.join(", ") + ')';
@@ -178,10 +189,10 @@ void Converter::generateServerMethod(KODE::Code &code, const Binding &binding, c
// TODO factorize with same code in next method
if (soapStyle(binding) == SoapBinding::DocumentStyle) {
- code.addBlock(serializePart(retPart, "ret", responseVarName, false));
+ code.addBlock(serializePart(retPart, "ret", "ret_nil", responseVarName, false));
} else {
code += QString("KDSoapValue wrapper(\"%1\", QVariant(), \"%2\");").arg(outputMessage.name()).arg(outputMessage.nameSpace());
- code.addBlock(serializePart(retPart, "ret", "wrapper.childValues()", true));
+ code.addBlock(serializePart(retPart, "ret", "ret_nil", "wrapper.childValues()", true));
code += responseVarName + " = wrapper;";
}
@@ -201,7 +212,7 @@ void Converter::generateServerMethod(KODE::Code &code, const Binding &binding, c
}
void Converter::generateDelayedReponseMethod(const QString &methodName, const QString &retInputType, const Part &retPart, KODE::Class &newClass,
- const Binding &binding, const Message &outputMessage)
+ const Binding &binding, const Message &outputMessage)
{
const QString delayedMethodName = methodName + "Response";
KODE::Function delayedMethod(delayedMethodName);
@@ -213,10 +224,10 @@ void Converter::generateDelayedReponseMethod(const QString &methodName, const QS
code.addLine("KDSoapMessage _response;");
if (soapStyle(binding) == SoapBinding::DocumentStyle) {
- code.addBlock(serializePart(retPart, "ret", "_response", false));
+ code.addBlock(serializePart(retPart, "ret", "ret_nil", "_response", false));
} else {
code += QString("KDSoapValue wrapper(\"%1\", QVariant(), \"%2\");").arg(outputMessage.name()).arg(outputMessage.nameSpace());
- code.addBlock(serializePart(retPart, "ret", "wrapper.childValues()", true));
+ code.addBlock(serializePart(retPart, "ret", "ret_nil", "wrapper.childValues()", true));
code += "_response = wrapper;";
}
diff --git a/kdwsdl2cpp/src/converter_simpletype.cpp b/kdwsdl2cpp/src/converter_simpletype.cpp
index 13fd70b..8abe231 100644
--- a/kdwsdl2cpp/src/converter_simpletype.cpp
+++ b/kdwsdl2cpp/src/converter_simpletype.cpp
@@ -1,8 +1,15 @@
+/*
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
+*/
+
#include "converter.h"
#include "settings.h"
-#include <libkode/style.h>
+#include <code_generation/style.h>
#include <QDebug>
+#include <QRegularExpression>
using namespace KWSDL;
@@ -12,13 +19,10 @@ static KODE::Code createRangeCheckCode(const XSD::SimpleType *, const QString &b
void Converter::addVariableInitializer(KODE::MemberVariable &variable) const
{
const QByteArray type = variable.type().toLatin1();
- static const char *s_numericTypes[] = {
- "int", "unsigned int", "quint64", "qint64",
- "char", "signed char", "unsigned char", "short", "unsigned short",
- "float", "double"
- };
- for (uint i = 0; i < sizeof(s_numericTypes) / sizeof(*s_numericTypes); ++i) {
- if (type == s_numericTypes[i]) {
+ static const char *s_numericTypes[] = {"int", "unsigned int", "quint64", "qint64", "char", "signed char",
+ "unsigned char", "short", "unsigned short", "float", "double"};
+ for (const char *numericType : s_numericTypes) {
+ if (type == numericType) {
variable.setInitializer("0");
return;
}
@@ -45,7 +49,7 @@ QString Converter::listTypeFor(const QString &itemTypeName, KODE::Class &newClas
void Converter::convertSimpleType(const XSD::SimpleType *type, const XSD::SimpleType::List &simpleTypeList)
{
const QString typeName(mTypeMap.localType(type->qualifiedName()));
- //qDebug() << "convertSimpleType:" << type->qualifiedName() << typeName;
+ // qDebug() << "convertSimpleType:" << type->qualifiedName() << typeName;
KODE::Class newClass;
newClass.setNamespaceAndName(typeName);
if (!Settings::self()->exportDeclaration().isEmpty()) {
@@ -65,14 +69,13 @@ void Converter::convertSimpleType(const XSD::SimpleType *type, const XSD::Simple
NameMapper nameMapper;
QStringList enums = type->facetEnums();
for (int i = 0; i < enums.count(); ++i) {
- enums[ i ] = nameMapper.escape(escapeEnum(enums[ i ]));
+ enums[i] = nameMapper.escape(escapeEnum(enums[i]));
}
newClass.addEnum(KODE::Enum("Type", enums));
- classDocumentation += "Whenever you have to pass an object of type " + newClass.name() +
- " you can also pass the enum directly. Example:\n" +
- "someMethod(" + newClass.name() + "::" + enums.first() + ").";
+ classDocumentation += "Whenever you have to pass an object of type " + newClass.name()
+ + " you can also pass the enum directly. Example:\n" + "someMethod(" + newClass.name() + "::" + enums.first() + ").";
// member variables
KODE::MemberVariable variable("type", "Type");
@@ -111,9 +114,7 @@ void Converter::convertSimpleType(const XSD::SimpleType *type, const XSD::Simple
A class can't derive from basic types (e.g. int or unsigned char), so
we add setter and getter methods to set the value of this class.
*/
- if (type->baseTypeName() != XmlAnyType
- && !type->baseTypeName().isEmpty()
- && !(type->facetType() & XSD::SimpleType::ENUM)) {
+ if (type->baseTypeName() != XmlAnyType && !type->baseTypeName().isEmpty() && !(type->facetType() & XSD::SimpleType::ENUM)) {
classDocumentation = "This class encapsulates a simple type.\n";
const QName baseName = type->baseTypeName();
@@ -123,7 +124,8 @@ void Converter::convertSimpleType(const XSD::SimpleType *type, const XSD::Simple
QList<QName> parentBasicTypes;
parentBasicTypes.append(baseName);
QName currentType = baseName;
- Q_FOREVER {
+ Q_FOREVER
+ {
const XSD::SimpleType simpleType = simpleTypeList.simpleType(currentType);
if (!simpleType.isNull() && simpleType.isRestriction()) {
currentType = simpleType.baseTypeName();
@@ -133,8 +135,8 @@ void Converter::convertSimpleType(const XSD::SimpleType *type, const XSD::Simple
break;
}
- classDocumentation += "Whenever you have to pass an object of type " + newClass.name() +
- " you can also pass the value directly as a " + mTypeMap.localType(currentType) + '.';
+ classDocumentation += "Whenever you have to pass an object of type " + newClass.name() + " you can also pass the value directly as a "
+ + mTypeMap.localType(currentType) + '.';
// include header
newClass.addIncludes(QStringList(), mTypeMap.forwardDeclarations(baseName));
newClass.addHeaderIncludes(mTypeMap.headerIncludes(baseName));
@@ -176,14 +178,14 @@ void Converter::convertSimpleType(const XSD::SimpleType *type, const XSD::Simple
newClass.addFunction(conctor);
// even more convenient constructor, for the case of multiple-level simple-type restrictions
- //qDebug() << typeName << ": baseName=" << baseName << "further up:" << parentBasicTypes;
+ // qDebug() << typeName << ": baseName=" << baseName << "further up:" << parentBasicTypes;
if (parentBasicTypes.count() > 1) {
parentBasicTypes.removeLast(); // the top-most one is in "currentType", so it's the input arg.
KODE::Function baseCtor(conctor.name());
baseCtor.addArgument(mTypeMap.localInputType(currentType, QName()) + " value");
QString beginLine = "setValue(";
QString endLine = ")";
- Q_FOREACH (const QName &base, parentBasicTypes) {
+ for (const QName &base : qAsConst(parentBasicTypes)) {
beginLine += mTypeMap.localType(base) + '(';
endLine += ')';
}
@@ -197,8 +199,7 @@ void Converter::convertSimpleType(const XSD::SimpleType *type, const XSD::Simple
op.setConst(true);
newClass.addFunction(op);
}
- }
- break;
+ } break;
case XSD::SimpleType::TypeList: {
classDocumentation = "This class encapsulates a list type.";
@@ -230,8 +231,7 @@ void Converter::convertSimpleType(const XSD::SimpleType *type, const XSD::Simple
newClass.addFunction(setter);
newClass.addFunction(getter);
- }
- break;
+ } break;
case XSD::SimpleType::TypeUnion:
classDocumentation = "This class encapsulates a union type.";
// Let's be lazy and let's just have a qvariant for storing the various
@@ -294,20 +294,23 @@ void Converter::createSimpleTypeSerializer(KODE::Class &newClass, const XSD::Sim
const QStringList enums = type->facetEnums();
NameMapper nameMapper;
QStringList escapedEnums;
- for (int i = 0; i < enums.count(); ++i) {
- escapedEnums.append(nameMapper.escape(escapeEnum(enums[ i ])));
+ for (const QString &facetEnum : qAsConst(enums)) {
+ escapedEnums.append(nameMapper.escape(escapeEnum(facetEnum)));
}
const QString variableName = KODE::MemberVariable::memberVariableName("type");
+ // Generate a stringValue() function, also useful to implement restrictions on the string representation (issue 234)
{
+ KODE::Function stringValueFunc(QLatin1String("stringValue"), QLatin1String("QString"));
+ stringValueFunc.setConst(true);
KODE::Code code;
- code += "switch ( " + variableName + " ) {";
+ code += "switch ( " + variableName + " ) {" + COMMENT;
code.indent();
for (int i = 0; i < enums.count(); ++i) {
- code += "case " + typeName + "::" + escapedEnums[ i ] + ':';
+ code += "case " + typeName + "::" + escapedEnums[i] + ':';
code.indent();
- code += "return KDSoapValue(valueName, \"" + enums[i] + "\", " + namespaceString(type->nameSpace()) + ", QString::fromLatin1(\"" + type->name() + "\"));";
+ code += "return QStringLiteral(\"" + enums[i] + "\");";
code.unindent();
/* add a hack for msvc because that one cannot parse switch statements
longer than a certain length, so start a new switch statement */
@@ -328,15 +331,23 @@ void Converter::createSimpleTypeSerializer(KODE::Class &newClass, const XSD::Sim
code.unindent();
code.unindent();
code += '}';
- code.newLine();
- code += "return KDSoapValue();";
+ code += "return QString();";
+ stringValueFunc.setBody(code);
+ newClass.addFunction(stringValueFunc);
+ }
+
+ {
+ KODE::Code code;
+ code += COMMENT;
+ code += "return KDSoapValue(valueName, stringValue(), " + namespaceString(type->nameSpace()) + ", QString::fromLatin1(\""
+ + type->name() + "\"));";
serializeFunc.setBody(code);
}
{
KODE::Code code;
code += "static const struct { const char* name; Type value; } s_values[" + QString::number(enums.count()) + "] = {";
for (int i = 0; i < enums.count(); ++i) {
- code += "{ \"" + enums[ i ] + "\", " + typeName + "::" + escapedEnums[ i ] + " }" + (i < enums.count() - 1 ? "," : "");
+ code += "{ \"" + enums[i] + "\", " + typeName + "::" + escapedEnums[i] + " }" + (i < enums.count() - 1 ? "," : "");
}
code += "};";
code += "const QString str = mainValue.value().toString();";
@@ -353,11 +364,8 @@ void Converter::createSimpleTypeSerializer(KODE::Class &newClass, const XSD::Sim
code += "qDebug(\"Unknown enum value '%s' passed to '" + newClass.name() + "'.\", qPrintable(str) );";
deserializeFunc.setBody(code);
}
-
}
- if (type->baseTypeName() != XmlAnyType
- && !type->baseTypeName().isEmpty()
- && !(type->facetType() & XSD::SimpleType::ENUM)) {
+ if (type->baseTypeName() != XmlAnyType && !type->baseTypeName().isEmpty() && !(type->facetType() & XSD::SimpleType::ENUM)) {
// 'inherits' a basic type or another simple type -> using value.
const QName baseName = type->baseTypeName();
@@ -366,18 +374,21 @@ void Converter::createSimpleTypeSerializer(KODE::Class &newClass, const XSD::Sim
const QString variableName = KODE::MemberVariable::memberVariableName("value");
const QName baseType = type->baseTypeName();
Q_UNUSED(simpleTypeList);
- //const QName mostBasicTypeName = simpleTypeList.mostBasicType( baseType );
- //Q_UNUSED(mostBasicTypeName);
- if (mTypeMap.isBuiltinType(baseType)) { // serialize from QString, int, etc.
- serializeFunc.addBodyLine("return " + mTypeMap.serializeBuiltin(baseType, QName(), variableName, "valueName", type->nameSpace(), type->name()) + ";" + COMMENT);
- deserializeFunc.addBodyLine(variableName + " = " + mTypeMap.deserializeBuiltin(baseType, QName(), "mainValue", baseTypeName) + ";" + COMMENT);
+ // const QName mostBasicTypeName = simpleTypeList.mostBasicType( baseType );
+ // Q_UNUSED(mostBasicTypeName);
+ if (mTypeMap.isBuiltinType(baseType)) { // serialize from QString, int, etc.
+ serializeFunc.addBodyLine("return "
+ + mTypeMap.serializeBuiltin(baseType, QName(), variableName, "valueName", type->nameSpace(), type->name())
+ + ";" + COMMENT);
+ deserializeFunc.addBodyLine(variableName + " = " + mTypeMap.deserializeBuiltin(baseType, QName(), "mainValue", baseTypeName) + ";"
+ + COMMENT);
} else { // inherits another simple type, need to call its serialize/deserialize method
serializeFunc.addBodyLine("KDSoapValue value = mValue.serialize(valueName);");
- serializeFunc.addBodyLine("value.setType(" + namespaceString(type->nameSpace()) + ", QString::fromLatin1(\"" + type->name() + "\"));");
+ serializeFunc.addBodyLine("value.setType(" + namespaceString(type->nameSpace()) + ", QString::fromLatin1(\"" + type->name()
+ + "\"));");
serializeFunc.addBodyLine("return value;" + COMMENT);
deserializeFunc.addBodyLine(variableName + ".deserialize( mainValue );" + COMMENT);
}
-
}
break;
case XSD::SimpleType::TypeList: {
@@ -398,7 +409,8 @@ void Converter::createSimpleTypeSerializer(KODE::Class &newClass, const XSD::Sim
code += "str += " + variableName + ".at(i);";
} else {
if (mTypeMap.isBuiltinType(baseName)) { // serialize from int, float, bool, etc.
- code += "KDSoapValue subValue = " + mTypeMap.serializeBuiltin(baseName, QName(), variableName + ".at(i)", "QString()", QString(), QString()) + ";";
+ code += "KDSoapValue subValue = "
+ + mTypeMap.serializeBuiltin(baseName, QName(), variableName + ".at(i)", "QString()", QString(), QString()) + ";";
} else {
code += "KDSoapValue subValue = " + variableName + ".at(i).serialize(QString());";
}
@@ -422,7 +434,7 @@ void Converter::createSimpleTypeSerializer(KODE::Class &newClass, const XSD::Sim
QString val = QString::fromLatin1("list.at(i)");
if (itemTypeName == "QString")
val = val + ".value().toString()";
- else if (mTypeMap.isBuiltinType(baseName)) { // deserialize to int, float, bool, etc.
+ else if (mTypeMap.isBuiltinType(baseName)) { // deserialize to int, float, bool, etc.
val = mTypeMap.deserializeBuiltin(baseName, QName(), val, itemTypeName);
} else {
code += itemTypeName + " tmp;";
@@ -434,13 +446,13 @@ void Converter::createSimpleTypeSerializer(KODE::Class &newClass, const XSD::Sim
code += "}";
deserializeFunc.setBody(code);
}
- }
- break;
+ } break;
case XSD::SimpleType::TypeUnion: {
const QString variableName = KODE::MemberVariable::memberVariableName("value");
{
KODE::Code code;
- code += "return KDSoapValue(valueName, " + variableName + ", " + namespaceString(type->nameSpace()) + ", QString::fromLatin1(\"" + type->name() + "\"));";
+ code += "return KDSoapValue(valueName, " + variableName + ", " + namespaceString(type->nameSpace()) + ", QString::fromLatin1(\""
+ + type->name() + "\"));";
serializeFunc.setBody(code);
}
{
@@ -461,6 +473,7 @@ static QString escapeEnum(const QString &str)
return upperlize(KODE::Style::makeIdentifier(str));
}
+// Escape because we are generating a C++ literal
static QString escapeRegExp(const QString &str)
{
QString reg = str;
@@ -468,12 +481,15 @@ static QString escapeRegExp(const QString &str)
return reg;
}
-static KODE::Code createRangeCheckCode(const XSD::SimpleType *type, const QString &baseTypeName, const QString &variableName, KODE::Class &parentClass, const XSD::SimpleType &baseSimpleType)
+static KODE::Code createRangeCheckCode(const XSD::SimpleType *type, const QString &baseTypeName, const QString &variableName,
+ KODE::Class &parentClass, const XSD::SimpleType &baseSimpleType)
{
QString extendedVariableName = variableName;
if (!baseSimpleType.isNull()) {
- if (baseSimpleType.subType() == XSD::SimpleType::SubType::TypeList) {
+ if (baseSimpleType.subType() == XSD::SimpleType::SubType::TypeRestriction && (baseSimpleType.facetType() & XSD::SimpleType::ENUM)) {
+ extendedVariableName += ".stringValue()";
+ } else if (baseSimpleType.subType() == XSD::SimpleType::SubType::TypeList) {
extendedVariableName += ".entries()";
} else {
extendedVariableName += ".value()";
@@ -481,7 +497,7 @@ static KODE::Code createRangeCheckCode(const XSD::SimpleType *type, const QStrin
}
KODE::Code code;
- code += "bool rangeOk = true;";
+ code += "bool rangeOk = true;" + COMMENT;
code.newLine();
// TODO range-check code for facetWhiteSpace, facetTotalDigits, facetFractionDigits
@@ -518,11 +534,20 @@ static KODE::Code createRangeCheckCode(const XSD::SimpleType *type, const QStrin
}
if (type->facetType() & XSD::SimpleType::PATTERN) {
if (baseTypeName == "QString") {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
+ code += "QRegularExpression exp( QStringLiteral(\"" + escapeRegExp(QRegularExpression::anchoredPattern(type->facetPattern())) + "\") );";
+ code += "rangeOk = rangeOk && exp.match(" + variableName + ").hasMatch();";
+#else
code += "QRegExp exp( QString::fromLatin1(\"" + escapeRegExp(type->facetPattern()) + "\") );";
code += "rangeOk = rangeOk && exp.exactMatch( " + variableName + " );";
+#endif
}
+#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
+ parentClass.addInclude("QtCore/QRegularExpression");
+#else
parentClass.addInclude("QtCore/QRegExp");
+#endif
}
return code;
diff --git a/kdwsdl2cpp/src/creator.cpp b/kdwsdl2cpp/src/creator.cpp
index cbd54be..ca5ffd4 100644
--- a/kdwsdl2cpp/src/creator.cpp
+++ b/kdwsdl2cpp/src/creator.cpp
@@ -1,25 +1,12 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
*/
-#include <libkode/file.h>
-#include <libkode/license.h>
-#include <libkode/printer.h>
+#include <code_generation/file.h>
+#include <code_generation/license.h>
+#include <code_generation/printer.h>
#include "settings.h"
@@ -34,7 +21,8 @@ Creator::Creator()
// Set generated header details.
_printer.setCreationWarning(true);
_printer.setGenerator(QLatin1String("KDAB's kdwsdl2cpp"));
- _printer.setStatementsAfterIncludes(QStringList() << "#undef daylight" << "#undef timezone");
+ _printer.setStatementsAfterIncludes(QStringList() << "#undef daylight"
+ << "#undef timezone");
// Qt-like coding style
_printer.setLabelsDefineIndent(false);
@@ -65,9 +53,8 @@ void Creator::setImplementationFileName(const QString &implementationFileName)
void Creator::setClasses(const KODE::Class::List &list)
{
- KODE::Class::List::ConstIterator it;
- for (it = list.constBegin(); it != list.constEnd(); ++it) {
- _file.insertClass(*it);
+ for (const KODE::Class &newClass : qAsConst(list)) {
+ _file.insertClass(newClass);
}
}
diff --git a/kdwsdl2cpp/src/creator.h b/kdwsdl2cpp/src/creator.h
index 0f4a414..ced8d4d 100644
--- a/kdwsdl2cpp/src/creator.h
+++ b/kdwsdl2cpp/src/creator.h
@@ -1,32 +1,18 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_CREATOR_H
#define KWSDL_CREATOR_H
-#include <libkode/class.h>
-#include <libkode/file.h>
-#include <libkode/license.h>
-#include <libkode/printer.h>
+#include <code_generation/class.h>
+#include <code_generation/file.h>
+#include <code_generation/license.h>
+#include <code_generation/printer.h>
-namespace KWSDL
-{
+namespace KWSDL {
class Creator
{
diff --git a/kdwsdl2cpp/src/elementargumentserializer.cpp b/kdwsdl2cpp/src/elementargumentserializer.cpp
index 96c0cbe..0651cbb 100644
--- a/kdwsdl2cpp/src/elementargumentserializer.cpp
+++ b/kdwsdl2cpp/src/elementargumentserializer.cpp
@@ -1,26 +1,34 @@
+/*
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
+*/
+
#include "elementargumentserializer.h"
#include "converter.h" // upperlize(), COMMENT
-#include <libkode/style.h>
+#include <code_generation/style.h>
using namespace KWSDL;
-ElementArgumentSerializer::ElementArgumentSerializer(const TypeMap &typeMap, const QName &type, const QName &elementType, const QString &localVarName)
- : mTypeMap(typeMap),
- mType(type),
- mElementType(elementType),
- mLocalVarName(localVarName),
- mAppend(false),
- mIsQualified(false),
- mNillable(false),
- mOmitIfEmpty(false),
- mUsePointer(false)
+ElementArgumentSerializer::ElementArgumentSerializer(const TypeMap &typeMap, const QName &type, const QName &elementType, const QString &localVarName,
+ const QString &nilLocalVarName)
+ : mTypeMap(typeMap)
+ , mType(type)
+ , mElementType(elementType)
+ , mLocalVarName(localVarName)
+ , mNilLocalVarName(nilLocalVarName)
+ , mAppend(false)
+ , mIsQualified(false)
+ , mNillable(false)
+ , mOptional(false)
+ , mUsePointer(false)
{
-
}
void ElementArgumentSerializer::setLocalVariableName(const QString &localVarName)
{
mLocalVarName = localVarName;
+ Q_ASSERT(!mNillable); // if nillable, we're missing mNilLocalVarName here
}
void ElementArgumentSerializer::setElementName(const QName &name)
@@ -43,14 +51,14 @@ void ElementArgumentSerializer::setOutputVariable(const QString &outputVarName,
mAppend = append;
}
-void ElementArgumentSerializer::setOmitIfEmpty(bool omit)
+void ElementArgumentSerializer::setNillable(bool nillable)
{
- mOmitIfEmpty = omit;
+ mNillable = nillable;
}
-void ElementArgumentSerializer::setNillable(bool nillable)
+void ElementArgumentSerializer::setOptional(bool optional)
{
- mNillable = nillable;
+ mOptional = optional;
}
void ElementArgumentSerializer::setIsQualified(bool qualified)
@@ -63,7 +71,7 @@ void ElementArgumentSerializer::setUsePointer(bool usePointer)
mUsePointer = usePointer;
}
-KODE::Code ElementArgumentSerializer::generate() const
+KODE::Code ElementArgumentSerializer::generateSerializationCode() const
{
Q_ASSERT(!mLocalVarName.isEmpty());
Q_ASSERT(!mOutputVarName.isEmpty());
@@ -72,9 +80,9 @@ KODE::Code ElementArgumentSerializer::generate() const
KODE::Code block;
// for debugging, add this:
- //block += "// type: " + type.qname() + " element:" + elementType.qname();
+ // block += "// type: " + type.qname() + " element:" + elementType.qname();
- //if ( name.localName() == "..." )
+ // if ( name.localName() == "..." )
// qDebug() << "appendElementArg:" << name << "type=" << type << "isBuiltin=" << mTypeMap.isBuiltinType(type) << "isQualified=" << isQualified;
if (mTypeMap.isTypeAny(mType)) {
block += QLatin1String("if (!") + mLocalVarName + QLatin1String(".isNull()) {");
@@ -84,28 +92,32 @@ KODE::Code ElementArgumentSerializer::generate() const
block += "}";
} else {
const QName actualType = mType.isEmpty() ? mElementType : mType;
- //UNUSED const QString typeArgs = namespaceString(actualType.nameSpace()) + QLatin1String(", QString::fromLatin1(\"") + actualType.localName() + QLatin1String("\")");
+ // UNUSED const QString typeArgs = namespaceString(actualType.nameSpace()) + QLatin1String(", QString::fromLatin1(\"") +
+ // actualType.localName() + QLatin1String("\")");
const bool isComplex = mTypeMap.isComplexType(mType, mElementType);
const bool isPolymorphic = mTypeMap.isPolymorphic(mType, mElementType);
- if (mAppend && mOmitIfEmpty) {
+ if (mAppend && mOptional) {
if (mUsePointer) {
block += "if (" + mLocalVarName + ") {";
} else {
- block += "if (!" + mLocalVarName + "_nil) {";
+ block += "if (!" + mNilLocalVarName + ") {" + COMMENT;
}
block.indent();
}
if (isComplex) {
const QString op = (isPolymorphic || mUsePointer) ? "->" : ".";
- block += QLatin1String("KDSoapValue ") + mValueVarName + QLatin1Char('(') + mLocalVarName + op + QLatin1String("serialize(") + mNameArg + QLatin1String("));") + COMMENT;
+ block += QLatin1String("KDSoapValue ") + mValueVarName + QLatin1Char('(') + mLocalVarName + op + QLatin1String("serialize(") + mNameArg
+ + QLatin1String("));") + COMMENT;
} else {
if (mTypeMap.isBuiltinType(mType, mElementType)) {
- const QString value = mTypeMap.serializeBuiltin(mType, mElementType, mLocalVarName, mNameArg, actualType.nameSpace(), actualType.localName());
+ const QString value =
+ mTypeMap.serializeBuiltin(mType, mElementType, mLocalVarName, mNameArg, actualType.nameSpace(), actualType.localName());
block += QLatin1String("KDSoapValue ") + mValueVarName + QLatin1String(" = ") + value + QLatin1String(";") + COMMENT;
} else {
- block += QLatin1String("KDSoapValue ") + mValueVarName + QLatin1String(" = ") + mLocalVarName + QLatin1String(".serialize(") + mNameArg + QLatin1String(");") + COMMENT;
+ block += QLatin1String("KDSoapValue ") + mValueVarName + QLatin1String(" = ") + mLocalVarName + QLatin1String(".serialize(")
+ + mNameArg + QLatin1String(");") + COMMENT;
}
}
if (!mNameNamespace.isEmpty()) {
@@ -119,7 +131,7 @@ KODE::Code ElementArgumentSerializer::generate() const
}
block += varAndMethodBefore + mValueVarName + varAndMethodAfter + QLatin1String(";") + COMMENT;
- if (mAppend && mOmitIfEmpty) {
+ if (mAppend && mOptional) {
block.unindent();
block += "}";
}
@@ -127,3 +139,86 @@ KODE::Code ElementArgumentSerializer::generate() const
return block;
}
+QString ElementArgumentSerializer::pointerStorageType(const QString &typeName)
+{
+ if (typeName == "QString" || typeName == "bool") {
+ qWarning() << "Should not happen: polymorphic" << typeName;
+ Q_ASSERT(0);
+ }
+
+ return "QSharedPointer<" + typeName + '>';
+}
+
+KODE::Code ElementArgumentSerializer::demarshalArray(const QString &soapValueVarName) const
+{
+ KODE::Code code;
+ const QString qtTypeName = mTypeMap.localType(mType, mElementType);
+
+ if (mTypeMap.isTypeAny(mType)) {
+ code += mLocalVarName + QLatin1String(".append(") + soapValueVarName + QLatin1String(");");
+ } else if (mTypeMap.isBuiltinType(mType, mElementType)) {
+ code += mLocalVarName + QLatin1String(".append(") + mTypeMap.deserializeBuiltin(mType, mElementType, soapValueVarName, qtTypeName)
+ + QLatin1String(");") + COMMENT;
+ } else {
+ // we need a temp var because of deserialize()
+ QString tempVar;
+ if (mLocalVarName.startsWith(QLatin1String("d_ptr->"))) {
+ tempVar = mLocalVarName.mid(7) + QLatin1String("Temp");
+ } else {
+ tempVar = mLocalVarName + QLatin1String("Temp");
+ }
+ code += qtTypeName + QLatin1String(" ") + tempVar + QLatin1String(";") + COMMENT;
+ const ElementArgumentSerializer tempDeserializer(mTypeMap, mType, mElementType, tempVar, QString());
+ code.addBlock(tempDeserializer.demarshalVarHelper(soapValueVarName));
+ QString toAppend = tempVar;
+ const bool isPolymorphic = mTypeMap.isPolymorphic(mType);
+ if (isPolymorphic) {
+ const QString storageType = pointerStorageType(qtTypeName);
+ toAppend = storageType + "(new " + qtTypeName + "(" + tempVar + "))";
+ }
+ code += mLocalVarName + QLatin1String(".append(") + toAppend + QLatin1String(");") + COMMENT;
+ }
+ if (mOptional) {
+ code += mNilLocalVarName + QLatin1String(" = false;") + COMMENT;
+ }
+ return code;
+}
+
+KODE::Code ElementArgumentSerializer::demarshalVariable(const QString &soapValueVarName) const
+{
+ const bool isPolymorphic = mTypeMap.isPolymorphic(mType, mElementType);
+ if (mUsePointer || isPolymorphic) {
+ const QString qtTypeName = mTypeMap.localType(mType, mElementType);
+ const QString storageType = pointerStorageType(qtTypeName);
+ KODE::Code code;
+ code += mLocalVarName + "_as_kdsoap_value = " + soapValueVarName + ";" + COMMENT;
+ code += "if (!" + mLocalVarName + ")";
+ code.indent();
+ code += mLocalVarName + " = " + storageType + "(new " + qtTypeName + ");" + COMMENT;
+ code.unindent();
+ code += mLocalVarName + QLatin1String("->deserialize(") + soapValueVarName + QLatin1String(");") + COMMENT;
+ return code;
+ } else {
+ return demarshalVarHelper(soapValueVarName);
+ }
+}
+
+KODE::Code ElementArgumentSerializer::demarshalVarHelper(const QString &soapValueVarName) const
+{
+ KODE::Code code;
+ if (mTypeMap.isTypeAny(mType)) {
+ code += mLocalVarName + QLatin1String(" = ") + soapValueVarName + QLatin1String(";") + COMMENT;
+ } else if (mTypeMap.isBuiltinType(mType, mElementType)) {
+ const QString qtTypeName = mTypeMap.localType(mType, mElementType);
+ code += mLocalVarName + QLatin1String(" = ") + mTypeMap.deserializeBuiltin(mType, mElementType, soapValueVarName, qtTypeName)
+ + QLatin1String(";") + COMMENT;
+ } else if (mTypeMap.isComplexType(mType, mElementType)) {
+ code += mLocalVarName + QLatin1String(".deserialize(") + soapValueVarName + QLatin1String(");") + COMMENT;
+ } else {
+ code += mLocalVarName + QLatin1String(".deserialize(") + soapValueVarName + QLatin1String(");") + COMMENT;
+ }
+ if (mOptional) {
+ code += mNilLocalVarName + QLatin1String(" = false;") + COMMENT;
+ }
+ return code;
+}
diff --git a/kdwsdl2cpp/src/elementargumentserializer.h b/kdwsdl2cpp/src/elementargumentserializer.h
index 4daf75a..9da770c 100644
--- a/kdwsdl2cpp/src/elementargumentserializer.h
+++ b/kdwsdl2cpp/src/elementargumentserializer.h
@@ -1,8 +1,14 @@
+/*
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
+*/
+
#ifndef ELEMENTARGUMENTSERIALIZER_H
#define ELEMENTARGUMENTSERIALIZER_H
#include "typemap.h"
-#include <libkode/code.h>
+#include <code_generation/code.h>
/**
* The ElementArgumentSerializer class is used to generate the code that serializes one XML element
@@ -19,8 +25,10 @@ public:
* @param elementType the name of the XSD element type. Exclusive with type.
* @param localVarName the name of the variable containing the type to send, in the generated C++ code
* If it's not a builtin type, .serialize() will be called on this variable.
+ * @param nilLocalVarName name of the _nil variable, if any
*/
- ElementArgumentSerializer(const KWSDL::TypeMap &typeMap, const QName &type, const QName &elementType, const QString &localVarName);
+ ElementArgumentSerializer(const KWSDL::TypeMap &typeMap, const QName &type, const QName &elementType, const QString &localVarName,
+ const QString &nilLocalVarName);
/**
* Modifies the localVarName set in the constructor.
@@ -51,11 +59,12 @@ public:
void setOutputVariable(const QString &outputVarName, bool append);
/**
- * @brief sets whether to omit empty child elements
- * @param omit if true, omit this element if it's empty
+ * @brief sets whether the element is optional.
+ * For serialization, this means it will be omitted if it's empty.
+ * For deserialization, it means setting _nil to false if present.
* The default is false.
*/
- void setOmitIfEmpty(bool omit);
+ void setOptional(bool optional);
/**
* @brief sets whether the element can be nil (xsi:nil)
@@ -79,24 +88,43 @@ public:
void setUsePointer(bool usePointer);
/**
- * The main method: generate!
+ * The main method: generate the serialization code.
+ * @return the generated code
+ */
+ KODE::Code generateSerializationCode() const;
+
+ /**
+ * Generate code to deserialize an entire array
* @return the generated code
*/
- KODE::Code generate() const;
+ KODE::Code demarshalArray(const QString &soapValueVarName) const;
+
+ /**
+ * Generate code to deserialize the variable
+ * @param the name of the variable containing the KDSoapValue to read from
+ * @return the generated code
+ */
+ KODE::Code demarshalVariable(const QString &soapValueVarName) const;
+
+ static QString pointerStorageType(const QString &typeName);
private:
+ // Low-level helper for demarshalVariable, doesn't handle the polymorphic case (so it can be called for lists of polymorphics)
+ KODE::Code demarshalVarHelper(const QString &soapValueVarName) const;
+
const KWSDL::TypeMap &mTypeMap;
QName mType;
QName mElementType;
QString mNameArg;
QString mNameNamespace;
QString mLocalVarName;
+ QString mNilLocalVarName;
QString mOutputVarName;
QString mValueVarName;
bool mAppend;
bool mIsQualified;
bool mNillable;
- bool mOmitIfEmpty;
+ bool mOptional;
bool mUsePointer;
};
diff --git a/kdwsdl2cpp/src/kdwsdl2cpp.pro b/kdwsdl2cpp/src/kdwsdl2cpp.pro
deleted file mode 100755
index c686896..0000000
--- a/kdwsdl2cpp/src/kdwsdl2cpp.pro
+++ /dev/null
@@ -1,39 +0,0 @@
-TEMPLATE = app
-TARGET = kdwsdl2cpp
-SOURCES = main.cpp
-INCLUDEPATH += $${TOP_SOURCE_DIR}/kdwsdl2cpp
-QT -= gui
-QT += xml
-
-CONFIG += console
-macx:CONFIG -= app_bundle
-static:macx:QMAKE_LFLAGS += -Wl,-rpath,$$[QT_INSTALL_LIBS]
-
-# Relink when a static lib changed
-unix:PRE_TARGETDEPS += $${TOP_BUILD_DIR}/lib/libkode.a \
- $${TOP_BUILD_DIR}/lib/libwsdl.a \
- $${TOP_BUILD_DIR}/lib/libxmlschema.a \
- $${TOP_BUILD_DIR}/lib/libxmlcommon.a \
- $${TOP_BUILD_DIR}/lib/libkdwsdl2cpp_lib.a
-
-win32-msvc*:PRE_TARGETDEPS += $${TOP_BUILD_DIR}/lib/kode.lib \
- $${TOP_BUILD_DIR}/lib/wsdl.lib \
- $${TOP_BUILD_DIR}/lib/xmlschema.lib \
- $${TOP_BUILD_DIR}/lib/xmlcommon.lib
-LIBS += -L$${TOP_BUILD_DIR}/lib \
- -l$${KDWSDL2CPP_LIB} \
- -lkode \
- -lwsdl \
- -lxmlschema \
- -lxmlcommon
-
-include($${TOP_SOURCE_DIR}/variables.pri)
-DEFINES -= QT_NO_CAST_TO_ASCII \
- QBA_NO_CAST_TO_VOID \
- QBA_NO_CAST_TO_ASCII \
- QT_NO_CAST_FROM_ASCII
-
-#installation targets
-target.path = $$INSTALL_PREFIX/bin
-
-INSTALLS += target
diff --git a/kdwsdl2cpp/src/kdwsdl2cpp_lib.pro b/kdwsdl2cpp/src/kdwsdl2cpp_lib.pro
deleted file mode 100755
index ae475e8..0000000
--- a/kdwsdl2cpp/src/kdwsdl2cpp_lib.pro
+++ /dev/null
@@ -1,44 +0,0 @@
-TEMPLATE = lib
-TARGET = $${KDWSDL2CPP_LIB}
-SOURCES = compiler.cpp \
- converter.cpp \
- converter_clientstub.cpp \
- converter_complextype.cpp \
- converter_serverstub.cpp \
- converter_simpletype.cpp \
- creator.cpp \
- namemapper.cpp \
- settings.cpp \
- typemap.cpp \
- elementargumentserializer.cpp
-HEADERS = compiler.h \
- converter.h \
- elementargumentserializer.h
-INCLUDEPATH += $${TOP_SOURCE_DIR}/kdwsdl2cpp
-QT -= gui
-QT += xml
-
-CONFIG += staticlib
-
-CONFIG += console
-static:macx:QMAKE_LFLAGS += -Wl,-rpath,$$[QT_INSTALL_LIBS]
-
-# Relink when a static lib changed
-unix:PRE_TARGETDEPS += $${TOP_BUILD_DIR}/lib/libkode.a \
- $${TOP_BUILD_DIR}/lib/libwsdl.a \
- $${TOP_BUILD_DIR}/lib/libxmlschema.a \
- $${TOP_BUILD_DIR}/lib/libxmlcommon.a
-win32-msvc*:PRE_TARGETDEPS += $${TOP_BUILD_DIR}/lib/kode.lib \
- $${TOP_BUILD_DIR}/lib/wsdl.lib \
- $${TOP_BUILD_DIR}/lib/xmlschema.lib \
- $${TOP_BUILD_DIR}/lib/xmlcommon.lib
-LIBS += -L$${TOP_BUILD_DIR}/lib \
- -lkode \
- -lwsdl \
- -lxmlschema \
- -lxmlcommon
-include($${TOP_SOURCE_DIR}/variables.pri)
-DEFINES -= QT_NO_CAST_TO_ASCII \
- QBA_NO_CAST_TO_VOID \
- QBA_NO_CAST_TO_ASCII \
- QT_NO_CAST_FROM_ASCII
diff --git a/kdwsdl2cpp/src/kwsdlcfg.xsd b/kdwsdl2cpp/src/kwsdlcfg.xsd
index 677e828..49284fa 100644
--- a/kdwsdl2cpp/src/kwsdlcfg.xsd
+++ b/kdwsdl2cpp/src/kwsdlcfg.xsd
@@ -7,8 +7,8 @@
<xsd:annotation>
<xsd:documentation>
- Copyright (c) 2006 Tobias Koenig <tokoe@kde.org>
-
+ SPDX-FileCopyrightText: 2006 Tobias Koenig <tokoe@kde.org>
+ SPDX-License-Identifier: MIT
Permission to use, copy, modify and distribute this schema
and its accompanying documentation for any purpose and without fee
is hereby granted in perpetuity, provided that the above copyright
diff --git a/kdwsdl2cpp/src/main.cpp b/kdwsdl2cpp/src/main.cpp
index 8905b6d..0754b0c 100644
--- a/kdwsdl2cpp/src/main.cpp
+++ b/kdwsdl2cpp/src/main.cpp
@@ -1,31 +1,21 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include "compiler.h"
#include "settings.h"
+#include <QCoreApplication>
+#include <QDebug>
#include <QDir>
#include <QFile>
#include <QFileInfo>
+#include <QNetworkAccessManager>
+#include <QSslCertificate>
+#include <QSslKey>
#include <QTimer>
-#include <QCoreApplication>
-#include <QDebug>
static const char *WSDL2CPP_DESCRIPTION = "KDAB's WSDL to C++ compiler";
static const char *WSDL2CPP_VERSION_STR = "2.1";
@@ -67,22 +57,28 @@ static void showHelp(const char *appName)
" use of the import-path option\n"
" -help-on-missing When groups or basic types could not be found, display\n"
" available types (helps with wrong namespaces)\n"
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+#if !defined(QT_NO_SSL)
" -pkcs12file Load a certificate from a PKCS12 file. You can use this option\n"
- " if the WSDL file (or files refering to it) is served from a \n"
+ " if the WSDL file (or files referring to it) is served from a \n"
" location which require certificate based authentication\n"
" -pkcs12password Pass the password for the certificate file if required.\n"
" This option is not secure and should be used with caution\n"
- " if other users of the machine are capable to see the running "
+ " if other users of the machine are capable to see the running\n"
" processes ran by the current user.\n"
#endif
- "\n", appName, appName, appName);
+ " -no-sync Do not generate synchronous API methods to the client code\n"
+ " -no-async Do not generate asynchronous API methods to the client code\n"
+ " -no-async-jobs Do not generate asynchronous job API classes to the client code\n"
+ "\n",
+ appName, appName, appName);
}
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
+ Q_INIT_RESOURCE(schemas);
+
const char *fileName = nullptr;
QFileInfo outputFile;
bool both = false;
@@ -99,7 +95,10 @@ int main(int argc, char **argv)
QStringList importPathList;
bool useLocalFilesOnly = false;
bool helpOnMissing = false;
+ bool skipAsync = false, skipSync = false, skipAsyncJobs = false;
+#if !defined(QT_NO_SSL)
QString pkcs12File, pkcs12Password;
+#endif
int arg = 1;
while (arg < argc) {
@@ -217,7 +216,7 @@ int main(int argc, char **argv)
useLocalFilesOnly = true;
} else if (opt == QLatin1String("-help-on-missing")) {
helpOnMissing = true;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+#if !defined(QT_NO_SSL)
} else if (opt == QLatin1String("-pkcs12file")) {
++arg;
if (!argv[arg]) {
@@ -233,6 +232,12 @@ int main(int argc, char **argv)
}
pkcs12Password = QLatin1String(argv[arg]);
#endif
+ } else if (opt == QLatin1String("-no-sync")) {
+ skipSync = true;
+ } else if (opt == QLatin1String("-no-async")) {
+ skipAsync = true;
+ } else if (opt == QLatin1String("-no-async-jobs")) {
+ skipAsyncJobs = true;
} else if (!fileName) {
fileName = argv[arg];
} else {
@@ -286,17 +291,45 @@ int main(int argc, char **argv)
Settings::self()->setImportPathList(importPathList);
Settings::self()->setUseLocalFilesOnly(useLocalFilesOnly);
Settings::self()->setHelpOnMissing(helpOnMissing);
+ Settings::self()->setSkipSync(skipSync);
+ Settings::self()->setSkipAsync(skipAsync);
+ Settings::self()->setSkipAsyncJobs(skipAsyncJobs);
KWSDL::Compiler compiler;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+#if !defined(QT_NO_SSL)
if (!pkcs12File.isEmpty()) {
- if (!Settings::self()->loadCertificate(pkcs12File, pkcs12Password))
- return -1;
+ QFile certFile(pkcs12File);
+ if (certFile.open(QFile::ReadOnly)) {
+ QSslKey key;
+ QSslCertificate certificate;
+ QList<QSslCertificate> caCertificates;
+ const bool certificateLoaded =
+ QSslCertificate::importPkcs12(&certFile, &key, &certificate, &caCertificates, pkcs12Password.toLocal8Bit());
+ certFile.close();
+ if (!certificateLoaded) {
+ fprintf(stderr, "Unable to load the %s certificate file\n", pkcs12File.toLocal8Bit().constData());
+ if (!pkcs12Password.isEmpty())
+ fprintf(stderr, "Please make sure that you have passed the correct password\n");
+ else
+ fprintf(stderr, "Maybe it is password protected?\n");
+ return 1;
+ }
+
+ // set the loaded certificate info as default SSL config
+ QSslConfiguration sslConfig = QSslConfiguration::defaultConfiguration();
+ sslConfig.setPrivateKey(key);
+ sslConfig.setLocalCertificate(certificate);
+ sslConfig.setCaCertificates(caCertificates);
+ QSslConfiguration::setDefaultConfiguration(sslConfig);
+ } else {
+ fprintf(stderr, "Failed to open the %s certificate file for reading\n", pkcs12File.toLocal8Bit().constData());
+ return 1;
+ }
}
#endif
// so that we have an event loop, for downloads
- QTimer::singleShot(0, &compiler, SLOT(run()));
+ QTimer::singleShot(0, &compiler, &KWSDL::Compiler::run);
return app.exec();
}
diff --git a/kdwsdl2cpp/src/namemapper.cpp b/kdwsdl2cpp/src/namemapper.cpp
index 0ef8d6e..2d2541e 100644
--- a/kdwsdl2cpp/src/namemapper.cpp
+++ b/kdwsdl2cpp/src/namemapper.cpp
@@ -1,21 +1,10 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2010 David Faure <david.faure@kdab.com>
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+ Author: David Faure <david.faure@kdab.com>
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include "namemapper.h"
@@ -25,22 +14,87 @@ using namespace KWSDL;
NameMapper::NameMapper()
{
// From https://en.cppreference.com/w/cpp/keyword
- mKeyWords << "and" << "and_eq" << "asm" << "auto" << "bitand" << "bitor"
- << "bool" << "break" << "case" << "catch" << "char" << "class"
- << "compl" << "const" << "const_cast" << "continue" << "default"
- << "delete" << "do" << "double" << "dynamic_cast" << "else"
- << "enum" << "explicit" << "export" << "extern" << "false" << "FALSE"
- << "float" << "for" << "friend" << "goto" << "if" << "inline"
- << "int" << "long" << "mutable" << "namespace" << "new" << "not"
- << "not_eq" << "operator" << "or" << "or_eq" << "private" << "protected"
- << "public" << "register" << "reinterpret_cast" << "return" << "short"
- << "signed" << "sizeof" << "static" << "static_cast" << "struct"
- << "switch" << "template" << "this" << "throw" << "true" << "TRUE" << "try"
- << "typedef" << "typeid" << "typename" << "union" << "unsigned"
- << "using" << "virtual" << "void" << "volatile" << "wchar_t"
- << "while" << "xor" << "xor_eq";
+ mKeyWords << "and"
+ << "and_eq"
+ << "asm"
+ << "auto"
+ << "bitand"
+ << "bitor"
+ << "bool"
+ << "break"
+ << "case"
+ << "catch"
+ << "char"
+ << "class"
+ << "compl"
+ << "const"
+ << "const_cast"
+ << "continue"
+ << "default"
+ << "delete"
+ << "do"
+ << "double"
+ << "dynamic_cast"
+ << "else"
+ << "enum"
+ << "explicit"
+ << "export"
+ << "extern"
+ << "false"
+ << "FALSE"
+ << "float"
+ << "for"
+ << "friend"
+ << "goto"
+ << "if"
+ << "inline"
+ << "int"
+ << "long"
+ << "mutable"
+ << "namespace"
+ << "new"
+ << "not"
+ << "not_eq"
+ << "operator"
+ << "or"
+ << "or_eq"
+ << "private"
+ << "protected"
+ << "public"
+ << "register"
+ << "reinterpret_cast"
+ << "return"
+ << "short"
+ << "signed"
+ << "sizeof"
+ << "static"
+ << "static_cast"
+ << "struct"
+ << "switch"
+ << "template"
+ << "this"
+ << "throw"
+ << "true"
+ << "TRUE"
+ << "try"
+ << "typedef"
+ << "typeid"
+ << "typename"
+ << "union"
+ << "unsigned"
+ << "using"
+ << "virtual"
+ << "void"
+ << "volatile"
+ << "wchar_t"
+ << "while"
+ << "xor"
+ << "xor_eq";
// Also some Qt keywords:
- mKeyWords << "emit" << "signals" << "slots" << "foreach";
+ mKeyWords << "emit"
+ << "signals"
+ << "slots"
+ << "foreach";
}
QString NameMapper::escape(const QString &name) const
diff --git a/kdwsdl2cpp/src/namemapper.h b/kdwsdl2cpp/src/namemapper.h
index b385f94..7048b8d 100644
--- a/kdwsdl2cpp/src/namemapper.h
+++ b/kdwsdl2cpp/src/namemapper.h
@@ -1,20 +1,7 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_NAMEMAPPER_H
@@ -22,8 +9,7 @@
#include <QStringList>
-namespace KWSDL
-{
+namespace KWSDL {
class NameMapper
{
diff --git a/kdwsdl2cpp/src/settings.cpp b/kdwsdl2cpp/src/settings.cpp
index 2e25e01..51205a6 100644
--- a/kdwsdl2cpp/src/settings.cpp
+++ b/kdwsdl2cpp/src/settings.cpp
@@ -1,30 +1,16 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
*/
#define QT_NO_CAST_TO_ASCII
#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_URL_CAST_FROM_STRING
+#include <QDebug>
#include <QDir>
#include <QDomDocument>
#include <QFile>
-#include <QDebug>
#include "settings.h"
@@ -41,12 +27,39 @@ Settings::Settings()
mOutputDirectory = QDir::current().path();
mHeaderFileName = QString::fromLatin1("kwsdl_generated");
mImplementationFileName = QString::fromLatin1("kwsdl_generated");
- mImpl = false;
- mServer = false;
- mKeepUnusedTypes = false;
mOptionalElementType = Settings::ENone;
}
+bool Settings::skipAsyncJobs() const
+{
+ return mSkipAsyncJobs;
+}
+
+void Settings::setSkipAsyncJobs(bool skipAsyncJobs)
+{
+ mSkipAsyncJobs = skipAsyncJobs;
+}
+
+bool Settings::skipAsync() const
+{
+ return mSkipAsync;
+}
+
+void Settings::setSkipAsync(bool skipAsync)
+{
+ mSkipAsync = skipAsync;
+}
+
+bool Settings::skipSync() const
+{
+ return mSkipSync;
+}
+
+void Settings::setSkipSync(bool skipSync)
+{
+ mSkipSync = skipSync;
+}
+
bool Settings::useLocalFilesOnly() const
{
return mUseLocalFilesOnly;
@@ -70,7 +83,7 @@ void Settings::setWsdlFile(const QString &wsdlFile)
{
QString path = QDir::fromNativeSeparators(wsdlFile);
- // Check first for files, since on Windows drive letters can be interpretted as schemes
+ // Check first for files, since on Windows drive letters can be interpreted as schemes
if (QDir::isAbsolutePath(path)) {
mWsdlUrl = QUrl::fromLocalFile(path);
return;
@@ -251,51 +264,3 @@ bool Settings::helpOnMissing() const
{
return mHelpOnMissing;
}
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-bool Settings::loadCertificate(const QString &certPath, const QString & password)
-{
- QFile certFile(certPath);
- if (certFile.open(QFile::ReadOnly)) {
- mCertificateLoaded = QSslCertificate::importPkcs12(&certFile,
- &mSslKey,
- &mCertificate,
- &mCaCertificates,
- password.toLocal8Bit());
- certFile.close();
- if (!mCertificateLoaded) {
- fprintf(stderr, "Unable to load the %s certificate file\n",
- certPath.toLocal8Bit().constData());
- if (!password.isEmpty())
- fprintf(stderr, "Please make sure that you have passed the correct password\n");
- else
- fprintf(stderr, "Maybe it is password protected?\n");
- }
- return mCertificateLoaded;
- } else {
- fprintf(stderr, "Failed to open the %s certificate file for reading\n",
- certPath.toLocal8Bit().constData());
- }
- return false;
-}
-
-QList<QSslCertificate> Settings::caCertificates() const
-{
- return mCaCertificates;
-}
-
-QSslCertificate Settings::certificate() const
-{
- return mCertificate;
-}
-
-QSslKey Settings::sslKey() const
-{
- return mSslKey;
-}
-
-bool Settings::certificateLoaded() const
-{
- return mCertificateLoaded;
-}
-#endif
diff --git a/kdwsdl2cpp/src/settings.h b/kdwsdl2cpp/src/settings.h
index c5ca846..106a28b 100644
--- a/kdwsdl2cpp/src/settings.h
+++ b/kdwsdl2cpp/src/settings.h
@@ -1,28 +1,13 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-License-Identifier: MIT
*/
#ifndef SETTINGS_H
#define SETTINGS_H
#include <QMap>
-#include <QSslCertificate>
-#include <QSslKey>
#include <QStringList>
#include <QUrl>
@@ -31,7 +16,13 @@ class Settings
public:
typedef QMap<QString, QString> NSMapping;
- enum OptionalElementType { ENone, ERawPointer, EBoostOptional, EStdOptional };
+ enum OptionalElementType
+ {
+ ENone,
+ ERawPointer,
+ EBoostOptional,
+ EStdOptional
+ };
~Settings();
@@ -87,13 +78,14 @@ public:
bool helpOnMissing() const;
void setHelpOnMissing(bool b);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
- bool loadCertificate(const QString & certPath, const QString &password = QString());
- bool certificateLoaded() const;
- QSslKey sslKey() const;
- QSslCertificate certificate() const;
- QList<QSslCertificate> caCertificates() const;
-#endif
+ bool skipSync() const;
+ void setSkipSync(bool skipSync);
+
+ bool skipAsync() const;
+ void setSkipAsync(bool skipAsync);
+
+ bool skipAsyncJobs() const;
+ void setSkipAsyncJobs(bool skipAsyncJobs);
private:
friend class SettingsSingleton;
@@ -108,19 +100,16 @@ private:
QString mNameSpace;
QStringList mImportPathList;
NSMapping mNamespaceMapping;
- bool mHeader;
- bool mImpl;
- bool mServer;
OptionalElementType mOptionalElementType;
- bool mKeepUnusedTypes;
- bool mUseLocalFilesOnly;
- bool mHelpOnMissing;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
- QSslKey mSslKey;
- QSslCertificate mCertificate;
- QList<QSslCertificate> mCaCertificates;
- bool mCertificateLoaded = false;
-#endif
+ bool mHeader = false;
+ bool mImpl = false;
+ bool mServer = false;
+ bool mKeepUnusedTypes = false;
+ bool mUseLocalFilesOnly = false;
+ bool mHelpOnMissing = false;
+ bool mSkipSync = false;
+ bool mSkipAsync = false;
+ bool mSkipAsyncJobs = false;
};
#endif
diff --git a/kdwsdl2cpp/src/src.pro b/kdwsdl2cpp/src/src.pro
deleted file mode 100644
index 46059f3..0000000
--- a/kdwsdl2cpp/src/src.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = kdwsdl2cpp_lib.pro kdwsdl2cpp.pro
-CONFIG += ordered
diff --git a/kdwsdl2cpp/src/typemap.cpp b/kdwsdl2cpp/src/typemap.cpp
index 0e8a0aa..8e30662 100644
--- a/kdwsdl2cpp/src/typemap.cpp
+++ b/kdwsdl2cpp/src/typemap.cpp
@@ -1,36 +1,25 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2010 David Faure <dfaure@kdab.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+ Author: David Faure <david.faure@kdab.com>
+
+ SPDX-License-Identifier: MIT
*/
-#include <common/nsmanager.h>
#include "settings.h"
+#include <common/nsmanager.h>
-#include <QDebug>
-#include "typemap.h"
#include "converter.h"
+#include "typemap.h"
+#include <QDebug>
using namespace KWSDL;
static QString adaptLocalTypeName(const QString &str)
{
QString result(str);
- result[ 0 ] = result[ 0 ].toUpper();
+ result[0] = result[0].toUpper();
if (result.endsWith("[]")) {
result.truncate(result.length() - 2);
@@ -244,7 +233,7 @@ QStringList TypeMap::forwardDeclarations(const QName &typeName) const
return QStringList();
}
QStringList ret;
- Q_FOREACH (const QString &str, (*it).forwardDeclarations) {
+ for (const QString &str : (*it).forwardDeclarations) {
ret.append(correctSyntaxCpp(str));
}
return ret;
@@ -363,24 +352,24 @@ void TypeMap::addSchemaTypes(const XSD::Types &types, const QString &ns)
{
Q_ASSERT(mNSManager);
- XSD::SimpleType::List simpleTypes = types.simpleTypes();
- XSD::SimpleType::List::ConstIterator simpleIt;
- for (simpleIt = simpleTypes.constBegin(); simpleIt != simpleTypes.constEnd(); ++simpleIt) {
+ const XSD::SimpleType::List simpleTypes = types.simpleTypes();
+ for (const XSD::SimpleType &simple : simpleTypes) {
Entry entry;
entry.basicType = false;
entry.builtinType = false;
- entry.nameSpace = (*simpleIt).nameSpace();
- entry.typeName = (*simpleIt).name();
- entry.localType = prefixNamespace(mNSManager->prefix(entry.nameSpace).toUpper() + "__" + adaptLocalTypeName((*simpleIt).name()), ns);
- entry.baseType = (*simpleIt).baseTypeName();
- //qDebug() << entry.baseType.nameSpace() << entry.baseType.localName() << entry.baseType;
- //entry.headers << (*simpleIt).name().toLower() + ".h";
+ entry.nameSpace = simple.nameSpace();
+ entry.typeName = simple.name();
+ entry.localType = prefixNamespace(mNSManager->prefix(entry.nameSpace).toUpper() + "__" + adaptLocalTypeName(simple.name()), ns);
+ entry.baseType = simple.baseTypeName();
+ // qDebug() << entry.baseType.nameSpace() << entry.baseType.localName() << entry.baseType;
+ // entry.headers << simple.name().toLower() + ".h";
entry.forwardDeclarations << entry.localType;
mTypeMap.append(entry);
}
- foreach (const XSD::ComplexType &complex, types.complexTypes()) {
+ const XSD::ComplexType::List complexTypes = types.complexTypes();
+ for (const XSD::ComplexType &complex : complexTypes) {
Entry entry;
entry.basicType = false;
entry.builtinType = false;
@@ -389,50 +378,51 @@ void TypeMap::addSchemaTypes(const XSD::Types &types, const QString &ns)
entry.typeName = complex.name();
entry.isPolymorphic = complex.isPolymorphicBaseClass();
- //qDebug() << "TypeMap: adding complex type" << entry.nameSpace << entry.typeName << "derived types:" << complex.derivedTypes();
+ // qDebug() << "TypeMap: adding complex type" << entry.nameSpace << entry.typeName << "derived types:" << complex.derivedTypes();
// Keep empty complex types, useful for document mode.
- /*if ( (*complexIt).isEmpty() )
+ /*if ( complex.isEmpty() )
entry.localType = "void";
- else*/ {
+ else*/
+ {
entry.localType = prefixNamespace(mNSManager->prefix(entry.nameSpace).toUpper() + "__" + adaptLocalTypeName(complex.name()), ns);
if (complex.isConflicting()) {
entry.localType += complex.isAnonymous() ? "Element" : "Type";
}
- //entry.headers << (*complexIt).name().toLower() + ".h";
+ // entry.headers << complex.name().toLower() + ".h";
entry.forwardDeclarations << entry.localType;
}
mTypeMap.append(entry);
}
- XSD::Attribute::List attributes = types.attributes();
- XSD::Attribute::List::ConstIterator attrIt;
- for (attrIt = attributes.constBegin(); attrIt != attributes.constEnd(); ++attrIt) {
- if ((*attrIt).nameSpace() == "http://www.w3.org/2003/05/soap-encoding") { // e.g. soap-enc:arrayType
+ const XSD::Attribute::List attributes = types.attributes();
+ for (const XSD::Attribute &attr : attributes) {
+ if (attr.nameSpace() == "http://www.w3.org/2003/05/soap-encoding") { // e.g. soap-enc:arrayType
continue;
}
Entry entry;
entry.basicType = false;
entry.builtinType = false;
- entry.nameSpace = (*attrIt).nameSpace();
- entry.typeName = (*attrIt).name();
- entry.localType = prefixNamespace(mNSManager->prefix(entry.nameSpace).toUpper() + "__" + adaptLocalTypeName((*attrIt).name() + "Attribute"), ns);
- entry.headers << (*attrIt).name().toLower() + "attribute.h";
+ entry.nameSpace = attr.nameSpace();
+ entry.typeName = attr.name();
+ entry.localType =
+ prefixNamespace(mNSManager->prefix(entry.nameSpace).toUpper() + "__" + adaptLocalTypeName(attr.name() + "Attribute"), ns);
+ entry.headers << attr.name().toLower() + "attribute.h";
entry.forwardDeclarations << entry.localType;
mAttributeMap.append(entry);
}
const XSD::Element::List elements = types.elements();
- Q_FOREACH (const XSD::Element &elemIt, elements) {
+ for (const XSD::Element &elem : elements) {
Entry entry;
- entry.nameSpace = elemIt.nameSpace();
- entry.typeName = elemIt.name();
+ entry.nameSpace = elem.nameSpace();
+ entry.typeName = elem.name();
- QName type = elemIt.type();
+ QName type = elem.type();
if (type.isEmpty()) {
- qDebug() << "ERROR: element without type" << elemIt.nameSpace() << elemIt.name();
+ qDebug() << "ERROR: element without type" << elem.nameSpace() << elem.name();
}
// Resolve to localType(type)
@@ -462,9 +452,9 @@ void TypeMap::addSchemaTypes(const XSD::Types &types, const QString &ns)
// The "FooElement" type isn't necessary, we just point to the resolved type
// directly, this is much simpler.
/*} else {
- entry.localType = mNSManager->prefix( entry.nameSpace ).toUpper() + "__" + adaptLocalTypeName( elemIt.name() + "Element" );
+ entry.localType = mNSManager->prefix( entry.nameSpace ).toUpper() + "__" + adaptLocalTypeName( elem.name() + "Element" );
}*/
- //qDebug() << "Adding TypeMap entry for element" << entry.typeName << resolvedType;
+ // qDebug() << "Adding TypeMap entry for element" << entry.typeName << resolvedType;
mElementMap.append(entry);
}
}
@@ -474,37 +464,24 @@ void TypeMap::dump() const
qDebug("--------------------------------");
qDebug("Types:");
for (int i = 0; i < mTypeMap.count(); ++i) {
- qDebug("%s\t%s\t%s\t%s\t%s\t%s",
- qPrintable(mTypeMap[ i ].nameSpace),
- qPrintable(mTypeMap[ i ].typeName),
- qPrintable(mTypeMap[ i ].localType),
- qPrintable(mTypeMap[ i ].headers.join(",")),
- qPrintable(mTypeMap[ i ].headerIncludes.join(",")),
- qPrintable(mTypeMap[ i ].dumpBools()));
+ qDebug("%s\t%s\t%s\t%s\t%s\t%s", qPrintable(mTypeMap[i].nameSpace), qPrintable(mTypeMap[i].typeName), qPrintable(mTypeMap[i].localType),
+ qPrintable(mTypeMap[i].headers.join(",")), qPrintable(mTypeMap[i].headerIncludes.join(",")), qPrintable(mTypeMap[i].dumpBools()));
}
qDebug("--------------------------------");
qDebug("Attributes:");
for (int i = 0; i < mAttributeMap.count(); ++i) {
- qDebug("%s\t%s\t%s\t%s\t%s\t%s",
- qPrintable(mAttributeMap[ i ].nameSpace),
- qPrintable(mAttributeMap[ i ].typeName),
- qPrintable(mAttributeMap[ i ].localType),
- qPrintable(mAttributeMap[ i ].headers.join(",")),
- qPrintable(mAttributeMap[ i ].headerIncludes.join(",")),
- qPrintable(mAttributeMap[ i ].dumpBools()));
+ qDebug("%s\t%s\t%s\t%s\t%s\t%s", qPrintable(mAttributeMap[i].nameSpace), qPrintable(mAttributeMap[i].typeName),
+ qPrintable(mAttributeMap[i].localType), qPrintable(mAttributeMap[i].headers.join(",")),
+ qPrintable(mAttributeMap[i].headerIncludes.join(",")), qPrintable(mAttributeMap[i].dumpBools()));
}
qDebug("--------------------------------");
qDebug("Elements:");
for (int i = 0; i < mElementMap.count(); ++i) {
- qDebug("%s\t%s\t%s\t%s\t%s\t%s",
- qPrintable(mElementMap[ i ].nameSpace),
- qPrintable(mElementMap[ i ].typeName),
- qPrintable(mElementMap[ i ].localType),
- qPrintable(mElementMap[ i ].headers.join(",")),
- qPrintable(mElementMap[ i ].headerIncludes.join(",")),
- qPrintable(mElementMap[ i ].dumpBools()));
+ qDebug("%s\t%s\t%s\t%s\t%s\t%s", qPrintable(mElementMap[i].nameSpace), qPrintable(mElementMap[i].typeName),
+ qPrintable(mElementMap[i].localType), qPrintable(mElementMap[i].headers.join(",")),
+ qPrintable(mElementMap[i].headerIncludes.join(",")), qPrintable(mElementMap[i].dumpBools()));
}
}
@@ -549,8 +526,7 @@ QString TypeMap::localInputType(const QName &typeName, const QName &elementName)
// If the type is represented as a KDSoapValue already, no need to serialize/deserialize it
bool KWSDL::TypeMap::isTypeAny(const QName &typeName) const
{
- return (typeName.nameSpace() == XMLSchemaURI &&
- (typeName.localName() == "any" || typeName.localName() == "anyType"));
+ return (typeName.nameSpace() == XMLSchemaURI && (typeName.localName() == "any" || typeName.localName() == "anyType"));
}
QString KWSDL::TypeMap::Entry::dumpBools() const
@@ -588,7 +564,8 @@ QString KWSDL::TypeMap::deserializeBuiltin(const QName &typeName, const QName &e
}
}
-QString KWSDL::TypeMap::serializeBuiltin(const QName &baseTypeName, const QName &elementName, const QString &var, const QString &name, const QString &typeNameSpace, const QString &typeName) const
+QString KWSDL::TypeMap::serializeBuiltin(const QName &baseTypeName, const QName &elementName, const QString &var, const QString &name,
+ const QString &typeNameSpace, const QString &typeName) const
{
QString value;
const QName baseType = baseTypeName.isEmpty() ? baseTypeForElement(elementName) : baseTypeName;
diff --git a/kdwsdl2cpp/src/typemap.h b/kdwsdl2cpp/src/typemap.h
index b381cb6..55c9139 100644
--- a/kdwsdl2cpp/src/typemap.h
+++ b/kdwsdl2cpp/src/typemap.h
@@ -1,21 +1,10 @@
/*
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2010 David Faure <dfaure@kdab.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
+
+ SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+ Author: David Faure <david.faure@kdab.com>
+
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_TYPEMAP_H
@@ -31,13 +20,11 @@ static const QString XMLSchemaInstanceURI(QLatin1String("http://www.w3.org/2001/
class NSManager;
-namespace KWSDL
-{
+namespace KWSDL {
class TypeMap
{
public:
-
TypeMap();
~TypeMap();
@@ -72,9 +59,9 @@ public:
QStringList headers(const QName &typeName) const;
QStringList forwardDeclarations(const QName &typeName) const;
QStringList headerIncludes(const QName &typeName) const;
- //QString localNameSpace( const QName &typeName ) const;
+ // QString localNameSpace( const QName &typeName ) const;
- //QStringList headersForElement( const QName &typeName ) const;
+ // QStringList headersForElement( const QName &typeName ) const;
QStringList forwardDeclarationsForElement(const QName &typeName) const;
/// Convenience methods:
@@ -108,7 +95,8 @@ public:
* Return C++ code for converting the variant in "var" into the right type.
*/
QString deserializeBuiltin(const QName &typeName, const QName &elementName, const QString &var, const QString &qtTypeName) const;
- QString serializeBuiltin(const QName &baseTypeName, const QName &elementName, const QString &var, const QString &name, const QString &typeNameSpace, const QString &typeName) const;
+ QString serializeBuiltin(const QName &baseTypeName, const QName &elementName, const QString &var, const QString &name,
+ const QString &typeNameSpace, const QString &typeName) const;
QString localTypeForAttribute(const QName &typeName) const;
QStringList headersForAttribute(const QName &typeName) const;
@@ -129,8 +117,14 @@ private:
class Entry
{
public:
- Entry() : basicType(false), builtinType(false), complexType(false), isPolymorphic(false) {}
- bool basicType; // POD (int, bool, etc.)
+ Entry()
+ : basicType(false)
+ , builtinType(false)
+ , complexType(false)
+ , isPolymorphic(false)
+ {
+ }
+ bool basicType; // POD (int, bool, etc.)
bool builtinType; // types defined in xmlschema
bool complexType;
bool isPolymorphic; // has derived classes -> store as shared pointer
diff --git a/kdwsdl2cpp/wsdl/abstractbinding.h b/kdwsdl2cpp/wsdl/abstractbinding.h
index 8f1c404..facd46b 100644
--- a/kdwsdl2cpp/wsdl/abstractbinding.h
+++ b/kdwsdl2cpp/wsdl/abstractbinding.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_ABSTRACTBINDING_H
@@ -29,13 +14,14 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class AbstractBinding
{
public:
- virtual ~AbstractBinding() {}
+ virtual ~AbstractBinding()
+ {
+ }
virtual void parseBinding(ParserContext *context, const QDomElement &parent) = 0;
virtual void parseOperation(ParserContext *context, const QString &name, const QDomElement &parent) = 0;
diff --git a/kdwsdl2cpp/wsdl/binding.cpp b/kdwsdl2cpp/wsdl/binding.cpp
index 5088fc3..2dfd97c 100644
--- a/kdwsdl2cpp/wsdl/binding.cpp
+++ b/kdwsdl2cpp/wsdl/binding.cpp
@@ -1,28 +1,13 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
+#include <QDebug>
#include <common/messagehandler.h>
#include <common/nsmanager.h>
#include <common/parsercontext.h>
-#include <QDebug>
#include "binding.h"
@@ -33,12 +18,15 @@ static QString soap12StandardNamespace = QLatin1String("http://schemas.xmlsoap.o
static QString httpStandardNamespace = QLatin1String("http://schemas.xmlsoap.org/wsdl/http/");
Binding::Binding()
- : mType(UnknownBinding), mVersion(SOAP_1_1)
+ : mType(UnknownBinding)
+ , mVersion(SOAP_1_1)
{
}
Binding::Binding(const QString &nameSpace)
- : Element(nameSpace), mType(UnknownBinding), mVersion(SOAP_1_1)
+ : Element(nameSpace)
+ , mType(UnknownBinding)
+ , mVersion(SOAP_1_1)
{
}
@@ -114,10 +102,8 @@ void Binding::saveXML(ParserContext *context, QDomDocument &document, QDomElemen
mSoapBinding.synthesizeBinding(context, document, element);
- BindingOperation::List::ConstIterator it(mOperations.begin());
- const BindingOperation::List::ConstIterator endIt(mOperations.end());
- for (; it != endIt; ++it) {
- (*it).saveXML(&mSoapBinding, context, document, element);
+ for (const BindingOperation &operation : qAsConst(mOperations)) {
+ operation.saveXML(&mSoapBinding, context, document, element);
}
}
diff --git a/kdwsdl2cpp/wsdl/binding.h b/kdwsdl2cpp/wsdl/binding.h
index e9d83a8..a41db9b 100644
--- a/kdwsdl2cpp/wsdl/binding.h
+++ b/kdwsdl2cpp/wsdl/binding.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_BINDING_H
@@ -34,15 +19,15 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Binding : public Element
{
public:
typedef QList<Binding> List;
- enum Type {
+ enum Type
+ {
SOAPBinding,
HTTPBinding,
MIMEBinding,
@@ -62,7 +47,8 @@ public:
void setType(Type type);
Type type() const;
- enum Version {
+ enum Version
+ {
SOAP_1_1,
SOAP_1_2
};
@@ -72,7 +58,7 @@ public:
void setOperations(const BindingOperation::List &operations);
BindingOperation::List operations() const;
- //void setSoapBinding( const SoapBinding &soapBinding );
+ // void setSoapBinding( const SoapBinding &soapBinding );
SoapBinding soapBinding() const;
const AbstractBinding *binding() const;
@@ -93,4 +79,3 @@ private:
}
#endif // KWSDL_BINDING_H
-
diff --git a/kdwsdl2cpp/wsdl/bindingoperation.cpp b/kdwsdl2cpp/wsdl/bindingoperation.cpp
index e4dc21f..646f21c 100644
--- a/kdwsdl2cpp/wsdl/bindingoperation.cpp
+++ b/kdwsdl2cpp/wsdl/bindingoperation.cpp
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include <wsdl/abstractbinding.h>
@@ -24,8 +9,8 @@
#include "bindingoperation.h"
#include <common/messagehandler.h>
-#include <common/parsercontext.h>
#include <common/nsmanager.h>
+#include <common/parsercontext.h>
using namespace KWSDL;
diff --git a/kdwsdl2cpp/wsdl/bindingoperation.h b/kdwsdl2cpp/wsdl/bindingoperation.h
index fd88817..c6b19c5 100644
--- a/kdwsdl2cpp/wsdl/bindingoperation.h
+++ b/kdwsdl2cpp/wsdl/bindingoperation.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_BINDINGOPERATION_H
@@ -32,8 +17,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class AbstractBinding;
@@ -49,7 +33,7 @@ public:
void setName(const QString &name);
QString name() const;
- void loadXML(AbstractBinding *binding, ParserContext *context, const QDomElement &element);
+ void loadXML(AbstractBinding *binding, ParserContext *context, const QDomElement &element);
void saveXML(const AbstractBinding *binding, ParserContext *context, QDomDocument &document, QDomElement &parent) const;
private:
@@ -59,4 +43,3 @@ private:
}
#endif
-
diff --git a/kdwsdl2cpp/wsdl/definitions.cpp b/kdwsdl2cpp/wsdl/definitions.cpp
index dc4212e..be74db2 100644
--- a/kdwsdl2cpp/wsdl/definitions.cpp
+++ b/kdwsdl2cpp/wsdl/definitions.cpp
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include "definitions.h"
@@ -25,10 +10,9 @@
#include <QFile>
#include <QUrl>
-#include <QXmlSimpleReader>
-#include <common/nsmanager.h>
#include <common/fileprovider.h>
#include <common/messagehandler.h>
+#include <common/nsmanager.h>
#include <common/parsercontext.h>
#include <wsdl/port.h>
@@ -157,7 +141,7 @@ bool Definitions::loadXML(ParserContext *context, const QDomElement &element)
} else if (tagName.localName() == QLatin1String("message")) {
Message message(mTargetNamespace);
message.loadXML(context, child);
- //qDebug() << "Definitions: found message" << message.name() << message.nameSpace();
+ // qDebug() << "Definitions: found message" << message.name() << message.nameSpace();
mMessages.append(message);
} else if (tagName.localName() == QLatin1String("portType")) {
PortType portType(mTargetNamespace);
@@ -169,7 +153,7 @@ bool Definitions::loadXML(ParserContext *context, const QDomElement &element)
mBindings.append(binding);
} else if (tagName.localName() == QLatin1String("service")) {
const QString name = child.attribute(QLatin1String("name"));
- //qDebug() << "Service:" << name << "looking for" << mWantedService;
+ // qDebug() << "Service:" << name << "looking for" << mWantedService;
// is this the service we want?
if (mWantedService.isEmpty() || mWantedService == name) {
Service service(mTargetNamespace);
@@ -191,7 +175,7 @@ void Definitions::fixUpDefinitions(/*ParserContext *context, const QDomElement &
if (mServices.isEmpty()) {
if (!mBindings.isEmpty()) {
qDebug() << "No service tag found in the wsdl file, generating one service per binding";
- Q_FOREACH (const Binding &bind, mBindings) {
+ for (const Binding &bind : qAsConst(mBindings)) {
Service service(mTargetNamespace);
service.setName(bind.name() + "Service");
@@ -209,7 +193,7 @@ void Definitions::fixUpDefinitions(/*ParserContext *context, const QDomElement &
} else {
Q_ASSERT(!mPortTypes.isEmpty());
qDebug() << "No service or binding tag found in the wsdl file, generating only messages";
- Q_FOREACH (const PortType &portType, mPortTypes) {
+ for (const PortType &portType : qAsConst(mPortTypes)) {
Binding binding(mTargetNamespace);
binding.setName(portType.name() + "Binding");
binding.setPortTypeName(QName(portType.nameSpace(), portType.name()));
@@ -248,7 +232,7 @@ void Definitions::importDefinition(ParserContext *context, const QString &locati
context->messageHandler()->warning(QString::fromLatin1("Definitions import: location tag required: %1").arg(location));
return;
}
- FileProvider provider;
+ FileProvider provider(mUseLocalFilesOnly);
QString fileName;
const QUrl locationUrl = urlForLocation(context, location);
qDebug("Importing wsdl definition at %s", locationUrl.toEncoded().constData());
@@ -260,14 +244,10 @@ void Definitions::importDefinition(ParserContext *context, const QString &locati
return;
}
- QXmlInputSource source(&file);
- QXmlSimpleReader reader;
- reader.setFeature(QLatin1String("http://xml.org/sax/features/namespace-prefixes"), true);
-
QDomDocument doc(QLatin1String("kwsdl"));
QString errorMsg;
int errorLine, errorColumn;
- bool ok = doc.setContent(&source, &reader, &errorMsg, &errorLine, &errorColumn);
+ bool ok = doc.setContent(&file, false, &errorMsg, &errorLine, &errorColumn);
if (!ok) {
qDebug("Error[%d:%d] %s", errorLine, errorColumn, qPrintable(errorMsg));
return;
@@ -354,3 +334,8 @@ void Definitions::setWantedService(const QString &name)
{
mWantedService = name;
}
+
+void Definitions::setUseLocalFilesOnly(bool localFilesOnly)
+{
+ mUseLocalFilesOnly = localFilesOnly;
+}
diff --git a/kdwsdl2cpp/wsdl/definitions.h b/kdwsdl2cpp/wsdl/definitions.h
index 8048b2e..a2f8586 100644
--- a/kdwsdl2cpp/wsdl/definitions.h
+++ b/kdwsdl2cpp/wsdl/definitions.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_DEFINITIONS_H
@@ -24,7 +9,6 @@
#include <qdom.h>
#include <qurl.h>
-#include <qxml.h>
#include <wsdl/binding.h>
#include <wsdl/import.h>
@@ -37,8 +21,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Definitions
{
@@ -48,17 +31,19 @@ public:
void setWantedService(const QString &name);
+ void setUseLocalFilesOnly(bool localFilesOnly);
+
void setName(const QString &name);
QString name() const;
void setTargetNamespace(const QString &targetNamespace);
QString targetNamespace() const;
- //void setBindings( const Binding::List &bindings );
+ // void setBindings( const Binding::List &bindings );
Binding::List bindings() const;
- //void setImports( const Import::List &imports );
- //Import::List imports() const;
+ // void setImports( const Import::List &imports );
+ // Import::List imports() const;
void setMessages(const Message::List &messages);
Message::List messages() const;
@@ -66,14 +51,14 @@ public:
void setPortTypes(const PortType::List &portTypes);
PortType::List portTypes() const;
- //void setService( const Service &service );
+ // void setService( const Service &service );
Service::List services() const;
void setType(const Type &type);
Type type() const;
bool loadXML(ParserContext *context, const QDomElement &element);
- //void saveXML( ParserContext *context, QDomDocument &document ) const;
+ // void saveXML( ParserContext *context, QDomDocument &document ) const;
void fixUpDefinitions(/*ParserContext *context, const QDomElement &element*/);
@@ -81,7 +66,7 @@ private:
void importDefinition(ParserContext *context, const QString &location);
Binding::List mBindings;
- //Import::List mImports;
+ // Import::List mImports;
Message::List mMessages;
PortType::List mPortTypes;
Service::List mServices;
@@ -90,9 +75,11 @@ private:
QString mTargetNamespace;
QString mName;
QString mWantedService;
+
+ bool mUseLocalFilesOnly = false;
};
+
}
#endif // KWSDL_DEFINITIONS_H
-
diff --git a/kdwsdl2cpp/wsdl/element.cpp b/kdwsdl2cpp/wsdl/element.cpp
index a079127..8cd5b59 100644
--- a/kdwsdl2cpp/wsdl/element.cpp
+++ b/kdwsdl2cpp/wsdl/element.cpp
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include "element.h"
diff --git a/kdwsdl2cpp/wsdl/element.h b/kdwsdl2cpp/wsdl/element.h
index 47699b1..1b9853a 100644
--- a/kdwsdl2cpp/wsdl/element.h
+++ b/kdwsdl2cpp/wsdl/element.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_ELEMENT_H
@@ -26,8 +11,7 @@
#include <kode_export.h>
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Element
{
@@ -50,4 +34,3 @@ private:
}
#endif // KWSDL_ELEMENT_H
-
diff --git a/kdwsdl2cpp/wsdl/fault.cpp b/kdwsdl2cpp/wsdl/fault.cpp
index 22555cd..5690ff4 100644
--- a/kdwsdl2cpp/wsdl/fault.cpp
+++ b/kdwsdl2cpp/wsdl/fault.cpp
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include <common/messagehandler.h>
diff --git a/kdwsdl2cpp/wsdl/fault.h b/kdwsdl2cpp/wsdl/fault.h
index 7d45f32..5bd8e01 100644
--- a/kdwsdl2cpp/wsdl/fault.h
+++ b/kdwsdl2cpp/wsdl/fault.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_FAULT_H
@@ -32,8 +17,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Fault : public Element
{
@@ -61,4 +45,3 @@ private:
}
#endif // KWSDL_FAULT_H
-
diff --git a/kdwsdl2cpp/wsdl/import.cpp b/kdwsdl2cpp/wsdl/import.cpp
index 76a9c55..b710bfa 100644
--- a/kdwsdl2cpp/wsdl/import.cpp
+++ b/kdwsdl2cpp/wsdl/import.cpp
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include <common/messagehandler.h>
@@ -66,7 +51,7 @@ void Import::loadXML(ParserContext *context, const QDomElement &element)
context->messageHandler()->warning(QLatin1String("Import: 'namespace' required"));
}
- mLocation = element.attribute(QLatin1String("schemaLocation"));
+ mLocation = QUrl(element.attribute(QLatin1String("schemaLocation")));
if (!mLocation.isValid()) {
context->messageHandler()->warning(QLatin1String("Import: 'schemaLocation' required"));
}
diff --git a/kdwsdl2cpp/wsdl/import.h b/kdwsdl2cpp/wsdl/import.h
index 6ac052e..e051a39 100644
--- a/kdwsdl2cpp/wsdl/import.h
+++ b/kdwsdl2cpp/wsdl/import.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_IMPORT_H
@@ -32,8 +17,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Import : public Element
{
@@ -61,4 +45,3 @@ private:
}
#endif // KWSDL_IMPORT_H
-
diff --git a/kdwsdl2cpp/wsdl/message.cpp b/kdwsdl2cpp/wsdl/message.cpp
index 319d84e..99f5a80 100644
--- a/kdwsdl2cpp/wsdl/message.cpp
+++ b/kdwsdl2cpp/wsdl/message.cpp
@@ -1,30 +1,15 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include "message.h"
+#include <QDebug>
#include <common/messagehandler.h>
-#include <common/parsercontext.h>
#include <common/nsmanager.h>
-#include <QDebug>
+#include <common/parsercontext.h>
using namespace KWSDL;
@@ -63,7 +48,7 @@ Part::List Message::parts() const
Part Message::partByName(const QString &name) const
{
- Q_FOREACH (const Part &part, mParts) {
+ for (const Part &part : qAsConst(mParts)) {
if (part.name() == name) { // # namespace comparison needed too?
return part;
}
@@ -108,9 +93,7 @@ void Message::saveXML(ParserContext *context, QDomDocument &document, QDomElemen
context->messageHandler()->warning(QLatin1String("Message: 'name' required"));
}
- Part::List::ConstIterator it(mParts.begin());
- const Part::List::ConstIterator endIt(mParts.end());
- for (; it != endIt; ++it) {
- (*it).saveXML(context, document, element);
+ for (const Part &part : qAsConst(mParts)) {
+ part.saveXML(context, document, element);
}
}
diff --git a/kdwsdl2cpp/wsdl/message.h b/kdwsdl2cpp/wsdl/message.h
index d3e0572..ace9c4c 100644
--- a/kdwsdl2cpp/wsdl/message.h
+++ b/kdwsdl2cpp/wsdl/message.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_MESSAGE_H
@@ -32,8 +17,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Message : public Element
{
@@ -62,4 +46,3 @@ private:
}
#endif // KWSDL_MESSAGE_H
-
diff --git a/kdwsdl2cpp/wsdl/operation.cpp b/kdwsdl2cpp/wsdl/operation.cpp
index be4a962..614e5be 100644
--- a/kdwsdl2cpp/wsdl/operation.cpp
+++ b/kdwsdl2cpp/wsdl/operation.cpp
@@ -1,30 +1,15 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include "operation.h"
+#include <QDebug>
#include <common/messagehandler.h>
-#include <common/parsercontext.h>
#include <common/nsmanager.h>
-#include <QDebug>
+#include <common/parsercontext.h>
using namespace KWSDL;
@@ -34,7 +19,8 @@ Operation::Operation()
}
Operation::Operation(const QString &nameSpace)
- : Element(nameSpace), mType(OneWayOperation)
+ : Element(nameSpace)
+ , mType(OneWayOperation)
{
mInput.setNameSpace(nameSpace);
mOutput.setNameSpace(nameSpace);
@@ -167,12 +153,8 @@ void Operation::saveXML(ParserContext *context, QDomDocument &document, QDomElem
case SolicitResponseOperation:
mOutput.saveXML(context, QLatin1String("output"), document, element);
mInput.saveXML(context, QLatin1String("input"), document, element);
- {
- Fault::List::ConstIterator it(mFaults.begin());
- const Fault::List::ConstIterator endIt(mFaults.end());
- for (; it != endIt; ++it) {
- (*it).saveXML(context, document, element);
- }
+ for (const Fault &fault : qAsConst(mFaults)) {
+ fault.saveXML(context, document, element);
}
break;
case NotificationOperation:
@@ -182,12 +164,8 @@ void Operation::saveXML(ParserContext *context, QDomDocument &document, QDomElem
default:
mInput.saveXML(context, QLatin1String("input"), document, element);
mOutput.saveXML(context, QLatin1String("output"), document, element);
- {
- Fault::List::ConstIterator it(mFaults.begin());
- const Fault::List::ConstIterator endIt(mFaults.end());
- for (; it != endIt; ++it) {
- (*it).saveXML(context, document, element);
- }
+ for (const Fault &fault : qAsConst(mFaults)) {
+ fault.saveXML(context, document, element);
}
break;
}
diff --git a/kdwsdl2cpp/wsdl/operation.h b/kdwsdl2cpp/wsdl/operation.h
index 3da0ddf..d4ca3d6 100644
--- a/kdwsdl2cpp/wsdl/operation.h
+++ b/kdwsdl2cpp/wsdl/operation.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_OPERATION_H
@@ -33,8 +18,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
/**
* <operation> as defined inside <portType>.
@@ -45,7 +29,8 @@ class KWSDL_EXPORT Operation : public Element
public:
typedef QList<Operation> List;
- enum OperationType {
+ enum OperationType
+ {
OneWayOperation,
RequestResponseOperation,
SolicitResponseOperation,
@@ -87,4 +72,3 @@ private:
}
#endif // KWSDL_OPERATION_H
-
diff --git a/kdwsdl2cpp/wsdl/param.cpp b/kdwsdl2cpp/wsdl/param.cpp
index d50d6f2..f58ff66 100644
--- a/kdwsdl2cpp/wsdl/param.cpp
+++ b/kdwsdl2cpp/wsdl/param.cpp
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include <common/messagehandler.h>
diff --git a/kdwsdl2cpp/wsdl/param.h b/kdwsdl2cpp/wsdl/param.h
index d145ecd..ae2defd 100644
--- a/kdwsdl2cpp/wsdl/param.h
+++ b/kdwsdl2cpp/wsdl/param.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_PARAM_H
@@ -32,8 +17,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Param : public Element
{
@@ -61,4 +45,3 @@ private:
}
#endif // KWSDL_PARAM_H
-
diff --git a/kdwsdl2cpp/wsdl/part.cpp b/kdwsdl2cpp/wsdl/part.cpp
index 798c584..463c811 100644
--- a/kdwsdl2cpp/wsdl/part.cpp
+++ b/kdwsdl2cpp/wsdl/part.cpp
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include <common/nsmanager.h>
diff --git a/kdwsdl2cpp/wsdl/part.h b/kdwsdl2cpp/wsdl/part.h
index deb8158..6b4f898 100644
--- a/kdwsdl2cpp/wsdl/part.h
+++ b/kdwsdl2cpp/wsdl/part.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_PART_H
@@ -32,8 +17,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Part : public Element
{
@@ -65,4 +49,3 @@ private:
}
#endif // KWSDL_PART_H
-
diff --git a/kdwsdl2cpp/wsdl/port.cpp b/kdwsdl2cpp/wsdl/port.cpp
index 6deff5a..e746f3d 100644
--- a/kdwsdl2cpp/wsdl/port.cpp
+++ b/kdwsdl2cpp/wsdl/port.cpp
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include <common/messagehandler.h>
@@ -77,12 +62,12 @@ void Port::loadXML(ParserContext *context, Binding::List *bindings, const QDomEl
}
for (int i = 0; i < bindings->count(); ++i) {
- if ((*bindings)[ i ].name() == mBindingName.localName()) {
+ if ((*bindings)[i].name() == mBindingName.localName()) {
AbstractBinding *binding = const_cast<AbstractBinding *>((*bindings)[i].binding());
if (binding) {
binding->parsePort(context, element);
}
- //else // ignore unimplemented bindings
+ // else // ignore unimplemented bindings
// context->messageHandler()->error( "No binding set" );
}
}
@@ -106,13 +91,13 @@ void Port::saveXML(ParserContext *context, const Binding::List *bindings, QDomDo
}
for (int i = 0; i < bindings->count(); ++i) {
- if ((*bindings)[ i ].name() == mBindingName.localName()) {
+ if ((*bindings)[i].name() == mBindingName.localName()) {
const AbstractBinding *binding = (*bindings)[i].binding();
if (binding) {
binding->synthesizePort(context, document, element);
}
- //else // ignore unimplemented bindings
+ // else // ignore unimplemented bindings
// context->messageHandler()->error( "No binding set" );
}
}
diff --git a/kdwsdl2cpp/wsdl/port.h b/kdwsdl2cpp/wsdl/port.h
index 3b3af53..61595a3 100644
--- a/kdwsdl2cpp/wsdl/port.h
+++ b/kdwsdl2cpp/wsdl/port.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_PORT_H
@@ -33,8 +18,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Port : public Element
{
@@ -62,4 +46,3 @@ private:
}
#endif // KWSDL_PORT_H
-
diff --git a/kdwsdl2cpp/wsdl/porttype.cpp b/kdwsdl2cpp/wsdl/porttype.cpp
index 3cc397f..a033af2 100644
--- a/kdwsdl2cpp/wsdl/porttype.cpp
+++ b/kdwsdl2cpp/wsdl/porttype.cpp
@@ -1,29 +1,14 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include "porttype.h"
#include <common/messagehandler.h>
-#include <common/parsercontext.h>
#include <common/nsmanager.h>
+#include <common/parsercontext.h>
using namespace KWSDL;
@@ -96,9 +81,7 @@ void PortType::saveXML(ParserContext *context, QDomDocument &document, QDomEleme
context->messageHandler()->warning(QLatin1String("PortType: 'name' required"));
}
- Operation::List::ConstIterator it(mOperations.begin());
- const Operation::List::ConstIterator endIt(mOperations.end());
- for (; it != endIt; ++it) {
- (*it).saveXML(context, document, element);
+ for (const Operation &operation : qAsConst(mOperations)) {
+ operation.saveXML(context, document, element);
}
}
diff --git a/kdwsdl2cpp/wsdl/porttype.h b/kdwsdl2cpp/wsdl/porttype.h
index 4cf4564..47b7336 100644
--- a/kdwsdl2cpp/wsdl/porttype.h
+++ b/kdwsdl2cpp/wsdl/porttype.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_PORTTYPE_H
@@ -32,8 +17,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT PortType : public Element
{
@@ -61,4 +45,3 @@ private:
}
#endif // KWSDL_PORTTYPE_H
-
diff --git a/kdwsdl2cpp/wsdl/service.cpp b/kdwsdl2cpp/wsdl/service.cpp
index da3b0ee..7cfe934 100644
--- a/kdwsdl2cpp/wsdl/service.cpp
+++ b/kdwsdl2cpp/wsdl/service.cpp
@@ -1,29 +1,14 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include "service.h"
#include <common/messagehandler.h>
-#include <common/parsercontext.h>
#include <common/nsmanager.h>
+#include <common/parsercontext.h>
#include <QDebug>
@@ -99,9 +84,7 @@ void Service::saveXML(ParserContext *context, const Binding::List *bindings, QDo
context->messageHandler()->warning(QLatin1String("Service: 'name' required"));
}
- Port::List::ConstIterator it(mPorts.begin());
- const Port::List::ConstIterator endIt(mPorts.end());
- for (; it != endIt; ++it) {
- (*it).saveXML(context, bindings, document, element);
+ for (const Port &port : qAsConst(mPorts)) {
+ port.saveXML(context, bindings, document, element);
}
}
diff --git a/kdwsdl2cpp/wsdl/service.h b/kdwsdl2cpp/wsdl/service.h
index a987c06..8c53567 100644
--- a/kdwsdl2cpp/wsdl/service.h
+++ b/kdwsdl2cpp/wsdl/service.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_SERVICE_H
@@ -33,8 +18,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Service : public Element
{
@@ -62,4 +46,3 @@ private:
}
#endif // KWSDL_SERVICE_H
-
diff --git a/kdwsdl2cpp/wsdl/soapbinding.cpp b/kdwsdl2cpp/wsdl/soapbinding.cpp
index 3ca6700..3164214 100644
--- a/kdwsdl2cpp/wsdl/soapbinding.cpp
+++ b/kdwsdl2cpp/wsdl/soapbinding.cpp
@@ -1,30 +1,15 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include <common/messagehandler.h>
#include <common/nsmanager.h>
#include <common/parsercontext.h>
-#include <QDebug>
#include "soapbinding.h"
+#include <QDebug>
using namespace KWSDL;
@@ -44,8 +29,8 @@ static QString soapPrefix(ParserContext *context)
}
SoapBinding::Binding::Binding()
- : mTransport(HTTPTransport),
- mStyle(DocumentStyle)
+ : mTransport(HTTPTransport)
+ , mStyle(DocumentStyle)
{
}
@@ -118,7 +103,8 @@ SoapBinding::Operation::Operation()
}
SoapBinding::Operation::Operation(const QString &name)
- : mName(name), mStyle(DocumentStyle)
+ : mName(name)
+ , mStyle(DocumentStyle)
{
}
@@ -131,7 +117,7 @@ void SoapBinding::Operation::loadXML(ParserContext *context, const QDomElement &
// read soapAction, discarding leading/trailing space (https://github.com/KDAB/KDSoap/issues/71)
mSoapAction = element.attribute(QLatin1String("soapAction")).trimmed();
- //qDebug() << "style=" << element.attribute("style");
+ // qDebug() << "style=" << element.attribute("style");
if (element.hasAttribute(QLatin1String("style"))) {
if (element.attribute(QLatin1String("style")) == QLatin1String("rpc")) {
@@ -738,7 +724,7 @@ SoapBinding::Operation::Map SoapBinding::operations() const
void SoapBinding::Address::loadXML(ParserContext *context, const QDomElement &element)
{
- mLocation = element.attribute(QLatin1String("location"));
+ mLocation = QUrl(element.attribute(QLatin1String("location")));
if (!mLocation.isValid()) {
context->messageHandler()->warning(QLatin1String("SoapBinding::Address: 'location' required"));
}
@@ -812,15 +798,15 @@ void SoapBinding::parseOperationInput(ParserContext *context, const QString &nam
QDomElement child = parent.firstChildElement();
while (!child.isNull()) {
NSManager namespaceManager(context, child);
- //qDebug() << Q_FUNC_INFO << namespaceManager.localName(child) << namespaceManager.nameSpace(child);
+ // qDebug() << Q_FUNC_INFO << namespaceManager.localName(child) << namespaceManager.nameSpace(child);
if (NSManager::soapNamespaces().contains(namespaceManager.nameSpace(child))) {
if (namespaceManager.localName(child) == QLatin1String("body")) {
- Operation &op = mOperations[ name ];
+ Operation &op = mOperations[name];
Body inputBody;
inputBody.loadXML(context, child);
op.setInput(inputBody);
} else if (namespaceManager.localName(child) == QLatin1String("header")) {
- Operation &op = mOperations[ name ];
+ Operation &op = mOperations[name];
Header inputHeader;
inputHeader.loadXML(context, child);
op.addInputHeader(inputHeader);
@@ -838,12 +824,12 @@ void SoapBinding::parseOperationOutput(ParserContext *context, const QString &na
NSManager namespaceManager(context, child);
if (NSManager::soapNamespaces().contains(namespaceManager.nameSpace(child))) {
if (namespaceManager.localName(child) == QLatin1String("body")) {
- Operation &op = mOperations[ name ];
+ Operation &op = mOperations[name];
Body outputBody;
outputBody.loadXML(context, child);
op.setOutput(outputBody);
} else if (namespaceManager.localName(child) == QLatin1String("header")) {
- Operation &op = mOperations[ name ];
+ Operation &op = mOperations[name];
Header outputHeader;
outputHeader.loadXML(context, child);
op.addOutputHeader(outputHeader);
@@ -861,7 +847,7 @@ void SoapBinding::parseOperationFault(ParserContext *context, const QString &nam
NSManager namespaceManager(context, child);
if (NSManager::soapNamespaces().contains(namespaceManager.nameSpace(child))) {
if (namespaceManager.localName(child) == QLatin1String("fault")) {
- Operation &op = mOperations[ name ];
+ Operation &op = mOperations[name];
Fault fault;
fault.loadXML(context, child);
op.setFault(fault);
@@ -893,31 +879,33 @@ void SoapBinding::synthesizeBinding(ParserContext *context, QDomDocument &docume
void SoapBinding::synthesizeOperation(ParserContext *context, const QString &name, QDomDocument &document, QDomElement &parent) const
{
- const Operation &op = mOperations[ name ];
+ const Operation &op = mOperations[name];
op.saveXML(context, document, parent);
}
void SoapBinding::synthesizeOperationInput(ParserContext *context, const QString &name, QDomDocument &document, QDomElement &parent) const
{
- const Operation &op = mOperations[ name ];
+ const Operation &op = mOperations[name];
op.input().saveXML(context, document, parent);
- Q_FOREACH (const Header &header, op.inputHeaders()) {
+ const Headers inputHeaders = op.inputHeaders();
+ for (const Header &header : inputHeaders) {
header.saveXML(context, document, parent);
}
}
void SoapBinding::synthesizeOperationOutput(ParserContext *context, const QString &name, QDomDocument &document, QDomElement &parent) const
{
- const Operation &op = mOperations[ name ];
+ const Operation &op = mOperations[name];
op.output().saveXML(context, document, parent);
- Q_FOREACH (const Header &header, op.outputHeaders()) {
+ const Headers outputHeaders = op.outputHeaders();
+ for (const Header &header : outputHeaders) {
header.saveXML(context, document, parent);
}
}
void SoapBinding::synthesizeOperationFault(ParserContext *context, const QString &name, QDomDocument &document, QDomElement &parent) const
{
- const Operation &op = mOperations[ name ];
+ const Operation &op = mOperations[name];
op.fault().saveXML(context, document, parent);
}
@@ -928,14 +916,12 @@ void SoapBinding::synthesizePort(ParserContext *context, QDomDocument &document,
bool SoapBinding::Headers::contains(const Header &other) const
{
- Q_FOREACH (const Header &header, *this) {
- if (header.mMessage == other.mMessage &&
- header.mPart == other.mPart &&
- header.mUse == other.mUse &&
+ for (const Header &header : qAsConst(*this)) {
+ if (header.mMessage == other.mMessage && header.mPart == other.mPart && header.mUse == other.mUse &&
#if 0
header.mEncodingStyle == other.mEncodingStyle &&
#endif
- header.mNameSpace == other.mNameSpace) {
+ header.mNameSpace == other.mNameSpace) {
return true;
}
}
diff --git a/kdwsdl2cpp/wsdl/soapbinding.h b/kdwsdl2cpp/wsdl/soapbinding.h
index 5566ec6..989fa36 100644
--- a/kdwsdl2cpp/wsdl/soapbinding.h
+++ b/kdwsdl2cpp/wsdl/soapbinding.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_SOAPBINDING_H
@@ -31,23 +16,25 @@
#include <kode_export.h>
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT SoapBinding : public AbstractBinding
{
public:
- enum Style {
+ enum Style
+ {
RPCStyle,
DocumentStyle
};
- enum Use {
+ enum Use
+ {
LiteralUse,
EncodedUse
};
- enum Transport {
+ enum Transport
+ {
HTTPTransport
};
@@ -82,13 +69,13 @@ public:
QString encodingStyle() const;
#endif
- //void setPart( const QString &part );
+ // void setPart( const QString &part );
QString part() const;
- //void setUse( Use use );
+ // void setUse( Use use );
Use use() const;
- //void setNameSpace( const QString &nameSpace );
+ // void setNameSpace( const QString &nameSpace );
QString nameSpace() const;
void loadXML(ParserContext *context, const QDomElement &element);
@@ -319,4 +306,3 @@ private:
}
#endif // KWSDL_SOAPBINDING_H
-
diff --git a/kdwsdl2cpp/wsdl/type.cpp b/kdwsdl2cpp/wsdl/type.cpp
index 84583e9..15e197d 100644
--- a/kdwsdl2cpp/wsdl/type.cpp
+++ b/kdwsdl2cpp/wsdl/type.cpp
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include <common/messagehandler.h>
@@ -25,6 +10,8 @@
#include <schema/parser.h>
+#include "../src/settings.h"
+
#include <QDebug>
#include "type.h"
@@ -54,15 +41,23 @@ XSD::Types Type::types() const
return mTypes;
}
+static QMap<QUrl, QString> localSchemas()
+{
+ QMap<QUrl, QString> map;
+ map.insert(QUrl(QLatin1String("http://schemas.xmlsoap.org/soap/encoding/")), QLatin1String(":/libkode/soapenc-1.1.xsd"));
+ map.insert(QUrl(QLatin1String("http://www.w3.org/2003/05/soap-encoding")), QLatin1String(":/libkode/soapenc-1.2.xsd"));
+ return map;
+}
+
bool Type::loadXML(ParserContext *context, const QDomElement &element)
{
- XSD::Parser parser(context, nameSpace());
+ XSD::Parser parser(context, nameSpace(), Settings::self()->useLocalFilesOnly(), Settings::self()->importPathList());
+ parser.setLocalSchemas(localSchemas());
QDomElement child = element.firstChildElement();
while (!child.isNull()) {
NSManager namespaceManager(context, child);
- if (namespaceManager.nameSpace(child) == XSD::Parser::schemaUri() &&
- namespaceManager.localName(child) == QLatin1String("schema")) {
- //qDebug() << "Loading schema" << nameSpace();
+ if (namespaceManager.nameSpace(child) == XSD::Parser::schemaUri() && namespaceManager.localName(child) == QLatin1String("schema")) {
+ // qDebug() << "Loading schema" << nameSpace();
if (!parser.parseSchemaTag(context, child)) {
return false;
}
diff --git a/kdwsdl2cpp/wsdl/type.h b/kdwsdl2cpp/wsdl/type.h
index 734394b..23bf3ea 100644
--- a/kdwsdl2cpp/wsdl/type.h
+++ b/kdwsdl2cpp/wsdl/type.h
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_TYPE_H
@@ -31,8 +16,7 @@
class ParserContext;
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT Type : public Element
{
@@ -54,4 +38,3 @@ private:
}
#endif // KWSDL_TYPE_H
-
diff --git a/kdwsdl2cpp/wsdl/wsdl.cpp b/kdwsdl2cpp/wsdl/wsdl.cpp
index b254605..0cea62d 100644
--- a/kdwsdl2cpp/wsdl/wsdl.cpp
+++ b/kdwsdl2cpp/wsdl/wsdl.cpp
@@ -1,22 +1,7 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include "wsdl.h"
@@ -55,10 +40,9 @@ const NSManager &WSDL::namespaceManager() const
Binding WSDL::findBinding(const QName &bindingName) const
{
const Binding::List list = mDefinitions.bindings();
- Binding::List::ConstIterator it;
- for (it = list.constBegin(); it != list.constEnd(); ++it) {
- if ((*it).name() == bindingName.localName() && (*it).nameSpace() == bindingName.nameSpace()) {
- return *it;
+ for (const Binding &binding : list) {
+ if (binding.name() == bindingName.localName() && binding.nameSpace() == bindingName.nameSpace()) {
+ return binding;
}
}
@@ -68,11 +52,10 @@ Binding WSDL::findBinding(const QName &bindingName) const
BindingOperation WSDL::findBindingOperation(const Binding &binding, const QString &operationName)
{
- BindingOperation::List list = binding.operations();
- BindingOperation::List::ConstIterator it;
- for (it = list.constBegin(); it != list.constEnd(); ++it) {
- if ((*it).name() == operationName) {
- return *it;
+ const BindingOperation::List list = binding.operations();
+ for (const BindingOperation &operation : list) {
+ if (operation.name() == operationName) {
+ return operation;
}
}
qDebug("findBindingOperation: no match found for '%s'!", qPrintable(operationName));
@@ -84,11 +67,10 @@ PortType WSDL::findPortType(const QName &portTypeName) const
{
// qDebug() << "Looking for portType" << portTypeName.nameSpace() << portTypeName.localName();
const PortType::List list = mDefinitions.portTypes();
- PortType::List::ConstIterator it;
- for (it = list.begin(); it != list.end(); ++it) {
- // qDebug() << "available portType:" << (*it).nameSpace() << (*it).name();
- if ((*it).name() == portTypeName.localName() && (*it).nameSpace() == portTypeName.nameSpace()) {
- return *it;
+ for (const PortType &portType : list) {
+ // qDebug() << "available portType:" << portType.nameSpace() << portType.name();
+ if (portType.name() == portTypeName.localName() && portType.nameSpace() == portTypeName.nameSpace()) {
+ return portType;
}
}
qDebug("findPortType: no match found for '%s'!", qPrintable(portTypeName.qname()));
@@ -99,28 +81,27 @@ PortType WSDL::findPortType(const QName &portTypeName) const
Message WSDL::findMessage(const QName &messageName) const
{
const Message::List list = mDefinitions.messages();
- Message::List::ConstIterator it;
- for (it = list.constBegin(); it != list.constEnd(); ++it) {
- //qDebug() << (*it).name() << (*it).nameSpace();
- if ((*it).name() == messageName.localName() && (*it).nameSpace() == messageName.nameSpace()) {
- return *it;
+ for (const Message &message : list) {
+ // qDebug() << message.name() << message.nameSpace();
+ if (message.name() == messageName.localName() && message.nameSpace() == messageName.nameSpace()) {
+ return message;
}
}
- qDebug() << "findMessage: no match found for" << messageName.qname()
- << "(localName=" << messageName.localName() << " nameSpace=" << messageName.nameSpace() << ")";
+ qDebug() << "findMessage: no match found for" << messageName.qname() << "(localName=" << messageName.localName()
+ << " nameSpace=" << messageName.nameSpace() << ")";
return Message();
}
XSD::Element WSDL::findElement(const QName &elementName) const
{
- //qDebug() << "findElement" << elementName.nameSpace() << elementName.localName();
+ // qDebug() << "findElement" << elementName.nameSpace() << elementName.localName();
const XSD::Types types = mDefinitions.type().types();
const XSD::Element::List elements = types.elements();
for (int i = 0; i < elements.count(); ++i) {
- //qDebug() << " " << i << elements[ i ].nameSpace() << elements[i].name();
- if (elements[ i ].nameSpace() == elementName.nameSpace() && elements[ i ].name() == elementName.localName()) {
- return elements[ i ];
+ // qDebug() << " " << i << elements[ i ].nameSpace() << elements[i].name();
+ if (elements[i].nameSpace() == elementName.nameSpace() && elements[i].name() == elementName.localName()) {
+ return elements[i];
}
}
@@ -135,7 +116,8 @@ XSD::ComplexType WSDL::findComplexType(const QName &typeName) const
QSet<QName> WSDL::uniqueBindings(const Service &service) const
{
QSet<QName> bindings;
- Q_FOREACH (const Port &port, service.ports()) {
+ const Port::List servicePorts = service.ports();
+ for (const Port &port : servicePorts) {
const Binding binding = findBinding(port.bindingName());
if (binding.type() == Binding::SOAPBinding) {
bindings.insert(port.bindingName());
@@ -146,4 +128,3 @@ QSet<QName> WSDL::uniqueBindings(const Service &service) const
}
return bindings;
}
-
diff --git a/kdwsdl2cpp/wsdl/wsdl.h b/kdwsdl2cpp/wsdl/wsdl.h
index ab80de2..2ba9396 100644
--- a/kdwsdl2cpp/wsdl/wsdl.h
+++ b/kdwsdl2cpp/wsdl/wsdl.h
@@ -1,33 +1,17 @@
/*
- This file is part of KDE.
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KWSDL_WSDL_H
#define KWSDL_WSDL_H
#include <common/nsmanager.h>
-#include <wsdl/definitions.h>
#include <kode_export.h>
+#include <wsdl/definitions.h>
-namespace KWSDL
-{
+namespace KWSDL {
class KWSDL_EXPORT WSDL
{
diff --git a/kdwsdl2cpp/wsdl/wsdl.pro b/kdwsdl2cpp/wsdl/wsdl.pro
deleted file mode 100644
index d98d88d..0000000
--- a/kdwsdl2cpp/wsdl/wsdl.pro
+++ /dev/null
@@ -1,31 +0,0 @@
-TEMPLATE = lib
-TARGET = wsdl
-CONFIG += staticlib
-
-SOURCES = \
- binding.cpp \
- bindingoperation.cpp \
- definitions.cpp \
- element.cpp \
- fault.cpp \
- import.cpp \
- message.cpp \
- operation.cpp \
- param.cpp \
- part.cpp \
- port.cpp \
- porttype.cpp \
- service.cpp \
- soapbinding.cpp \
- type.cpp \
- wsdl.cpp
-
-QT -= gui
-QT += xml
-LIBS += kxmlcommon schema
-
-INCLUDEPATH += $${TOP_SOURCE_DIR}/kdwsdl2cpp
-
-include($${TOP_SOURCE_DIR}/variables.pri)
-DEFINES -= QT_NO_CAST_TO_ASCII QBA_NO_CAST_TO_VOID QBA_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
diff --git a/qt5-kdsoap.dsc b/qt5-kdsoap.dsc
deleted file mode 100644
index 28758f2..0000000
--- a/qt5-kdsoap.dsc
+++ /dev/null
@@ -1,10 +0,0 @@
-Format: 1.0
-Source: kdsoap
-Version: 1.9.1
-Binary: kdsoap
-Maintainer: Allen Winter <allen.winter@kdab.com>
-Architecture: any
-Build-Depends: debhelper (>=9), cdbs, cmake, qt5-default, qtbase5-dev
-
-Files:
- 00000000000000000000000000000000 00000 qt5-kdsoap-1.9.1.tar.gz
diff --git a/scripts/genignore.py b/scripts/genignore.py
new file mode 100644
index 0000000..2765774
--- /dev/null
+++ b/scripts/genignore.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+import os
+import stat
+
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+# This script, when run in KD Soap's source and build directory containing the results of a full
+# build, writes a list of files to be excluded from packaging to CPackIgnores.txt.
+# autogen reads that list and passes it to CPack.
+
+# You should re-generate CPackIgnores.txt before every release and also check that no new binary
+# slips through the cracks using
+# find . -type f -executable
+
+sourceDirectory = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+
+
+def ignoredFiles():
+ ret = []
+
+ def findExecutables(top):
+ for f in os.listdir(top):
+ pathname = os.path.join(top, f)
+ if stat.S_ISDIR(os.stat(pathname).st_mode):
+ findExecutables(pathname)
+ elif os.access(pathname, os.X_OK):
+ # The file is executable for us
+ ret.append(pathname + '$')
+ # for OS X
+ ret.append(pathname + '.app/')
+
+ # With one exception, the executables in those paths are binaries and we're making a SOURCE package.
+ for path in ['unittests']:
+ findExecutables(os.path.join(sourceDirectory, path))
+ # The exception!
+ def isGoodExclude(s): return not s.startswith(os.path.join(sourceDirectory, 'unittests/runTest.bat'))
+ return sorted(filter(isGoodExclude, ret))
+
+
+f = open('CPackIgnores.txt', 'w')
+for ign in ignoredFiles():
+ # write paths relative to the source dir, one per line
+ f.write(ign[len(sourceDirectory):] + '\n')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 11b32cc..f5b3cd4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,2 +1,10 @@
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
add_subdirectory(KDSoapClient)
add_subdirectory(KDSoapServer)
diff --git a/src/KDSoapClient/CMakeLists.txt b/src/KDSoapClient/CMakeLists.txt
index 8a8873b..86807fa 100644
--- a/src/KDSoapClient/CMakeLists.txt
+++ b/src/KDSoapClient/CMakeLists.txt
@@ -1,107 +1,129 @@
-set(QT_USE_QTNETWORK TRUE)
-include(${QT_USE_FILE})
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
set(SOURCES
- KDSoapMessage.cpp
- KDSoapClientInterface.cpp
- KDSoapPendingCall.cpp
- KDSoapPendingCallWatcher.cpp
- KDSoapClientThread.cpp
- KDSoapValue.cpp
- KDSoapAuthentication.cpp
- KDSoapNamespaceManager.cpp
- KDSoapMessageWriter.cpp
- KDSoapMessageReader.cpp
- KDDateTime.cpp
- KDSoapNamespacePrefixes.cpp
- KDSoapJob.cpp
- KDSoapSslHandler.cpp
- KDSoapReplySslHandler.cpp
- KDSoapFaultException.cpp
- KDSoapMessageAddressingProperties.cpp
- KDSoapEndpointReference.cpp
- KDQName.cpp
- KDSoapUdpClient.cpp
+ KDSoapMessage.cpp
+ KDSoapClientInterface.cpp
+ KDSoapPendingCall.cpp
+ KDSoapPendingCallWatcher.cpp
+ KDSoapClientThread.cpp
+ KDSoapValue.cpp
+ KDSoapAuthentication.cpp
+ KDSoapNamespaceManager.cpp
+ KDSoapMessageWriter.cpp
+ KDSoapMessageReader.cpp
+ KDDateTime.cpp
+ KDSoapNamespacePrefixes.cpp
+ KDSoapJob.cpp
+ KDSoapSslHandler.cpp
+ KDSoapReplySslHandler.cpp
+ KDSoapFaultException.cpp
+ KDSoapMessageAddressingProperties.cpp
+ KDSoapEndpointReference.cpp
+ KDQName.cpp
+ KDSoapUdpClient.cpp
)
-add_library(kdsoap ${KDSoap_LIBRARY_MODE} ${SOURCES})
+add_library(
+ kdsoap
+ ${KDSoap_LIBRARY_MODE} ${SOURCES}
+)
+set_target_properties(kdsoap PROPERTIES OUTPUT_NAME "kdsoap${${PROJECT_NAME}_LIBRARY_QTID}")
if(${PROJECT_NAME}_STATIC)
- target_compile_definitions(kdsoap PUBLIC KDSOAP_STATICLIB)
+ target_compile_definitions(kdsoap PUBLIC KDSOAP_STATICLIB)
else()
- target_compile_definitions(kdsoap PRIVATE KDSOAP_BUILD_KDSOAP_LIB)
+ target_compile_definitions(kdsoap PRIVATE KDSOAP_BUILD_KDSOAP_LIB)
endif()
-target_link_libraries(kdsoap ${QT_LIBRARIES})
-set_target_properties(kdsoap PROPERTIES
- SOVERSION ${${PROJECT_NAME}_SOVERSION}
- VERSION ${${PROJECT_NAME}_VERSION}
+target_link_libraries(
+ kdsoap ${QT_LIBRARIES}
+)
+target_include_directories(
+ kdsoap
+ INTERFACE "$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>"
)
-target_include_directories(kdsoap INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}>")
+set_target_properties(kdsoap PROPERTIES SOVERSION ${${PROJECT_NAME}_SOVERSION} VERSION ${${PROJECT_NAME}_VERSION})
#version libraries on Windows
if(WIN32)
- set(postfix ${${PROJECT_NAME}_SOVERSION})
- set(CMAKE_RELEASE_POSTFIX ${postfix})
- set_target_properties(kdsoap PROPERTIES RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX})
- #append 'd' to debug libraries
- string(CONCAT postfix ${postfix} "d")
- set(CMAKE_DEBUG_POSTFIX ${postfix})
- set_target_properties(kdsoap PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
+ set(postfix ${${PROJECT_NAME}_SOVERSION})
+ string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_BUILD_TYPE)
+ if(${UPPER_BUILD_TYPE} MATCHES "^DEBUG")
+ string(CONCAT postfix ${postfix} "d")
+ set_target_properties(kdsoap PROPERTIES DEBUG_POSTFIX ${postfix})
+ else()
+ set_target_properties(kdsoap PROPERTIES ${UPPER_BUILD_TYPE}_POSTFIX ${postfix})
+ endif()
endif()
if(KDSoap_IS_ROOT_PROJECT)
- include(ECMGenerateHeaders)
- ecm_generate_headers(client_HEADERS
- ORIGINAL
- CAMELCASE
- HEADER_NAMES
- KDSoapGlobal
- KDSoapMessage,KDSoapHeaders
- KDSoap
- KDDateTime
- KDSoapJob
- KDSoapClientInterface
- KDSoapNamespaceManager
- KDSoapSslHandler
- KDSoapValue,KDSoapValueList
- KDSoapPendingCallWatcher
- KDSoapFaultException
- KDSoapMessageAddressingProperties
- KDSoapEndpointReference
- KDSoapPendingCall
- KDSoapAuthentication
- KDQName
- KDSoapUdpClient
- COMMON_HEADER
- KDSoapClient
- )
+ include(ECMGenerateHeaders)
+ ecm_generate_headers(
+ client_HEADERS
+ ORIGINAL
+ CAMELCASE
+ HEADER_NAMES
+ KDSoapGlobal
+ KDSoapMessage,KDSoapHeaders
+ KDSoap
+ KDDateTime
+ KDSoapJob
+ KDSoapClientInterface
+ KDSoapNamespaceManager
+ KDSoapSslHandler
+ KDSoapValue,KDSoapValueList
+ KDSoapPendingCallWatcher
+ KDSoapFaultException
+ KDSoapMessageAddressingProperties
+ KDSoapEndpointReference
+ KDSoapPendingCall
+ KDSoapAuthentication
+ KDQName
+ KDSoapUdpClient
+ COMMON_HEADER
+ KDSoapClient
+ )
- install(FILES
- ${client_HEADERS}
- KDSoapMessage.h
- KDSoapClientInterface.h
- KDSoapPendingCall.h
- KDSoapPendingCallWatcher.h
- KDSoapValue.h
- KDSoapGlobal.h
- KDSoapJob.h
- KDSoapAuthentication.h
- KDSoapNamespaceManager.h
- KDDateTime.h
- KDSoap.h
- KDSoapSslHandler.h
- KDSoapFaultException.h
- KDSoapMessageAddressingProperties.h
- KDSoapEndpointReference.h
- KDQName.h
- KDSoapUdpClient.h
- DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapClient
- )
+ install(
+ FILES ${client_HEADERS}
+ KDSoapMessage.h
+ KDSoapClientInterface.h
+ KDSoapPendingCall.h
+ KDSoapPendingCallWatcher.h
+ KDSoapValue.h
+ KDSoapGlobal.h
+ KDSoapJob.h
+ KDSoapAuthentication.h
+ KDSoapNamespaceManager.h
+ KDDateTime.h
+ KDSoap.h
+ KDSoapSslHandler.h
+ KDSoapFaultException.h
+ KDSoapMessageAddressingProperties.h
+ KDSoapEndpointReference.h
+ KDQName.h
+ KDSoapUdpClient.h
+ DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapClient
+ )
- install(TARGETS kdsoap EXPORT KDSoapTargets
- RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
- LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
- ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
+ install(
+ TARGETS kdsoap
+ EXPORT KDSoapTargets
+ RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
+ LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
+ ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
)
+ if(MSVC AND NOT ${PROJECT_NAME}_STATIC)
+ install(
+ FILES "$<TARGET_PDB_FILE_DIR:kdsoap>/$<TARGET_PDB_FILE_NAME:kdsoap>"
+ DESTINATION ${INSTALL_LIBRARY_DIR}
+ CONFIGURATIONS Debug RelWithDebInfo
+ )
+ endif()
+
endif()
diff --git a/src/KDSoapClient/KDDateTime.cpp b/src/KDSoapClient/KDDateTime.cpp
index 4160288..aa070a9 100644
--- a/src/KDSoapClient/KDDateTime.cpp
+++ b/src/KDSoapClient/KDDateTime.cpp
@@ -1,28 +1,15 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDDateTime.h"
-#include <QSharedData>
#include <QDebug>
+#include <QSharedData>
class KDDateTimeData : public QSharedData
{
@@ -30,17 +17,20 @@ public:
QString mTimeZone;
};
-KDDateTime::KDDateTime() : d(new KDDateTimeData)
+KDDateTime::KDDateTime()
+ : d(new KDDateTimeData)
{
}
KDDateTime::KDDateTime(const KDDateTime &rhs)
- : QDateTime(rhs), d(rhs.d)
+ : QDateTime(rhs)
+ , d(rhs.d)
{
}
KDDateTime::KDDateTime(const QDateTime &rhs)
- : QDateTime(rhs), d(new KDDateTimeData)
+ : QDateTime(rhs)
+ , d(new KDDateTimeData)
{
}
@@ -48,7 +38,7 @@ KDDateTime &KDDateTime::operator=(const KDDateTime &rhs)
{
if (this != &rhs) {
QDateTime::operator=(rhs);
- d.operator = (rhs.d);
+ d.operator=(rhs.d);
}
return *this;
}
@@ -84,7 +74,7 @@ void KDDateTime::setTimeZone(const QString &timeZone)
const int hours = timeZone.left(pos).toInt();
const int minutes = timeZone.mid(pos + 1).toInt();
const int offset = hours * 3600 + minutes * 60;
- setUtcOffset(offset);
+ setOffsetFromUtc(offset);
}
}
}
@@ -104,7 +94,7 @@ KDDateTime KDDateTime::fromDateString(const QString &s)
baseString.chop(6);
}
}
- //qDebug() << "KDDateTime: Parsing" << baseString << "tz=" << tz;
+ // qDebug() << "KDDateTime: Parsing" << baseString << "tz=" << tz;
kdt = QDateTime::fromString(baseString, Qt::ISODate);
kdt.setTimeZone(tz);
return kdt;
@@ -118,10 +108,7 @@ QString KDDateTime::toDateString() const
str = toString(QLatin1String("yyyy-MM-ddThh:mm:ss.zzz"));
str += d->mTimeZone;
} else {
- str = toString(Qt::ISODate);
-#if QT_VERSION < 0x040800 // Qt adds the timezone since 4.8
- str += d->mTimeZone;
-#endif
+ str = toString(Qt::ISODate); // includes the timezone (since Qt 4.8)
}
return str;
}
diff --git a/src/KDSoapClient/KDDateTime.h b/src/KDSoapClient/KDDateTime.h
index a759e78..83575b4 100644
--- a/src/KDSoapClient/KDDateTime.h
+++ b/src/KDSoapClient/KDDateTime.h
@@ -1,33 +1,20 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDDATETIME_H
#define KDDATETIME_H
#include "KDSoapGlobal.h"
#include <QtCore/QDateTime>
-#include <QtCore/QVariant>
#include <QtCore/QSharedDataPointer>
+#include <QtCore/QVariant>
class KDDateTimeData;
diff --git a/src/KDSoapClient/KDQName.cpp b/src/KDSoapClient/KDQName.cpp
index d6bad0f..69fbaf2 100644
--- a/src/KDSoapClient/KDQName.cpp
+++ b/src/KDSoapClient/KDQName.cpp
@@ -1,23 +1,10 @@
/*
This file is part of KDE Schema Parser
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
based on wsdlpull parser by Vivek Krishna
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#include "KDQName.h"
@@ -29,20 +16,21 @@ KDQName::KDQName()
{
}
-KDQName::KDQName( const QString &name )
+KDQName::KDQName(const QString &name)
{
- parse( name );
+ parse(name);
}
-KDQName::KDQName( const QString &nameSpace, const QString &localName )
- : mNameSpace( nameSpace ), mLocalName( localName )
+KDQName::KDQName(const QString &nameSpace, const QString &localName)
+ : mNameSpace(nameSpace)
+ , mLocalName(localName)
{
Q_ASSERT(!localName.contains(QLatin1Char(':')));
}
-void KDQName::operator=( const QString &name )
+void KDQName::operator=(const QString &name)
{
- parse( name );
+ parse(name);
}
QString KDQName::localName() const
@@ -57,13 +45,13 @@ QString KDQName::prefix() const
QString KDQName::qname() const
{
- if ( mPrefix.isEmpty() )
+ if (mPrefix.isEmpty())
return mLocalName;
else
return mPrefix + QLatin1Char(':') + mLocalName;
}
-void KDQName::setNameSpace( const QString &nameSpace )
+void KDQName::setNameSpace(const QString &nameSpace)
{
mNameSpace = nameSpace;
}
@@ -73,14 +61,14 @@ QString KDQName::nameSpace() const
return mNameSpace;
}
-bool KDQName::operator==( const KDQName &qname ) const
+bool KDQName::operator==(const KDQName &qname) const
{
return (qname.nameSpace() == mNameSpace && qname.localName() == mLocalName);
}
-bool KDQName::operator!=( const KDQName &qname ) const
+bool KDQName::operator!=(const KDQName &qname) const
{
- return !operator==( qname );
+ return !operator==(qname);
}
bool KDQName::isEmpty() const
@@ -107,26 +95,26 @@ KDQName KDQName::fromSoapValue(const KDSoapValue &value)
KDSoapValue KDQName::toSoapValue(const QString &name, const QString &typeNameSpace, const QString &typeName) const
{
KDSoapValue value = KDSoapValue(name, qname(), typeNameSpace, typeName);
- if ( !mPrefix.isEmpty() && !mNameSpace.isEmpty() ) {
+ if (!mPrefix.isEmpty() && !mNameSpace.isEmpty()) {
QXmlStreamNamespaceDeclaration decl(mPrefix, mNameSpace);
value.addNamespaceDeclaration(decl);
}
return value;
}
-void KDQName::parse( const QString &str )
+void KDQName::parse(const QString &str)
{
- int pos = str.indexOf( QLatin1Char(':') );
- if ( pos != -1 ) {
- mPrefix = str.left( pos );
- mLocalName = str.mid( pos + 1 );
+ int pos = str.indexOf(QLatin1Char(':'));
+ if (pos != -1) {
+ mPrefix = str.left(pos);
+ mLocalName = str.mid(pos + 1);
} else {
mLocalName = str;
}
Q_ASSERT(!mLocalName.contains(QLatin1Char(':')));
}
-QDebug operator <<(QDebug dbg, const KDQName &qn)
+QDebug operator<<(QDebug dbg, const KDQName &qn)
{
if (!qn.nameSpace().isEmpty())
dbg << "(" << qn.nameSpace() << "," << qn.localName() << ")";
diff --git a/src/KDSoapClient/KDQName.h b/src/KDSoapClient/KDQName.h
index 21046d5..912c669 100644
--- a/src/KDSoapClient/KDQName.h
+++ b/src/KDSoapClient/KDQName.h
@@ -1,32 +1,19 @@
/*
This file is part of KDE.
- Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
+ SPDX-FileCopyrightText: 2005 Tobias Koenig <tokoe@kde.org>
based on wsdlpull parser by Vivek Krishna
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: MIT
*/
#ifndef KDQNAME_H
#define KDQNAME_H
-#include <QString>
-#include <QList>
#include <QHash>
+#include <QList>
#include <QMetaType>
+#include <QString>
class KDSoapValue;
@@ -34,28 +21,28 @@ class KDSoapValue;
class KDSOAP_EXPORT KDQName
{
- public:
+public:
typedef QList<KDQName> List;
KDQName();
// Create a KDQName with prefix+localname
- explicit KDQName( const QString &name );
+ explicit KDQName(const QString &name);
// Create a KDQName with namespace+localname
- KDQName( const QString &nameSpace, const QString &localName );
+ KDQName(const QString &nameSpace, const QString &localName);
- void operator=( const QString &name );
+ void operator=(const QString &name);
QString localName() const;
QString prefix() const;
QString qname() const;
- void setNameSpace( const QString &nameSpace );
+ void setNameSpace(const QString &nameSpace);
QString nameSpace() const;
- bool operator==( const KDQName& ) const;
- bool operator!=( const KDQName& ) const;
+ bool operator==(const KDQName &) const;
+ bool operator!=(const KDQName &) const;
bool isEmpty() const;
@@ -69,8 +56,8 @@ class KDSOAP_EXPORT KDQName
*/
KDSoapValue toSoapValue(const QString &name, const QString &typeNameSpace = QString(), const QString &typeName = QString()) const;
- private:
- void parse( const QString& );
+private:
+ void parse(const QString &);
QString mNameSpace;
QString mLocalName;
@@ -79,7 +66,10 @@ class KDSOAP_EXPORT KDQName
Q_DECLARE_METATYPE(KDQName)
-inline uint qHash(const KDQName& qn) { return qHash(qn.nameSpace())^qHash(qn.localName()); }
+inline uint qHash(const KDQName &qn)
+{
+ return qHash(qn.nameSpace()) ^ qHash(qn.localName());
+}
QDebug operator<<(QDebug dbg, const KDQName &qn);
diff --git a/src/KDSoapClient/KDSoap.h b/src/KDSoapClient/KDSoap.h
index 5f2bba0..3b5f488 100644
--- a/src/KDSoapClient/KDSoap.h
+++ b/src/KDSoapClient/KDSoap.h
@@ -1,35 +1,22 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAP_H
#define KDSOAP_H
+#include "KDSoapAuthentication.h"
#include "KDSoapClientInterface.h"
#include "KDSoapMessage.h"
+#include "KDSoapNamespaceManager.h"
#include "KDSoapPendingCall.h"
#include "KDSoapPendingCallWatcher.h"
#include "KDSoapValue.h"
-#include "KDSoapAuthentication.h"
-#include "KDSoapNamespaceManager.h"
#endif
diff --git a/src/KDSoapClient/KDSoapAuthentication.cpp b/src/KDSoapClient/KDSoapAuthentication.cpp
index a010fe1..f5b6fad 100644
--- a/src/KDSoapClient/KDSoapAuthentication.cpp
+++ b/src/KDSoapClient/KDSoapAuthentication.cpp
@@ -1,44 +1,31 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapAuthentication.h"
+#include "KDSoapNamespaceManager.h"
+#include "KDSoapNamespacePrefixes_p.h"
#include <QAuthenticator>
#include <QCryptographicHash>
#include <QDateTime>
#include <QDebug>
#include <QNetworkReply>
-#include "KDSoapNamespacePrefixes_p.h"
-#include "KDSoapNamespaceManager.h"
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#include <QRandomGenerator>
+#endif
class KDSoapAuthentication::Private
{
public:
- Private() :
- useWSUsernameToken(false)
- {}
-
QString user;
QString password;
- bool useWSUsernameToken;
+ bool usePasswordDigest = false;
+ bool useWSUsernameToken = false;
QDateTime overrideWSUsernameCreatedTime;
QByteArray overrideWSUsernameNonce;
};
@@ -46,6 +33,7 @@ public:
KDSoapAuthentication::KDSoapAuthentication()
: d(new Private)
{
+ d->usePasswordDigest = true;
}
KDSoapAuthentication::KDSoapAuthentication(const KDSoapAuthentication &other)
@@ -75,6 +63,11 @@ void KDSoapAuthentication::setPassword(const QString &password)
d->password = password;
}
+void KDSoapAuthentication::setUsePasswordDigest(const bool usePasswordDigest)
+{
+ d->usePasswordDigest = usePasswordDigest;
+}
+
void KDSoapAuthentication::setUseWSUsernameToken(bool useWSUsernameToken)
{
d->useWSUsernameToken = useWSUsernameToken;
@@ -100,6 +93,11 @@ QString KDSoapAuthentication::password() const
return d->password;
}
+bool KDSoapAuthentication::usePasswordDigest() const
+{
+ return d->usePasswordDigest;
+}
+
bool KDSoapAuthentication::useWSUsernameToken() const
{
return d->useWSUsernameToken;
@@ -122,7 +120,7 @@ bool KDSoapAuthentication::hasAuth() const
void KDSoapAuthentication::handleAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator)
{
- //qDebug() << "handleAuthenticationRequired" << reply << reply->url() << "realm=" << authenticator->realm();
+ // qDebug() << "handleAuthenticationRequired" << reply << reply->url() << "realm=" << authenticator->realm();
// Only proceed if
// 1) we have some authentication to offer
// 2) we didn't try once already (unittest: BuiltinHttpTest::testAsyncCallRefusedAuth)
@@ -146,8 +144,12 @@ void KDSoapAuthentication::writeWSUsernameTokenHeader(QXmlStreamWriter &writer)
const QString securityExtentionNS = KDSoapNamespaceManager::soapSecurityExtention();
const QString securityUtilityNS = KDSoapNamespaceManager::soapSecurityUtility();
-
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+ static QRandomGenerator generator;
+ QByteArray nonce = "kdsoap" + QByteArray::number(generator.generate64());
+#else
QByteArray nonce = "kdsoap" + QByteArray::number(qrand());
+#endif
if (!d->overrideWSUsernameNonce.isEmpty()) {
nonce = d->overrideWSUsernameNonce;
}
@@ -156,8 +158,6 @@ void KDSoapAuthentication::writeWSUsernameTokenHeader(QXmlStreamWriter &writer)
time = d->overrideWSUsernameCreatedTime;
}
QString timestamp = time.toString(QLatin1String("yyyy-MM-ddTHH:mm:ssZ"));
- QByteArray passwordConcat = nonce + timestamp.toUtf8() + d->password.toUtf8();
- QByteArray passwordHash = QCryptographicHash::hash(passwordConcat, QCryptographicHash::Sha1);
writer.writeStartElement(securityExtentionNS, QLatin1String("Security"));
writer.writeStartElement(securityExtentionNS, QLatin1String("UsernameToken"));
@@ -171,8 +171,17 @@ void KDSoapAuthentication::writeWSUsernameTokenHeader(QXmlStreamWriter &writer)
writer.writeEndElement();
writer.writeStartElement(securityExtentionNS, QLatin1String("Password"));
- writer.writeAttribute(QLatin1String("Type"), QLatin1String("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"));
- writer.writeCharacters(QString::fromLatin1(passwordHash.toBase64().constData()));
+ if (d->usePasswordDigest) {
+ writer.writeAttribute(QLatin1String("Type"),
+ QLatin1String("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"));
+ QByteArray passwordConcat = nonce + timestamp.toUtf8() + d->password.toUtf8();
+ QByteArray passwordHash = QCryptographicHash::hash(passwordConcat, QCryptographicHash::Sha1);
+ writer.writeCharacters(QString::fromLatin1(passwordHash.toBase64().constData()));
+ } else {
+ writer.writeAttribute(QLatin1String("Type"),
+ QLatin1String("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText"));
+ writer.writeCharacters(d->password);
+ }
writer.writeEndElement();
writer.writeStartElement(securityExtentionNS, QLatin1String("Username"));
diff --git a/src/KDSoapClient/KDSoapAuthentication.h b/src/KDSoapClient/KDSoapAuthentication.h
index d9524a2..b0a1cfb 100644
--- a/src/KDSoapClient/KDSoapAuthentication.h
+++ b/src/KDSoapClient/KDSoapAuthentication.h
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPAUTHENTICATION_H
#define KDSOAPAUTHENTICATION_H
@@ -78,6 +65,15 @@ public:
*/
QString password() const;
+ /**
+ * Sets whether \a PasswordDigest (default) or \a PasswordText is used for authentication
+ */
+ void setUsePasswordDigest(const bool usePasswordDigest);
+ /**
+ * \return whether \a PasswordDigest is used for authentication
+ */
+ bool usePasswordDigest() const;
+
/**
* Sets whether WS-UsernameToken is used for authentication. When
* set, the WS-UsernameToken headers are included in each request.
diff --git a/src/KDSoapClient/KDSoapClient.pro b/src/KDSoapClient/KDSoapClient.pro
deleted file mode 100644
index 9b25479..0000000
--- a/src/KDSoapClient/KDSoapClient.pro
+++ /dev/null
@@ -1,76 +0,0 @@
-TEMPLATE = lib
-TARGET = $${KDSOAPLIB}
-QT -= gui
-QT += network
-
-# Workaround for visual studio integration
-DESTDIR = $${TOP_BUILD_DIR}/lib
-win32:DLLDESTDIR = $${TOP_BUILD_DIR}/bin
-include($${TOP_SOURCE_DIR}/variables.pri)
-
-# Only used by Mac frameworks.
-# See the include subdir for standard header installation
-# TODO: install these from include/ as well
-INSTALLHEADERS = KDSoapMessage.h \
- KDSoapClientInterface.h \
- KDSoapPendingCall.h \
- KDSoapPendingCallWatcher.h \
- KDSoapValue.h \
- KDSoapGlobal.h \
- KDSoapJob.h \
- KDSoapAuthentication.h \
- KDSoapNamespaceManager.h \
- KDSoapSslHandler.h \
- KDDateTime.h \
- KDSoapFaultException.h \
- KDSoapMessageAddressingProperties.cpp \
- KDSoapEndpointReference.cpp \
- KDSoapUdpClient.h
-PRIVATEHEADERS = KDSoapPendingCall_p.h \
- KDSoapPendingCallWatcher_p.h \
- KDSoapClientInterface_p.h \
- KDSoapClientThread_p.h \
- KDSoapMessageReader_p.h \
- KDSoapMessageWriter_p.h \
- KDSoapNamespacePrefixes_p.h \
- KDSoapUdpClient_p.h
-HEADERS = $$INSTALLHEADERS \
- $$PRIVATEHEADERS \
- KDSoapReplySslHandler_p.h \
-
-# Note: remember to add files into CMakeLists.txt!
-SOURCES = KDSoapMessage.cpp \
- KDSoapClientInterface.cpp \
- KDSoapPendingCall.cpp \
- KDSoapPendingCallWatcher.cpp \
- KDSoapClientThread.cpp \
- KDSoapValue.cpp \
- KDSoapAuthentication.cpp \
- KDSoapNamespaceManager.cpp \
- KDSoapMessageReader.cpp \
- KDSoapMessageWriter.cpp \
- KDSoapNamespacePrefixes.cpp \
- KDDateTime.cpp \
- KDSoapJob.cpp \
- KDSoapSslHandler.cpp \
- KDSoapReplySslHandler.cpp \
- KDSoapFaultException.cpp \
- KDSoapMessageAddressingProperties.cpp \
- KDSoapEndpointReference.cpp \
- KDQName.cpp \
- KDSoapUdpClient.cpp \
-
-
-DEFINES += KDSOAP_BUILD_KDSOAP_LIB
-
-# installation targets:
-target.path = $$INSTALL_PREFIX/lib$$LIB_SUFFIX
-INSTALLS += target
-
-# Mac frameworks
-macx:lib_bundle: {
- FRAMEWORK_HEADERS.version = Versions
- FRAMEWORK_HEADERS.files = $$INSTALLHEADERS
- FRAMEWORK_HEADERS.path = Headers
- QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
-}
diff --git a/src/KDSoapClient/KDSoapClientInterface.cpp b/src/KDSoapClient/KDSoapClientInterface.cpp
index f6bb47f..d922009 100644
--- a/src/KDSoapClient/KDSoapClientInterface.cpp
+++ b/src/KDSoapClient/KDSoapClientInterface.cpp
@@ -1,41 +1,28 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapClientInterface.h"
#include "KDSoapClientInterface_p.h"
-#include "KDSoapNamespaceManager.h"
#include "KDSoapMessageWriter_p.h"
-#ifndef QT_NO_OPENSSL
-#include "KDSoapSslHandler.h"
+#include "KDSoapNamespaceManager.h"
+#ifndef QT_NO_SSL
#include "KDSoapReplySslHandler_p.h"
+#include "KDSoapSslHandler.h"
#endif
#include "KDSoapPendingCall_p.h"
-#include <QSslConfiguration>
-#include <QNetworkRequest>
-#include <QNetworkReply>
#include <QAuthenticator>
-#include <QDebug>
#include <QBuffer>
+#include <QDebug>
#include <QNetworkProxy>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QSslConfiguration>
#include <QTimer>
KDSoapClientInterface::KDSoapClientInterface(const QString &endPoint, const QString &messageNamespace)
@@ -64,21 +51,21 @@ KDSoapClientInterface::SoapVersion KDSoapClientInterface::soapVersion() const
}
KDSoapClientInterfacePrivate::KDSoapClientInterfacePrivate()
- : m_accessManager(nullptr),
- m_authentication(),
- m_version(KDSoap::SOAP1_1),
- m_style(KDSoapClientInterface::RPCStyle),
- m_ignoreSslErrors(false),
- m_timeout(30 * 60 * 1000) // 30 minutes, as documented
-{
-#ifndef QT_NO_OPENSSL
+ : m_accessManager(nullptr)
+ , m_authentication()
+ , m_version(KDSoap::SOAP1_1)
+ , m_style(KDSoapClientInterface::RPCStyle)
+ , m_ignoreSslErrors(false)
+ , m_timeout(30 * 60 * 1000) // 30 minutes, as documented
+{
+#ifndef QT_NO_SSL
m_sslHandler = nullptr;
#endif
}
KDSoapClientInterfacePrivate::~KDSoapClientInterfacePrivate()
{
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
delete m_sslHandler;
#endif
}
@@ -87,8 +74,7 @@ QNetworkAccessManager *KDSoapClientInterfacePrivate::accessManager()
{
if (!m_accessManager) {
m_accessManager = new QNetworkAccessManager(this);
- connect(m_accessManager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)),
- this, SLOT(_kd_slotAuthenticationRequired(QNetworkReply*,QAuthenticator*)));
+ connect(m_accessManager, &QNetworkAccessManager::authenticationRequired, this, &KDSoapClientInterfacePrivate::_kd_slotAuthenticationRequired);
}
return m_accessManager;
}
@@ -97,6 +83,11 @@ QNetworkRequest KDSoapClientInterfacePrivate::prepareRequest(const QString &meth
{
QNetworkRequest request(QUrl(this->m_endPoint));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ // HTTP/2 (on by default since Qt 6) creates trouble, disable it for now (https://github.com/KDAB/KDSoap/issues/246)
+ request.setAttribute(QNetworkRequest::Http2AllowedAttribute, false);
+#endif
+
QString soapAction = action;
if (soapAction.isNull()) {
@@ -109,14 +100,16 @@ QNetworkRequest KDSoapClientInterfacePrivate::prepareRequest(const QString &meth
}
soapAction += method;
}
- //qDebug() << "soapAction=" << soapAction;
+ // qDebug() << "soapAction=" << soapAction;
QString soapHeader;
if (m_version == KDSoap::SOAP1_1) {
soapHeader += QString::fromLatin1("text/xml;charset=utf-8");
request.setRawHeader("SoapAction", '\"' + soapAction.toUtf8() + '\"');
} else if (m_version == KDSoap::SOAP1_2) {
- soapHeader += QString::fromLatin1("application/soap+xml;charset=utf-8;action=") + soapAction;
+ soapHeader += QString::fromLatin1("application/soap+xml;charset=utf-8");
+ if (m_sendSoapActionInHttpHeader)
+ soapHeader += QString::fromLatin1(";action=") + soapAction;
}
request.setHeader(QNetworkRequest::ContentTypeHeader, soapHeader.toUtf8());
@@ -133,7 +126,7 @@ QNetworkRequest KDSoapClientInterfacePrivate::prepareRequest(const QString &meth
request.setRawHeader(it.key(), it.value());
}
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
if (!m_sslConfiguration.isNull()) {
request.setSslConfiguration(m_sslConfiguration);
}
@@ -142,21 +135,39 @@ QNetworkRequest KDSoapClientInterfacePrivate::prepareRequest(const QString &meth
return request;
}
-QBuffer *KDSoapClientInterfacePrivate::prepareRequestBuffer(const QString &method, const KDSoapMessage &message, const KDSoapHeaders &headers)
+QBuffer *KDSoapClientInterfacePrivate::prepareRequestBuffer(const QString &method, const KDSoapMessage &message, const QString &soapAction, const KDSoapHeaders &headers)
{
KDSoapMessageWriter msgWriter;
msgWriter.setMessageNamespace(m_messageNamespace);
msgWriter.setVersion(m_version);
- const QByteArray data = msgWriter.messageToXml(message, (m_style == KDSoapClientInterface::RPCStyle) ? method : QString(), headers, m_persistentHeaders, m_authentication);
QBuffer *buffer = new QBuffer;
- buffer->setData(data);
+ auto setBufferData = [=](const KDSoapMessage &msg) {
+ buffer->setData(msgWriter.messageToXml(msg,
+ (m_style == KDSoapClientInterface::RPCStyle) ? method : QString(),
+ headers, m_persistentHeaders,
+ m_authentication));
+ };
+
+ if (m_sendSoapActionInWsAddressingHeader) {
+ KDSoapMessage messageCopy = message;
+ KDSoapMessageAddressingProperties prop = message.messageAddressingProperties();
+ if (!prop.action().isEmpty())
+ qWarning("Overwriting the action addressing parameter (%s) with the SOAP action (%s)",
+ prop.action().toLocal8Bit().constData(), soapAction.toLocal8Bit().constData());
+ prop.setAction(soapAction);
+ messageCopy.setMessageAddressingProperties(prop);
+ setBufferData(messageCopy);
+ } else {
+ setBufferData(message);
+ }
buffer->open(QIODevice::ReadOnly);
return buffer;
}
-KDSoapPendingCall KDSoapClientInterface::asyncCall(const QString &method, const KDSoapMessage &message, const QString &soapAction, const KDSoapHeaders &headers)
+KDSoapPendingCall KDSoapClientInterface::asyncCall(const QString &method, const KDSoapMessage &message, const QString &soapAction,
+ const KDSoapHeaders &headers)
{
- QBuffer *buffer = d->prepareRequestBuffer(method, message, headers);
+ QBuffer *buffer = d->prepareRequestBuffer(method, message, soapAction, headers);
QNetworkRequest request = d->prepareRequest(method, soapAction);
QNetworkReply *reply = d->accessManager()->post(request, buffer);
d->setupReply(reply);
@@ -166,7 +177,8 @@ KDSoapPendingCall KDSoapClientInterface::asyncCall(const QString &method, const
return call;
}
-KDSoapMessage KDSoapClientInterface::call(const QString &method, const KDSoapMessage &message, const QString &soapAction, const KDSoapHeaders &headers)
+KDSoapMessage KDSoapClientInterface::call(const QString &method, const KDSoapMessage &message, const QString &soapAction,
+ const KDSoapHeaders &headers)
{
d->accessManager()->cookieJar(); // create it in the right thread, the secondary thread will use it
// Problem is: I don't want a nested event loop here. Too dangerous for GUI programs.
@@ -185,15 +197,16 @@ KDSoapMessage KDSoapClientInterface::call(const QString &method, const KDSoapMes
return ret;
}
-void KDSoapClientInterface::callNoReply(const QString &method, const KDSoapMessage &message, const QString &soapAction, const KDSoapHeaders &headers)
+void KDSoapClientInterface::callNoReply(const QString &method, const KDSoapMessage &message,
+ const QString &soapAction, const KDSoapHeaders &headers)
{
- QBuffer *buffer = d->prepareRequestBuffer(method, message, headers);
+ QBuffer *buffer = d->prepareRequestBuffer(method, message, soapAction, headers);
QNetworkRequest request = d->prepareRequest(method, soapAction);
QNetworkReply *reply = d->accessManager()->post(request, buffer);
d->setupReply(reply);
maybeDebugRequest(buffer->data(), reply->request(), reply);
- QObject::connect(reply, SIGNAL(finished()), reply, SLOT(deleteLater()));
- QObject::connect(reply, SIGNAL(finished()), buffer, SLOT(deleteLater()));
+ QObject::connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
+ QObject::connect(reply, &QNetworkReply::finished, buffer, &QBuffer::deleteLater);
}
void KDSoapClientInterfacePrivate::_kd_slotAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator)
@@ -227,7 +240,7 @@ void KDSoapClientInterface::ignoreSslErrors()
d->m_ignoreSslErrors = true;
}
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
void KDSoapClientInterface::ignoreSslErrors(const QList<QSslError> &errors)
{
d->m_ignoreErrorsList = errors;
@@ -264,10 +277,10 @@ public Q_SLOTS:
void KDSoapClientInterfacePrivate::setupReply(QNetworkReply *reply)
{
+#ifndef QT_NO_SSL
if (m_ignoreSslErrors) {
- QObject::connect(reply, SIGNAL(sslErrors(QList<QSslError>)), reply, SLOT(ignoreSslErrors()));
+ QObject::connect(reply, &QNetworkReply::sslErrors, reply, QOverload<>::of(&QNetworkReply::ignoreSslErrors));
} else {
-#ifndef QT_NO_OPENSSL
reply->ignoreSslErrors(m_ignoreErrorsList);
if (m_sslHandler) {
// create a child object of the reply, which will forward to m_sslHandler.
@@ -275,11 +288,11 @@ void KDSoapClientInterfacePrivate::setupReply(QNetworkReply *reply)
// and sender() doesn't work for sync calls (from another thread) (SOAP-79/issue29)
new KDSoapReplySslHandler(reply, m_sslHandler);
}
-#endif
}
+#endif
if (m_timeout >= 0) {
TimeoutHandler *timeoutHandler = new TimeoutHandler(reply);
- connect(timeoutHandler, SIGNAL(timeout()), timeoutHandler, SLOT(replyTimeout()));
+ connect(timeoutHandler, &TimeoutHandler::timeout, timeoutHandler, &TimeoutHandler::replyTimeout);
timeoutHandler->start(m_timeout);
}
}
@@ -336,6 +349,26 @@ void KDSoapClientInterface::setTimeout(int msecs)
d->m_timeout = msecs;
}
+bool KDSoapClientInterface::sendSoapActionInHttpHeader() const
+{
+ return d->m_sendSoapActionInHttpHeader;
+}
+
+void KDSoapClientInterface::setSendSoapActionInHttpHeader(bool sendInHttpHeader)
+{
+ d->m_sendSoapActionInHttpHeader = sendInHttpHeader;
+}
+
+bool KDSoapClientInterface::sendSoapActionInWsAddressingHeader() const
+{
+ return d->m_sendSoapActionInWsAddressingHeader;
+}
+
+void KDSoapClientInterface::setSendSoapActionInWsAddressingHeader(bool sendInWsAddressingHeader)
+{
+ d->m_sendSoapActionInWsAddressingHeader = sendInWsAddressingHeader;
+}
+
#ifndef QT_NO_OPENSSL
QSslConfiguration KDSoapClientInterface::sslConfiguration() const
{
@@ -356,5 +389,5 @@ KDSoapSslHandler *KDSoapClientInterface::sslHandler() const
}
#endif
-#include "moc_KDSoapClientInterface_p.cpp"
#include "KDSoapClientInterface.moc"
+#include "moc_KDSoapClientInterface_p.cpp"
diff --git a/src/KDSoapClient/KDSoapClientInterface.h b/src/KDSoapClient/KDSoapClientInterface.h
index 0fb1cc6..9c5450f 100644
--- a/src/KDSoapClient/KDSoapClientInterface.h
+++ b/src/KDSoapClient/KDSoapClientInterface.h
@@ -1,32 +1,19 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPCLIENTINTERFACE_H
#define KDSOAPCLIENTINTERFACE_H
-#include <QtCore/QtGlobal>
-#include <QtCore/QString>
#include "KDSoapMessage.h"
#include "KDSoapPendingCall.h"
+#include <QtCore/QString>
+#include <QtCore/QtGlobal>
class KDSoapAuthentication;
class KDSoapSslHandler;
@@ -67,7 +54,8 @@ public:
* Version of the SOAP protocol to use when sending requests.
* \see setSoapVersion()
*/
- enum SoapVersion {
+ enum SoapVersion
+ {
/** Use format version 1.1 of the SOAP specification */
SOAP1_1 = 1,
/** Use format version 1.2 of the SOAP specification */
@@ -91,6 +79,9 @@ public:
*/
~KDSoapClientInterface();
+ KDSoapClientInterface(const KDSoapClientInterface &) = delete;
+ KDSoapClientInterface &operator=(const KDSoapClientInterface &) = delete;
+
/**
* Calls the method \p method on this interface and passes the arguments specified in \p message
* to the method.
@@ -125,8 +116,8 @@ public:
*
* // create a watcher object that will signal the call's completion
* KDSoapPendingCallWatcher* watcher = new KDSoapPendingCallWatcher(pendingCall, this);
- * connect(watcher, SIGNAL(finished(KDSoapPendingCallWatcher*)),
- * this, SLOT(pendingCallFinished(KDSoapPendingCallWatcher*)));
+ * connect(watcher, &KDSoapPendingCallWatcher::finished,
+ * this, &MyClass::pendingCallFinished);
*
* void MyClass::pendingCallFinished(KDSoapPendingCallWatcher* pendingCall)
* {
@@ -135,8 +126,7 @@ public:
* }
* \endcode
*/
- KDSoapPendingCall asyncCall(const QString &method, const KDSoapMessage &message,
- const QString &soapAction = QString(),
+ KDSoapPendingCall asyncCall(const QString &method, const KDSoapMessage &message, const QString &soapAction = QString(),
const KDSoapHeaders &headers = KDSoapHeaders());
/**
@@ -153,8 +143,7 @@ public:
* graphical applications, since it will block the event loop for the duration of the call.
* Use this only in threads, or in non-GUI programs.
*/
- KDSoapMessage call(const QString &method, const KDSoapMessage &message,
- const QString &soapAction = QString(),
+ KDSoapMessage call(const QString &method, const KDSoapMessage &message, const QString &soapAction = QString(),
const KDSoapHeaders &headers = KDSoapHeaders());
/**
@@ -170,8 +159,7 @@ public:
* This is an asynchronous call, where the caller does not want to wait for a response.
* The method returns immediately, the call is performed later. No error handling is possible.
*/
- void callNoReply(const QString &method, const KDSoapMessage &message,
- const QString &soapAction = QString(),
+ void callNoReply(const QString &method, const KDSoapMessage &message, const QString &soapAction = QString(),
const KDSoapHeaders &headers = KDSoapHeaders());
/**
@@ -230,24 +218,24 @@ public:
void setCookieJar(QNetworkCookieJar *jar);
/**
- * Returns the network proxy used for the HTTP requests.
- * \since 1.2
- * \sa QNetworkAccessManager::proxy()
- */
+ * Returns the network proxy used for the HTTP requests.
+ * \since 1.2
+ * \sa QNetworkAccessManager::proxy()
+ */
QNetworkProxy proxy() const;
/**
- * Sets the network proxy used for the HTTP requests.
- * \since 1.2
- * \sa QNetworkAccessManager::setProxy()
- */
+ * Sets the network proxy used for the HTTP requests.
+ * \since 1.2
+ * \sa QNetworkAccessManager::setProxy()
+ */
void setProxy(const QNetworkProxy &proxy);
/**
- * Sets additional HTTP headers in the requests
- * \since 1.4
- * \sa QNetworkAccessManager::setRawHeader()
- */
+ * Sets additional HTTP headers in the requests
+ * \since 1.4
+ * \sa QNetworkAccessManager::setRawHeader()
+ */
void setRawHTTPHeaders(const QMap<QByteArray, QByteArray> &headers);
/**
@@ -263,9 +251,10 @@ public:
* is used as the main xml element name. This difference is mostly useful in the case of
* generated code, so that it can serialize existing complex types, and send them as messages.
*/
- enum Style {
- RPCStyle, ///< the method name is sent as an xml element wrapping the message parameters
- DocumentStyle ///< the message is sent as is, the method name is usually the name of the message
+ enum Style
+ {
+ RPCStyle, ///< the method name is sent as an xml element wrapping the message parameters
+ DocumentStyle ///< the message is sent as is, the method name is usually the name of the message
};
/**
@@ -293,7 +282,7 @@ public:
*/
void ignoreSslErrors();
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
/**
* \brief ignoreSslErrors
* If this function is called, the SSL errors given in \p errors will be ignored.
@@ -318,7 +307,7 @@ public:
*/
KDSoapSslHandler *sslHandler() const;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
/**
* Returns the ssl configuration used for outgoing connections
* \since 1.3
@@ -333,22 +322,62 @@ public:
#endif
/**
- * Returns the timeout used for requests, in milliseconds.
- * The default timeout is 30 minutes.
- * \since 1.8
- */
+ * Returns the timeout used for requests, in milliseconds.
+ * The default timeout is 30 minutes.
+ * \since 1.8
+ */
int timeout() const;
/**
- * Sets the timeout used for future requests, in milliseconds.
- * A negative value disables the timeout feature.
- * \since 1.8
- */
+ * Sets the timeout used for future requests, in milliseconds.
+ * A negative value disables the timeout feature.
+ * \since 1.8
+ */
void setTimeout(int msecs);
+ /**
+ * \brief setSendSoapActionInHttpHeader
+ * \param sendInHttpHeader
+ * This option can be used to enable/disable the sending of the SOAP action parameter
+ * in the Content-Type HTTP header (in the case of SOAP 1.2 requests).
+ * It might be necessary to disable it for certain SOAP server implementations
+ * in the case if the action is passed in the SOAP envelope's header with WS-Addressing.
+ * \since 1.11
+ */
+ void setSendSoapActionInHttpHeader(bool sendInHttpHeader);
+
+ /**
+ * \brief sendActionInHTTP_Header
+ * \return true if the SOAP action is passed in the HTTP Content-Type of the request.
+ * This parameter is used only in the case of SOAP 1.2 requests.
+ * This option is enabled by default.
+ * \since 1.11
+ */
+ bool sendSoapActionInHttpHeader() const;
+
+ /**
+ * \brief setSendSoapActionInWsAddressingHeader
+ * \param sendInWsAddressingHeader
+ * This function can be used to enable/disable the sending of the SOAP action embedded to
+ * the request's SOAP envelope header. See the headers of the WS-Addressing:
+ * https://docs.microsoft.com/en-us/dotnet/framework/wcf/feature-details/messaging-protocols#message-addressing-headers
+ * \since 1.11
+ */
+ void setSendSoapActionInWsAddressingHeader(bool sendInWsAddressingHeader);
+
+ /**
+ * \brief sendSoapActionInWsAddressingHeader
+ * \return true if the SOAP action is embedded to the request's SOAP envelope
+ * header. See the headers of the WS-Addressing:
+ * https://docs.microsoft.com/en-us/dotnet/framework/wcf/feature-details/messaging-protocols#message-addressing-headers
+ * This option is disabled by default, the SOAP action is sent in the Conten-Type HTTP header.
+ * See setSendHTTPActionParameter for more details.
+ * \since 1.11
+ */
+ bool sendSoapActionInWsAddressingHeader() const;
+
private:
friend class KDSoapThreadTask;
-
KDSoapClientInterfacePrivate *const d;
};
diff --git a/src/KDSoapClient/KDSoapClientInterface_p.h b/src/KDSoapClient/KDSoapClientInterface_p.h
index d1c0da5..5f8efef 100644
--- a/src/KDSoapClient/KDSoapClientInterface_p.h
+++ b/src/KDSoapClient/KDSoapClientInterface_p.h
@@ -1,36 +1,23 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPCLIENTINTERFACE_P_H
#define KDSOAPCLIENTINTERFACE_P_H
-#include <QtNetwork/QSslConfiguration>
+#include <QtCore/QXmlStreamWriter>
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkCookieJar>
-#include <QtCore/QXmlStreamWriter>
+#include <QtNetwork/QSslConfiguration>
+#include "KDSoapAuthentication.h"
#include "KDSoapClientInterface.h"
#include "KDSoapClientThread_p.h"
-#include "KDSoapAuthentication.h"
QT_BEGIN_NAMESPACE
class QBuffer;
QT_END_NAMESPACE
@@ -57,16 +44,18 @@ public:
KDSoapClientInterface::Style m_style;
bool m_ignoreSslErrors;
KDSoapHeaders m_lastResponseHeaders;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
QList<QSslError> m_ignoreErrorsList;
QSslConfiguration m_sslConfiguration;
KDSoapSslHandler *m_sslHandler;
#endif
int m_timeout;
+ bool m_sendSoapActionInHttpHeader = true;
+ bool m_sendSoapActionInWsAddressingHeader = false;
QNetworkAccessManager *accessManager();
QNetworkRequest prepareRequest(const QString &method, const QString &action);
- QBuffer *prepareRequestBuffer(const QString &method, const KDSoapMessage &message, const KDSoapHeaders &headers);
+ QBuffer *prepareRequestBuffer(const QString &method, const KDSoapMessage &message, const QString &soapAction, const KDSoapHeaders &headers);
void writeElementContents(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, const KDSoapValue &element, KDSoapMessage::Use use);
void writeChildren(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, const KDSoapValueList &args, KDSoapMessage::Use use);
void writeAttributes(QXmlStreamWriter &writer, const QList<KDSoapValue> &attributes);
diff --git a/src/KDSoapClient/KDSoapClientThread.cpp b/src/KDSoapClient/KDSoapClientThread.cpp
index f6a9111..56a388b 100644
--- a/src/KDSoapClient/KDSoapClientThread.cpp
+++ b/src/KDSoapClient/KDSoapClientThread.cpp
@@ -1,41 +1,29 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
-#include "KDSoapClientThread_p.h"
-#include <QDebug>
-#include "KDSoapPendingCallWatcher.h"
#include "KDSoapClientInterface.h"
#include "KDSoapClientInterface_p.h"
+#include "KDSoapClientThread_p.h"
#include "KDSoapPendingCall.h"
+#include "KDSoapPendingCallWatcher.h"
#include "KDSoapPendingCall_p.h"
-#include <QNetworkRequest>
-#include <QNetworkProxy>
+#include <QAuthenticator>
#include <QBuffer>
+#include <QDebug>
#include <QEventLoop>
-#include <QAuthenticator>
+#include <QNetworkProxy>
+#include <QNetworkRequest>
-KDSoapClientThread::KDSoapClientThread(QObject *parent) :
- QThread(parent), m_stopThread(false)
+KDSoapClientThread::KDSoapClientThread(QObject *parent)
+ : QThread(parent)
+ , m_stopThread(false)
{
}
@@ -71,9 +59,8 @@ void KDSoapClientThread::run()
locker.unlock();
KDSoapThreadTask task(taskData); // must be created here, so that it's in the right thread
- connect(&task, SIGNAL(taskDone()), &eventLoop, SLOT(quit()));
- connect(&accessManager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)),
- &task, SLOT(slotAuthenticationRequired(QNetworkReply*,QAuthenticator*)));
+ connect(&task, &KDSoapThreadTask::taskDone, &eventLoop, &QEventLoop::quit);
+ connect(&accessManager, &QNetworkAccessManager::authenticationRequired, &task, &KDSoapThreadTask::slotAuthenticationRequired);
task.process(accessManager);
// Process events until the task tells us the handling of that task is finished
@@ -84,32 +71,31 @@ void KDSoapClientThread::run()
void KDSoapThreadTask::process(QNetworkAccessManager &accessManager)
{
// Can't use m_iface->asyncCall, it would use the accessmanager from the main thread
- //KDSoapPendingCall pendingCall = m_iface->asyncCall(m_method, m_message, m_action);
+ // KDSoapPendingCall pendingCall = m_iface->asyncCall(m_method, m_message, m_action);
- //Headers should be always qualified
- for (KDSoapHeaders::Iterator it = m_data->m_headers.begin(); it != m_data->m_headers.end(); ++it) {
- it->setQualified(true);
+ // Headers should be always qualified
+ for (KDSoapMessage &header : m_data->m_headers) {
+ header.setQualified(true);
}
-#if QT_VERSION >= 0x040700
QNetworkCookieJar *jar = m_data->m_iface->d->accessManager()->cookieJar();
- // Qt-4.6: this aborts in setParent(this) because the jar is from another thread
- // Qt-4.7: it's from a different thread, so this won't change the parent object
accessManager.setCookieJar(jar);
-#endif
accessManager.setProxy(m_data->m_iface->d->accessManager()->proxy());
- QBuffer *buffer = m_data->m_iface->d->prepareRequestBuffer(m_data->m_method, m_data->m_message, m_data->m_headers);
+ QBuffer *buffer = m_data->m_iface->d->prepareRequestBuffer(m_data->m_method,
+ m_data->m_message,
+ m_data->m_action,
+ m_data->m_headers);
QNetworkRequest request = m_data->m_iface->d->prepareRequest(m_data->m_method, m_data->m_action);
QNetworkReply *reply = accessManager.post(request, buffer);
m_data->m_iface->d->setupReply(reply);
+ maybeDebugRequest(buffer->data(), reply->request(), reply);
KDSoapPendingCall pendingCall(reply, buffer);
pendingCall.d->soapVersion = m_data->m_iface->d->m_version;
KDSoapPendingCallWatcher *watcher = new KDSoapPendingCallWatcher(pendingCall, this);
- connect(watcher, SIGNAL(finished(KDSoapPendingCallWatcher*)),
- this, SLOT(slotFinished(KDSoapPendingCallWatcher*)));
+ connect(watcher, &KDSoapPendingCallWatcher::finished, this, &KDSoapThreadTask::slotFinished);
}
void KDSoapThreadTask::slotFinished(KDSoapPendingCallWatcher *watcher)
@@ -118,7 +104,7 @@ void KDSoapThreadTask::slotFinished(KDSoapPendingCallWatcher *watcher)
m_data->m_responseHeaders = watcher->returnHeaders();
m_data->m_semaphore.release();
// Helgrind bug: says this races with main thread. Looks like it's confused by QSharedDataPointer
- //qDebug() << m_data->m_returnArguments.value();
+ // qDebug() << m_data->m_returnArguments.value();
watcher->deleteLater();
emit taskDone();
diff --git a/src/KDSoapClient/KDSoapClientThread_p.h b/src/KDSoapClient/KDSoapClientThread_p.h
index be22171..fcc4c1f 100644
--- a/src/KDSoapClient/KDSoapClientThread_p.h
+++ b/src/KDSoapClient/KDSoapClientThread_p.h
@@ -1,36 +1,23 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPCLIENTTHREAD_P_H
#define KDSOAPCLIENTTHREAD_P_H
-#include "KDSoapMessage.h"
#include "KDSoapAuthentication.h"
-#include <QtCore/QWaitCondition>
-#include <QtCore/QQueue>
-#include <QtCore/QThread>
+#include "KDSoapMessage.h"
#include <QtCore/QMutex>
+#include <QtCore/QQueue>
#include <QtCore/QSemaphore>
+#include <QtCore/QThread>
+#include <QtCore/QWaitCondition>
#include <QtNetwork/QNetworkAccessManager>
class KDSoapPendingCallWatcher;
@@ -42,8 +29,15 @@ QT_END_NAMESPACE
class KDSoapThreadTaskData
{
public:
- KDSoapThreadTaskData(KDSoapClientInterface *iface, const QString &method, const KDSoapMessage &message, const QString &action, const KDSoapHeaders &headers)
- : m_iface(iface), m_method(method), m_message(message), m_action(action), m_headers(headers) {}
+ KDSoapThreadTaskData(KDSoapClientInterface *iface, const QString &method, const KDSoapMessage &message, const QString &action,
+ const KDSoapHeaders &headers)
+ : m_iface(iface)
+ , m_method(method)
+ , m_message(message)
+ , m_action(action)
+ , m_headers(headers)
+ {
+ }
void waitForCompletion()
{
@@ -74,16 +68,18 @@ class KDSoapThreadTask : public QObject
Q_OBJECT
public:
explicit KDSoapThreadTask(KDSoapThreadTaskData *data)
- : m_data(data) {}
+ : m_data(data)
+ {
+ }
void process(QNetworkAccessManager &accessManager);
+ void slotAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator);
signals:
void taskDone();
private Q_SLOTS:
void slotFinished(KDSoapPendingCallWatcher *watcher);
- void slotAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator);
private:
KDSoapThreadTaskData *m_data;
diff --git a/src/KDSoapClient/KDSoapEndpointReference.cpp b/src/KDSoapClient/KDSoapEndpointReference.cpp
index 5427193..b3b4035 100644
--- a/src/KDSoapClient/KDSoapEndpointReference.cpp
+++ b/src/KDSoapClient/KDSoapEndpointReference.cpp
@@ -1,24 +1,12 @@
/****************************************************************************
-** Copyright (C) 2016-2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2016-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
+** SPDX-License-Identifier: MIT
**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapEndpointReference.h"
@@ -27,7 +15,9 @@
class KDSoapEndpointReferenceData : public QSharedData
{
public:
- KDSoapEndpointReferenceData() {}
+ KDSoapEndpointReferenceData()
+ {
+ }
QString m_address;
KDSoapValueList m_metadata;
@@ -45,7 +35,7 @@ KDSoapEndpointReference::KDSoapEndpointReference(const KDSoapEndpointReference &
{
}
-KDSoapEndpointReference &KDSoapEndpointReference::operator =(const KDSoapEndpointReference &other)
+KDSoapEndpointReference &KDSoapEndpointReference::operator=(const KDSoapEndpointReference &other)
{
d = other.d;
return *this;
@@ -89,4 +79,3 @@ void KDSoapEndpointReference::setReferenceParameters(const KDSoapValueList &refe
{
d->m_referenceParameters = referenceParameters;
}
-
diff --git a/src/KDSoapClient/KDSoapEndpointReference.h b/src/KDSoapClient/KDSoapEndpointReference.h
index 70419b3..f6377f8 100644
--- a/src/KDSoapClient/KDSoapEndpointReference.h
+++ b/src/KDSoapClient/KDSoapEndpointReference.h
@@ -1,33 +1,20 @@
/****************************************************************************
-** Copyright (C) 2015-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2015-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPENDPOINTREFERENCE_H
#define KDSOAPENDPOINTREFERENCE_H
#include "KDSoapGlobal.h"
#include "KDSoapValue.h"
-#include <QString>
#include <QSharedDataPointer>
+#include <QString>
class KDSoapEndpointReferenceData;
/**
@@ -40,7 +27,6 @@ class KDSoapEndpointReferenceData;
class KDSOAP_EXPORT KDSoapEndpointReference
{
public:
-
/**
* Construct a KDSoapEndpointReference object with the given \p address
* If no address is given, then an empty QString is taken
@@ -55,11 +41,11 @@ public:
/**
* Copy the content of the KDSoapEndpointReference from \p other to the object
*/
- KDSoapEndpointReference &operator =(const KDSoapEndpointReference &other);
+ KDSoapEndpointReference &operator=(const KDSoapEndpointReference &other);
/**
- * Destroys the object and frees up any resource used.
- */
+ * Destroys the object and frees up any resource used.
+ */
~KDSoapEndpointReference();
/**
@@ -105,4 +91,3 @@ private:
};
#endif // KDSOAPENDPOINTREFERENCE_H
-
diff --git a/src/KDSoapClient/KDSoapFaultException.cpp b/src/KDSoapClient/KDSoapFaultException.cpp
index f38412b..897c4cb 100644
--- a/src/KDSoapClient/KDSoapFaultException.cpp
+++ b/src/KDSoapClient/KDSoapFaultException.cpp
@@ -1,32 +1,20 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapFaultException.h"
-class KDSoapFaultException::Private: public QSharedData
+class KDSoapFaultException::Private : public QSharedData
{
public:
Private();
+
public:
QString m_faultCode;
QString m_faultString;
@@ -38,19 +26,18 @@ KDSoapFaultException::Private::Private()
{
}
-KDSoapFaultException::KDSoapFaultException():
- d(new Private())
+KDSoapFaultException::KDSoapFaultException()
+ : d(new Private())
{
}
KDSoapFaultException::KDSoapFaultException(const KDSoapFaultException &cpy)
: d(cpy.d)
{
-
}
-KDSoapFaultException::KDSoapFaultException(const QString &faultCode, const QString &faultString, const QString &faultActor):
- d(new Private())
+KDSoapFaultException::KDSoapFaultException(const QString &faultCode, const QString &faultString, const QString &faultActor)
+ : d(new Private())
{
d->m_faultCode = faultCode;
d->m_faultString = faultString;
diff --git a/src/KDSoapClient/KDSoapFaultException.h b/src/KDSoapClient/KDSoapFaultException.h
index 8343d5f..e4c1421 100644
--- a/src/KDSoapClient/KDSoapFaultException.h
+++ b/src/KDSoapClient/KDSoapFaultException.h
@@ -1,31 +1,18 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPFAULTEXCEPTION_H
#define KDSOAPFAULTEXCEPTION_H
-#include <QString>
#include "KDSoapValue.h"
+#include <QString>
/**
* KDSoapFaultException is the base class for exceptions representing a fault element.
diff --git a/src/KDSoapClient/KDSoapGlobal.h b/src/KDSoapClient/KDSoapGlobal.h
index 4b34ab9..c3a110f 100644
--- a/src/KDSoapClient/KDSoapGlobal.h
+++ b/src/KDSoapClient/KDSoapGlobal.h
@@ -1,40 +1,26 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPGLOBAL_H
#define KDSOAPGLOBAL_H
#include <QtCore/QtGlobal>
-# ifdef KDSOAP_STATICLIB
-# undef KDSOAP_SHARED
-# define KDSOAP_EXPORT
-# else
-# ifdef KDSOAP_BUILD_KDSOAP_LIB
-# define KDSOAP_EXPORT Q_DECL_EXPORT
-# else
-# define KDSOAP_EXPORT Q_DECL_IMPORT
-# endif
-# endif
+#ifdef KDSOAP_STATICLIB
+#undef KDSOAP_SHARED
+#define KDSOAP_EXPORT
+#else
+#ifdef KDSOAP_BUILD_KDSOAP_LIB
+#define KDSOAP_EXPORT Q_DECL_EXPORT
+#else
+#define KDSOAP_EXPORT Q_DECL_IMPORT
+#endif
+#endif
#endif /* KDSOAPGLOBAL_H */
-
diff --git a/src/KDSoapClient/KDSoapJob.cpp b/src/KDSoapClient/KDSoapJob.cpp
index ac13276..e0b93cd 100644
--- a/src/KDSoapClient/KDSoapJob.cpp
+++ b/src/KDSoapClient/KDSoapJob.cpp
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapJob.h"
#include "KDSoapMessage.h"
diff --git a/src/KDSoapClient/KDSoapJob.h b/src/KDSoapClient/KDSoapJob.h
index 54140ef..bb55b1e 100644
--- a/src/KDSoapClient/KDSoapJob.h
+++ b/src/KDSoapClient/KDSoapJob.h
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPJOB_H
#define KDSOAPJOB_H
@@ -39,8 +26,8 @@ class KDSoapHeaders;
*
* For example, a call to getMothersDay (from the holidays example) using the conventional asynchronous API would look like this:
* \code
- * connect(client, SIGNAL(getMothersDayDone(TNS__GetMothersDayResponse)), this, SLOT(getMothersDayDone(TNS__GetMothersDayResponse)));
- * connect(client, SIGNAL(getMothersDayError(KDSoapMessage)), this, SLOT(getMothersDayError(KDSoapMessage)));
+ * connect(client, &ServiceClass::getMothersDayDone, this, &MyClass::getMothersDayDone);
+ * connect(client, &ServiceClass::getMothersDayError, this, &MyClass::getMothersDayError);
* TNS__GetMothersDay params;
* params.setYear(2012);
* client->asyncGetMothersDay(params);
@@ -51,7 +38,7 @@ class KDSoapHeaders;
*
* \code
* GetMothersDayJob* job = new GetMothersDayJob(client);
- * connect(job, SIGNAL(finished(KDSoapJob*)), this, SLOT(getMothersDayDone(KDSoapJob*)));
+ * connect(job, &GetMothersDayJob::finished, this, &MyClass::getMothersDayDone);
* TNS__GetMothersDay params;
* params.setYear(2012);
* job->setParameters(params);
diff --git a/src/KDSoapClient/KDSoapMessage.cpp b/src/KDSoapClient/KDSoapMessage.cpp
index ef7c9a7..798ffd4 100644
--- a/src/KDSoapClient/KDSoapMessage.cpp
+++ b/src/KDSoapClient/KDSoapMessage.cpp
@@ -1,39 +1,29 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapMessage.h"
+#include "KDDateTime.h"
#include "KDSoapNamespaceManager.h"
#include "KDSoapNamespacePrefixes_p.h"
-#include "KDDateTime.h"
#include <QDebug>
-#include <QXmlStreamReader>
#include <QVariant>
+#include <QXmlStreamReader>
class KDSoapMessageData : public QSharedData
{
public:
KDSoapMessageData()
- : use(KDSoapMessage::LiteralUse), isFault(false), hasMessageAddressingProperties(false)
- {}
+ : use(KDSoapMessage::LiteralUse)
+ , isFault(false)
+ , hasMessageAddressingProperties(false)
+ {
+ }
KDSoapMessage::Use use;
bool isFault;
@@ -47,18 +37,19 @@ KDSoapMessage::KDSoapMessage()
}
KDSoapMessage::KDSoapMessage(const KDSoapMessage &other)
- : KDSoapValue(other), d(other.d)
+ : KDSoapValue(other)
+ , d(other.d)
{
}
-KDSoapMessage &KDSoapMessage::operator =(const KDSoapMessage &other)
+KDSoapMessage &KDSoapMessage::operator=(const KDSoapMessage &other)
{
KDSoapValue::operator=(other);
d = other.d;
return *this;
}
-KDSoapMessage &KDSoapMessage::operator =(const KDSoapValue &other)
+KDSoapMessage &KDSoapMessage::operator=(const KDSoapValue &other)
{
KDSoapValue::operator=(other);
return *this;
@@ -66,12 +57,10 @@ KDSoapMessage &KDSoapMessage::operator =(const KDSoapValue &other)
bool KDSoapMessage::operator==(const KDSoapMessage &other) const
{
- return KDSoapValue::operator ==(other)
- && d->use == other.d->use
- && d->isFault == other.d->isFault;
+ return KDSoapValue::operator==(other) && d->use == other.d->use && d->isFault == other.d->isFault;
}
-bool KDSoapMessage::operator !=(const KDSoapMessage &other) const
+bool KDSoapMessage::operator!=(const KDSoapMessage &other) const
{
return !(*this == other);
}
@@ -89,7 +78,8 @@ void KDSoapMessage::addArgument(const QString &argumentName, const QVariant &arg
childValues().append(soapValue);
}
-void KDSoapMessage::addArgument(const QString &argumentName, const KDSoapValueList &argumentValueList, const QString &typeNameSpace, const QString &typeName)
+void KDSoapMessage::addArgument(const QString &argumentName, const KDSoapValueList &argumentValueList, const QString &typeNameSpace,
+ const QString &typeName)
{
KDSoapValue soapValue(argumentName, argumentValueList, typeNameSpace, typeName);
if (isQualified()) {
@@ -112,7 +102,7 @@ const KDSoapValueList &KDSoapMessage::arguments() const
return childValues();
}
-QDebug operator <<(QDebug dbg, const KDSoapMessage &msg)
+QDebug operator<<(QDebug dbg, const KDSoapMessage &msg)
{
return dbg << KDSoapValue(msg);
}
@@ -128,25 +118,27 @@ QString KDSoapMessage::faultAsString() const
QString faultCodeStr;
KDSoapValue faultCode = childValues().child(QLatin1String("Code"));
while (!faultCode.isNull()) {
- if (!faultCodeStr.isEmpty())
+ if (!faultCodeStr.isEmpty()) {
faultCodeStr += QLatin1String(" ");
+ }
faultCodeStr += faultCode.childValues().child(QLatin1String("Value")).value().toString();
faultCode = faultCode.childValues().child(QLatin1String("Subcode"));
}
return QObject::tr("Fault %1: %2")
- .arg(faultCodeStr)
- .arg(childValues().child(QLatin1String("Reason")).childValues().child(QLatin1String("Text")).value().toString());
+ .arg(faultCodeStr)
+ .arg(childValues().child(QLatin1String("Reason")).childValues().child(QLatin1String("Text")).value().toString());
} else {
// This better be on a single line, since it's used by server-side logging too
const QString actor = childValues().child(QLatin1String("faultactor")).value().toString();
QString ret = QObject::tr("Fault code %1: %2%3")
- .arg(childValues().child(QLatin1String("faultcode")).value().toString(),
- childValues().child(QLatin1String("faultstring")).value().toString(),
- actor.isEmpty() ? QString() : QString::fromLatin1(" (%1)").arg(actor));
+ .arg(childValues().child(QLatin1String("faultcode")).value().toString(),
+ childValues().child(QLatin1String("faultstring")).value().toString(),
+ actor.isEmpty() ? QString() : QString::fromLatin1(" (%1)").arg(actor));
const QString detail = childValues().child(QLatin1String("detail")).value().toString();
if (!detail.isEmpty()) {
- if (!ret.endsWith(QLatin1Char('.')))
+ if (!ret.endsWith(QLatin1Char('.'))) {
ret += QLatin1Char('.');
+ }
ret += QLatin1String(" Error detail: ") + detail;
}
return ret;
@@ -206,11 +198,9 @@ void KDSoapMessage::setUse(Use use)
KDSoapMessage KDSoapHeaders::header(const QString &name) const
{
- const_iterator it = begin();
- const const_iterator e = end();
- for (; it != e; ++it) {
- if ((*it).name() == name) {
- return *it;
+ for (const KDSoapMessage &header : qAsConst(*this)) {
+ if (header.name() == name) {
+ return header;
}
}
return KDSoapMessage();
@@ -218,12 +208,10 @@ KDSoapMessage KDSoapHeaders::header(const QString &name) const
KDSoapMessage KDSoapHeaders::header(const QString &name, const QString &namespaceUri) const
{
- const_iterator it = begin();
- const const_iterator e = end();
- for (; it != e; ++it) {
- //qDebug() << "header(" << name << "," << namespaceUri << "): Looking at" << (*it).name() << "," << (*it).namespaceUri();
- if ((*it).name() == name && (namespaceUri.isEmpty() || (*it).namespaceUri() == namespaceUri)) {
- return *it;
+ for (const KDSoapMessage &header : qAsConst(*this)) {
+ // qDebug() << "header(" << name << "," << namespaceUri << "): Looking at" << header.name() << "," << header.namespaceUri();
+ if (header.name() == name && (namespaceUri.isEmpty() || header.namespaceUri() == namespaceUri)) {
+ return header;
}
}
return KDSoapMessage();
diff --git a/src/KDSoapClient/KDSoapMessage.h b/src/KDSoapClient/KDSoapMessage.h
index cda1226..8b0acc5 100644
--- a/src/KDSoapClient/KDSoapMessage.h
+++ b/src/KDSoapClient/KDSoapMessage.h
@@ -1,33 +1,20 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPMESSAGE_H
#define KDSOAPMESSAGE_H
#include <QtCore/QSharedDataPointer>
#include <QtCore/QVariant>
-#include "KDSoapValue.h"
#include "KDSoapMessageAddressingProperties.h"
+#include "KDSoapValue.h"
QT_BEGIN_NAMESPACE
class QString;
@@ -100,7 +87,8 @@ public:
*
* If the message isQualified(), the value will be set to qualified as well, for convenience.
*/
- void addArgument(const QString &argumentName, const QVariant &argumentValue, const QString &typeNameSpace = QString(), const QString &typeName = QString());
+ void addArgument(const QString &argumentName, const QVariant &argumentValue, const QString &typeNameSpace = QString(),
+ const QString &typeName = QString());
/**
* Adds a complex-type argument to the message.
@@ -117,7 +105,8 @@ public:
*
* If the message isQualified(), the value will be set to qualified as well, for convenience.
*/
- void addArgument(const QString &argumentName, const KDSoapValueList &argumentValueList, const QString &typeNameSpace = QString(), const QString &typeName = QString());
+ void addArgument(const QString &argumentName, const KDSoapValueList &argumentValueList, const QString &typeNameSpace = QString(),
+ const QString &typeName = QString());
/**
* Returns the arguments for the message.
@@ -180,6 +169,7 @@ public:
* \since 1.5
*/
KDSoapMessageAddressingProperties messageAddressingProperties() const;
+
private:
bool isNull() const;
friend class KDSoapPendingCall;
@@ -192,7 +182,7 @@ private:
* Set of headers that can be provided when making a SOAP call.
* \see KDSoapClientInterface
*/
-class KDSOAP_EXPORT KDSoapHeaders : public QList<KDSoapMessage> //krazy:exclude=dpointer
+class KDSOAP_EXPORT KDSoapHeaders : public QList<KDSoapMessage> // krazy:exclude=dpointer
{
public:
/**
diff --git a/src/KDSoapClient/KDSoapMessageAddressingProperties.cpp b/src/KDSoapClient/KDSoapMessageAddressingProperties.cpp
index dbe1c6b..28dd6bc 100644
--- a/src/KDSoapClient/KDSoapMessageAddressingProperties.cpp
+++ b/src/KDSoapClient/KDSoapMessageAddressingProperties.cpp
@@ -1,29 +1,16 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapMessageAddressingProperties.h"
-#include "KDSoapNamespacePrefixes_p.h"
#include "KDSoapNamespaceManager.h"
+#include "KDSoapNamespacePrefixes_p.h"
#include <QDebug>
#include <QLatin1String>
@@ -33,14 +20,16 @@
class KDSoapMessageAddressingPropertiesData : public QSharedData
{
public:
-
- QString destination; // Provides the address of the intended receiver of this message
- QString action; // Identifies the semantics implied by this message
+ QString destination; // Provides the address of the intended receiver of this message
+ QString action; // Identifies the semantics implied by this message
KDSoapEndpointReference sourceEndpoint; // Message origin, could be included to facilitate longer running message exchanges.
- KDSoapEndpointReference replyEndpoint; // Intended receiver for replies to this message, could be included to facilitate longer running message exchanges.
- KDSoapEndpointReference faultEndpoint; // Intended receiver for faults related to this message, could be included to facilitate longer running message exchanges.
- QString messageID; // Unique identifier for this message, may be included to facilitate longer running message exchanges.
- QVector<KDSoapMessageRelationship::Relationship> relationships; // Indicates relationships to prior messages, could be included to facilitate longer running message exchanges.
+ KDSoapEndpointReference replyEndpoint; // Intended receiver for replies to this message, could be included to facilitate longer running message
+ // exchanges.
+ KDSoapEndpointReference faultEndpoint; // Intended receiver for faults related to this message, could be included to facilitate longer running
+ // message exchanges.
+ QString messageID; // Unique identifier for this message, may be included to facilitate longer running message exchanges.
+ QVector<KDSoapMessageRelationship::Relationship> relationships; // Indicates relationships to prior messages, could be included to facilitate
+ // longer running message exchanges.
KDSoapValueList referenceParameters; // Equivalent of the reference parameters object from the endpoint reference within WSDL file
KDSoapValueList metadata; // Holding metadata information
KDSoapMessageAddressingProperties::KDSoapAddressingNamespace addressingNamespace = KDSoapMessageAddressingProperties::Addressing200508;
@@ -56,7 +45,7 @@ KDSoapMessageAddressingProperties::KDSoapMessageAddressingProperties(const KDSoa
{
}
-KDSoapMessageAddressingProperties &KDSoapMessageAddressingProperties::operator =(const KDSoapMessageAddressingProperties &other)
+KDSoapMessageAddressingProperties &KDSoapMessageAddressingProperties::operator=(const KDSoapMessageAddressingProperties &other)
{
d = other.d;
return *this;
@@ -215,7 +204,8 @@ KDSoapMessageAddressingProperties::~KDSoapMessageAddressingProperties()
{
}
-QString KDSoapMessageAddressingProperties::predefinedAddressToString(KDSoapMessageAddressingProperties::KDSoapAddressingPredefinedAddress address, KDSoapAddressingNamespace addressingNamespace)
+QString KDSoapMessageAddressingProperties::predefinedAddressToString(KDSoapMessageAddressingProperties::KDSoapAddressingPredefinedAddress address,
+ KDSoapAddressingNamespace addressingNamespace)
{
QString prefix = addressingNamespaceToString(addressingNamespace);
switch (addressingNamespace) {
@@ -256,10 +246,9 @@ QString KDSoapMessageAddressingProperties::predefinedAddressToString(KDSoapMessa
bool KDSoapMessageAddressingProperties::isWSAddressingNamespace(const QString &namespaceUri)
{
- return namespaceUri == KDSoapNamespaceManager::soapMessageAddressing() ||
- namespaceUri == KDSoapNamespaceManager::soapMessageAddressing200303() ||
- namespaceUri == KDSoapNamespaceManager::soapMessageAddressing200403() ||
- namespaceUri == KDSoapNamespaceManager::soapMessageAddressing200408();
+ return namespaceUri == KDSoapNamespaceManager::soapMessageAddressing() || namespaceUri == KDSoapNamespaceManager::soapMessageAddressing200303()
+ || namespaceUri == KDSoapNamespaceManager::soapMessageAddressing200403()
+ || namespaceUri == KDSoapNamespaceManager::soapMessageAddressing200408();
}
QString KDSoapMessageAddressingProperties::addressingNamespaceToString(KDSoapAddressingNamespace addressingNamespace)
@@ -291,14 +280,16 @@ static void writeKDSoapValueVariant(QXmlStreamWriter &writer, const KDSoapValue
const QVariant valueToWrite = value.value();
if (valueToWrite.canConvert(QVariant::String)) {
writer.writeCharacters(valueToWrite.toString());
- } else
+ } else {
qWarning("Warning: KDSoapMessageAddressingProperties call to writeKDSoapValueVariant could not write the given KDSoapValue "
"value because it could not be converted into a QString");
+ }
}
-static void writeKDSoapValueListHierarchy(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, const QString &addressingNS, const KDSoapValueList &values)
+static void writeKDSoapValueListHierarchy(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, const QString &addressingNS,
+ const KDSoapValueList &values)
{
- Q_FOREACH (const KDSoapValue &value, values) {
+ for (const KDSoapValue &value : qAsConst(values)) {
const QString topLevelName = value.name();
writer.writeStartElement(addressingNS, topLevelName);
@@ -312,7 +303,8 @@ static void writeKDSoapValueListHierarchy(KDSoapNamespacePrefixes &namespacePref
}
}
-void KDSoapMessageAddressingProperties::writeMessageAddressingProperties(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, const QString &messageNamespace, bool forceQualified) const
+void KDSoapMessageAddressingProperties::writeMessageAddressingProperties(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer,
+ const QString &messageNamespace, bool forceQualified) const
{
Q_UNUSED(messageNamespace);
Q_UNUSED(forceQualified);
@@ -375,7 +367,7 @@ void KDSoapMessageAddressingProperties::writeMessageAddressingProperties(KDSoapN
writer.writeEndElement();
}
- foreach (const KDSoapMessageRelationship::Relationship &relationship, d->relationships) {
+ for (const KDSoapMessageRelationship::Relationship &relationship : qAsConst(d->relationships)) {
if (relationship.uri.isEmpty()) {
continue;
}
@@ -421,7 +413,8 @@ void KDSoapMessageAddressingProperties::readMessageAddressingProperty(const KDSo
KDSoapMessageRelationship::Relationship relationship;
relationship.uri = (value.value().toString());
relationship.relationshipType = addressingNS + QLatin1String("/reply");
- foreach (KDSoapValue attr, value.childValues().attributes()) {
+ const auto &childAttributes = value.childValues().attributes();
+ for (const KDSoapValue &attr : childAttributes) {
if (attr.name() == QLatin1String("RelationshipType")) {
relationship.relationshipType = attr.value().toString();
}
@@ -436,9 +429,10 @@ void KDSoapMessageAddressingProperties::readMessageAddressingProperty(const KDSo
}
}
-QDebug operator <<(QDebug dbg, const KDSoapMessageAddressingProperties &msg)
+QDebug operator<<(QDebug dbg, const KDSoapMessageAddressingProperties &msg)
{
- dbg << msg.action() << msg.destination() << msg.sourceEndpoint().address() << msg.replyEndpoint().address() << msg.faultEndpoint().address() << msg.messageID();
+ dbg << msg.action() << msg.destination() << msg.sourceEndpoint().address() << msg.replyEndpoint().address() << msg.faultEndpoint().address()
+ << msg.messageID();
return dbg;
}
diff --git a/src/KDSoapClient/KDSoapMessageAddressingProperties.h b/src/KDSoapClient/KDSoapMessageAddressingProperties.h
index 27d1f19..98eff24 100644
--- a/src/KDSoapClient/KDSoapMessageAddressingProperties.h
+++ b/src/KDSoapClient/KDSoapMessageAddressingProperties.h
@@ -1,30 +1,17 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPMESSAGEADDRESSINGPROPERTIES_H
#define KDSOAPMESSAGEADDRESSINGPROPERTIES_H
-#include <QtCore/QSharedDataPointer>
#include "KDSoapGlobal.h"
+#include <QtCore/QSharedDataPointer>
#include "KDSoapEndpointReference.h"
#include "KDSoapValue.h"
@@ -43,14 +30,16 @@ class KDSoapMessageAddressingPropertiesData;
* \see https://www.w3.org/TR/ws-addr-core/#msgaddrpropsinfoset
* \since 1.5
*/
-namespace KDSoapMessageRelationship
-{
+namespace KDSoapMessageRelationship {
-struct Relationship {
+struct Relationship
+{
/**
* Relationship default ctor
*/
- Relationship() {}
+ Relationship()
+ {
+ }
/**
* Relationship constructor
@@ -60,7 +49,10 @@ struct Relationship {
* https://www.w3.org/TR/2006/REC-ws-addr-core-20060509)
*/
Relationship(const QString &URI, const QString &type = QString())
- : uri(URI), relationshipType(type) {}
+ : uri(URI)
+ , relationshipType(type)
+ {
+ }
QString uri;
QString relationshipType;
@@ -91,7 +83,8 @@ public:
* It is meant to be used with the predefinedAddress helper function to retrieve the uri as a QString
* \see predefinedAddressToString
*/
- enum KDSoapAddressingPredefinedAddress {
+ enum KDSoapAddressingPredefinedAddress
+ {
None,
Anonymous,
Reply,
@@ -104,7 +97,8 @@ public:
* \since 1.9
* \see setAddressingNamespace
*/
- enum KDSoapAddressingNamespace {
+ enum KDSoapAddressingNamespace
+ {
Addressing200303,
Addressing200403,
Addressing200408,
@@ -129,7 +123,7 @@ public:
/**
* Copies the contents of the object given by \p other.
*/
- KDSoapMessageAddressingProperties &operator =(const KDSoapMessageAddressingProperties &other);
+ KDSoapMessageAddressingProperties &operator=(const KDSoapMessageAddressingProperties &other);
/**
* Returns the destination address, it should match the EndpointReference given from WSDL
@@ -235,7 +229,8 @@ public:
QVector<KDSoapMessageRelationship::Relationship> relationships() const;
/**
- * Set the relationships of the message, parameter is a QVector of Relationship, the class Relationship carry the relationship type and the message ID of the related message
+ * Set the relationships of the message, parameter is a QVector of Relationship, the class Relationship carry the relationship type and the
+ * message ID of the related message
*
* \see Relationship
*
@@ -297,12 +292,13 @@ public:
/**
* Helper function that takes the \p address enum and \p addressingNamespace to provide the QString equivalent
*/
- static QString predefinedAddressToString(KDSoapAddressingPredefinedAddress address, KDSoapAddressingNamespace addressingNamespace = Addressing200508);
+ static QString predefinedAddressToString(KDSoapAddressingPredefinedAddress address,
+ KDSoapAddressingNamespace addressingNamespace = Addressing200508);
/**
* Helper function that compares \p namespaceUri with the known WS-Addressing namespaces
*/
- static bool isWSAddressingNamespace(const QString& namespaceUri);
+ static bool isWSAddressingNamespace(const QString &namespaceUri);
/**
* Helper function that takes the \p addressingNamespace enum to provide the QString equivalent
@@ -314,12 +310,13 @@ private:
/**
* Private method called to write the properties to the soap header, using QXmlStreamWriter
*/
- void writeMessageAddressingProperties(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, const QString &messageNamespace, bool forceQualified) const;
+ void writeMessageAddressingProperties(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, const QString &messageNamespace,
+ bool forceQualified) const;
/**
* Private method called to read a property from a soap header
*/
- void readMessageAddressingProperty(const KDSoapValue& value);
+ void readMessageAddressingProperty(const KDSoapValue &value);
private:
QSharedDataPointer<KDSoapMessageAddressingPropertiesData> d;
@@ -328,6 +325,6 @@ private:
/**
* Support for debugging KDSoapMessageAddressingProperties object via qDebug() << msg;
*/
-KDSOAP_EXPORT QDebug operator <<(QDebug dbg, const KDSoapMessageAddressingProperties &msg);
+KDSOAP_EXPORT QDebug operator<<(QDebug dbg, const KDSoapMessageAddressingProperties &msg);
#endif // KDSOAPMESSAGEADDRESSINGPROPERTIES_H
diff --git a/src/KDSoapClient/KDSoapMessageReader.cpp b/src/KDSoapClient/KDSoapMessageReader.cpp
index bb5ae7e..bed1369 100644
--- a/src/KDSoapClient/KDSoapMessageReader.cpp
+++ b/src/KDSoapClient/KDSoapMessageReader.cpp
@@ -1,91 +1,62 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
+#include "KDDateTime.h"
#include "KDSoapMessageReader_p.h"
#include "KDSoapNamespaceManager.h"
#include "KDSoapNamespacePrefixes_p.h"
-#include "KDDateTime.h"
#include <QDebug>
#include <QXmlStreamReader>
-// Wrapper for compatibility with Qt < 4.6.
-static bool readNextStartElement(QXmlStreamReader &reader)
-{
-#if QT_VERSION >= 0x040600
- return reader.readNextStartElement();
-#else
- while (reader.readNext() != QXmlStreamReader::Invalid) {
- if (reader.isEndElement()) {
- return false;
- } else if (reader.isStartElement()) {
- return true;
- }
- }
- return false;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#define QStringView QStringRef
#endif
-}
-static QStringRef namespaceForPrefix(const QXmlStreamNamespaceDeclarations &decls, const QString &prefix)
+static QStringView namespaceForPrefix(const QXmlStreamNamespaceDeclarations &decls, const QString &prefix)
{
- for (int i = 0; i < decls.count(); ++i) {
- const QXmlStreamNamespaceDeclaration &decl = decls.at(i);
+ for (const QXmlStreamNamespaceDeclaration &decl : qAsConst(decls)) {
if (decl.prefix() == prefix) {
return decl.namespaceUri();
}
}
- return QStringRef();
+ return QStringView();
}
static int xmlTypeToMetaType(const QString &xmlType)
{
// Reverse operation from variantToXmlType in KDSoapClientInterface, keep in sync
- static const struct {
+ static const struct
+ {
const char *xml; // xsd: prefix assumed
const int metaTypeId;
- } s_types[] = {
- { "string", QVariant::String }, // or QUrl
- { "base64Binary", QVariant::ByteArray },
- { "int", QVariant::Int }, // or long, or uint, or longlong
- { "unsignedInt", QVariant::ULongLong },
- { "boolean", QVariant::Bool },
- { "float", QMetaType::Float },
- { "double", QVariant::Double },
- { "time", QVariant::Time },
- { "date", QVariant::Date }
- };
+ } s_types[] = {{"string", QVariant::String}, // or QUrl
+ {"base64Binary", QVariant::ByteArray},
+ {"int", QVariant::Int}, // or long, or uint, or longlong
+ {"unsignedInt", QVariant::ULongLong},
+ {"boolean", QVariant::Bool},
+ {"float", QMetaType::Float},
+ {"double", QVariant::Double},
+ {"time", QVariant::Time},
+ {"date", QVariant::Date}};
// Speed: could be sorted and then we could use qBinaryFind
- static const int s_numTypes = sizeof(s_types) / sizeof(*s_types);
- for (int i = 0; i < s_numTypes; ++i) {
- if (xmlType == QLatin1String(s_types[i].xml)) {
- return s_types[i].metaTypeId;
+ for (const auto &type : s_types) {
+ if (xmlType == QLatin1String(type.xml)) {
+ return type.metaTypeId;
}
}
if (xmlType == QLatin1String("dateTime")) {
return qMetaTypeId<KDDateTime>();
}
// This will happen with any custom type, don't bother the user
- //qDebug() << QString::fromLatin1("xmlTypeToMetaType: XML type %1 is not supported in "
+ // qDebug() << QString::fromLatin1("xmlTypeToMetaType: XML type %1 is not supported in "
// "KDSoap, see the documentation").arg(xmlType);
return -1;
}
@@ -98,18 +69,17 @@ static KDSoapValue parseElement(QXmlStreamReader &reader, const QXmlStreamNamesp
val.setNamespaceUri(reader.namespaceUri().toString());
val.setNamespaceDeclarations(reader.namespaceDeclarations());
val.setEnvironmentNamespaceDeclarations(combinedNamespaceDeclarations);
- //qDebug() << "parsing" << name;
+ // qDebug() << "parsing" << name;
QVariant::Type metaTypeId = QVariant::Invalid;
const QXmlStreamAttributes attributes = reader.attributes();
- Q_FOREACH (const QXmlStreamAttribute &attribute, attributes) {
- const QStringRef name = attribute.name();
- const QStringRef ns = attribute.namespaceUri();
- const QStringRef attrValue = attribute.value();
+ for (const QXmlStreamAttribute &attribute : attributes) {
+ const QStringView name = attribute.name();
+ const QStringView ns = attribute.namespaceUri();
+ const QStringView attrValue = attribute.value();
// Parse xsi:type and soap-enc:arrayType
// and ignore anything else from the xsi or soap-enc namespaces until someone needs it...
- if (ns == KDSoapNamespaceManager::xmlSchemaInstance1999() ||
- ns == KDSoapNamespaceManager::xmlSchemaInstance2001()) {
+ if (ns == KDSoapNamespaceManager::xmlSchemaInstance1999() || ns == KDSoapNamespaceManager::xmlSchemaInstance2001()) {
if (name == QLatin1String("type")) {
// The type can be like xsd:float, resolve that
const QString type = attrValue.toString();
@@ -119,11 +89,11 @@ static KDSoapValue parseElement(QXmlStreamReader &reader, const QXmlStreamNamesp
metaTypeId = static_cast<QVariant::Type>(xmlTypeToMetaType(dataType));
}
continue;
- } else if (ns == KDSoapNamespaceManager::soapEncoding() || ns == KDSoapNamespaceManager::soapEncoding200305() ||
- ns == KDSoapNamespaceManager::soapEnvelope() || ns == KDSoapNamespaceManager::soapEnvelope200305()) {
+ } else if (ns == KDSoapNamespaceManager::soapEncoding() || ns == KDSoapNamespaceManager::soapEncoding200305()
+ || ns == KDSoapNamespaceManager::soapEnvelope() || ns == KDSoapNamespaceManager::soapEnvelope200305()) {
continue;
}
- //qDebug() << "Got attribute:" << name << ns << "=" << attrValue;
+ // qDebug() << "Got attribute:" << name << ns << "=" << attrValue;
val.childValues().attributes().append(KDSoapValue(name.toString(), attrValue.toString()));
}
QString text;
@@ -133,7 +103,7 @@ static KDSoapValue parseElement(QXmlStreamReader &reader, const QXmlStreamNamesp
}
if (reader.isCharacters()) {
text = reader.text().toString();
- //qDebug() << "text=" << text;
+ // qDebug() << "text=" << text;
} else if (reader.isStartElement()) {
const KDSoapValue subVal = parseElement(reader, combinedNamespaceDeclarations); // recurse
val.childValues().append(subVal);
@@ -142,7 +112,7 @@ static KDSoapValue parseElement(QXmlStreamReader &reader, const QXmlStreamNamesp
if (!text.isEmpty()) {
QVariant variant(text);
- //qDebug() << text << variant << metaTypeId;
+ // qDebug() << text << variant << metaTypeId;
// With use=encoded, we have type info, we can convert the variant here
// Otherwise, for servers, we do it later, once we know the method's parameter types.
if (metaTypeId != QVariant::Invalid) {
@@ -206,19 +176,22 @@ static QByteArray handleNotWellFormedError(const QByteArray &data, qint64 offset
return dataCleanedUp;
}
-KDSoapMessageReader::XmlError KDSoapMessageReader::xmlToMessage(const QByteArray &data, KDSoapMessage *pMsg, QString *pMessageNamespace, KDSoapHeaders *pRequestHeaders, KDSoap::SoapVersion soapVersion) const
+KDSoapMessageReader::XmlError KDSoapMessageReader::xmlToMessage(const QByteArray &data, KDSoapMessage *pMsg, QString *pMessageNamespace,
+ KDSoapHeaders *pRequestHeaders, KDSoap::SoapVersion soapVersion) const
{
Q_ASSERT(pMsg);
QXmlStreamReader reader(data);
- if (readNextStartElement(reader)) {
- if (reader.name() == QLatin1String("Envelope") && (reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope() ||
- reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope200305())) {
+ if (reader.readNextStartElement()) {
+ if (reader.name() == QLatin1String("Envelope")
+ && (reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope()
+ || reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope200305())) {
const QXmlStreamNamespaceDeclarations envNsDecls = reader.namespaceDeclarations();
- if (readNextStartElement(reader)) {
- if (reader.name() == QLatin1String("Header") && (reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope() ||
- reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope200305())) {
+ if (reader.readNextStartElement()) {
+ if (reader.name() == QLatin1String("Header")
+ && (reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope()
+ || reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope200305())) {
KDSoapMessageAddressingProperties messageAddressingProperties;
- while (readNextStartElement(reader)) {
+ while (reader.readNextStartElement()) {
if (KDSoapMessageAddressingProperties::isWSAddressingNamespace(reader.namespaceUri().toString())) {
KDSoapValue value = parseElement(reader, envNsDecls);
messageAddressingProperties.readMessageAddressingProperty(value);
@@ -229,17 +202,19 @@ KDSoapMessageReader::XmlError KDSoapMessageReader::xmlToMessage(const QByteArray
}
}
pMsg->setMessageAddressingProperties(messageAddressingProperties);
- readNextStartElement(reader); // read <Body>
+ reader.readNextStartElement(); // read <Body>
}
- if (reader.name() == QLatin1String("Body") && (reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope() ||
- reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope200305())) {
- if (readNextStartElement(reader)) {
+ if (reader.name() == QLatin1String("Body")
+ && (reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope()
+ || reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope200305())) {
+ if (reader.readNextStartElement()) {
*pMsg = parseElement(reader, envNsDecls);
if (pMessageNamespace) {
*pMessageNamespace = pMsg->namespaceUri();
}
- if (pMsg->name() == QLatin1String("Fault") && (reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope() ||
- reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope200305())) {
+ if (pMsg->name() == QLatin1String("Fault")
+ && (reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope()
+ || reader.namespaceUri() == KDSoapNamespaceManager::soapEnvelope200305())) {
pMsg->setFault(true);
}
}
@@ -263,9 +238,7 @@ KDSoapMessageReader::XmlError KDSoapMessageReader::xmlToMessage(const QByteArray
}
}
QString faultText = QString::fromLatin1("XML error: [%1:%2] %3")
- .arg(QString::number(reader.lineNumber()),
- QString::number(reader.columnNumber()),
- reader.errorString());
+ .arg(QString::number(reader.lineNumber()), QString::number(reader.columnNumber()), reader.errorString());
pMsg->createFaultMessage(QString::number(reader.error()), faultText, soapVersion);
return reader.error() == QXmlStreamReader::PrematureEndOfDocumentError ? PrematureEndOfDocumentError : ParseError;
}
diff --git a/src/KDSoapClient/KDSoapMessageReader_p.h b/src/KDSoapClient/KDSoapMessageReader_p.h
index d5a412b..7558b7d 100644
--- a/src/KDSoapClient/KDSoapMessageReader_p.h
+++ b/src/KDSoapClient/KDSoapMessageReader_p.h
@@ -1,36 +1,24 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPMESSAGEREADER_P_H
#define KDSOAPMESSAGEREADER_P_H
-#include "KDSoapMessage.h"
#include "KDSoapClientInterface.h"
+#include "KDSoapMessage.h"
class KDSOAP_EXPORT KDSoapMessageReader
{
public:
- enum XmlError {
+ enum XmlError
+ {
NoError = 0,
ParseError,
PrematureEndOfDocumentError
@@ -38,7 +26,8 @@ public:
KDSoapMessageReader();
- XmlError xmlToMessage(const QByteArray &data, KDSoapMessage *pParsedMessage, QString *pMessageNamespace, KDSoapHeaders *pRequestHeaders, KDSoap::SoapVersion soapVersion) const;
+ XmlError xmlToMessage(const QByteArray &data, KDSoapMessage *pParsedMessage, QString *pMessageNamespace, KDSoapHeaders *pRequestHeaders,
+ KDSoap::SoapVersion soapVersion) const;
};
#endif
diff --git a/src/KDSoapClient/KDSoapMessageWriter.cpp b/src/KDSoapClient/KDSoapMessageWriter.cpp
index 874a643..ca40460 100644
--- a/src/KDSoapClient/KDSoapMessageWriter.cpp
+++ b/src/KDSoapClient/KDSoapMessageWriter.cpp
@@ -1,32 +1,19 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
-#include "KDSoapMessageWriter_p.h"
-#include "KDSoapNamespacePrefixes_p.h"
+****************************************************************************/
#include "KDSoapClientInterface_p.h"
+#include "KDSoapMessageWriter_p.h"
#include "KDSoapNamespaceManager.h"
+#include "KDSoapNamespacePrefixes_p.h"
#include "KDSoapValue.h"
-#include <QVariant>
#include <QDebug>
+#include <QVariant>
KDSoapMessageWriter::KDSoapMessageWriter()
: m_version(KDSoap::SOAP1_1)
@@ -43,16 +30,16 @@ void KDSoapMessageWriter::setMessageNamespace(const QString &ns)
m_messageNamespace = ns;
}
-QByteArray KDSoapMessageWriter::messageToXml(const KDSoapMessage &message, const QString &method,
- const KDSoapHeaders &headers, const QMap<QString, KDSoapMessage> &persistentHeaders,
- const KDSoapAuthentication &authentication) const
+QByteArray KDSoapMessageWriter::messageToXml(const KDSoapMessage &message, const QString &method, const KDSoapHeaders &headers,
+ const QMap<QString, KDSoapMessage> &persistentHeaders, const KDSoapAuthentication &authentication) const
{
QByteArray data;
QXmlStreamWriter writer(&data);
writer.writeStartDocument();
KDSoapNamespacePrefixes namespacePrefixes;
- namespacePrefixes.writeStandardNamespaces(writer, m_version, message.hasMessageAddressingProperties(), message.messageAddressingProperties().addressingNamespace());
+ namespacePrefixes.writeStandardNamespaces(writer, m_version, message.hasMessageAddressingProperties(),
+ message.messageAddressingProperties().addressingNamespace());
QString soapEnvelope;
QString soapEncoding;
@@ -67,7 +54,7 @@ QByteArray KDSoapMessageWriter::messageToXml(const KDSoapMessage &message, const
writer.writeStartElement(soapEnvelope, QLatin1String("Envelope"));
// This has been removed, see https://msdn.microsoft.com/en-us/library/ms995710.aspx for details
- //writer.writeAttribute(soapEnvelope, QLatin1String("encodingStyle"), soapEncoding);
+ // writer.writeAttribute(soapEnvelope, QLatin1String("encodingStyle"), soapEncoding);
QString messageNamespace = m_messageNamespace;
if (!message.namespaceUri().isEmpty() && messageNamespace != message.namespaceUri()) {
@@ -80,10 +67,10 @@ QByteArray KDSoapMessageWriter::messageToXml(const KDSoapMessage &message, const
// and xsi:type attributes that refer to n1, which isn't defined in the body...
namespacePrefixes.writeNamespace(writer, messageNamespace, QLatin1String("n1") /*make configurable?*/);
writer.writeStartElement(soapEnvelope, QLatin1String("Header"));
- Q_FOREACH (const KDSoapMessage &header, persistentHeaders) {
+ for (const KDSoapMessage &header : qAsConst(persistentHeaders)) {
header.writeChildren(namespacePrefixes, writer, header.use(), messageNamespace, true);
}
- Q_FOREACH (const KDSoapMessage &header, headers) {
+ for (const KDSoapMessage &header : qAsConst(headers)) {
header.writeChildren(namespacePrefixes, writer, header.use(), messageNamespace, true);
}
if (message.hasMessageAddressingProperties()) {
diff --git a/src/KDSoapClient/KDSoapMessageWriter_p.h b/src/KDSoapClient/KDSoapMessageWriter_p.h
index 0213ee3..eb7fc52 100644
--- a/src/KDSoapClient/KDSoapMessageWriter_p.h
+++ b/src/KDSoapClient/KDSoapMessageWriter_p.h
@@ -1,35 +1,22 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPMESSAGEWRITER_P_H
#define KDSOAPMESSAGEWRITER_P_H
-#include "KDSoapMessage.h"
#include "KDSoapAuthentication.h"
#include "KDSoapClientInterface.h"
-#include <QtCore/QXmlStreamWriter>
+#include "KDSoapMessage.h"
#include <QtCore/QByteArray>
-#include <QtCore/QString>
#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QXmlStreamWriter>
class KDSoapMessage;
class KDSoapHeaders;
class KDSoapNamespacePrefixes;
@@ -56,7 +43,6 @@ public:
private:
QString m_messageNamespace;
KDSoap::SoapVersion m_version;
-
};
#endif // KDSOAPMESSAGEWRITER_P_H
diff --git a/src/KDSoapClient/KDSoapNamespaceManager.cpp b/src/KDSoapClient/KDSoapNamespaceManager.cpp
index af42667..4ec1659 100644
--- a/src/KDSoapClient/KDSoapNamespaceManager.cpp
+++ b/src/KDSoapClient/KDSoapNamespaceManager.cpp
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapNamespaceManager.h"
KDSoapNamespaceManager::KDSoapNamespaceManager()
diff --git a/src/KDSoapClient/KDSoapNamespaceManager.h b/src/KDSoapClient/KDSoapNamespaceManager.h
index 2c2f45b..ae1bfcc 100644
--- a/src/KDSoapClient/KDSoapNamespaceManager.h
+++ b/src/KDSoapClient/KDSoapNamespaceManager.h
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPNAMESPACEMANAGER_H
#define KDSOAPNAMESPACEMANAGER_H
@@ -29,7 +16,7 @@
/**
* Repository of namespaces
*/
-class KDSOAP_EXPORT KDSoapNamespaceManager //krazy:exclude=dpointer
+class KDSOAP_EXPORT KDSoapNamespaceManager // krazy:exclude=dpointer
{
public:
static QString xmlSchema1999();
diff --git a/src/KDSoapClient/KDSoapNamespacePrefixes.cpp b/src/KDSoapClient/KDSoapNamespacePrefixes.cpp
index 9ae218b..d4b45f9 100644
--- a/src/KDSoapClient/KDSoapNamespacePrefixes.cpp
+++ b/src/KDSoapClient/KDSoapNamespacePrefixes.cpp
@@ -1,33 +1,18 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
-#include "KDSoapNamespacePrefixes_p.h"
+****************************************************************************/
#include "KDSoapClientInterface_p.h"
#include "KDSoapNamespaceManager.h"
+#include "KDSoapNamespacePrefixes_p.h"
-void KDSoapNamespacePrefixes::writeStandardNamespaces(QXmlStreamWriter &writer,
- KDSoap::SoapVersion version,
- bool messageAddressingEnabled,
- KDSoapMessageAddressingProperties::KDSoapAddressingNamespace messageAddressingNamespace)
+void KDSoapNamespacePrefixes::writeStandardNamespaces(QXmlStreamWriter &writer, KDSoap::SoapVersion version, bool messageAddressingEnabled,
+ KDSoapMessageAddressingProperties::KDSoapAddressingNamespace messageAddressingNamespace)
{
if (version == KDSoap::SOAP1_1) {
writeNamespace(writer, KDSoapNamespaceManager::soapEnvelope(), QLatin1String("soap"));
diff --git a/src/KDSoapClient/KDSoapNamespacePrefixes_p.h b/src/KDSoapClient/KDSoapNamespacePrefixes_p.h
index 3ed9377..8ad8d78 100644
--- a/src/KDSoapClient/KDSoapNamespacePrefixes_p.h
+++ b/src/KDSoapClient/KDSoapNamespacePrefixes_p.h
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPNAMESPACEPREFIXES_P_H
#define KDSOAPNAMESPACEPREFIXES_P_H
@@ -32,15 +19,13 @@
class KDSoapNamespacePrefixes : public QMap<QString /*ns*/, QString /*prefix*/>
{
public:
- void writeStandardNamespaces(QXmlStreamWriter &writer,
- KDSoap::SoapVersion version = KDSoap::SOAP1_1,
- bool messageAddressingEnabled = false,
- KDSoapMessageAddressingProperties::KDSoapAddressingNamespace messageAddressingNamespace = KDSoapMessageAddressingProperties::Addressing200508
- );
+ void writeStandardNamespaces(QXmlStreamWriter &writer, KDSoap::SoapVersion version = KDSoap::SOAP1_1, bool messageAddressingEnabled = false,
+ KDSoapMessageAddressingProperties::KDSoapAddressingNamespace messageAddressingNamespace =
+ KDSoapMessageAddressingProperties::Addressing200508);
void writeNamespace(QXmlStreamWriter &writer, const QString &ns, const QString &prefix)
{
- //qDebug() << "writeNamespace" << ns << prefix;
+ // qDebug() << "writeNamespace" << ns << prefix;
insert(ns, prefix);
writer.writeNamespace(ns, prefix);
}
diff --git a/src/KDSoapClient/KDSoapPendingCall.cpp b/src/KDSoapClient/KDSoapPendingCall.cpp
index 465db64..3f6cb96 100644
--- a/src/KDSoapClient/KDSoapPendingCall.cpp
+++ b/src/KDSoapClient/KDSoapPendingCall.cpp
@@ -1,48 +1,36 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapPendingCall.h"
-#include "KDSoapPendingCall_p.h"
-#include "KDSoapNamespaceManager.h"
#include "KDSoapMessageReader_p.h"
-#include <QNetworkReply>
+#include "KDSoapNamespaceManager.h"
+#include "KDSoapPendingCall_p.h"
#include <QDebug>
+#include <QNetworkReply>
-static void debugHelper(const QByteArray &data, const QList<QNetworkReply::RawHeaderPair> &headerList) {
+static void debugHelper(const QByteArray &data, const QList<QNetworkReply::RawHeaderPair> &headerList)
+{
const QByteArray doDebug = qgetenv("KDSOAP_DEBUG");
const QList<QByteArray> options = doDebug.toLower().split(',');
const bool optEscape = options.contains("escape");
const bool optHttp = options.contains("http") || options.contains("https");
const bool optReformat = options.contains("reformat");
quint8 indentation = 4;
- Q_FOREACH( const QByteArray &opt, options ) {
- if (opt.startsWith("indent=")) { //krazy:exclude=strings
+ for (const QByteArray &opt : qAsConst(options)) {
+ if (opt.startsWith("indent=")) { // krazy:exclude=strings
indentation = opt.mid(7).toUShort();
}
}
QByteArray toOutput;
if (optHttp) {
- Q_FOREACH( const QNetworkReply::RawHeaderPair &header, headerList ) {
+ for (const QNetworkReply::RawHeaderPair &header : qAsConst(headerList)) {
if (!header.first.isEmpty()) {
toOutput += header.first + ": ";
}
@@ -71,19 +59,15 @@ static void debugHelper(const QByteArray &data, const QList<QNetworkReply::RawHe
}
if (optEscape) {
- // no support for escaping with Qt4
qDebug() << toOutput;
} else {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
qDebug().noquote() << toOutput;
-#else
- qDebug() << toOutput;
-#endif
}
}
// Log the HTTP and XML of a response from the server.
-static void maybeDebugResponse(const QByteArray &data, QNetworkReply *reply) {
+static void maybeDebugResponse(const QByteArray &data, QNetworkReply *reply)
+{
const QByteArray doDebug = qgetenv("KDSOAP_DEBUG");
if (doDebug.trimmed().isEmpty() || doDebug == "0") {
return;
@@ -94,7 +78,8 @@ static void maybeDebugResponse(const QByteArray &data, QNetworkReply *reply) {
// Log the HTTP and XML of a request.
// (not static, because this is used in KDSoapClientInterface)
-void maybeDebugRequest(const QByteArray &data, const QNetworkRequest &request, QNetworkReply *reply) {
+void maybeDebugRequest(const QByteArray &data, const QNetworkRequest &request, QNetworkReply *reply)
+{
const QByteArray doDebug = qgetenv("KDSOAP_DEBUG");
if (doDebug.trimmed().isEmpty() || doDebug == "0") {
return;
@@ -104,29 +89,41 @@ void maybeDebugRequest(const QByteArray &data, const QNetworkRequest &request, Q
if (reply) {
QByteArray method;
switch (reply->operation()) {
- default: break; // don't try to mimic the basic HTTP command
- case QNetworkAccessManager::GetOperation: method = "GET"; break;
- case QNetworkAccessManager::HeadOperation: method = "HEAD"; break;
- case QNetworkAccessManager::PutOperation: method = "PUT"; break;
- case QNetworkAccessManager::PostOperation: method = "POST"; break;
- case QNetworkAccessManager::DeleteOperation: method = "DELETE"; break;
+ default:
+ break; // don't try to mimic the basic HTTP command
+ case QNetworkAccessManager::GetOperation:
+ method = "GET";
+ break;
+ case QNetworkAccessManager::HeadOperation:
+ method = "HEAD";
+ break;
+ case QNetworkAccessManager::PutOperation:
+ method = "PUT";
+ break;
+ case QNetworkAccessManager::PostOperation:
+ method = "POST";
+ break;
+ case QNetworkAccessManager::DeleteOperation:
+ method = "DELETE";
+ break;
}
if (!method.isEmpty()) {
- headerList << qMakePair<QByteArray,QByteArray>("", method + " " + qPrintable(reply->url().toString()));
+ QByteArray output = method + " " + reply->url().toString().toUtf8();
+ headerList << QNetworkReply::RawHeaderPair {{}, std::move(output)};
}
}
- Q_FOREACH( const QByteArray &h, request.rawHeaderList() ) {
- headerList << qMakePair<QByteArray,QByteArray>(h, request.rawHeader(h));
+ const auto rawHeaders = request.rawHeaderList();
+ for (const QByteArray &h : rawHeaders) {
+ headerList << QNetworkReply::RawHeaderPair {h, request.rawHeader(h)};
}
debugHelper(data, headerList);
}
-
KDSoapPendingCall::Private::~Private()
{
if (reply) {
// Ensure the connection is closed, which QNetworkReply doesn't do in its destructor. This needs abort().
- QObject::disconnect(reply.data(), SIGNAL(finished()), nullptr, nullptr);
+ QObject::disconnect(reply.data(), &QNetworkReply::finished, nullptr, nullptr);
reply->abort();
}
delete reply.data();
@@ -185,12 +182,10 @@ void KDSoapPendingCall::Private::parseReply()
return;
}
QNetworkReply *reply = this->reply.data();
-#if QT_VERSION >= 0x040600
if (!reply->isFinished()) {
qWarning("KDSoap: Parsing reply before it finished!");
return;
}
-#endif
parsed = true;
// Don't try to read from an aborted (closed) reply
@@ -205,10 +200,12 @@ void KDSoapPendingCall::Private::parseReply()
if (reply->error()) {
if (!replyMessage.isFault()) {
replyHeaders.clear();
- if (reply->error() == QNetworkReply::OperationCanceledError && reply->property("kdsoap_reply_timed_out").toBool()) // see KDSoapClientInterface.cpp
+ if (reply->error() == QNetworkReply::OperationCanceledError
+ && reply->property("kdsoap_reply_timed_out").toBool()) { // see KDSoapClientInterface.cpp
replyMessage.createFaultMessage(QString::number(QNetworkReply::TimeoutError), QLatin1String("Operation timed out"), soapVersion);
- else
+ } else {
replyMessage.createFaultMessage(QString::number(reply->error()), reply->errorString(), soapVersion);
+ }
}
}
}
diff --git a/src/KDSoapClient/KDSoapPendingCall.h b/src/KDSoapClient/KDSoapPendingCall.h
index bda86db..d1166bc 100644
--- a/src/KDSoapClient/KDSoapPendingCall.h
+++ b/src/KDSoapClient/KDSoapPendingCall.h
@@ -1,30 +1,17 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPPENDINGCALL_H
#define KDSOAPPENDINGCALL_H
-#include <QtCore/QExplicitlySharedDataPointer>
#include "KDSoapMessage.h"
+#include <QtCore/QExplicitlySharedDataPointer>
QT_BEGIN_NAMESPACE
class QNetworkReply;
class QBuffer;
@@ -100,9 +87,6 @@ public:
*
* You generally do not need to use this: use KDSoapPendingCallWatcher to be notified
* of the call completion.
- *
- * \warning This method requires Qt 4.6 to work properly. Do not call isFinished when
- * KDSoap was compiled against 4.4 or 4.5, it will always return \c false.
*/
bool isFinished() const;
diff --git a/src/KDSoapClient/KDSoapPendingCallWatcher.cpp b/src/KDSoapClient/KDSoapPendingCallWatcher.cpp
index fd5452f..6a817be 100644
--- a/src/KDSoapClient/KDSoapPendingCallWatcher.cpp
+++ b/src/KDSoapClient/KDSoapPendingCallWatcher.cpp
@@ -1,55 +1,30 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapPendingCallWatcher.h"
#include "KDSoapPendingCallWatcher_p.h"
#include "KDSoapPendingCall_p.h"
-#include <QNetworkReply>
#include <QDebug>
+#include <QNetworkReply>
KDSoapPendingCallWatcher::KDSoapPendingCallWatcher(const KDSoapPendingCall &call, QObject *parent)
- : QObject(parent), KDSoapPendingCall(call),
- d(new Private(this))
+ : QObject(parent)
+ , KDSoapPendingCall(call)
+ , d(nullptr) // currently unused
{
- connect(call.d->reply.data(), SIGNAL(finished()), this, SLOT(_kd_slotReplyFinished()));
+ connect(call.d->reply.data(), &QNetworkReply::finished, this, [&]() {
+ emit finished(this);
+ });
}
KDSoapPendingCallWatcher::~KDSoapPendingCallWatcher()
{
- delete d;
-}
-
-#if 0
-void KDSoapPendingCallWatcher::waitForFinished()
-{
- // TODO?
-}
-#endif
-
-void KDSoapPendingCallWatcher::Private::_kd_slotReplyFinished()
-{
- // Workaround Qt-4.5 emitting finished twice in testCallRefusedAuth
- disconnect(q->KDSoapPendingCall::d->reply.data(), SIGNAL(finished()), q, nullptr);
- emit q->finished(q);
}
#include "moc_KDSoapPendingCallWatcher.cpp"
diff --git a/src/KDSoapClient/KDSoapPendingCallWatcher.h b/src/KDSoapClient/KDSoapPendingCallWatcher.h
index 52622e2..0f4fb99 100644
--- a/src/KDSoapClient/KDSoapPendingCallWatcher.h
+++ b/src/KDSoapClient/KDSoapPendingCallWatcher.h
@@ -1,30 +1,17 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPPENDINGCALLWATCHER_H
#define KDSOAPPENDINGCALLWATCHER_H
-#include <QtCore/QObject>
#include "KDSoapPendingCall.h"
+#include <QtCore/QObject>
/**
* The KDSoapPendingCallWatcher class provides a convenient way for waiting for
@@ -38,8 +25,8 @@
* KDSoapPendingCall pendingCall = client.asyncCall(QLatin1String("MethodName"), message);
* KDSoapPendingCallWatcher *watcher = new KDSoapPendingCallWatcher(pendingCall, this);
*
- * QObject::connect(watcher, SIGNAL(finished(KDSoapPendingCallWatcher*)),
- * this, SLOT(slotFinished(KDSoapPendingCallWatcher*)));
+ * QObject::connect(watcher, &KDSoapPendingCallWatcher::finished,
+ * this, &MyClass::slotFinished);
* \endcode
*
* \note It is not necessary to keep the original KDSoapPendingCall object
@@ -72,7 +59,6 @@ Q_SIGNALS:
private:
friend class KDSoapPendingCallPrivate;
- Q_PRIVATE_SLOT(d, void _kd_slotReplyFinished())
class Private;
Private *const d;
};
diff --git a/src/KDSoapClient/KDSoapPendingCallWatcher_p.h b/src/KDSoapClient/KDSoapPendingCallWatcher_p.h
index 627d60d..00b097d 100644
--- a/src/KDSoapClient/KDSoapPendingCallWatcher_p.h
+++ b/src/KDSoapClient/KDSoapPendingCallWatcher_p.h
@@ -1,35 +1,23 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPPENDINGCALLWATCHER_P_H
#define KDSOAPPENDINGCALLWATCHER_P_H
+// currently unused
class KDSoapPendingCallWatcher::Private
{
public:
Private(KDSoapPendingCallWatcher *qq)
: q(qq)
- {}
- void _kd_slotReplyFinished();
+ {
+ }
KDSoapPendingCallWatcher *q;
};
diff --git a/src/KDSoapClient/KDSoapPendingCall_p.h b/src/KDSoapClient/KDSoapPendingCall_p.h
index 861484a..16fa408 100644
--- a/src/KDSoapClient/KDSoapPendingCall_p.h
+++ b/src/KDSoapClient/KDSoapPendingCall_p.h
@@ -1,35 +1,22 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPPENDINGCALL_P_H
#define KDSOAPPENDINGCALL_P_H
-#include <QSharedData>
-#include <QBuffer>
-#include <QXmlStreamReader>
-#include "KDSoapMessage.h"
-#include <QPointer>
#include "KDSoapClientInterface.h"
+#include "KDSoapMessage.h"
+#include <QBuffer>
#include <QNetworkReply>
+#include <QPointer>
+#include <QSharedData>
+#include <QXmlStreamReader>
class KDSoapValue;
@@ -39,7 +26,10 @@ class KDSoapPendingCall::Private : public QSharedData
{
public:
Private(QNetworkReply *r, QBuffer *b)
- : reply(r), buffer(b), soapVersion(KDSoap::SOAP1_1), parsed(false)
+ : reply(r)
+ , buffer(b)
+ , soapVersion(KDSoap::SOAP1_1)
+ , parsed(false)
{
}
~Private();
diff --git a/src/KDSoapClient/KDSoapReplySslHandler.cpp b/src/KDSoapClient/KDSoapReplySslHandler.cpp
index 2c0f3be..db2f111 100644
--- a/src/KDSoapClient/KDSoapReplySslHandler.cpp
+++ b/src/KDSoapClient/KDSoapReplySslHandler.cpp
@@ -1,39 +1,27 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
-#include <QNetworkReply> //krazy:exclude=includes must come first to define QT_NO_OPENSSL
+#include <QNetworkReply> //krazy:exclude=includes must come first to define QT_NO_SSL
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
#include "KDSoapReplySslHandler_p.h"
#include "KDSoapSslHandler.h"
-KDSoapReplySslHandler::KDSoapReplySslHandler(QNetworkReply *reply, KDSoapSslHandler *handler) :
- QObject(reply), m_handler(handler)
+KDSoapReplySslHandler::KDSoapReplySslHandler(QNetworkReply *reply, KDSoapSslHandler *handler)
+ : QObject(reply)
+ , m_handler(handler)
{
Q_ASSERT(reply);
Q_ASSERT(handler);
- QObject::connect(reply, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotReplySslErrors(QList<QSslError>)));
+ QObject::connect(reply, &QNetworkReply::sslErrors, this, &KDSoapReplySslHandler::slotReplySslErrors);
}
void KDSoapReplySslHandler::slotReplySslErrors(const QList<QSslError> &errors)
diff --git a/src/KDSoapClient/KDSoapReplySslHandler_p.h b/src/KDSoapClient/KDSoapReplySslHandler_p.h
index fe8f5ba..9672d54 100644
--- a/src/KDSoapClient/KDSoapReplySslHandler_p.h
+++ b/src/KDSoapClient/KDSoapReplySslHandler_p.h
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPREPLYSSLHANDLER_P_H
#define KDSOAPREPLYSSLHANDLER_P_H
@@ -32,7 +19,7 @@ QT_END_NAMESPACE
class KDSoapSslHandler;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
class KDSoapReplySslHandler : public QObject
{
diff --git a/src/KDSoapClient/KDSoapSslHandler.cpp b/src/KDSoapClient/KDSoapSslHandler.cpp
index d19580f..25be048 100644
--- a/src/KDSoapClient/KDSoapSslHandler.cpp
+++ b/src/KDSoapClient/KDSoapSslHandler.cpp
@@ -1,33 +1,21 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
-#include <QNetworkReply> //may define QT_NO_OPENSSL. krazy:exclude=includes
+#include <QNetworkReply> //may define QT_NO_SSL. krazy:exclude=includes
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
#include "KDSoapSslHandler.h"
KDSoapSslHandler::KDSoapSslHandler(QObject *parent)
- : QObject(parent), m_reply(nullptr)
+ : QObject(parent)
+ , m_reply(nullptr)
{
}
diff --git a/src/KDSoapClient/KDSoapSslHandler.h b/src/KDSoapClient/KDSoapSslHandler.h
index ea73bea..fc53035 100644
--- a/src/KDSoapClient/KDSoapSslHandler.h
+++ b/src/KDSoapClient/KDSoapSslHandler.h
@@ -1,38 +1,25 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPSSLHANDLER_H
#define KDSOAPSSLHANDLER_H
+#include "KDSoapGlobal.h"
#include <QObject>
#include <QSslError>
-#include "KDSoapGlobal.h"
QT_BEGIN_NAMESPACE
class QNetworkReply;
QT_END_NAMESPACE
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
class KDSoapReplySslHandler;
/**
@@ -44,7 +31,6 @@ class KDSOAP_EXPORT KDSoapSslHandler : public QObject
{
Q_OBJECT
public:
-
Q_SIGNALS:
/**
* @brief Notification of SSL errors
@@ -106,10 +92,6 @@ private:
QNetworkReply *m_reply;
};
-#if QT_VERSION < 0x050000
-Q_DECLARE_METATYPE(KDSoapSslHandler *)
-#endif
-
-#endif // QT_NO_OPENSSL
+#endif // QT_NO_SSL
#endif // KDSOAPSSLHANDLER_H
diff --git a/src/KDSoapClient/KDSoapUdpClient.cpp b/src/KDSoapClient/KDSoapUdpClient.cpp
index d97eadd..ebff1e8 100644
--- a/src/KDSoapClient/KDSoapUdpClient.cpp
+++ b/src/KDSoapClient/KDSoapUdpClient.cpp
@@ -1,24 +1,12 @@
/****************************************************************************
-** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
+** SPDX-License-Identifier: MIT
**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapUdpClient.h"
#include "KDSoapUdpClient_p.h"
@@ -28,24 +16,25 @@
#include "KDSoapMessageWriter_p.h"
#include <QNetworkInterface>
-static bool isMulticastAddress(const QHostAddress &address) {
+static bool isMulticastAddress(const QHostAddress &address)
+{
if (address.protocol() == QAbstractSocket::IPv4Protocol) {
- return address.isInSubnet(QHostAddress (QLatin1String("224.0.0.0")), 4);
+ return address.isInSubnet(QHostAddress(QLatin1String("224.0.0.0")), 4);
} else if (address.protocol() == QAbstractSocket::IPv6Protocol) {
- return address.isInSubnet(QHostAddress (QLatin1String("ff00::")), 8);
+ return address.isInSubnet(QHostAddress(QLatin1String("ff00::")), 8);
}
return false;
}
-KDSoapUdpClient::KDSoapUdpClient(QObject *parent) :
- QObject(parent),
- d_ptr(new KDSoapUdpClientPrivate(this))
+KDSoapUdpClient::KDSoapUdpClient(QObject *parent)
+ : QObject(parent)
+ , d_ptr(new KDSoapUdpClientPrivate(this))
{
Q_D(KDSoapUdpClient);
d->socketIPv4 = new QUdpSocket(this);
- connect(d->socketIPv4, SIGNAL(readyRead()), d, SLOT(readyRead()));
+ connect(d->socketIPv4, &QIODevice::readyRead, d, &KDSoapUdpClientPrivate::readyRead);
d->socketIPv6 = new QUdpSocket(this);
- connect(d->socketIPv6, SIGNAL(readyRead()), d, SLOT(readyRead()));
+ connect(d->socketIPv6, &QIODevice::readyRead, d, &KDSoapUdpClientPrivate::readyRead);
}
KDSoapUdpClient::~KDSoapUdpClient()
@@ -53,38 +42,27 @@ KDSoapUdpClient::~KDSoapUdpClient()
delete d_ptr;
}
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-bool KDSoapUdpClient::bind(quint16 port, QAbstractSocket::BindMode mode) {
+bool KDSoapUdpClient::bind(quint16 port, QAbstractSocket::BindMode mode)
+{
Q_D(KDSoapUdpClient);
const QHostAddress AnyIPv4(QLatin1String("0.0.0.0"));
bool rc = true;
// Workaround for lack of dual stack sockets in Qt4
// Qt5 supports binding to QHostAddress::Any, which will listen on both IPv4 and IPv6 interfaces.
- // TODO: use a single socket once we drop Qt4 support
+ // TODO: use a single socket now that we dropped Qt4 support
rc = d->socketIPv4->bind(AnyIPv4, port, mode) && rc;
rc = d->socketIPv6->bind(QHostAddress::AnyIPv6, port, mode) && rc;
return rc;
}
-#else
-bool KDSoapUdpClient::bind(quint16 port) {
- Q_D(KDSoapUdpClient);
- const QHostAddress AnyIPv4(QLatin1String("0.0.0.0"));
- bool rc = true;
- // Workaround for lack of dual stack sockets in Qt4
- // Qt5 supports binding to QHostAddress::Any, which will listen on both IPv4 and IPv6 interfaces.
- rc = d->socketIPv4->bind(AnyIPv4, port) && rc;
- rc = d->socketIPv6->bind(QHostAddress::AnyIPv6, port) && rc;
- return rc;
-}
-#endif
-void KDSoapUdpClient::setSoapVersion(KDSoap::SoapVersion version) {
+void KDSoapUdpClient::setSoapVersion(KDSoap::SoapVersion version)
+{
Q_D(KDSoapUdpClient);
d->soapVersion = version;
}
-bool KDSoapUdpClient::sendMessage(const KDSoapMessage &message, const KDSoapHeaders &headers, const QHostAddress &address, quint16 port) {
+bool KDSoapUdpClient::sendMessage(const KDSoapMessage &message, const KDSoapHeaders &headers, const QHostAddress &address, quint16 port)
+{
Q_D(KDSoapUdpClient);
KDSoapMessageWriter msgWriter;
msgWriter.setVersion(d->soapVersion);
@@ -92,11 +70,10 @@ bool KDSoapUdpClient::sendMessage(const KDSoapMessage &message, const KDSoapHead
if (isMulticastAddress(address)) {
bool anySuccess = false;
- const auto& allInterfaces = QNetworkInterface::allInterfaces();
+ const auto &allInterfaces = QNetworkInterface::allInterfaces();
for (const auto &iface : allInterfaces) {
- if (iface.flags().testFlag(QNetworkInterface::IsUp) &&
- iface.flags().testFlag(QNetworkInterface::CanMulticast)) {
- //qDebug() << "Sending multicast to" << iface.name() << address << ":" << data;
+ if (iface.flags().testFlag(QNetworkInterface::IsUp) && iface.flags().testFlag(QNetworkInterface::CanMulticast)) {
+ // qDebug() << "Sending multicast to" << iface.name() << address << ":" << data;
if (address.protocol() == QAbstractSocket::IPv4Protocol) {
d->socketIPv4->setMulticastInterface(iface);
qint64 writtenSize = d->socketIPv4->writeDatagram(data, address, port);
@@ -110,7 +87,7 @@ bool KDSoapUdpClient::sendMessage(const KDSoapMessage &message, const KDSoapHead
}
return anySuccess;
} else {
- //qDebug() << "Sending to" << address << ":" << data;
+ // qDebug() << "Sending to" << address << ":" << data;
if (address.protocol() == QAbstractSocket::IPv4Protocol) {
qint64 writtenSize = d->socketIPv4->writeDatagram(data, address, port);
return writtenSize == data.size();
@@ -141,7 +118,7 @@ void KDSoapUdpClientPrivate::readyRead()
void KDSoapUdpClientPrivate::receivedDatagram(const QByteArray &messageData, const QHostAddress &senderAddress, quint16 senderPort)
{
Q_Q(KDSoapUdpClient);
- //qDebug() << "Received datagram from:" << senderAddress << "data:" << QString::fromUtf8(messageData);
+ // qDebug() << "Received datagram from:" << senderAddress << "data:" << QString::fromUtf8(messageData);
KDSoapMessage replyMessage;
KDSoapHeaders replyHeaders;
diff --git a/src/KDSoapClient/KDSoapUdpClient.h b/src/KDSoapClient/KDSoapUdpClient.h
index ceaa62f..5f11a7f 100644
--- a/src/KDSoapClient/KDSoapUdpClient.h
+++ b/src/KDSoapClient/KDSoapUdpClient.h
@@ -1,30 +1,18 @@
/****************************************************************************
-** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
+** SPDX-License-Identifier: MIT
**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPUDPCLIENT_H
#define KDSOAPUDPCLIENT_H
-#include "KDSoapGlobal.h"
#include "KDSoapClientInterface.h"
+#include "KDSoapGlobal.h"
#include <QAbstractSocket>
#include <QObject>
@@ -37,7 +25,8 @@ class QHostAddress;
QT_END_NAMESPACE
/**
- * \brief KDSoapUdpClient provides an interface for implementing a [SOAP-over-UDP](https://docs.oasis-open.org/ws-dd/soapoverudp/1.1/os/wsdd-soapoverudp-1.1-spec-os.html) client.
+ * \brief KDSoapUdpClient provides an interface for implementing a
+ * [SOAP-over-UDP](https://docs.oasis-open.org/ws-dd/soapoverudp/1.1/os/wsdd-soapoverudp-1.1-spec-os.html) client.
*
* One-way SOAP-over-UDP can be send by simply using sendMessage().
*
@@ -50,9 +39,9 @@ QT_END_NAMESPACE
*
* \code
* auto soapUdpClient = new KDSoapUdpClient(this);
- * connect(soapUdpClient, &KDSoapUdpClient::receivedMessage, [=](const KDSoapMessage &message, const KDSoapHeaders &headers, const QHostAddress &address, quint16 port) {
- * if(message.messageAddressingProperties().action() == QStringLiteral("http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ProbeMatches")) {
- * TNS__ProbeMatchesType probeMatches;
+ * connect(soapUdpClient, &KDSoapUdpClient::receivedMessage, [=](const KDSoapMessage &message, const KDSoapHeaders &headers, const QHostAddress
+ * &address, quint16 port) { if(message.messageAddressingProperties().action() ==
+ * QStringLiteral("http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/ProbeMatches")) { TNS__ProbeMatchesType probeMatches;
* probeMatches.deserialize(message);
* qDebug() << "Received probe match from" << address;
* }
@@ -83,7 +72,7 @@ class KDSOAP_EXPORT KDSoapUdpClient : public QObject
Q_OBJECT
public:
- explicit KDSoapUdpClient(QObject *parent=nullptr);
+ explicit KDSoapUdpClient(QObject *parent = nullptr);
~KDSoapUdpClient();
@@ -95,14 +84,10 @@ public:
* \see receivedMessage()
* \since 1.9
*/
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
bool bind(quint16 port = 0, QAbstractSocket::BindMode mode = QAbstractSocket::DefaultForPlatform);
-#else
- bool bind(quint16 port = 0);
-#endif
/**
* Sets the SOAP version to be used for any subsequent send message.
- * \param version #SOAP1_1 or #SOAP1_2
+ * \param version \a SOAP1_1 or \a SOAP1_2
* The default version is SOAP 1.2.
*/
void setSoapVersion(KDSoap::SoapVersion version);
diff --git a/src/KDSoapClient/KDSoapUdpClient_p.h b/src/KDSoapClient/KDSoapUdpClient_p.h
index 821e13d..3f46e28 100644
--- a/src/KDSoapClient/KDSoapUdpClient_p.h
+++ b/src/KDSoapClient/KDSoapUdpClient_p.h
@@ -1,19 +1,12 @@
-/*
- * Copyright (C) 2019-2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2019-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
#ifndef KDSOAPUDPCLIENT_P_H
#define KDSOAPUDPCLIENT_P_H
@@ -28,8 +21,11 @@ class KDSoapUdpClientPrivate : public QObject
Q_OBJECT
public:
explicit KDSoapUdpClientPrivate(KDSoapUdpClient *q)
- : q_ptr(q)
- {}
+ : socketIPv4(0)
+ , socketIPv6(0)
+ , q_ptr(q)
+ {
+ }
void receivedDatagram(const QByteArray &messageData, const QHostAddress &senderAddress, quint16 senderPort);
diff --git a/src/KDSoapClient/KDSoapValue.cpp b/src/KDSoapClient/KDSoapValue.cpp
index b218f54..2d8dc84 100644
--- a/src/KDSoapClient/KDSoapValue.cpp
+++ b/src/KDSoapClient/KDSoapValue.cpp
@@ -1,40 +1,38 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapValue.h"
-#include "KDSoapNamespacePrefixes_p.h"
-#include "KDSoapNamespaceManager.h"
#include "KDDateTime.h"
+#include "KDSoapNamespaceManager.h"
+#include "KDSoapNamespacePrefixes_p.h"
#include <QDateTime>
-#include <QUrl>
#include <QDebug>
#include <QStringList>
+#include <QUrl>
class KDSoapValue::Private : public QSharedData
{
public:
- Private(): m_qualified(false), m_nillable(false) {}
+ Private()
+ : m_qualified(false)
+ , m_nillable(false)
+ {
+ }
Private(const QString &n, const QVariant &v, const QString &typeNameSpace, const QString &typeName)
- : m_name(n), m_value(v), m_typeNamespace(typeNameSpace), m_typeName(typeName), m_qualified(false), m_nillable(false) {}
+ : m_name(n)
+ , m_value(v)
+ , m_typeNamespace(typeNameSpace)
+ , m_typeName(typeName)
+ , m_qualified(false)
+ , m_nillable(false)
+ {
+ }
QString m_name;
QString m_nameNamespace;
@@ -154,12 +152,12 @@ KDSoapValueList &KDSoapValue::childValues() const
return const_cast<KDSoapValueList &>(d->m_childValues);
}
-bool KDSoapValue::operator ==(const KDSoapValue &other) const
+bool KDSoapValue::operator==(const KDSoapValue &other) const
{
return d == other.d;
}
-bool KDSoapValue::operator !=(const KDSoapValue &other) const
+bool KDSoapValue::operator!=(const KDSoapValue &other) const
{
return d != other.d;
}
@@ -224,7 +222,8 @@ static QString variantToTextValue(const QVariant &value, const QString &typeNs,
}
qDebug() << QString::fromLatin1("QVariants of type %1 are not supported in "
- "KDSoap, see the documentation").arg(QLatin1String(value.typeName()));
+ "KDSoap, see the documentation")
+ .arg(QLatin1String(value.typeName()));
return value.toString();
}
}
@@ -272,12 +271,14 @@ static QString variantToXMLType(const QVariant &value)
qDebug() << value;
qDebug() << QString::fromLatin1("variantToXmlType: QVariants of type %1 are not supported in "
- "KDSoap, see the documentation").arg(QLatin1String(value.typeName()));
+ "KDSoap, see the documentation")
+ .arg(QLatin1String(value.typeName()));
return QString();
}
}
-void KDSoapValue::writeElement(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use, const QString &messageNamespace, bool forceQualified) const
+void KDSoapValue::writeElement(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use,
+ const QString &messageNamespace, bool forceQualified) const
{
Q_ASSERT(!name().isEmpty());
if (!d->m_nameNamespace.isEmpty() && d->m_nameNamespace != messageNamespace) {
@@ -298,11 +299,12 @@ void KDSoapValue::writeElement(KDSoapNamespacePrefixes &namespacePrefixes, QXmlS
writer.writeEndElement();
}
-void KDSoapValue::writeElementContents(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use, const QString &messageNamespace) const
+void KDSoapValue::writeElementContents(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use,
+ const QString &messageNamespace) const
{
const QVariant value = this->value();
- foreach (const QXmlStreamNamespaceDeclaration& decl, d->m_localNamespaceDeclarations) {
+ for (const QXmlStreamNamespaceDeclaration &decl : qAsConst(d->m_localNamespaceDeclarations)) {
writer.writeNamespace(decl.namespaceUri().toString(), decl.prefix().toString());
}
@@ -317,7 +319,7 @@ void KDSoapValue::writeElementContents(KDSoapNamespacePrefixes &namespacePrefixe
type = namespacePrefixes.resolve(this->typeNs(), this->type());
}
if (type.isEmpty() && !value.isNull()) {
- type = variantToXMLType(value); // fallback
+ type = variantToXMLType(value); // fallback
}
if (!type.isEmpty()) {
writer.writeAttribute(KDSoapNamespaceManager::xmlSchemaInstance2001(), QLatin1String("type"), type);
@@ -326,21 +328,28 @@ void KDSoapValue::writeElementContents(KDSoapNamespacePrefixes &namespacePrefixe
const KDSoapValueList list = this->childValues();
const bool isArray = !list.arrayType().isEmpty();
if (isArray) {
- writer.writeAttribute(KDSoapNamespaceManager::soapEncoding(), QLatin1String("arrayType"), namespacePrefixes.resolve(list.arrayTypeNs(), list.arrayType()) + QLatin1Char('[') + QString::number(list.count()) + QLatin1Char(']'));
+ writer.writeAttribute(KDSoapNamespaceManager::soapEncoding(), QLatin1String("arrayType"),
+ namespacePrefixes.resolve(list.arrayTypeNs(), list.arrayType()) + QLatin1Char('[') + QString::number(list.count())
+ + QLatin1Char(']'));
}
}
writeChildren(namespacePrefixes, writer, use, messageNamespace, false);
if (!value.isNull()) {
- writer.writeCharacters(variantToTextValue(value, this->typeNs(), this->type()));
+ const QString txt = variantToTextValue(value, this->typeNs(), this->type());
+ if (!txt.isEmpty()) { // In Qt6, a null string doesn't lead to a null variant anymore
+ writer.writeCharacters(txt);
+ }
}
}
-void KDSoapValue::writeChildren(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use, const QString &messageNamespace, bool forceQualified) const
+void KDSoapValue::writeChildren(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use,
+ const QString &messageNamespace, bool forceQualified) const
{
const KDSoapValueList &args = childValues();
- Q_FOREACH (const KDSoapValue &attr, args.attributes()) {
- //Q_ASSERT(!attr.value().isNull());
+ const auto attributes = args.attributes();
+ for (const KDSoapValue &attr : attributes) {
+ // Q_ASSERT(!attr.value().isNull());
const QString attributeNamespace = attr.namespaceUri();
if (attr.isQualified() || forceQualified) {
@@ -358,7 +367,7 @@ void KDSoapValue::writeChildren(KDSoapNamespacePrefixes &namespacePrefixes, QXml
////
-QDebug operator <<(QDebug dbg, const KDSoapValue &value)
+QDebug operator<<(QDebug dbg, const KDSoapValue &value)
{
dbg.space() << value.name() << value.value();
if (!value.childValues().isEmpty()) {
@@ -401,11 +410,15 @@ QString KDSoapValue::type() const
KDSoapValueList KDSoapValue::split() const
{
KDSoapValueList valueList;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ const QStringList list = value().toString().split(QLatin1Char(' '), Qt::SkipEmptyParts);
+#else
const QStringList list = value().toString().split(QLatin1Char(' '), QString::SkipEmptyParts);
+#endif
valueList.reserve(list.count());
- for (int i = 0; i < list.count(); ++i) {
+ for (const QString &part : qAsConst(list)) {
KDSoapValue value(*this);
- value.setValue(list.at(i));
+ value.setValue(part);
valueList << value;
}
return valueList;
@@ -413,10 +426,7 @@ KDSoapValueList KDSoapValue::split() const
KDSoapValue KDSoapValueList::child(const QString &name) const
{
- const_iterator it = begin();
- const const_iterator e = end();
- for (; it != e; ++it) {
- const KDSoapValue &val = *it;
+ for (const KDSoapValue &val : qAsConst(*this)) {
if (val.name() == name) {
return val;
}
diff --git a/src/KDSoapClient/KDSoapValue.h b/src/KDSoapClient/KDSoapValue.h
index 4c350ca..1a3c62c 100644
--- a/src/KDSoapClient/KDSoapValue.h
+++ b/src/KDSoapClient/KDSoapValue.h
@@ -1,45 +1,27 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPVALUE_H
#define KDSOAPVALUE_H
-#include <QtCore/QString>
-#include <QtCore/QVariant>
+#include "KDSoapGlobal.h"
#include <QtCore/QList>
#include <QtCore/QPair>
#include <QtCore/QSet>
-#include <QtCore/QVector>
#include <QtCore/QSharedDataPointer>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
#include <QtCore/QXmlStreamNamespaceDeclarations>
-#include "KDSoapGlobal.h"
#ifndef QT_NO_STL
-# include <algorithm>
-#endif
-
-// Qt-4.7 errors on QVariant::fromValue<signed char>(), but later versions support it.
-#if QT_VERSION < 0x040800
-Q_DECLARE_METATYPE(signed char)
+#include <algorithm>
#endif
class KDSoapValueList;
@@ -54,7 +36,8 @@ namespace KDSoap {
* This enum value is used in KDSoapMessage.
* For historical reasons, KDSoapClientInterface uses its own version enum.
*/
-enum SoapVersion {
+enum SoapVersion
+{
/** Use format version 1.1 of the SOAP specification */
SOAP1_1 = 1,
/** Use format version 1.2 of the SOAP specification */
@@ -103,7 +86,8 @@ public:
* \param typeNameSpace namespace of the type of this value; this is only useful if using KDSoapMessage::EncodedUse
* \param typeName localname of the type of this value; this is only useful if using KDSoapMessage::EncodedUse
*/
- KDSoapValue(const QString &name, const KDSoapValueList &childValues, const QString &typeNameSpace = QString(), const QString &typeName = QString());
+ KDSoapValue(const QString &name, const KDSoapValueList &childValues, const QString &typeNameSpace = QString(),
+ const QString &typeName = QString());
/**
* Copy constructor
@@ -127,11 +111,7 @@ public:
*/
void swap(KDSoapValue &other)
{
-#if QT_VERSION < 0x040600
- qSwap(reinterpret_cast<Private *&>(d), reinterpret_cast<Private *&>(other.d));
-#else
d.swap(other.d);
-#endif
}
/**
@@ -245,13 +225,13 @@ public:
* Sets the \p namespaceDeclarations of this value.
* \since 1.8
*/
- void setNamespaceDeclarations(const QXmlStreamNamespaceDeclarations& namespaceDeclarations);
+ void setNamespaceDeclarations(const QXmlStreamNamespaceDeclarations &namespaceDeclarations);
/**
* Adds a \p namespaceDeclaration to the existing list of namespaceDeclarations.
* \since 1.8
*/
- void addNamespaceDeclaration(const QXmlStreamNamespaceDeclaration& namespaceDeclaration);
+ void addNamespaceDeclaration(const QXmlStreamNamespaceDeclaration &namespaceDeclaration);
/**
* Returns the namespaceDeclarations of this value as it was during parsing of the message
@@ -263,7 +243,7 @@ public:
* Sets the \p environmentNamespaceDeclarations of this value.
* \since 1.8
*/
- void setEnvironmentNamespaceDeclarations(const QXmlStreamNamespaceDeclarations& environmentNamespaceDeclarations);
+ void setEnvironmentNamespaceDeclarations(const QXmlStreamNamespaceDeclarations &environmentNamespaceDeclarations);
/**
* Returns the namespaceDeclarations of this value and its parents combined as it was during parsing of the message
@@ -282,15 +262,15 @@ public:
* Defines the way the message should be serialized.
* See the "use" attribute for soap:body, in the WSDL file.
*/
- enum Use {
+ enum Use
+ {
LiteralUse, ///< data is serialized according to a given schema, no \c xsi:type attributes are written out
- EncodedUse ///< each message part references an abstract type using the \c xsi:type attribute
+ EncodedUse ///< each message part references an abstract type using the \c xsi:type attribute
};
QByteArray toXml(Use use = LiteralUse, const QString &messageNamespace = QString()) const;
protected: // for KDSoapMessage
-
void setName(const QString &name);
private:
@@ -298,9 +278,12 @@ private:
KDSoapValue(QString, QString, QString);
friend class KDSoapMessageWriter;
- void writeElement(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use, const QString &messageNamespace, bool forceQualified) const;
- void writeElementContents(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use, const QString &messageNamespace) const;
- void writeChildren(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use, const QString &messageNamespace, bool forceQualified) const;
+ void writeElement(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use, const QString &messageNamespace,
+ bool forceQualified) const;
+ void writeElementContents(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use,
+ const QString &messageNamespace) const;
+ void writeChildren(KDSoapNamespacePrefixes &namespacePrefixes, QXmlStreamWriter &writer, KDSoapValue::Use use, const QString &messageNamespace,
+ bool forceQualified) const;
class Private;
QSharedDataPointer<Private> d;
@@ -310,7 +293,7 @@ QT_BEGIN_NAMESPACE
Q_DECLARE_TYPEINFO(KDSoapValue, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
-KDSOAP_EXPORT QDebug operator <<(QDebug dbg, const KDSoapValue &value);
+KDSOAP_EXPORT QDebug operator<<(QDebug dbg, const KDSoapValue &value);
KDSOAP_EXPORT uint qHash(const KDSoapValue &value);
inline void qSwap(KDSoapValue &lhs, KDSoapValue &rhs)
@@ -319,9 +302,9 @@ inline void qSwap(KDSoapValue &lhs, KDSoapValue &rhs)
}
#ifndef QT_NO_STL
-namespace std
-{
-template <> inline void swap<KDSoapValue>(KDSoapValue &lhs, KDSoapValue &rhs)
+namespace std {
+template<>
+inline void swap<KDSoapValue>(KDSoapValue &lhs, KDSoapValue &rhs)
{
lhs.swap(rhs);
}
@@ -334,7 +317,7 @@ template <> inline void swap<KDSoapValue>(KDSoapValue &lhs, KDSoapValue &rhs)
* In other words, it corresponds to a list of XML elements in a SOAP
* message. It also supports XML attributes.
*/
-class KDSOAP_EXPORT KDSoapValueList : public QList<KDSoapValue> //krazy:exclude=dpointer
+class KDSOAP_EXPORT KDSoapValueList : public QList<KDSoapValue> // krazy:exclude=dpointer
{
public:
/**
@@ -352,7 +335,8 @@ public:
* append(KDSoapValue(argumentName, argumentValue [, typeNameSpace, typeName] ));
* \endcode
*/
- void addArgument(const QString &argumentName, const QVariant &argumentValue, const QString &typeNameSpace = QString(), const QString &typeName = QString());
+ void addArgument(const QString &argumentName, const QVariant &argumentValue, const QString &typeNameSpace = QString(),
+ const QString &typeName = QString());
/**
* Convenience method for extracting a child argument by \p name.
@@ -409,6 +393,6 @@ private:
typedef QListIterator<KDSoapValue> KDSoapValueListIterator;
-//Q_DECLARE_METATYPE(KDSoapValueList)
+// Q_DECLARE_METATYPE(KDSoapValueList)
#endif // KDSOAPVALUE_H
diff --git a/src/KDSoapClient/doxygen.cpp b/src/KDSoapClient/doxygen.cpp
index 7dbd37f..fc61059 100644
--- a/src/KDSoapClient/doxygen.cpp
+++ b/src/KDSoapClient/doxygen.cpp
@@ -1,16 +1,32 @@
+/****************************************************************************
+**
+** This file is part of the KD Soap project.
+**
+** SPDX-FileCopyrightText: 2011-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+**
+** SPDX-License-Identifier: MIT
+**
+****************************************************************************/
+
/*!
\mainpage KD Soap Reference Documentation
\image html xmldiagram2.png
-KD SOAP is a tool for creating client applications for web services. It makes it possible to interact with applications which have APIs that can be exported as SOAP objects. The web service then provides a machine-accessible interface to its functionality via HTTP. The remote method calls are handled with the SOAP standard, which describes method calls, their parameters and return values as XML documents.
-KD SOAP is used by a variety of programs for a variety of different purposes - for example, one application uses KD SOAP to access data from a CRM system such as SugarCRM or Salesforce.
+KD SOAP is a tool for creating client applications for web services. It makes it possible to interact with applications which have APIs that can be
+exported as SOAP objects. The web service then provides a machine-accessible interface to its functionality via HTTP. The remote method calls are
+handled with the SOAP standard, which describes method calls, their parameters and return values as XML documents. KD SOAP is used by a variety of
+programs for a variety of different purposes - for example, one application uses KD SOAP to access data from a CRM system such as SugarCRM or
+Salesforce.
\section Features
-\li The KD SOAP library provides an abstraction layer for both the actual transport, as well as, the construction of data objects and method calls. (The latter relieves application developers from manually writing XML marshalling and demarshalling code, allowing them to build arbitrary complex data structures using simple C++ classes.)
-\li The transport abstraction provides both synchronous as well as Qt signal/slot based asynchronous remote method call and response handling.
-\li Alongside the library, KD SOAP ships with the kdwsdl2cpp code generator, providing additional means for increasing developer productivity by generating a proxy API for a target web service based on its formal WSDL service description. Using classes generated by this approach adds build-time type checking and “in process”-like object behavior (i.e. using C++ data types as parameters and return values of each of the web service’s methods).
+\li The KD SOAP library provides an abstraction layer for both the actual transport, as well as, the construction of data objects and method calls.
+(The latter relieves application developers from manually writing XML marshalling and demarshalling code, allowing them to build arbitrary complex
+data structures using simple C++ classes.) \li The transport abstraction provides both synchronous as well as Qt signal/slot based asynchronous remote
+method call and response handling. \li Alongside the library, KD SOAP ships with the kdwsdl2cpp code generator, providing additional means for
+increasing developer productivity by generating a proxy API for a target web service based on its formal WSDL service description. Using classes
+generated by this approach adds build-time type checking and “in process”-like object behavior (i.e. using C++ data types as parameters and return
+values of each of the web service’s methods).
*/
-
diff --git a/src/KDSoapServer/CMakeLists.txt b/src/KDSoapServer/CMakeLists.txt
index 4f1701d..2f067c6 100644
--- a/src/KDSoapServer/CMakeLists.txt
+++ b/src/KDSoapServer/CMakeLists.txt
@@ -1,86 +1,110 @@
-set(QT_USE_QTNETWORK TRUE)
-include(${QT_USE_FILE})
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
include_directories(.. ../KDSoapClient)
set(SOURCES
- KDSoapDelayedResponseHandle.cpp
- KDSoapServer.cpp
- KDSoapServerObjectInterface.cpp
- KDSoapServerSocket.cpp
- KDSoapServerThread.cpp
- KDSoapServerThread.cpp
- KDSoapServerThread.cpp
- KDSoapServerAuthInterface.cpp
- KDSoapServerRawXMLInterface.cpp
- KDSoapServerCustomVerbRequestInterface.cpp
- KDSoapSocketList.cpp
- KDSoapThreadPool.cpp
+ KDSoapDelayedResponseHandle.cpp
+ KDSoapServer.cpp
+ KDSoapServerObjectInterface.cpp
+ KDSoapServerSocket.cpp
+ KDSoapServerThread.cpp
+ KDSoapServerThread.cpp
+ KDSoapServerThread.cpp
+ KDSoapServerAuthInterface.cpp
+ KDSoapServerRawXMLInterface.cpp
+ KDSoapServerCustomVerbRequestInterface.cpp
+ KDSoapSocketList.cpp
+ KDSoapThreadPool.cpp
)
set_source_files_properties(KDSoapServerObjectInterface.cpp PROPERTIES SKIP_AUTOMOC TRUE)
-add_library(kdsoap-server ${KDSoap_LIBRARY_MODE} ${SOURCES})
+add_library(
+ kdsoap-server
+ ${KDSoap_LIBRARY_MODE} ${SOURCES}
+)
+set_target_properties(kdsoap-server PROPERTIES OUTPUT_NAME "kdsoap-server${${PROJECT_NAME}_LIBRARY_QTID}")
if(${PROJECT_NAME}_STATIC)
- target_compile_definitions(kdsoap-server PUBLIC KDSOAPSERVER_STATICLIB)
+ target_compile_definitions(kdsoap-server PUBLIC KDSOAPSERVER_STATICLIB)
else()
- target_compile_definitions(kdsoap-server PRIVATE KDSOAP_BUILD_KDSOAPSERVER_LIB)
+ target_compile_definitions(kdsoap-server PRIVATE KDSOAP_BUILD_KDSOAPSERVER_LIB)
endif()
-target_link_libraries(kdsoap-server kdsoap ${QT_LIBRARIES})
-set_target_properties(kdsoap-server PROPERTIES
- SOVERSION ${${PROJECT_NAME}_SOVERSION}
- VERSION ${${PROJECT_NAME}_VERSION}
+target_link_libraries(
+ kdsoap-server kdsoap ${QT_LIBRARIES}
+)
+target_include_directories(
+ kdsoap-server
+ INTERFACE "$<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>"
+)
+set_target_properties(
+ kdsoap-server PROPERTIES SOVERSION ${${PROJECT_NAME}_SOVERSION} VERSION ${${PROJECT_NAME}_VERSION}
)
-target_include_directories(kdsoap-server INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}>")
#version libraries on Windows
if(WIN32)
- set(postfix ${${PROJECT_NAME}_SOVERSION})
- set(CMAKE_RELEASE_POSTFIX ${postfix})
- set_target_properties(kdsoap-server PROPERTIES RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX})
- #append 'd' to debug libraries
- string(CONCAT postfix ${postfix} "d")
- set(CMAKE_DEBUG_POSTFIX ${postfix})
- set_target_properties(kdsoap-server PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
+ set(postfix ${${PROJECT_NAME}_SOVERSION})
+ string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_BUILD_TYPE)
+ if(${UPPER_BUILD_TYPE} MATCHES "^DEBUG")
+ string(CONCAT postfix ${postfix} "d")
+ set_target_properties(kdsoap-server PROPERTIES DEBUG_POSTFIX ${postfix})
+ else()
+ set_target_properties(kdsoap-server PROPERTIES ${UPPER_BUILD_TYPE}_POSTFIX ${postfix})
+ endif()
endif()
if(KDSoap_IS_ROOT_PROJECT)
- include(ECMGenerateHeaders)
- ecm_generate_headers(server_HEADERS
- ORIGINAL
- CAMELCASE
- HEADER_NAMES
- KDSoapDelayedResponseHandle
- KDSoapServerGlobal
- KDSoapThreadPool
- KDSoapServerObjectInterface
- KDSoapServerAuthInterface
- KDSoapServerRawXMLInterface
- KDSoapServerCustomVerbRequestInterface
- COMMON_HEADER
- KDSoapServer
- )
+ include(ECMGenerateHeaders)
+ ecm_generate_headers(
+ server_HEADERS
+ ORIGINAL
+ CAMELCASE
+ HEADER_NAMES
+ KDSoapDelayedResponseHandle
+ KDSoapServerGlobal
+ KDSoapThreadPool
+ KDSoapServerObjectInterface
+ KDSoapServerAuthInterface
+ KDSoapServerRawXMLInterface
+ KDSoapServerCustomVerbRequestInterface
+ COMMON_HEADER
+ KDSoapServer
+ )
+
+ set(COMBINED_H ${CMAKE_CURRENT_BINARY_DIR}/KDSoapServer)
+ file(APPEND ${COMBINED_H} "#include \"KDSoapServer.h\"\n")
- set(COMBINED_H ${CMAKE_CURRENT_BINARY_DIR}/KDSoapServer)
- file(APPEND ${COMBINED_H} "#include \"KDSoapServer.h\"\n")
+ install(
+ FILES ${server_HEADERS}
+ KDSoapServer.h
+ KDSoapServerAuthInterface.h
+ KDSoapServerRawXMLInterface.h
+ KDSoapServerCustomVerbRequestInterface.h
+ KDSoapDelayedResponseHandle.h
+ KDSoapServerObjectInterface.h
+ KDSoapServerGlobal.h
+ KDSoapThreadPool.h
+ DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapServer
+ )
- install(FILES
- ${server_HEADERS}
- KDSoapServer.h
- KDSoapServerAuthInterface.h
- KDSoapServerRawXMLInterface.h
- KDSoapServerCustomVerbRequestInterface.h
- KDSoapDelayedResponseHandle.h
- KDSoapServerObjectInterface.h
- KDSoapServerGlobal.h
- KDSoapThreadPool.h
- DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapServer
- )
+ install(
+ TARGETS kdsoap-server
+ EXPORT KDSoapTargets
+ RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
+ LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
+ ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
+ )
- install(TARGETS kdsoap-server EXPORT KDSoapTargets
- RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
- LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}
- ARCHIVE DESTINATION ${INSTALL_ARCHIVE_DIR}
- )
+ if(MSVC AND NOT ${PROJECT_NAME}_STATIC)
+ install(
+ FILES "$<TARGET_PDB_FILE_DIR:kdsoap-server>/$<TARGET_PDB_FILE_NAME:kdsoap-server>"
+ DESTINATION ${INSTALL_LIBRARY_DIR}
+ CONFIGURATIONS Debug RelWithDebInfo
+ )
+ endif()
endif()
diff --git a/src/KDSoapServer/KDSoapDelayedResponseHandle.cpp b/src/KDSoapServer/KDSoapDelayedResponseHandle.cpp
index 39106f7..befbae9 100644
--- a/src/KDSoapServer/KDSoapDelayedResponseHandle.cpp
+++ b/src/KDSoapServer/KDSoapDelayedResponseHandle.cpp
@@ -1,37 +1,25 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapDelayedResponseHandle.h"
#include "KDSoapServerSocket_p.h"
-#include <QSharedData>
#include <QPointer>
+#include <QSharedData>
class KDSoapDelayedResponseHandleData : public QSharedData
{
public:
KDSoapDelayedResponseHandleData(KDSoapServerSocket *s)
: socket(s)
- {}
+ {
+ }
// QPointer in case the client disconnects during a delayed response
QPointer<KDSoapServerSocket> socket;
};
@@ -41,14 +29,15 @@ KDSoapDelayedResponseHandle::KDSoapDelayedResponseHandle()
{
}
-KDSoapDelayedResponseHandle::KDSoapDelayedResponseHandle(const KDSoapDelayedResponseHandle &rhs) : data(rhs.data)
+KDSoapDelayedResponseHandle::KDSoapDelayedResponseHandle(const KDSoapDelayedResponseHandle &rhs)
+ : data(rhs.data)
{
}
KDSoapDelayedResponseHandle &KDSoapDelayedResponseHandle::operator=(const KDSoapDelayedResponseHandle &rhs)
{
if (this != &rhs) {
- data.operator = (rhs.data);
+ data.operator=(rhs.data);
}
return *this;
}
diff --git a/src/KDSoapServer/KDSoapDelayedResponseHandle.h b/src/KDSoapServer/KDSoapDelayedResponseHandle.h
index 62bee3e..5c57ffa 100644
--- a/src/KDSoapServer/KDSoapDelayedResponseHandle.h
+++ b/src/KDSoapServer/KDSoapDelayedResponseHandle.h
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPDELAYEDRESPONSEHANDLE_H
#define KDSOAPDELAYEDRESPONSEHANDLE_H
diff --git a/src/KDSoapServer/KDSoapServer.cpp b/src/KDSoapServer/KDSoapServer.cpp
index 215fa07..d00dd20 100644
--- a/src/KDSoapServer/KDSoapServer.cpp
+++ b/src/KDSoapServer/KDSoapServer.cpp
@@ -1,48 +1,35 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapServer.h"
-#include "KDSoapThreadPool.h"
#include "KDSoapSocketList_p.h"
-#include <QMutex>
+#include "KDSoapThreadPool.h"
#include <QFile>
+#include <QMutex>
#ifdef Q_OS_UNIX
-#include <sys/time.h>
-#include <sys/resource.h>
#include <errno.h>
#include <limits.h>
+#include <sys/resource.h>
+#include <sys/time.h>
#endif
class KDSoapServer::Private
{
public:
Private()
- : m_threadPool(nullptr),
- m_mainThreadSocketList(nullptr),
- m_use(KDSoapMessage::LiteralUse),
- m_logLevel(KDSoapServer::LogNothing),
- m_path(QString::fromLatin1("/")),
- m_maxConnections(-1),
- m_portBeforeSuspend(0)
+ : m_threadPool(nullptr)
+ , m_mainThreadSocketList(nullptr)
+ , m_use(KDSoapMessage::LiteralUse)
+ , m_logLevel(KDSoapServer::LogNothing)
+ , m_path(QString::fromLatin1("/"))
+ , m_maxConnections(-1)
+ , m_portBeforeSuspend(0)
{
}
@@ -70,14 +57,14 @@ public:
QHostAddress m_addressBeforeSuspend;
quint16 m_portBeforeSuspend;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
QSslConfiguration m_sslConfiguration;
#endif
};
KDSoapServer::KDSoapServer(QObject *parent)
- : QTcpServer(parent),
- d(new KDSoapServer::Private)
+ : QTcpServer(parent)
+ , d(new KDSoapServer::Private)
{
// Probably not very useful since we handle them immediately, but cannot hurt.
setMaxPendingConnections(1000);
@@ -88,11 +75,7 @@ KDSoapServer::~KDSoapServer()
delete d;
}
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
void KDSoapServer::incomingConnection(qintptr socketDescriptor)
-#else
-void KDSoapServer::incomingConnection(int socketDescriptor)
-#endif
{
const int max = maxConnections();
const int numSockets = numConnectedSockets();
@@ -100,10 +83,10 @@ void KDSoapServer::incomingConnection(int socketDescriptor)
emit connectionRejected();
log(QByteArray("ERROR Too many connections (") + QByteArray::number(numSockets) + "), incoming connection rejected\n");
} else if (d->m_threadPool) {
- //qDebug() << "incomingConnection: using thread pool";
+ // qDebug() << "incomingConnection: using thread pool";
d->m_threadPool->handleIncomingConnection(socketDescriptor, this);
} else {
- //qDebug() << "incomingConnection: using main-thread socketlist";
+ // qDebug() << "incomingConnection: using main-thread socketlist";
if (!d->m_mainThreadSocketList) {
d->m_mainThreadSocketList = new KDSoapSocketList(this /*server*/);
}
@@ -136,9 +119,9 @@ int KDSoapServer::totalConnectionCount() const
void KDSoapServer::resetTotalConnectionCount()
{
if (d->m_threadPool) {
- return d->m_threadPool->resetTotalConnectionCount(this);
+ d->m_threadPool->resetTotalConnectionCount(this);
} else if (d->m_mainThreadSocketList) {
- return d->m_mainThreadSocketList->resetTotalConnectionCount();
+ d->m_mainThreadSocketList->resetTotalConnectionCount();
}
}
@@ -161,10 +144,10 @@ QString KDSoapServer::endPoint() const
}
const QString addressStr = address == QHostAddress::Any ? QString::fromLatin1("127.0.0.1") : address.toString();
return QString::fromLatin1("%1://%2:%3%4")
- .arg(QString::fromLatin1((d->m_features & Ssl) ? "https" : "http"))
- .arg(addressStr)
- .arg(serverPort())
- .arg(d->m_path);
+ .arg(QString::fromLatin1((d->m_features & Ssl) ? "https" : "http"))
+ .arg(addressStr)
+ .arg(serverPort())
+ .arg(d->m_path);
}
void KDSoapServer::setUse(KDSoapMessage::Use use)
@@ -254,7 +237,7 @@ bool KDSoapServer::setExpectedSocketCount(int sockets)
qDebug() << "Current limit" << lim.rlim_cur << lim.rlim_max;
sockets += 20; // we need some file descriptors too
if (rlim_t(sockets) <= lim.rlim_cur) {
- return true; // nothing to do
+ return true; // nothing to do
}
if (rlim_t(sockets) > lim.rlim_max) {
@@ -367,7 +350,7 @@ KDSoapServer::Features KDSoapServer::features() const
return d->m_features;
}
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
QSslConfiguration KDSoapServer::sslConfiguration() const
{
return d->m_sslConfiguration;
diff --git a/src/KDSoapServer/KDSoapServer.h b/src/KDSoapServer/KDSoapServer.h
index 0610323..3ba8fda 100644
--- a/src/KDSoapServer/KDSoapServer.h
+++ b/src/KDSoapServer/KDSoapServer.h
@@ -1,32 +1,19 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPSERVER_H
#define KDSOAPSERVER_H
#include "KDSoapServerGlobal.h"
#include <KDSoapClient/KDSoapMessage.h>
-#include <QtNetwork/QTcpServer>
#include <QtNetwork/QSslConfiguration>
+#include <QtNetwork/QTcpServer>
class KDSoapThreadPool;
@@ -56,11 +43,12 @@ public:
*/
~KDSoapServer();
- enum Feature {
- Public = 0, ///< HTTP with no ssl and no authentication needed (default)
- Ssl = 1, ///< HTTPS
- AuthRequired = 2 ///< Requires authentication. Currently not implemented, patches welcome.
- // bitfield, next item is 4
+ enum Feature
+ {
+ Public = 0, ///< HTTP with no ssl and no authentication needed (default)
+ Ssl = 1, ///< HTTPS
+ AuthRequired = 2 ///< Requires authentication. Currently not implemented, patches welcome.
+ // bitfield, next item is 4
};
Q_DECLARE_FLAGS(Features, Feature)
@@ -133,7 +121,12 @@ public:
*/
KDSoapMessage::Use use() const;
- enum LogLevel { LogNothing, LogFaults, LogEveryCall };
+ enum LogLevel
+ {
+ LogNothing,
+ LogFaults,
+ LogEveryCall
+ };
/**
* Sets the level of logging to be used by this SOAP server:
* <ul>
@@ -241,7 +234,7 @@ public:
*/
QString wsdlPathInUrl() const;
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
/**
* \returns the ssl configuration for this server
*/
@@ -274,11 +267,7 @@ Q_SIGNALS:
void connectionRejected();
protected:
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
/*! \reimp \internal */ void incomingConnection(qintptr socketDescriptor) override;
-#else
- /*! \reimp \internal */ void incomingConnection(int socketDescriptor) override;
-#endif
private:
friend class KDSoapServerSocket;
diff --git a/src/KDSoapServer/KDSoapServer.pro b/src/KDSoapServer/KDSoapServer.pro
deleted file mode 100644
index f203791..0000000
--- a/src/KDSoapServer/KDSoapServer.pro
+++ /dev/null
@@ -1,58 +0,0 @@
-TEMPLATE = lib
-TARGET = $${KDSOAPSERVERLIB}
-QT -= gui
-
-QT += network
-
-# Workaround for visual studio integration
-DESTDIR = $${TOP_BUILD_DIR}/lib
-win32:DLLDESTDIR = $${TOP_BUILD_DIR}/bin
-
-include($${TOP_SOURCE_DIR}/variables.pri)
-
-# Only used by Mac frameworks.
-# See the include subdir for standard header installation
-# TODO: install these from include/ as well
-INSTALLHEADERS = KDSoapServer.h \
- KDSoapServerAuthInterface.h \
- KDSoapServerRawXMLInterface.h \
- KDSoapServerObjectInterface.h \
- KDSoapServerGlobal.h \
- KDSoapDelayedResponseHandle.h \
- KDSoapServerCustomVerbRequestInterface.h
-
-HEADERS = $$INSTALLHEADERS \
- KDSoapThreadPool.h \
- KDSoapServerSocket_p.h \
- KDSoapServerThread_p.h \
- KDSoapSocketList_p.h \
-
-SOURCES = KDSoapServer.cpp \
- KDSoapThreadPool.cpp \
- KDSoapServerSocket.cpp \
- KDSoapServerThread.cpp \
- KDSoapSocketList.cpp \
- KDSoapServerAuthInterface.cpp \
- KDSoapServerRawXMLInterface.cpp \
- KDSoapServerObjectInterface.cpp \
- KDSoapDelayedResponseHandle.cpp \
- KDSoapServerCustomVerbRequestInterface.cpp
-
-DEFINES += KDSOAP_BUILD_KDSOAPSERVER_LIB
-
-# We use the soap client library, for xml parsing
-INCLUDEPATH += . $${TOP_SOURCE_DIR}/src
-DEPENDPATH += . $${TOP_SOURCE_DIR}/src
-LIBS += -L$$DESTDIR -l$$KDSOAPLIB
-
-# installation targets:
-target.path = $$INSTALL_PREFIX/lib$$LIB_SUFFIX
-INSTALLS += target
-
-# Mac frameworks
-macx:lib_bundle: {
- FRAMEWORK_HEADERS.version = Versions
- FRAMEWORK_HEADERS.files = $$INSTALLHEADERS
- FRAMEWORK_HEADERS.path = Headers
- QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
-}
diff --git a/src/KDSoapServer/KDSoapServerAuthInterface.cpp b/src/KDSoapServer/KDSoapServerAuthInterface.cpp
index ab8f3b2..2f7be5b 100644
--- a/src/KDSoapServer/KDSoapServerAuthInterface.cpp
+++ b/src/KDSoapServer/KDSoapServerAuthInterface.cpp
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapServerAuthInterface.h"
#include <KDSoapClient/KDSoapAuthentication.h>
@@ -27,15 +14,22 @@
KDSoapServerAuthInterface::KDSoapServerAuthInterface()
: d(nullptr)
{
-
}
KDSoapServerAuthInterface::~KDSoapServerAuthInterface()
{
-
}
-enum Method { None, Basic, Plain, Login, Ntlm, CramMd5, DigestMd5 };
+enum Method
+{
+ None,
+ Basic,
+ Plain,
+ Login,
+ Ntlm,
+ CramMd5,
+ DigestMd5
+};
static void parseAuthLine(const QString &str, Method *method, QString *headerVal)
{
*method = None;
@@ -43,7 +37,7 @@ static void parseAuthLine(const QString &str, Method *method, QString *headerVal
// is supposed to be run in a loop, apparently
// (multiple WWW-Authenticate lines? multiple values in the line?)
- //qDebug() << "parseAuthLine() " << str;
+ // qDebug() << "parseAuthLine() " << str;
if (*method < Basic && str.startsWith(QLatin1String("Basic"), Qt::CaseInsensitive)) {
*method = Basic;
*headerVal = str.mid(6);
@@ -64,11 +58,11 @@ bool KDSoapServerAuthInterface::handleHttpAuth(const QByteArray &authValue, cons
// Let the implementation decide whether it accepts "no auth".
authOk = validateAuthentication(authSettings, path);
} else {
- //qDebug() << "got authValue=" << authValue; // looks like "Basic <base64 of user:pass>"
+ // qDebug() << "got authValue=" << authValue; // looks like "Basic <base64 of user:pass>"
Method method;
QString headerVal;
parseAuthLine(QString::fromLatin1(authValue.constData(), authValue.size()), &method, &headerVal);
- //qDebug() << "method=" << method << "headerVal=" << headerVal;
+ // qDebug() << "method=" << method << "headerVal=" << headerVal;
switch (method) {
case None:
// Let the implementation decide whether it accepts "no auth".
diff --git a/src/KDSoapServer/KDSoapServerAuthInterface.h b/src/KDSoapServer/KDSoapServerAuthInterface.h
index 535741c..0121707 100644
--- a/src/KDSoapServer/KDSoapServerAuthInterface.h
+++ b/src/KDSoapServer/KDSoapServerAuthInterface.h
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPSERVERAUTHINTERFACE_H
#define KDSOAPSERVERAUTHINTERFACE_H
@@ -65,8 +52,7 @@ private:
};
QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(KDSoapServerAuthInterface,
- "com.kdab.KDSoap.ServerAuthInterface/1.0")
+Q_DECLARE_INTERFACE(KDSoapServerAuthInterface, "com.kdab.KDSoap.ServerAuthInterface/1.0")
QT_END_NAMESPACE
#endif /* KDSOAPSERVERAUTHINTERFACE_H */
diff --git a/src/KDSoapServer/KDSoapServerCustomVerbRequestInterface.cpp b/src/KDSoapServer/KDSoapServerCustomVerbRequestInterface.cpp
index 520cf86..a373c4f 100644
--- a/src/KDSoapServer/KDSoapServerCustomVerbRequestInterface.cpp
+++ b/src/KDSoapServer/KDSoapServerCustomVerbRequestInterface.cpp
@@ -1,41 +1,26 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapServerCustomVerbRequestInterface.h"
KDSoapServerCustomVerbRequestInterface::KDSoapServerCustomVerbRequestInterface()
: d(nullptr)
{
-
}
KDSoapServerCustomVerbRequestInterface::~KDSoapServerCustomVerbRequestInterface()
{
-
}
bool KDSoapServerCustomVerbRequestInterface::processCustomVerbRequest(const QByteArray &requestType, const QByteArray &requestData,
- const QMap<QByteArray, QByteArray> &httpHeaders, QByteArray &customAnswer)
+ const QMap<QByteArray, QByteArray> &httpHeaders, QByteArray &customAnswer)
{
Q_UNUSED(requestType);
Q_UNUSED(requestData);
diff --git a/src/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h b/src/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
index 99dc9b3..f34761d 100644
--- a/src/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
+++ b/src/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
@@ -1,31 +1,18 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPSERVERCUSTOMVERBREQUESTINTERFACE_H
#define KDSOAPSERVERCUSTOMVERBREQUESTINTERFACE_H
#include "KDSoapServerGlobal.h"
-#include <QtCore/QObject>
#include <QtCore/QMap>
+#include <QtCore/QObject>
class KDSoapAuthentication;
class KDSoapServerSocket;
@@ -71,8 +58,7 @@ private:
};
QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(KDSoapServerCustomVerbRequestInterface,
- "com.kdab.KDSoap.ServerCustomVerbRequestInterface/1.0")
+Q_DECLARE_INTERFACE(KDSoapServerCustomVerbRequestInterface, "com.kdab.KDSoap.ServerCustomVerbRequestInterface/1.0")
QT_END_NAMESPACE
#endif /* KDSOAPSERVERCUSTOMVERBREQUESTINTERFACE_H */
diff --git a/src/KDSoapServer/KDSoapServerGlobal.h b/src/KDSoapServer/KDSoapServerGlobal.h
index a2142e1..90e8b18 100644
--- a/src/KDSoapServer/KDSoapServerGlobal.h
+++ b/src/KDSoapServer/KDSoapServerGlobal.h
@@ -1,40 +1,26 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPSERVERGLOBAL_H
#define KDSOAPSERVERGLOBAL_H
#include <QtCore/QtGlobal>
-# ifdef KDSOAPSERVER_STATICLIB
-# undef KDSOAPSERVER_SHAREDLIB
-# define KDSOAPSERVER_EXPORT
-# else
-# ifdef KDSOAP_BUILD_KDSOAPSERVER_LIB
-# define KDSOAPSERVER_EXPORT Q_DECL_EXPORT
-# else
-# define KDSOAPSERVER_EXPORT Q_DECL_IMPORT
-# endif
-# endif
+#ifdef KDSOAPSERVER_STATICLIB
+#undef KDSOAPSERVER_SHAREDLIB
+#define KDSOAPSERVER_EXPORT
+#else
+#ifdef KDSOAP_BUILD_KDSOAPSERVER_LIB
+#define KDSOAPSERVER_EXPORT Q_DECL_EXPORT
+#else
+#define KDSOAPSERVER_EXPORT Q_DECL_IMPORT
+#endif
+#endif
#endif /* KDSOAPSERVERGLOBAL_H */
-
diff --git a/src/KDSoapServer/KDSoapServerObjectInterface.cpp b/src/KDSoapServer/KDSoapServerObjectInterface.cpp
index f790485..7f6362e 100644
--- a/src/KDSoapServer/KDSoapServerObjectInterface.cpp
+++ b/src/KDSoapServer/KDSoapServerObjectInterface.cpp
@@ -1,36 +1,23 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapServerObjectInterface.h"
-#include "KDSoapServerSocket_p.h"
#include "KDSoapClient/KDSoapValue.h"
+#include "KDSoapServerSocket_p.h"
#include <QDebug>
#include <QPointer>
class KDSoapServerObjectInterface::Private
{
public:
- Private() :
- m_serverSocket(nullptr)
+ Private()
+ : m_serverSocket(nullptr)
{
}
@@ -48,7 +35,8 @@ public:
};
KDSoapServerObjectInterface::HttpResponseHeaderItem::HttpResponseHeaderItem(const QByteArray &name, const QByteArray &value)
- : m_value(value), m_name(name)
+ : m_value(value)
+ , m_name(name)
{
}
@@ -81,14 +69,17 @@ QIODevice *KDSoapServerObjectInterface::processFileRequest(const QString &path,
return nullptr;
}
-void KDSoapServerObjectInterface::processRequestWithPath(const KDSoapMessage &request, KDSoapMessage &response, const QByteArray &soapAction, const QString &path)
+void KDSoapServerObjectInterface::processRequestWithPath(const KDSoapMessage &request, KDSoapMessage &response, const QByteArray &soapAction,
+ const QString &path)
{
Q_UNUSED(soapAction);
const QString method = request.name();
qWarning("Invalid path: \"%s\"", qPrintable(path));
- //qWarning() << "Invalid path:" << path << "[method =" << method << "; soapAction =" << soapAction << "]" /* << "in" << metaObject()->className()*/;
+ // qWarning() << "Invalid path:" << path << "[method =" << method << "; soapAction =" << soapAction << "]" /* << "in" <<
+ // metaObject()->className();
const KDSoap::SoapVersion soapVersion = KDSoap::SOAP1_1; // TODO version selection on the server side
- response.createFaultMessage(QString::fromLatin1("Client.Data"), QString::fromLatin1("Method %1 not found in path %2").arg(method, path), soapVersion);
+ response.createFaultMessage(QString::fromLatin1("Client.Data"), QString::fromLatin1("Method %1 not found in path %2").arg(method, path),
+ soapVersion);
}
KDSoapServerObjectInterface::HttpResponseHeaderItems KDSoapServerObjectInterface::additionalHttpResponseHeaderItems() const
diff --git a/src/KDSoapServer/KDSoapServerObjectInterface.h b/src/KDSoapServer/KDSoapServerObjectInterface.h
index 45b2325..8217e5d 100644
--- a/src/KDSoapServer/KDSoapServerObjectInterface.h
+++ b/src/KDSoapServer/KDSoapServerObjectInterface.h
@@ -1,36 +1,23 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPSERVEROBJECTINTERFACE_H
#define KDSOAPSERVEROBJECTINTERFACE_H
+#include "KDSoapDelayedResponseHandle.h"
#include "KDSoapServerGlobal.h"
#include <KDSoapClient/KDSoapMessage.h>
-#include "KDSoapDelayedResponseHandle.h"
-#include <QtCore/QObject>
+#include <QIODevice>
#include <QtCore/QByteArray>
+#include <QtCore/QObject>
#include <QtCore/QVector>
-#include <QIODevice>
class KDSoapServerSocket;
@@ -81,6 +68,9 @@ public:
*/
virtual ~KDSoapServerObjectInterface();
+ KDSoapServerObjectInterface(const KDSoapServerObjectInterface &) = delete;
+ KDSoapServerObjectInterface &operator=(const KDSoapServerObjectInterface &) = delete;
+
/**
* Handle \p request and return \p response.
* The default implementation in this base class is to simply return
@@ -130,7 +120,8 @@ public:
*/
virtual void processRequestWithPath(const KDSoapMessage &request, KDSoapMessage &response, const QByteArray &soapAction, const QString &path);
- struct KDSOAPSERVER_EXPORT HttpResponseHeaderItem {
+ struct KDSOAPSERVER_EXPORT HttpResponseHeaderItem
+ {
HttpResponseHeaderItem();
HttpResponseHeaderItem(const QByteArray &name, const QByteArray &value);
QByteArray m_value;
@@ -273,8 +264,7 @@ private:
};
QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(KDSoapServerObjectInterface,
- "com.kdab.KDSoap.ServerObjectInterface/1.0")
+Q_DECLARE_INTERFACE(KDSoapServerObjectInterface, "com.kdab.KDSoap.ServerObjectInterface/1.0")
QT_END_NAMESPACE
#endif // KDSOAPSERVEROBJECTINTERFACE_H
diff --git a/src/KDSoapServer/KDSoapServerRawXMLInterface.cpp b/src/KDSoapServer/KDSoapServerRawXMLInterface.cpp
index ca33d77..76c6851 100644
--- a/src/KDSoapServer/KDSoapServerRawXMLInterface.cpp
+++ b/src/KDSoapServer/KDSoapServerRawXMLInterface.cpp
@@ -1,32 +1,18 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapServerRawXMLInterface.h"
KDSoapServerRawXMLInterface::KDSoapServerRawXMLInterface()
: d(nullptr)
{
-
}
KDSoapServerRawXMLInterface::~KDSoapServerRawXMLInterface()
diff --git a/src/KDSoapServer/KDSoapServerRawXMLInterface.h b/src/KDSoapServer/KDSoapServerRawXMLInterface.h
index 252f5af..d4a10fe 100644
--- a/src/KDSoapServer/KDSoapServerRawXMLInterface.h
+++ b/src/KDSoapServer/KDSoapServerRawXMLInterface.h
@@ -1,31 +1,18 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPSERVERRAWXMLINTERFACE_H
#define KDSOAPSERVERRAWXMLINTERFACE_H
#include "KDSoapServerGlobal.h"
-#include <QtCore/QObject>
#include <QtCore/QMap>
+#include <QtCore/QObject>
class KDSoapRawXMLentication;
class KDSoapServerSocket;
class KDSoapServerRawXMLPrivate;
@@ -67,7 +54,8 @@ public:
* Called when starting to receive a new request.
* @param requestType GET or POST
* @param httpHeaders the map of http headers (keys have been lowercased since they are case insensitive)
- * @return true if you want this interface to handle the request, otherwise the usual processing via KDSoapServerObjectInterface::processRequest will happen.
+ * @return true if you want this interface to handle the request, otherwise the usual processing via KDSoapServerObjectInterface::processRequest
+ * will happen.
*/
virtual bool newRequest(const QByteArray &requestType, const QMap<QByteArray, QByteArray> &httpHeaders)
{
@@ -97,8 +85,7 @@ private:
};
QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(KDSoapServerRawXMLInterface,
- "com.kdab.KDSoap.ServerRawXMLInterface/1.0")
+Q_DECLARE_INTERFACE(KDSoapServerRawXMLInterface, "com.kdab.KDSoap.ServerRawXMLInterface/1.0")
QT_END_NAMESPACE
#endif /* KDSOAPSERVERRAWXMLINTERFACE_H */
diff --git a/src/KDSoapServer/KDSoapServerSocket.cpp b/src/KDSoapServer/KDSoapServerSocket.cpp
index f163b78..ea6cbf3 100644
--- a/src/KDSoapServer/KDSoapServerSocket.cpp
+++ b/src/KDSoapServer/KDSoapServerSocket.cpp
@@ -1,62 +1,52 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
-#include "KDSoapServerSocket_p.h"
-#include "KDSoapSocketList_p.h"
-#include "KDSoapServerObjectInterface.h"
+****************************************************************************/
+#include "KDSoapServer.h"
#include "KDSoapServerAuthInterface.h"
-#include "KDSoapServerRawXMLInterface.h"
#include "KDSoapServerCustomVerbRequestInterface.h"
-#include "KDSoapServer.h"
+#include "KDSoapServerObjectInterface.h"
+#include "KDSoapServerRawXMLInterface.h"
+#include "KDSoapServerSocket_p.h"
+#include "KDSoapSocketList_p.h"
#include <KDSoapClient/KDSoapMessage.h>
-#include <KDSoapClient/KDSoapNamespaceManager.h>
#include <KDSoapClient/KDSoapMessageReader_p.h>
#include <KDSoapClient/KDSoapMessageWriter_p.h>
+#include <KDSoapClient/KDSoapNamespaceManager.h>
#include <QBuffer>
-#include <QThread>
-#include <QMetaMethod>
-#include <QFile>
#include <QDir>
+#include <QFile>
#include <QFileInfo>
+#include <QMetaMethod>
+#include <QThread>
#include <QVarLengthArray>
+static const char s_forbidden[] = "HTTP/1.1 403 Forbidden\r\nContent-Length: 0\r\n\r\n";
+
KDSoapServerSocket::KDSoapServerSocket(KDSoapSocketList *owner, QObject *serverObject)
-#ifndef QT_NO_OPENSSL
- : QSslSocket(),
+#ifndef QT_NO_SSL
+ : QSslSocket()
+ ,
#else
- : QTcpSocket(),
+ : QTcpSocket()
+ ,
#endif
- m_owner(owner),
- m_serverObject(serverObject),
- m_delayedResponse(false),
- m_socketEnabled(true),
- m_receivedData(false),
- m_useRawXML(false),
- m_bytesReceived(0),
- m_chunkStart(0)
+ m_owner(owner)
+ , m_serverObject(serverObject)
+ , m_delayedResponse(false)
+ , m_socketEnabled(true)
+ , m_receivedData(false)
+ , m_useRawXML(false)
+ , m_bytesReceived(0)
+ , m_chunkStart(0)
{
- connect(this, SIGNAL(readyRead()),
- this, SLOT(slotReadyRead()));
- m_doDebug = qgetenv("KDSOAP_DEBUG").toInt();
+ connect(this, &QIODevice::readyRead, this, &KDSoapServerSocket::slotReadyRead);
+ m_doDebug = qEnvironmentVariableIsSet("KDSOAP_DEBUG");
}
// The socket is deleted when it emits disconnected() (see KDSoapSocketList::handleIncomingConnection).
@@ -79,11 +69,22 @@ static HeadersMap parseHeaders(const QByteArray &headerData)
qDebug() << "Malformed HTTP request:" << firstLine;
return headersMap;
}
- const QByteArray& requestType = firstLine.at(0);
- const QByteArray path = QDir::cleanPath(QString::fromLatin1(firstLine.at(1).constData())).toLatin1();
- const QByteArray& httpVersion = firstLine.at(2);
+ const QByteArray &requestType = firstLine.at(0);
headersMap.insert("_requestType", requestType);
- headersMap.insert("_path", path);
+
+ // Grammar from https://datatracker.ietf.org/doc/html/rfc7230#section-5.3.1
+ // origin-form = absolute-path [ "?" query ]
+ // and https://datatracker.ietf.org/doc/html/rfc3986#section-3.3
+ // says the path ends at the first '?' or '#' character
+ const QByteArray arg1 = firstLine.at(1);
+ const int queryPos = arg1.indexOf('?');
+ const QByteArray path = queryPos >= 0 ? arg1.left(queryPos) : arg1;
+ const QByteArray query = queryPos >= 0 ? arg1.mid(queryPos) : QByteArray();
+ // Unfortunately QDir::cleanPath works with QString
+ const QByteArray cleanedPath = QDir::cleanPath(QString::fromUtf8(path)).toUtf8();
+ headersMap.insert("_path", cleanedPath + query);
+
+ const QByteArray &httpVersion = firstLine.at(2);
headersMap.insert("_httpVersion", httpVersion);
while (!sourceBuffer.atEnd()) {
@@ -94,7 +95,7 @@ static HeadersMap parseHeaders(const QByteArray &headerData)
}
const QByteArray header = line.left(pos).toLower(); // RFC2616 section 4.2 "Field names are case-insensitive"
const QByteArray value = line.mid(pos + 1).trimmed(); // remove space before and \r\n after
- //qDebug() << "HEADER" << header << "VALUE" << value;
+ // qDebug() << "HEADER" << header << "VALUE" << value;
headersMap.insert(header, value);
}
return headersMap;
@@ -144,7 +145,7 @@ static QByteArray httpResponseHeaders(bool fault, const QByteArray &contentType,
KDSoapServerObjectInterface *serverObjectInterface = qobject_cast<KDSoapServerObjectInterface *>(serverObject);
if (serverObjectInterface) {
const KDSoapServerObjectInterface::HttpResponseHeaderItems &additionalItems = serverObjectInterface->additionalHttpResponseHeaderItems();
- Q_FOREACH (const KDSoapServerObjectInterface::HttpResponseHeaderItem &headerItem, additionalItems) {
+ for (const KDSoapServerObjectInterface::HttpResponseHeaderItem &headerItem : qAsConst(additionalItems)) {
httpResponse += headerItem.m_name;
httpResponse += ": ";
httpResponse += headerItem.m_value;
@@ -169,7 +170,7 @@ void KDSoapServerSocket::slotReadyRead()
m_owner->increaseConnectionCount();
}
- //qDebug() << this << QThread::currentThread() << "slotReadyRead!";
+ // qDebug() << this << QThread::currentThread() << "slotReadyRead!";
QByteArray buf(2048, ' ');
qint64 nread = -1;
@@ -190,8 +191,8 @@ void KDSoapServerSocket::slotReadyRead()
QByteArray receivedHttpHeaders, receivedData;
const bool splitOK = splitHeadersAndData(m_requestBuffer, receivedHttpHeaders, receivedData);
if (!splitOK) {
- //qDebug() << "Incomplete SOAP request, wait for more data";
- //incomplete request, wait for more data
+ // qDebug() << "Incomplete SOAP request, wait for more data";
+ // incomplete request, wait for more data
return;
}
m_httpHeaders = parseHeaders(receivedHttpHeaders);
@@ -219,7 +220,7 @@ void KDSoapServerSocket::slotReadyRead()
const QByteArray contentLength = m_httpHeaders.value("content-length");
if (m_bytesReceived < contentLength.toInt()) {
- return; // incomplete request, wait for more data
+ return; // incomplete request, wait for more data
}
if (m_useRawXML) {
@@ -228,14 +229,14 @@ void KDSoapServerSocket::slotReadyRead()
handleRequest(m_httpHeaders, m_requestBuffer);
}
} else {
- //qDebug() << "requestBuffer has " << m_requestBuffer.size() << "bytes, starting at" << m_chunkStart;
+ // qDebug() << "requestBuffer has " << m_requestBuffer.size() << "bytes, starting at" << m_chunkStart;
while (m_chunkStart >= 0) {
const int nextEOL = m_requestBuffer.indexOf("\r\n", m_chunkStart);
if (nextEOL == -1) {
return;
}
const QByteArray chunkSizeStr = m_requestBuffer.mid(m_chunkStart, nextEOL - m_chunkStart);
- //qDebug() << m_chunkStart << nextEOL << "chunkSizeStr=" << chunkSizeStr;
+ // qDebug() << m_chunkStart << nextEOL << "chunkSizeStr=" << chunkSizeStr;
bool ok;
int chunkSize = chunkSizeStr.toInt(&ok, 16);
if (!ok) {
@@ -281,12 +282,19 @@ void KDSoapServerSocket::handleRequest(const QMap<QByteArray, QByteArray> &httpH
const QByteArray requestType = httpHeaders.value("_requestType");
const QString path = QString::fromLatin1(httpHeaders.value("_path").constData());
+ if (!path.startsWith(QLatin1String("/"))) {
+ // denied for security reasons (ex: path starting with "..")
+ write(s_forbidden);
+ return;
+ }
+
KDSoapServerAuthInterface *serverAuthInterface = qobject_cast<KDSoapServerAuthInterface *>(m_serverObject);
if (serverAuthInterface) {
const QByteArray authValue = httpHeaders.value("authorization");
if (!serverAuthInterface->handleHttpAuth(authValue, path)) {
// send auth request (Qt supports basic, ntlm and digest)
- const QByteArray unauthorized = "HTTP/1.1 401 Authorization Required\r\nWWW-Authenticate: Basic realm=\"example\"\r\nContent-Length: 0\r\n\r\n";
+ const QByteArray unauthorized =
+ "HTTP/1.1 401 Authorization Required\r\nWWW-Authenticate: Basic realm=\"example\"\r\nContent-Length: 0\r\n\r\n";
write(unauthorized);
return;
}
@@ -300,8 +308,8 @@ void KDSoapServerSocket::handleRequest(const QMap<QByteArray, QByteArray> &httpH
return;
} else {
qWarning() << "Unknown HTTP request:" << requestType;
- //handleError(replyMsg, "Client.Data", QString::fromLatin1("Invalid request type '%1', should be GET or POST").arg(QString::fromLatin1(requestType.constData())));
- //sendReply(0, replyMsg);
+ // handleError(replyMsg, "Client.Data", QString::fromLatin1("Invalid request type '%1', should be GET or
+ // POST").arg(QString::fromLatin1(requestType.constData()))); sendReply(0, replyMsg);
const QByteArray methodNotAllowed = "HTTP/1.1 405 Method Not Allowed\r\nAllow: GET POST\r\nContent-Length: 0\r\n\r\n";
write(methodNotAllowed);
return;
@@ -314,7 +322,8 @@ void KDSoapServerSocket::handleRequest(const QMap<QByteArray, QByteArray> &httpH
KDSoapServerObjectInterface *serverObjectInterface = qobject_cast<KDSoapServerObjectInterface *>(m_serverObject);
if (!serverObjectInterface) {
- const QString error = QString::fromLatin1("Server object %1 does not implement KDSoapServerObjectInterface!").arg(QString::fromLatin1(m_serverObject->metaObject()->className()));
+ const QString error = QString::fromLatin1("Server object %1 does not implement KDSoapServerObjectInterface!")
+ .arg(QString::fromLatin1(m_serverObject->metaObject()->className()));
handleError(replyMsg, "Server.ImplementationError", error);
sendReply(nullptr, replyMsg);
return;
@@ -337,32 +346,32 @@ void KDSoapServerSocket::handleRequest(const QMap<QByteArray, QByteArray> &httpH
return;
}
- //parse message
+ // parse message
KDSoapMessage requestMsg;
KDSoapHeaders requestHeaders;
KDSoapMessageReader reader;
KDSoapMessageReader::XmlError err = reader.xmlToMessage(receivedData, &requestMsg, &m_messageNamespace, &requestHeaders, KDSoap::SOAP1_1);
if (err == KDSoapMessageReader::PrematureEndOfDocumentError) {
- //qDebug() << "Incomplete SOAP message, wait for more data";
+ // qDebug() << "Incomplete SOAP message, wait for more data";
// This should never happen, since we check for content-size above.
return;
- } //TODO handle parse errors?
+ } // TODO handle parse errors?
// check soap version and extract soapAction header
QByteArray soapAction;
const QByteArray contentType = httpHeaders.value("content-type");
- if (contentType.startsWith("text/xml")) { //krazy:exclude=strings
+ if (contentType.startsWith("text/xml")) { // krazy:exclude=strings
// SOAP 1.1
soapAction = httpHeaders.value("soapaction");
// The SOAP standard allows quotation marks around the SoapAction, so we have to get rid of these.
soapAction = stripQuotes(soapAction);
- } else if (contentType.startsWith("application/soap+xml")) { //krazy:exclude=strings
+ } else if (contentType.startsWith("application/soap+xml")) { // krazy:exclude=strings
// SOAP 1.2
// Example: application/soap+xml;charset=utf-8;action=ActionHex
const QList<QByteArray> parts = contentType.split(';');
- Q_FOREACH (const QByteArray &part, parts) {
- if (part.trimmed().startsWith("action=")) { //krazy:exclude=strings
+ for (const QByteArray &part : qAsConst(parts)) {
+ if (part.trimmed().startsWith("action=")) { // krazy:exclude=strings
soapAction = stripQuotes(part.mid(part.indexOf('=') + 1));
}
}
@@ -388,7 +397,7 @@ bool KDSoapServerSocket::handleWsdlDownload()
const QString wsdlFile = server->wsdlFile();
QFile wf(wsdlFile);
if (wf.open(QIODevice::ReadOnly)) {
- //qDebug() << "Returning wsdl file contents";
+ // qDebug() << "Returning wsdl file contents";
const QByteArray responseText = wf.readAll();
const QByteArray response = httpResponseHeaders(false, "application/xml", responseText.size(), m_serverObject);
write(response);
@@ -408,8 +417,7 @@ bool KDSoapServerSocket::handleFileDownload(KDSoapServerObjectInterface *serverO
return true;
}
if (!device->open(QIODevice::ReadOnly)) {
- const QByteArray forbidden = "HTTP/1.1 403 Forbidden\r\nContent-Length: 0\r\n\r\n";
- write(forbidden);
+ write(s_forbidden);
delete device;
return true; // handled!
}
@@ -422,19 +430,19 @@ bool KDSoapServerSocket::handleFileDownload(KDSoapServerObjectInterface *serverO
Q_UNUSED(written);
char block[4096] = {0};
- qint64 totalRead = 0;
+ // qint64 totalRead = 0;
while (!device->atEnd()) {
const qint64 in = device->read(block, sizeof(block));
if (in <= 0) {
break;
}
- totalRead += in;
+ // totalRead += in;
if (in != write(block, in)) {
- //error = true;
+ // error = true;
break;
}
}
- //if (totalRead != device->size()) {
+ // if (totalRead != device->size()) {
// // Unable to read from the source.
// error = true;
//}
@@ -446,7 +454,8 @@ bool KDSoapServerSocket::handleFileDownload(KDSoapServerObjectInterface *serverO
void KDSoapServerSocket::writeXML(const QByteArray &xmlResponse, bool isFault)
{
- const QByteArray httpHeaders = httpResponseHeaders(isFault, "text/xml", xmlResponse.size(), m_serverObject); // TODO return application/soap+xml;charset=utf-8 instead for SOAP 1.2
+ const QByteArray httpHeaders = httpResponseHeaders(isFault, "text/xml", xmlResponse.size(),
+ m_serverObject); // TODO return application/soap+xml;charset=utf-8 instead for SOAP 1.2
if (m_doDebug) {
qDebug() << "KDSoapServerSocket: writing" << httpHeaders << xmlResponse;
}
@@ -487,10 +496,10 @@ void KDSoapServerSocket::sendReply(KDSoapServerObjectInterface *serverObjectInte
// All done, check if we should log this
KDSoapServer *server = m_owner->server();
- const KDSoapServer::LogLevel logLevel = server->logLevel(); // we do this here in order to support dynamic settings changes (at the price of a mutex)
+ const KDSoapServer::LogLevel logLevel =
+ server->logLevel(); // we do this here in order to support dynamic settings changes (at the price of a mutex)
if (logLevel != KDSoapServer::LogNothing) {
- if (logLevel == KDSoapServer::LogEveryCall ||
- (logLevel == KDSoapServer::LogFaults && isFault)) {
+ if (logLevel == KDSoapServer::LogEveryCall || (logLevel == KDSoapServer::LogFaults && isFault)) {
if (isFault) {
server->log("FAULT " + m_method.toLatin1() + " -- " + replyMsg.faultAsString().toUtf8() + '\n');
@@ -520,7 +529,8 @@ void KDSoapServerSocket::handleError(KDSoapMessage &replyMsg, const char *errorC
replyMsg.createFaultMessage(QString::fromLatin1(errorCode), error, soapVersion);
}
-void KDSoapServerSocket::makeCall(KDSoapServerObjectInterface *serverObjectInterface, const KDSoapMessage &requestMsg, KDSoapMessage &replyMsg, const KDSoapHeaders &requestHeaders, const QByteArray &soapAction, const QString &path)
+void KDSoapServerSocket::makeCall(KDSoapServerObjectInterface *serverObjectInterface, const KDSoapMessage &requestMsg, KDSoapMessage &replyMsg,
+ const KDSoapHeaders &requestHeaders, const QByteArray &soapAction, const QString &path)
{
Q_ASSERT(serverObjectInterface);
@@ -542,7 +552,7 @@ void KDSoapServerSocket::makeCall(KDSoapServerObjectInterface *serverObjectInter
serverObjectInterface->processRequest(requestMsg, replyMsg, soapAction);
}
if (serverObjectInterface->hasFault()) {
- //qDebug() << "Got fault!";
+ // qDebug() << "Got fault!";
replyMsg.setFault(true);
serverObjectInterface->storeFaultAttributes(replyMsg);
}
diff --git a/src/KDSoapServer/KDSoapServerSocket_p.h b/src/KDSoapServer/KDSoapServerSocket_p.h
index 26a2197..3cd46da 100644
--- a/src/KDSoapServer/KDSoapServerSocket_p.h
+++ b/src/KDSoapServer/KDSoapServerSocket_p.h
@@ -1,32 +1,19 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPSERVERSOCKET_P_H
#define KDSOAPSERVERSOCKET_P_H
#include <QtGlobal>
-#include <QTcpSocket> //may define QT_NO_OPENSSL
-#ifndef QT_NO_OPENSSL
+#include <QTcpSocket> //may define QT_NO_SSL
+#ifndef QT_NO_SSL
#include <QSslSocket>
#endif
@@ -40,7 +27,7 @@ class KDSoapMessage;
class KDSoapHeaders;
class KDSoapServerSocket
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
: public QSslSocket
#else
: public QTcpSocket
@@ -64,10 +51,8 @@ private:
void handleRequest(const QMap<QByteArray, QByteArray> &headers, const QByteArray &receivedData);
bool handleWsdlDownload();
bool handleFileDownload(KDSoapServerObjectInterface *serverObjectInterface, const QString &path);
- void makeCall(KDSoapServerObjectInterface *serverObjectInterface,
- const KDSoapMessage &requestMsg, KDSoapMessage &replyMsg,
- const KDSoapHeaders &requestHeaders,
- const QByteArray &soapAction, const QString &path);
+ void makeCall(KDSoapServerObjectInterface *serverObjectInterface, const KDSoapMessage &requestMsg, KDSoapMessage &replyMsg,
+ const KDSoapHeaders &requestHeaders, const QByteArray &soapAction, const QString &path);
void handleError(KDSoapMessage &replyMsg, const char *errorCode, const QString &error);
void setSocketEnabled(bool enabled);
void writeXML(const QByteArray &xmlResponse, bool isFault);
diff --git a/src/KDSoapServer/KDSoapServerThread.cpp b/src/KDSoapServer/KDSoapServerThread.cpp
index 7563148..5de62e5 100644
--- a/src/KDSoapServer/KDSoapServerThread.cpp
+++ b/src/KDSoapServer/KDSoapServerThread.cpp
@@ -1,34 +1,22 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
+#include "KDSoapServer.h"
+#include "KDSoapServerSocket_p.h"
#include "KDSoapServerThread_p.h"
#include "KDSoapSocketList_p.h"
-#include "KDSoapServerSocket_p.h"
-#include "KDSoapServer.h"
#include <QMetaType>
KDSoapServerThread::KDSoapServerThread(QObject *parent)
- : QThread(parent), d(nullptr)
+ : QThread(parent)
+ , d(nullptr)
{
qRegisterMetaType<KDSoapServer *>("KDSoapServer*");
qRegisterMetaType<QSemaphore *>("QSemaphore*");
@@ -105,7 +93,8 @@ void KDSoapServerThread::handleIncomingConnection(int socketDescriptor, KDSoapSe
////
KDSoapServerThreadImpl::KDSoapServerThreadImpl()
- : QObject(nullptr), m_incomingConnectionCount(0)
+ : QObject(nullptr)
+ , m_incomingConnectionCount(0)
{
}
@@ -119,15 +108,10 @@ int KDSoapServerThreadImpl::socketCount()
{
QMutexLocker lock(&m_socketListMutex);
int sc = 0;
- SocketLists::const_iterator it = m_socketLists.constBegin();
- for (; it != m_socketLists.constEnd(); ++it) {
- sc += it.value()->socketCount();
+ for (KDSoapSocketList *socketList : qAsConst(m_socketLists)) {
+ sc += socketList->socketCount();
}
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
sc += m_incomingConnectionCount.loadAcquire();
-#else
- sc += m_incomingConnectionCount;
-#endif
return sc;
}
diff --git a/src/KDSoapServer/KDSoapServerThread_p.h b/src/KDSoapServer/KDSoapServerThread_p.h
index f10d185..986781d 100644
--- a/src/KDSoapServer/KDSoapServerThread_p.h
+++ b/src/KDSoapServer/KDSoapServerThread_p.h
@@ -1,32 +1,19 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPSERVERTHREAD_P_H
#define KDSOAPSERVERTHREAD_P_H
-#include <QThread>
-#include <QSemaphore>
-#include <QMutex>
#include <QHash>
+#include <QMutex>
+#include <QSemaphore>
+#include <QThread>
class KDSoapServer;
class KDSoapSocketList;
@@ -49,6 +36,7 @@ public:
void resetTotalConnectionCountForServer(const KDSoapServer *server);
void addIncomingConnection();
+
private:
QMutex m_socketListMutex;
KDSoapSocketList *socketListForServer(KDSoapServer *server);
diff --git a/src/KDSoapServer/KDSoapSocketList.cpp b/src/KDSoapServer/KDSoapSocketList.cpp
index 9dd76df..2cc755d 100644
--- a/src/KDSoapServer/KDSoapSocketList.cpp
+++ b/src/KDSoapServer/KDSoapSocketList.cpp
@@ -1,32 +1,21 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
-#include "KDSoapSocketList_p.h"
-#include "KDSoapServerSocket_p.h"
+****************************************************************************/
#include "KDSoapServer.h"
+#include "KDSoapServerSocket_p.h"
+#include "KDSoapSocketList_p.h"
#include <QDebug>
KDSoapSocketList::KDSoapSocketList(KDSoapServer *server)
- : m_server(server), m_serverObject(server->createServerObject()), m_totalConnectionCount(0)
+ : m_server(server)
+ , m_serverObject(server->createServerObject())
+ , m_totalConnectionCount(0)
{
Q_ASSERT(m_server);
Q_ASSERT(m_serverObject);
@@ -42,7 +31,7 @@ KDSoapServerSocket *KDSoapSocketList::handleIncomingConnection(int socketDescrip
KDSoapServerSocket *socket = new KDSoapServerSocket(this, m_serverObject);
socket->setSocketDescriptor(socketDescriptor);
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
if (m_server->features() & KDSoapServer::Ssl) {
// We could call a virtual "m_server->setSslConfiguration(socket)" here,
// if more control is needed (e.g. due to SNI)
@@ -53,16 +42,15 @@ KDSoapServerSocket *KDSoapSocketList::handleIncomingConnection(int socketDescrip
}
#endif
- QObject::connect(socket, SIGNAL(disconnected()),
- socket, SLOT(deleteLater()));
+ QObject::connect(socket, &KDSoapServerSocket::disconnected, socket, &KDSoapServerSocket::deleteLater);
m_sockets.insert(socket);
- connect(socket, SIGNAL(socketDeleted(KDSoapServerSocket*)), this, SLOT(socketDeleted(KDSoapServerSocket*)));
+ connect(socket, &KDSoapServerSocket::socketDeleted, this, &KDSoapSocketList::socketDeleted);
return socket;
}
void KDSoapSocketList::socketDeleted(KDSoapServerSocket *socket)
{
- //qDebug() << Q_FUNC_INFO;
+ // qDebug() << Q_FUNC_INFO;
m_sockets.remove(socket);
}
@@ -73,24 +61,20 @@ int KDSoapSocketList::socketCount() const
void KDSoapSocketList::disconnectAll()
{
- Q_FOREACH (KDSoapServerSocket *socket, m_sockets) {
- socket->close(); // will disconnect
+ for (KDSoapServerSocket *socket : qAsConst(m_sockets)) {
+ socket->close(); // will disconnect
}
}
int KDSoapSocketList::totalConnectionCount() const
{
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
return m_totalConnectionCount.loadAcquire();
-#else
- return m_totalConnectionCount;
-#endif
}
void KDSoapSocketList::increaseConnectionCount()
{
m_totalConnectionCount.ref();
- //qDebug() << m_totalConnectionCount << "sockets connected in" << QThread::currentThread();
+ // qDebug() << m_totalConnectionCount << "sockets connected in" << QThread::currentThread();
}
void KDSoapSocketList::resetTotalConnectionCount()
diff --git a/src/KDSoapServer/KDSoapSocketList_p.h b/src/KDSoapServer/KDSoapSocketList_p.h
index 0dea036..779df08 100644
--- a/src/KDSoapServer/KDSoapSocketList_p.h
+++ b/src/KDSoapServer/KDSoapSocketList_p.h
@@ -1,30 +1,17 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPSOCKETLIST_P_H
#define KDSOAPSOCKETLIST_P_H
-#include <QSet>
#include <QObject>
+#include <QSet>
QT_BEGIN_NAMESPACE
class QTcpSocket;
class QObject;
diff --git a/src/KDSoapServer/KDSoapThreadPool.cpp b/src/KDSoapServer/KDSoapThreadPool.cpp
index 22b9e3a..5bee091 100644
--- a/src/KDSoapServer/KDSoapThreadPool.cpp
+++ b/src/KDSoapServer/KDSoapThreadPool.cpp
@@ -1,25 +1,12 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "KDSoapThreadPool.h"
#include "KDSoapServerThread_p.h"
#include <QDebug>
@@ -40,18 +27,18 @@ public:
};
KDSoapThreadPool::KDSoapThreadPool(QObject *parent)
- : QObject(parent),
- d(new Private)
+ : QObject(parent)
+ , d(new Private)
{
}
KDSoapThreadPool::~KDSoapThreadPool()
{
// ask all threads to finish, then delete them all
- Q_FOREACH (KDSoapServerThread *thread, d->m_threads) {
+ for (KDSoapServerThread *thread : qAsConst(d->m_threads)) {
thread->quitThread();
}
- Q_FOREACH (KDSoapServerThread *thread, d->m_threads) {
+ for (KDSoapServerThread *thread : qAsConst(d->m_threads)) {
thread->wait();
delete thread;
}
@@ -75,9 +62,7 @@ KDSoapServerThread *KDSoapThreadPool::Private::chooseNextThread()
// Try to pick an existing thread
int minSocketCount = 0;
KDSoapServerThread *bestThread = nullptr;
- ThreadCollection::const_iterator it = m_threads.constBegin();
- for (; it != m_threads.constEnd(); ++it) {
- KDSoapServerThread *thr = *it;
+ for (KDSoapServerThread *thr : qAsConst(m_threads)) {
// We look at the amount of sockets connected to each thread, and pick the less busy one.
// Note that this isn't fully accurate, due to Keep-Alive: it's possible for long-term
// idling clients to be all on one thread, and active clients on another one, and this
@@ -86,7 +71,7 @@ KDSoapServerThread *KDSoapThreadPool::Private::chooseNextThread()
// N seconds... but the past is no indication of the future.
const int sc = thr->socketCount();
if (sc == 0) { // Perfect, an idling thread
- //qDebug() << "Picked" << thr << "since it was idling";
+ // qDebug() << "Picked" << thr << "since it was idling";
chosenThread = thr;
break;
}
@@ -104,7 +89,7 @@ KDSoapServerThread *KDSoapThreadPool::Private::chooseNextThread()
// Create new thread
if (!chosenThread) {
chosenThread = new KDSoapServerThread(nullptr);
- //qDebug() << "Creating KDSoapServerThread" << chosenThread;
+ // qDebug() << "Creating KDSoapServerThread" << chosenThread;
m_threads.append(chosenThread);
chosenThread->startThread();
}
@@ -123,7 +108,7 @@ void KDSoapThreadPool::handleIncomingConnection(int socketDescriptor, KDSoapServ
int KDSoapThreadPool::numConnectedSockets(const KDSoapServer *server) const
{
int sc = 0;
- Q_FOREACH (KDSoapServerThread *thread, d->m_threads) {
+ for (KDSoapServerThread *thread : qAsConst(d->m_threads)) {
sc += thread->socketCountForServer(server);
}
return sc;
@@ -132,7 +117,7 @@ int KDSoapThreadPool::numConnectedSockets(const KDSoapServer *server) const
void KDSoapThreadPool::disconnectSockets(KDSoapServer *server)
{
QSemaphore readyThreads;
- Q_FOREACH (KDSoapServerThread *thread, d->m_threads) {
+ for (KDSoapServerThread *thread : qAsConst(d->m_threads)) {
thread->disconnectSocketsForServer(server, readyThreads);
}
// Wait for all threads to have disconnected their sockets
@@ -142,7 +127,7 @@ void KDSoapThreadPool::disconnectSockets(KDSoapServer *server)
int KDSoapThreadPool::totalConnectionCount(const KDSoapServer *server) const
{
int sc = 0;
- Q_FOREACH (KDSoapServerThread *thread, d->m_threads) {
+ for (KDSoapServerThread *thread : qAsConst(d->m_threads)) {
sc += thread->totalConnectionCountForServer(server);
}
return sc;
@@ -150,7 +135,7 @@ int KDSoapThreadPool::totalConnectionCount(const KDSoapServer *server) const
void KDSoapThreadPool::resetTotalConnectionCount(const KDSoapServer *server)
{
- Q_FOREACH (KDSoapServerThread *thread, d->m_threads) {
+ for (KDSoapServerThread *thread : qAsConst(d->m_threads)) {
thread->resetTotalConnectionCountForServer(server);
}
}
diff --git a/src/KDSoapServer/KDSoapThreadPool.h b/src/KDSoapServer/KDSoapThreadPool.h
index 4a68388..0449613 100644
--- a/src/KDSoapServer/KDSoapThreadPool.h
+++ b/src/KDSoapServer/KDSoapThreadPool.h
@@ -1,31 +1,18 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef KDSOAPTHREADPOOL_H
#define KDSOAPTHREADPOOL_H
-#include <QtCore/QObject>
-#include <QtCore/QHash>
#include "KDSoapServerGlobal.h"
+#include <QtCore/QHash>
+#include <QtCore/QObject>
class KDSoapServer;
/**
diff --git a/src/src.pro b/src/src.pro
deleted file mode 100644
index fc36e18..0000000
--- a/src/src.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += KDSoapClient KDSoapServer
-KDSoapServer.depends = KDSoapClient
diff --git a/testtools/CMakeLists.txt b/testtools/CMakeLists.txt
index c156432..990bd30 100644
--- a/testtools/CMakeLists.txt
+++ b/testtools/CMakeLists.txt
@@ -1,16 +1,29 @@
-set(QT_USE_QTNETWORK TRUE)
-set(QT_USE_QTXML TRUE)
-include(${QT_USE_FILE})
-include_directories(.. ../src/KDSoapClient)
+#
+# This file is part of the KD Soap project.
+#
+# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+find_package(
+ Qt${Qt_VERSION_MAJOR} ${QT_MIN_VERSION}
+ COMPONENTS Xml CONFIG
+ REQUIRED
+)
+list(APPEND QT_LIBRARIES Qt${Qt_VERSION_MAJOR}::Xml)
-set(testtools_srcs httpserver_p.cpp)
+include_directories(.. ../src/KDSoapClient)
-qt4_add_resources(testtools_srcs testtools.qrc)
+set(testtools_srcs httpserver_p.cpp testtools.qrc)
-add_library(testtools STATIC ${testtools_srcs})
-target_link_libraries(testtools ${QT_LIBRARIES})
+add_library(
+ testtools STATIC
+ ${testtools_srcs}
+)
+target_link_libraries(
+ testtools ${QT_LIBRARIES}
+)
if(Qt5_POSITION_INDEPENDENT_CODE)
- set_target_properties(testtools PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+ set_target_properties(testtools PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
endif()
diff --git a/testtools/certs/README.txt b/testtools/certs/README.txt
new file mode 100644
index 0000000..2ef5f3b
--- /dev/null
+++ b/testtools/certs/README.txt
@@ -0,0 +1,25 @@
+Instructions for generating the SSL certificates (every 10 years)
+=================================================================
+
+New CA key/certificate
+----------------------
+
+openssl req -x509 -nodes -new -sha256 -days 3650 -newkey rsa:4096 -keyout cakey.pem -out cacert.pem -subj "/CN=KDAB Certificate Test CA/C=SE/ST=Värmland/O=KDAB Test Root Certification Authority/emailAddress=ca@example.com"
+
+Localhost signed certificate
+----------------------------
+
+Add this into a file called cert.ext:
+
+authorityInfoAccess=OCSP;URI:http://ocsp.example.com:8888/
+basicConstraints=CA:FALSE
+
+Create a certificate request:
+
+openssl req -nodes -new -sha256 -newkey rsa:4096 -keyout test-127.0.0.1-key.pem -out test-127.0.0.1-cert.crt -subj "/CN=127.0.0.1/C=SE/ST=Värmland/O=KDSoap Tests/emailAddress=test@example.com"
+
+Sign the certificate with the CA:
+
+openssl x509 -req -sha256 -days 3650 -in test-127.0.0.1-cert.crt -CA cacert.pem -CAkey cakey.pem -CAcreateserial -out test-127.0.0.1-cert.pem -extfile cert.ext
+
+You then just need to commit the .pem files, no need of the .crt or .srl, I think.
diff --git a/testtools/certs/cacert.pem b/testtools/certs/cacert.pem
index 8c75c54..805b257 100644
--- a/testtools/certs/cacert.pem
+++ b/testtools/certs/cacert.pem
@@ -1,23 +1,35 @@
-----BEGIN CERTIFICATE-----
-MIID6zCCAtOgAwIBAgIJAP4bjANFSx0BMA0GCSqGSIb3DQEBBQUAMIGrMSYwJAYD
-VQQDEx1XZXN0cG9pbnQgQ2VydGlmaWNhdGUgVGVzdCBDQTETMBEGA1UECBMKTGFu
-Y2FzaGlyZTELMAkGA1UEBhMCVUsxHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUu
-Y29tMUAwPgYDVQQKEzdXZXN0cG9pbnQgQ2VydGlmaWNhdGUgVGVzdCBSb290IENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTExMDczMTIxMDExNloXDTIxMDcyODIx
-MDExNlowgasxJjAkBgNVBAMTHVdlc3Rwb2ludCBDZXJ0aWZpY2F0ZSBUZXN0IENB
-MRMwEQYDVQQIEwpMYW5jYXNoaXJlMQswCQYDVQQGEwJVSzEdMBsGCSqGSIb3DQEJ
-ARYOY2FAZXhhbXBsZS5jb20xQDA+BgNVBAoTN1dlc3Rwb2ludCBDZXJ0aWZpY2F0
-ZSBUZXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC5xMKXviXuxFO67WzFIImO5RY3Y+dqt7maTB+p
-JiHkn98rJoBB4J1cDnEUIs5ErO+kqOjW7JwF50fePNJ5K+I6SbRVn9gxAI59ZA6O
-9UvOPZOw4/6GM24UY4B4mUcp8oXg9fhwgtjVhfXiMD2GvKQq3RazIiCoSW4aJWEq
-L58Q+sIo+jL72qwk648xIwIhuC3XzcOOE/+rCOtZmu812/NN08UfsL2qup0aaaGv
-aL36n6OIx5AYFcCD5uOxXAmUy14mhwQyDHAl6K42ghSm5b43VMMSQ+N9AQpentWl
-RH6Vt1eY52YTxjNxpRlj88GBnYxdr8WgjKOV7v8OPGXP6zWlAgMBAAGjEDAOMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADptDEfvsh8aq/tTc7ciGkHG
-jh7WFELVTcdWBTyveZ24298Hl9UOfsAfLqjMGMs3delAaZocchba9Og2xSZyRstH
-GUtlJXd4PnSJSx/TksPf2DCANo5sxBWBITs1Iprm3Nlm3/xPZM2QLIamRYi2J6Ed
-JTfWvMpoaW1umJX49jKqk1gfdcS6eUSaXetgYP2FQV7DstqPLYfQ731nEXZ1LXFM
-PO7IoPccqk4YJ0KOV7hFb7NCq4a6cz/Gf0S0qJ44vqHz6iRZpmWIo5UFivwtLw9r
-iMbdJ1mCCMR0oN5om3muKc7Sz+l2ItxdYMcLkZ1/3ouvQqOX+qIOrYEUN1RZCzI=
+MIIGDzCCA/egAwIBAgIUd9yWl0A/uGqX0AeA81MoFfFGcT0wDQYJKoZIhvcNAQEL
+BQAwgZYxITAfBgNVBAMMGEtEQUIgQ2VydGlmaWNhdGUgVGVzdCBDQTELMAkGA1UE
+BhMCU0UxFDASBgNVBAgMC1bDg8Kkcm1sYW5kMS8wLQYDVQQKDCZLREFCIFRlc3Qg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEdMBsGCSqGSIb3DQEJARYOY2FA
+ZXhhbXBsZS5jb20wHhcNMjEwNDEzMTU1NjE4WhcNMzEwNDExMTU1NjE4WjCBljEh
+MB8GA1UEAwwYS0RBQiBDZXJ0aWZpY2F0ZSBUZXN0IENBMQswCQYDVQQGEwJTRTEU
+MBIGA1UECAwLVsODwqRybWxhbmQxLzAtBgNVBAoMJktEQUIgVGVzdCBSb290IENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxl
+LmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJ6B1GCAj0rPWHvI
+caaDpfKkb0N093qc2KF4yNu4fcoujpSEPiQ/miwKshkGBmAlh8cbnwssQxy+hrif
+twvX882e+yBd5UYbFcw6Cp9qT7Mg0CIie7qBBM+6mo3c+aipN+8Lbx9nfizshyNO
+Fuze7zmh4oEAgwdk4nI2cG2mflrkaDVvU5OygTYDizL0Xl5k3P2xIPhfQIFT+pwn
+1r0CEdjgU9fZ9VS0e+bZVAdCDC0gFT7w0Su5wsEkWoti6azn/JNn/b0Z5n8H1TeU
+0Hh0r4Q5SC5OklL5yGgB/qRWzcrenTLXSnYj5/szZ7lJB5227hpagm2vdpYqCMMZ
+Sk0Du+M/2Ui9G1BGIgI3Dzp+KogCFx/RK0JmmP6qzAARXvBRIM5R7UfLNmfCMKby
+8yIR+52M5DnyATXeqDj8JsNQF92F2y+tRg+GFIP/jZBUxnWFMOY3a4DbJUI8XM/D
+fX63b1sqBRZhlt4yXSSjMObhB+vGLfY7dPxPqnxTbjrIG/Oa+APrksS6XZoFp8E1
+F7n9DLcbMg+QoKmOutHyIG8K2nIRan1ObUBavvoTaLPznIB3MzpW2Ew57Qp95e6a
+7FTmHGXRmTuVZwKABvMgxTdWl603B13Rx3HzHjIAUbfOOzRW3HmrfEn4DucHDTwb
+F/icva25/LYhQJd5/Ps6sVq8fXnvAgMBAAGjUzBRMB0GA1UdDgQWBBQ0nvqfiZUq
+huQaDLIUNZ9iSXPRWTAfBgNVHSMEGDAWgBQ0nvqfiZUqhuQaDLIUNZ9iSXPRWTAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQCQaCyq5TMBWKaYQVWm
+ejs8fenA0+lBMomVt2xAk/+jAHiCM/dnECpqaJJsTwJOPHZc702UVfKGtEP5LMHp
+awauod1PoxwqJixBDMH9BkXyy+hiVkgv7Boqx0L4lJ+4WN8/7/vy9l8HUneTX6IJ
+NSZ8yQHdPe4khaHZPjjn6fM2/Jzt6A2voRIv4lwSCKKd+9C42chCoxnhHZtjPWoc
+qrxI7FHj+3HXKqKRVLdThP1TeBJnVmSff587ZT7RRjzghMsWSdD87LF07otQbuL7
+MAYyvxgKvI37MAOou9qRNqZLXOeqTtJnsA8lpUk/5vUIasGNSj+7V0yCpI7Iforz
+TUtdu70nCWkvh4HL9qayDigkpg5iFp7AQhc2lTM2IIwfXKgLX2TvYPqF3xLZ/C1M
+qX73QueWHkg5Sk7Ygql2oRzVY9F5QtJaan5VXeMURVCcQFdiQb1Vb2nvEhXJF64p
+2ScDD6CJRQGZ7OtjpBkQtiNF3qHGz4efzPbhniBqr5+VuZDAtdwZy+Vmh1oeeyPV
+cm6zdUfbLbwo+szNemZ4CrSiMoRD/r0J7kzXZnbGc+euNQmrT1DdPVwPCR3ige88
+H3mcI8uEtX4XyKdj+B8MFrRf422p1urt+8lGkglitTA+JVBs0AV+oek89sxz+Sp2
+zDElNC9fXV01MBAKNnMlKoB4jw==
-----END CERTIFICATE-----
diff --git a/testtools/certs/cakey.pem b/testtools/certs/cakey.pem
index 4cf2388..d30aab6 100644
--- a/testtools/certs/cakey.pem
+++ b/testtools/certs/cakey.pem
@@ -1,28 +1,52 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDEd9PEaS3H9jZL
-I2aaiYw7kKcfWO9z0CkbrEeM217z4csiqcwfvWKGJSSdwrSaP7WN50C3PIm1lQsE
-3Xf0Ks3rn3EtkwIVW1pnn0O2W9OnBymlIMdiszYLB39CCSH8UToskLtonRSWoVCL
-hkRM2RCOzo6R01Kgw4xaPhoFlDebspm5uabhQa2uF9S+AUXBa9a81JBvthBQjUz4
-GMuJ9S2bMd4OH+geO14CIoeJhLylHJw4uclX2Zutsx8uOiHThmbddsH+2KQ4V4D+
-eUIBvrIGJfyuvKKUSkfGLQaHdzMHqzzXKT94BLar/t2JU07rHM4TBKephtQEZTMo
-gAQZtAjrAgMBAAECggEAadaHjVJ/6C3Z98ZdWrjog5ocfcWiUUh9LLw1W0s+LrGf
-hc/k9+BFODDANgCS3Fmfy48djNie8uQUqI1KNo3smpctGDkOsUSiQhpJFu8G6P7x
-z1QGNUSHw49JXeCfn1Z+uU1KuEOOuMq0IkW1e5Sf196sbSBjbdmKPX8g84pyHnw4
-SGRkhgPqjxsCZPlIXw8wgdn7RyL7vKgMiW5ByNgV9AM+Bb8QidM2n9teYC4xpIzH
-nx3bO9RS8NkgDrZk6tWwzD9bTyyx5d0aQSHZNIQCxVJVgiYkYUg6dYdH3c8T02ly
-nAgNWrbdtRI+wOb2c2MHfs+f/Wy3MZexHZ2dE8H0gQKBgQD59dsHx592YNpTfhth
-Qq1i8WDcNXm6CjRK6BrI1sQ9zo8zXyrq6mNkPv9nu/s+CTg0Jynoy+jCTJDOqneS
-7jQ9vnefyyrcaruWTrG4Eq3QfIVED6OBg7Lfn54sEOrrFCUBZiPzESc4i8Yho6Pg
-QFK73JRFuV1e81V+3EShfqtZKwKBgQDJNxeHWY5fc217VTQ+06hRX5wvmqMblGv7
-l0yYrHaMeR2o2zH/bBIKBqUc65MCYLSoI9pjCigYz49+tm1pRoKfVDQ8kfyQKVQD
-ldABcZz2f4Te9jcjOtT4dNt1Vq/i+AwLNgGn1SVCz/Wl6Sr5U807xRTrLeZhUdYT
-Hj9aj7qvQQKBgQCxpHi1XrmFd++xxr3OsYRn/QPJfHe2L+paEfp3Iar2Agbji48E
-xO8+H0eEgaRcwlCfP/YY7FHPRHrlZWD1mzSlbOe3OLyNSY1nlSXYm+3LbbOIW1To
-hqBpLRdMWfmaeAaUp/KEnHwzQ6Lb5WBhz1T9DhaSNtqU0HrCXeionU1JYQKBgQC3
-5uxQPl/LiXnUsSkRCu3ZgaMENzdAK8UNq1jMaUPoW4HqJHxr0GAkXbJm3j/8elpj
-GnGs90lyc7HYw+73uwQDjzg2686EC+HHbRMxXp9xA1dzWGFIh6rCcjtp4RLcRIzt
-aizVMg/eIqeHPbaTLi5zpErcL5VR+TPJQWnx4U9kgQKBgEyWjA9DrdEV4GrzGt/m
-hHK0p88/WjDWmFjU+cb1w5QCOqLE1Ju/QGb9dCzIKQ0cyrZcrWtsnjjgHtSNEvoe
-pzPju3TW3SG5yC9LP8z+84tZDiaOi9vjRKzTZ+fQWhMXVFPYP5AENPeDTjVRYdv5
-+F5LARuxX05Yz+wvTYe1OfiL
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCegdRggI9Kz1h7
+yHGmg6XypG9DdPd6nNiheMjbuH3KLo6UhD4kP5osCrIZBgZgJYfHG58LLEMcvoa4
+n7cL1/PNnvsgXeVGGxXMOgqfak+zINAiInu6gQTPupqN3PmoqTfvC28fZ34s7Icj
+Thbs3u85oeKBAIMHZOJyNnBtpn5a5Gg1b1OTsoE2A4sy9F5eZNz9sSD4X0CBU/qc
+J9a9AhHY4FPX2fVUtHvm2VQHQgwtIBU+8NErucLBJFqLYums5/yTZ/29GeZ/B9U3
+lNB4dK+EOUguTpJS+choAf6kVs3K3p0y10p2I+f7M2e5SQedtu4aWoJtr3aWKgjD
+GUpNA7vjP9lIvRtQRiICNw86fiqIAhcf0StCZpj+qswAEV7wUSDOUe1HyzZnwjCm
+8vMiEfudjOQ58gE13qg4/CbDUBfdhdsvrUYPhhSD/42QVMZ1hTDmN2uA2yVCPFzP
+w31+t29bKgUWYZbeMl0kozDm4Qfrxi32O3T8T6p8U246yBvzmvgD65LEul2aBafB
+NRe5/Qy3GzIPkKCpjrrR8iBvCtpyEWp9Tm1AWr76E2iz85yAdzM6VthMOe0KfeXu
+muxU5hxl0Zk7lWcCgAbzIMU3VpetNwdd0cdx8x4yAFG3zjs0Vtx5q3xJ+A7nBw08
+Gxf4nL2tufy2IUCXefz7OrFavH157wIDAQABAoICADDBoNE6WllZpE8XHhZpQl97
+wxnN3d4iZuRsYeRsQI0zevomH3NI+SR4+cWGu+lRQg216lsmd1JdLNWXk1eaSs1C
+DN8s4ryI0lCqvd/BdNiVzE/jqYl57D/1l1rx0P3XZ3QpYToYvJAXBY6Pk6+y94UT
+zbd+r89TcfBN3JFt+En/Hirpnpy8+M/jkSrQTkLc5blHhevAaPgfG+RywLQM8e5z
+OncX/UXb6ozc5uMApvwudTqSGtVHY6fDhfKAL37XMTMqdrt3PxZuE2DwbpvO0Lps
+YE6WLp5FZSbRDkIAzXaMuXANF0N10gLMEijFVQlnXqBOnPYeVezk6yMQIXHFJ0LI
+sYpoogtw1hux5GCQpulKnr3w7EnAfvf53qcrljnBEjStnMUKSA+XH7/JP70j9CRt
+SJQVx4E+Kdw9Oe/W4PjshvYZrXG1I5yIDGA7vs4a85Vr4cMXRTORdfPdn+cW36Uw
+eAV/B1BU67A9FMf/tvv8FUTyDmzF5g5aDd0PiEd5mdibcqMlrU48zq3DlfsYQU01
+mMdOx43Rw+fNX5rPlg6kCWKJ2lBspxGc2bzqqFEDOiislYuPF5x9zURO1z8oRUGz
+zZ/GKMhZjtGvA0KYLaRkgv5OpkBG8hKa5mlz6aGV6G+b9W7y6pRKVr5aYzFB4Rwv
+w8CTWJ0OwHCdp2amWjPhAoIBAQDSmebGBTiyjLJWLiyISbm3ZBPdUvM38nGf3zBU
+n44rHUVjen4slX/uxjjz2eAx0uP+G2s/IYPi0qDhB04+Af+IBTNNPd5n8/NGNpog
+DMbf6qLvvlzDyZLTjjML4GBa7jCjGtCILf/DzzvUr71Vl6FVOoVa96iLcvREgmBF
+dHjOgwkeL65nEX9Y32aHHNL1zio2QlTvmWc2sGE8f3AAoxWGTudMgC6lTFwgTfjR
+Ol5+FXAx4mRKXa6+4gWSXWVIqtp/Dby8IwNBb4pc6VvTwb+7cKvB9owfBngn7O8g
+fiN/NqLsly7XFd3qHLRNblt+eNXGLyea5viy0FzrkETE/sbxAoIBAQDArRniGgpi
+OlEPN436qN4E57CWUEgCkCTS3Q0sFngWswNxAGYlu3x9vmJZ+qKOra3RhI7eaU1C
+Vo9+sZ9ZHRHsnhBhdcebTDDTO/XCjDi2cpCmOyebxHEPt3hqghLB2+ZlK8zj5sZ6
+fb3SxWsqwtNfx1L3bpk2ozDXATL+BWbWWG36l7EY6f4TQ9Ubk3kJ9PdaBZKU9Azz
+/Q+b672PrBNVDC/6+0agSOwzwDPVbJaU3jGu1M97ZlIDcNdeIVFg3STAYzGxKuw0
+TZYt0gIMDvoqyt2Sv63FvQJ78cbiTH7CKScwaUDdrIIvz1bPDXIHi7DQxF76dHx8
+aKEgiUcQfQ7fAoIBAQDBBtaCAR8qZ9K9Mq0WbZyO/mdGoFTUnp6OTd7acTO5SKbk
+us0SyCPuEjj5KGVYxVa6/R6bSni7WRqjpjKMmwA/B6Ux0tcaqHn9jOZPIebWLRUS
+cIRN3194EAmxhQJL1a02kck4SBD4w+Su2DTNUqFIoM7BxeTxi3dfo6/heRORFIEy
+7bkINv1l070BceXZ7hC6kqmOwifb9GXrMVLTAqcj5wYRFBus3gRCh7Ta8IjTP4sJ
+7drGXn9f7YH12SyQIikJ8uld9ylwvG8xIaJMwHSftHF44iUj+qX+0ieKvJKEcut5
+tkf0U9KGVbDcl528mbw2XdoLHFAudNP2BNFDTdHBAoIBADy/lxSRr0pvJpWMp4gr
+a+zR+/w4jau5NNMC/R80amKFyIT9YjdtWH/w4eOKwWwI2G/hwoXfX4uV7SI98IbR
+QpB++Z0w3GFbcV14XzEastrbXj37Eq7rDdatuxqhrjZPFeI6IByO6289a/cjZXmS
++cAOAVugFFCEvWZcq24p19WnBe3nm9/GDuSWE3/hTF1WThKlBSVPmTHoTN6VQiwl
+TecXs50HUqpAs7BRXkZhOUzwjWuZD13R0fPhxRWZnaXTs72wyL8aUGThPYNu3lRc
++IU7dwbIxoo84KahgVpiUej3vrJlzRzXQii+z5jynUxBv9rivytqRMGY34x5m91Y
+ALMCggEATSokPUjbTNZFu8Negkz1J8AfjTdLs+gCiQ33OuYasHmF4qs8c6epV7dv
+Q6ppeNjnFSBr2mUfFT3yzgqPJ5PKuY6xNbVzZDZsVTQDsf48m+RhkiBD4rV6E+QC
+AJWuf1kgYMkdhGzNCp5St7SM+eYomZg2scVUXQXlBk5BdzM/cBoZHLQ6vPpnKvIz
+Scp8vaNS4FbunAUCmq9Y8UigpvS7DWWxAQuZoSuLwwCMsa0It30aS5e9UoumKE25
+v4hIGQlj1YE0cvtNXH3aZ9f7ehDxdwelNgj/8RIBg0ne6salL7oj46NDnz+Rvr3e
+uzqGitt+DWN8yjfyYzn93/oixlCtVQ==
-----END PRIVATE KEY-----
diff --git a/testtools/certs/test-127.0.0.1-cert.pem b/testtools/certs/test-127.0.0.1-cert.pem
index a44ca95..e57740f 100644
--- a/testtools/certs/test-127.0.0.1-cert.pem
+++ b/testtools/certs/test-127.0.0.1-cert.pem
@@ -1,67 +1,34 @@
-Certificate:
- Data:
- Version: 3 (0x2)
- Serial Number: 23 (0x17)
- Signature Algorithm: sha1WithRSAEncryption
- Issuer: CN=Westpoint Certificate Test CA, ST=Lancashire, C=UK/emailAddress=ca@example.com, O=Westpoint Certificate Test Root Certification Authority
- Validity
- Not Before: Jul 31 21:01:18 2011 GMT
- Not After : Jul 28 21:01:18 2021 GMT
- Subject: CN=127.0.0.1, ST=Lancashire, C=UK/emailAddress=test@example.com, O=Some organisation
- Subject Public Key Info:
- Public Key Algorithm: rsaEncryption
- Public-Key: (1024 bit)
- Modulus:
- 00:ae:80:d1:26:6c:67:a3:bc:1d:e9:9f:07:81:05:
- ff:aa:03:4f:6a:b9:ac:6d:32:88:f9:d8:c0:2a:24:
- 40:53:ac:d4:02:41:e7:b0:c8:d3:7d:3c:cd:ac:ac:
- 32:96:9a:ce:c7:20:df:db:92:25:4f:f3:ce:09:b5:
- d1:21:59:0b:69:8b:3f:a0:62:b5:7b:1c:b2:97:65:
- 80:31:88:56:ec:76:8e:28:8e:47:21:09:30:4e:fc:
- 3b:e0:12:34:8c:e1:94:64:bd:90:f3:b0:34:d4:98:
- d0:e0:b8:b7:ba:a5:ba:a3:33:f9:97:65:ef:a9:93:
- 69:f4:5f:22:8b:0a:37:4b:e9
- Exponent: 65537 (0x10001)
- X509v3 extensions:
- X509v3 Basic Constraints:
- CA:FALSE
- Authority Information Access:
- OCSP - URI:http://ocsp.example.com:8888/
-
- Signature Algorithm: sha1WithRSAEncryption
- 5a:7f:89:00:12:34:a8:b4:8e:24:26:4c:59:14:90:41:42:e4:
- d1:5b:a9:12:2e:40:8a:9a:ce:f6:64:62:e1:8f:b8:70:50:8a:
- b7:61:3f:5e:58:70:69:95:c2:41:a9:c4:0e:09:47:0b:9b:76:
- 78:b9:52:d6:f4:57:33:9d:ff:1b:43:14:37:ac:91:71:65:91:
- 3b:73:7e:a6:19:5c:39:cc:2e:48:18:dc:78:74:75:7f:20:8e:
- a7:f2:08:97:4d:4d:8a:24:37:3a:03:f0:5c:6e:49:74:09:e8:
- c2:81:46:36:d1:23:c2:02:4c:16:bd:d0:1d:8a:73:da:cc:73:
- d5:2b:11:9a:1d:3a:a1:c7:bc:90:54:3f:ef:e3:2f:ef:85:d6:
- a9:62:30:c2:1b:dc:b7:a0:bb:fd:19:e4:c8:0d:96:ce:a6:c5:
- 95:74:5b:a6:35:c9:ca:d4:4a:ef:bf:d1:9f:f7:ad:18:e6:97:
- 55:d5:3d:a7:85:33:a0:39:83:76:cd:a5:19:e3:e8:fd:99:50:
- 89:27:6a:30:cd:04:a9:89:87:5e:57:0d:85:8c:92:1a:26:99:
- 46:16:17:c6:26:4b:04:13:cc:4a:3b:fd:80:00:17:3c:88:ce:
- ab:1d:0d:ce:be:54:c4:8f:46:11:d0:85:aa:4f:35:a6:e6:77:
- b1:04:9a:37
-----BEGIN CERTIFICATE-----
-MIIDXjCCAkagAwIBAgIBFzANBgkqhkiG9w0BAQUFADCBqzEmMCQGA1UEAxMdV2Vz
-dHBvaW50IENlcnRpZmljYXRlIFRlc3QgQ0ExEzARBgNVBAgTCkxhbmNhc2hpcmUx
-CzAJBgNVBAYTAlVLMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTFAMD4G
-A1UEChM3V2VzdHBvaW50IENlcnRpZmljYXRlIFRlc3QgUm9vdCBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eTAeFw0xMTA3MzEyMTAxMThaFw0yMTA3MjgyMTAxMThaMHMx
-EjAQBgNVBAMTCTEyNy4wLjAuMTETMBEGA1UECBMKTGFuY2FzaGlyZTELMAkGA1UE
-BhMCVUsxHzAdBgkqhkiG9w0BCQEWEHRlc3RAZXhhbXBsZS5jb20xGjAYBgNVBAoT
-EVNvbWUgb3JnYW5pc2F0aW9uMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCu
-gNEmbGejvB3pnweBBf+qA09quaxtMoj52MAqJEBTrNQCQeewyNN9PM2srDKWms7H
-IN/bkiVP884JtdEhWQtpiz+gYrV7HLKXZYAxiFbsdo4ojkchCTBO/DvgEjSM4ZRk
-vZDzsDTUmNDguLe6pbqjM/mXZe+pk2n0XyKLCjdL6QIDAQABo0gwRjAJBgNVHRME
-AjAAMDkGCCsGAQUFBwEBBC0wKzApBggrBgEFBQcwAYYdaHR0cDovL29jc3AuZXhh
-bXBsZS5jb206ODg4OC8wDQYJKoZIhvcNAQEFBQADggEBAFp/iQASNKi0jiQmTFkU
-kEFC5NFbqRIuQIqazvZkYuGPuHBQirdhP15YcGmVwkGpxA4JRwubdni5Utb0VzOd
-/xtDFDeskXFlkTtzfqYZXDnMLkgY3Hh0dX8gjqfyCJdNTYokNzoD8FxuSXQJ6MKB
-RjbRI8ICTBa90B2Kc9rMc9UrEZodOqHHvJBUP+/jL++F1qliMMIb3Legu/0Z5MgN
-ls6mxZV0W6Y1ycrUSu+/0Z/3rRjml1XVPaeFM6A5g3bNpRnj6P2ZUIknajDNBKmJ
-h15XDYWMkhommUYWF8YmSwQTzEo7/YAAFzyIzqsdDc6+VMSPRhHQhapPNabmd7EE
-mjc=
+MIIF3DCCA8SgAwIBAgIUeo0WePNq+4Zgm8+ImXM+jyF8mBUwDQYJKoZIhvcNAQEL
+BQAwgZYxITAfBgNVBAMMGEtEQUIgQ2VydGlmaWNhdGUgVGVzdCBDQTELMAkGA1UE
+BhMCU0UxFDASBgNVBAgMC1bDg8Kkcm1sYW5kMS8wLQYDVQQKDCZLREFCIFRlc3Qg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEdMBsGCSqGSIb3DQEJARYOY2FA
+ZXhhbXBsZS5jb20wHhcNMjEwNDEzMTU1NjQyWhcNMzEwNDExMTU1NjQyWjBvMRIw
+EAYDVQQDDAkxMjcuMC4wLjExCzAJBgNVBAYTAlNFMRQwEgYDVQQIDAtWw4PCpHJt
+bGFuZDEVMBMGA1UECgwMS0RTb2FwIFRlc3RzMR8wHQYJKoZIhvcNAQkBFhB0ZXN0
+QGV4YW1wbGUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA20nR
++esJCS36fYpsi/piDprLLUP7Crgszq/o1IJ3OhNkX7KELg19urTRb/oMHyeUFo8/
+DJ77SrF031bqWH8eEd3jVKNOMfEgOPXGYQorJs/4hSEbz6IdYS6gqf/qO7rLO91O
+LiChJA7RB9Y0JiDGelC5YjsxRG1F2Pe9BqogHbH0BezN43q4Mg08iuW/qNWPJ0Yj
+5/xPfooFngZPVfuFRCfTe5rgZfovbYbPMU9o+kYc9eSwddyUcI+A+PVY+DqFajWK
+8zy21mZgGPeQGrmscJBHBJOaMIwrLDbmyld5gQDZ5qNyJvuaQ9kXCQ4M9rGESk5w
+52LYRcT9jpLPncy9Pd0pF0ehQQPrG/qm6YRq7ZILQP+s4NWnDaqqnyDFQFSoiJll
+Bl/VvhS63ikmTEfVVtEumrKkR7Q6z4ib1p1s711GRBkh9zeILFhqnVImlk/zXQjs
+6ZG60oLhUFISofuNK+6/AQq9rvdjwZH6TVXk8BBVn6zgnm/Iuui1ktm+mO44+eG8
+YimUbuAFqIs/AbkX4AWlM34svvygDJDHdJCyOuUSxRyoZGs5RUeSruBgxUtaRT8w
+Jo4HnqO1pHa4CcS0eCkb0B0VQjVfnSHw2qojEmJnMjInuIJjhpMsEQ7FJpLd9Qdr
+NtxSyExcqjZWgPr4/oPm+F7uEleSVFwKv0WMYS0CAwEAAaNIMEYwOQYIKwYBBQUH
+AQEELTArMCkGCCsGAQUFBzABhh1odHRwOi8vb2NzcC5leGFtcGxlLmNvbTo4ODg4
+LzAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQB0MLrCqB7aJI+9cluB8qh6
+k1hdxbg924Q9j0OOn/1HBqlpFHvqZtjmNbOl5IjKg7uBN0dAPx/3vm+WuqV0gVn/
+69nMO0fYhwdPjavgl+zZsqO5TUACy6zBTe/NvOsadyLQHvxkJq3zxZPxQd9DHIQO
+3wGhg4LKERcdfwoQ2rvDnjf0DGJqgN9ptsC9THr3oHa+NkTrwMT6xyogxQ1GJOzq
+Gj5ravkgYk1yEe7i5uoVF38/WqIwKkv08ADwTuUyghF5s72d1ypdUsfHvNnyeyCu
+cN2o0sU2cle/Ap6ASB/LFsPVbl2IfmlVxdHY9hQEv1MHV45LZNggets2SpgpBE4t
+To04wI3DPgTEx982oSXHFelB1Ffz5PJlhJaaxw62RkayonD0JCLJmlBcBCdjyyJ9
+r6BIEne13OmyOcaxe4pv4wpdg2TS28x6nSZOry8JRaAQDW4B/8qtzvKn2e4YQA8N
+H+kLbEuLLzwdTD8Zk/3jWt6+akSLyS0GvyZWC77AhFOXUFJlMKuhXdgDQlnHKYA1
+rBdFiEBvS5Z0Kcq9le4cPlHRuKSd3pyIZsShD3mz55KM3et72Hp1mx8c7DpnSwfZ
+PfZQpIY/EzWomkQdwFjd2r7cDt7b+S6NiuGTVyBpKrwqGrqtYWWTKxgBIyNr3StJ
++zRM+hnDLLATdPsNCmL3ug==
-----END CERTIFICATE-----
diff --git a/testtools/certs/test-127.0.0.1-key.pem b/testtools/certs/test-127.0.0.1-key.pem
index 35bc32d..834d3c3 100644
--- a/testtools/certs/test-127.0.0.1-key.pem
+++ b/testtools/certs/test-127.0.0.1-key.pem
@@ -1,16 +1,52 @@
-----BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAK6A0SZsZ6O8Hemf
-B4EF/6oDT2q5rG0yiPnYwCokQFOs1AJB57DI0308zaysMpaazscg39uSJU/zzgm1
-0SFZC2mLP6BitXscspdlgDGIVux2jiiORyEJME78O+ASNIzhlGS9kPOwNNSY0OC4
-t7qluqMz+Zdl76mTafRfIosKN0vpAgMBAAECgYBMujc8Pc4UIFLGtjYGdSzFBE+X
-DazTFrVDphpYbTgbkpJlq7TD9omHN4T3t39G2SqyQ7IqSUg+r2SYwGkD0LNDKoBM
-y9H3NWde9b1F/4iUWc4yE+KkACkG1QU0Kf93XXB/7c45uiY4CuRo+2BxMgvMnkC6
-5zOcOM81xcIWR+lIAQJBAOXnzgNiNFst04Rw9B9aS+QMOraVszSOxhTIYcZWJpYz
-C97EIuQ+9zMlotrnW2g1R2ZMNhjJ5ORe+A/7t2FAQHkCQQDCTzp0qGSuxLDbjKXp
-7GNt9D+y1ggsXBtUOdf+798AZqE8fSYCHhJoHeq27NTFS2BDQNfrpoUJD2eVTPTV
-LOrxAkBpSGozanmHd8jxUbi50uQGHwOUMaHLY8aaJdmAtlsdVWsOLMu9sogJyCZ4
-EJLvedakpinv2CUV39fBmgg0ZPQhAkB/ntHh9QfL0dvnF0WRknTrrtR3fSP5HrXE
-aAl5o8pv1PhpZjkkguPMBno2ku5cdtlO0rP+TmxqOvfpk5XqvYnBAkA+bbmDFar3
-x05Cw9UP11hwK8lULZP4S7kz8ddeQdfCWTICujimmCDJSjA3VVZ+KhRhXZ+WiDCA
-lyh2x4KehdPy
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDbSdH56wkJLfp9
+imyL+mIOmsstQ/sKuCzOr+jUgnc6E2RfsoQuDX26tNFv+gwfJ5QWjz8MnvtKsXTf
+VupYfx4R3eNUo04x8SA49cZhCismz/iFIRvPoh1hLqCp/+o7uss73U4uIKEkDtEH
+1jQmIMZ6ULliOzFEbUXY970GqiAdsfQF7M3jergyDTyK5b+o1Y8nRiPn/E9+igWe
+Bk9V+4VEJ9N7muBl+i9ths8xT2j6Rhz15LB13JRwj4D49Vj4OoVqNYrzPLbWZmAY
+95AauaxwkEcEk5owjCssNubKV3mBANnmo3Im+5pD2RcJDgz2sYRKTnDnYthFxP2O
+ks+dzL093SkXR6FBA+sb+qbphGrtkgtA/6zg1acNqqqfIMVAVKiImWUGX9W+FLre
+KSZMR9VW0S6asqRHtDrPiJvWnWzvXUZEGSH3N4gsWGqdUiaWT/NdCOzpkbrSguFQ
+UhKh+40r7r8BCr2u92PBkfpNVeTwEFWfrOCeb8i66LWS2b6Y7jj54bxiKZRu4AWo
+iz8BuRfgBaUzfiy+/KAMkMd0kLI65RLFHKhkazlFR5Ku4GDFS1pFPzAmjgeeo7Wk
+drgJxLR4KRvQHRVCNV+dIfDaqiMSYmcyMie4gmOGkywRDsUmkt31B2s23FLITFyq
+NlaA+vj+g+b4Xu4SV5JUXAq/RYxhLQIDAQABAoICAQCSKu6Pi58GQ2OIctBPraHW
+4k8z6PBZANK9Inwrypr2Vx68ux1oJQ39ebFw1ldmHNeVAf6gxwfxjb+9bw3d1z2P
+4zs4m3Hv0C4OSaTl4gVJZa7d7me/SuwSbyYgqrjS/3ugd685B/7hLg8fDiTMlWQ2
++7/WPmZkmgHI0blpy9SEdq2VlXbXfmFw22nTm7jZLSCyqQoeBAxo6E8+Oi5/vZvj
+BjjtVxrkXpNmiklpMOlkiX+cV8dXiKRZMw5g5AldzIRJe08XOw0UdEDx43JmngTX
+MxRjdI9+dLACVMYZcZ1H4+1a0u+wFF2LhBTasEbr2P+5F/giA7ztJJVuh2VkZaht
+bCovn/w6rRMEwl9kOGjUxUVTZS1l6gxkYUSuK0Zd65P4YiHNcgoIW/2dvdnd2yzM
+NRP7Sv8l5zwMYpVPPbS/rTruMRHJDmFtXogfH4TLZ53N0zm8ZEvJX/XGRsDGWQBQ
+4tnZ342SDGc7ltmz8s06L02W0VOTBCNRWlCtkttoiQ32CjmUztqyw0776AtzWahy
+S9bRff3K0BFDBWk//TD4X+KqTRMxeN75j9kFeLBPx7SauGpnC7OEX/wFxd5KDkyL
+l/Hqei1Nd+mFWglJ19R9jTv0dLYeFy2JRtQqo04SfEwCUwZlB8zEV6KqGp389XTU
+KZ9kRNhDXwGEAzHPWXq1AQKCAQEA8Lggh0IWseMD4JG+EjnfTJys+6EyWqAM1FL1
+9CiC33QfE7uVDuBWF0ixNwq2FSS9RjntdrOgdiXmuniTMubpklSdkqIbY3XHTot4
+2w0l8MVVjJ5zEUBPFG9r9RWgMcSvCK7qm6HLyuFu30dzRQjufLU/tyD8qI6gvTDU
+GaZ9nrvLFxkHywrBsbXfOACqdTPj6AGL1OckA2yMmKU0XIZsxanJfn8C25zQ/Val
+ZC+ZayeCeP9AczZ7kp+yCETh5vlJccHMD0/y5UKzErrd5wOz7LfeonfJ/KRKahpK
+ONO0nLm9BkZ9nfb2BXD3HASrDwEFrKdMcB02Hy8j7LHtVSWqMQKCAQEA6TVsvblH
+2TrVVWNCm2UWiJoOtxV8OeT/3dBcu7GGeiPE7hQ+HzI+xMz/5SWrB/Dy+6LLeqdx
+CGPidfFGuiElxzmYM/CrC+rZ3n82PFVEUte788/KILKBHLv55wnSo0b9AlEV4vs/
+fyehKqOZRZJNN8kgXuQmsNm6K1Gw7EBby1BGZUf2P/k5HMR7D6SqK3dV8Lg6d8q+
+99FVgHcra7KJCW2QhF4hzQYuxUj4AvHCshBhyt9luqWJP9MtL+iekXxNa9DND3u0
++EL/prfyBQZxadaaj3YQDx0pJcd7u81b3bmF56KmFFF7qO8En5TnLXnZfFjKE6OA
+H+Lm5Wiyvj+rvQKCAQBiXgvE2gfmJ2ulMElor0eFyhySMzwddnvnpAMoBAn/ADfW
+23e8/YWQvD7WzES9/SZvdSqJsDupLDHOD4mvalcWWgeOLTpd+Xo5qZr4gLX5Xtpn
+vTQuX4YxRprqKy0sSUBxnvD2KjbaMCcbjNoY4t56DaL81bkJtEcRKMvzs2pwHDOQ
+u8TIfxvJ4BVYkEUX4d2HKGKY3N+Fmq0Vj6UHDlOSrqBNVd+4GKv6apbpit35wMp7
+YWtX6XKz5xhccrGRrlsJ5nTZ6QTMFOaSh9Q4G/ZBjJ2o7KSY3hYep6Ge+Tw8M1aA
+IvwgOhQtAw2n4Gx6lCNae38r7XP5aE0Y41ily99xAoIBAFhc5db9XTvyDuNLuPEo
+XGFl/i1g9rD5E/n3+SslGM8uvm93PBKV9zKaeltY6nUX1vmBtZfD2hBTyHrn8OSV
+qrrSF9mWVzksw2CK0wIJTNoW5CB9mxjIiiNZFld0YVt8imFWV/SpPmXvniGJ24mA
+5cE9dAaAbCiWVvQS//aEbEOdJw85NRUIWZuM1xQWUGQn02hiZcT+DV3Y84y5mroz
+67imyxtcj3If5ZjbDR4QfLT7gBJeky0li9ujKHv+qBZ4At3XP9ueA/QNbtC84fcF
+efOgXO/+zBbt9ala7Ic8SJK6uQILnuIT/ccEybutr+qLQNzcx7SpPuLWFqbWBOQR
+PAECggEBAM37otxVravd9g+JxniRFQ2Ngzu9q4qxMHLqdmRNDaS/r7tU6BYNnXnk
+SG8YfWSdanUgFPVTUDo6Z/APz6ZJq+5DfbBZ1HQt48kUQx3H5NPAwrQslfOysh+D
+gcBltgdwv10ZI6krmDjlSi9hroiRAs1FPaEBONIBkQ+BYAFMrvRDVwVLTrBk+aZJ
+I+3AY9eqpD6II1dWvJ9qjRq21QCL/diMHWzqktBHk8/uWB4zuRrYhhqL9HeGg5Bi
+L3htUqiNjSnSJXRvEKfi6IOFPYxGVxPZmBrSM87hmw4MWGun9pm70enISv4IFASj
+5AqXrAXQy63vOVLc+EKgoa1+M4yHmQY=
-----END PRIVATE KEY-----
diff --git a/testtools/httpserver_p.cpp b/testtools/httpserver_p.cpp
index ad1eb4e..10eb27b 100644
--- a/testtools/httpserver_p.cpp
+++ b/testtools/httpserver_p.cpp
@@ -1,42 +1,28 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#include "httpserver_p.h"
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QNetworkAccessManager>
-#include <QDomDocument>
#include <QDateTime>
+#include <QDomDocument>
#include <QEventLoop>
#include <QFile>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
#ifndef QT_NO_OPENSSL
#include <QSslConfiguration>
#endif
// Helper for xmlBufferCompare
-static bool textBufferCompare(
- const QByteArray &source, const QByteArray &dest, // for the qDebug only
- QIODevice &sourceFile, QIODevice &destFile)
+static bool textBufferCompare(const QByteArray &source, const QByteArray &dest, // for the qDebug only
+ QIODevice &sourceFile, QIODevice &destFile)
{
int lineNumber = 1;
while (!sourceFile.atEnd()) {
@@ -58,29 +44,12 @@ static bool textBufferCompare(
return true;
}
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
-QT_BEGIN_NAMESPACE
-// Avoid QHash randomization so that the order of the XML attributes is stable
-extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed; // from qhash.cpp
-QT_END_NAMESPACE
-#endif
-
static void initHashSeed()
{
-#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
- // If the seed not initialized yet (-1), set it to 0;
- // if it was 0 already, do nothing;
- // otherwise abort, so we don't get unexplained test failures later.
- qt_qhash_seed.testAndSetRelaxed(-1, 0);
- Q_ASSERT(qt_qhash_seed.loadAcquire() == 0);
-#else
qSetGlobalQHashSeed(0);
-#endif
}
Q_CONSTRUCTOR_FUNCTION(initHashSeed)
-#endif
// A tool for comparing XML documents and outputting something useful if they differ
bool KDSoapUnitTestHelpers::xmlBufferCompare(const QByteArray &source, const QByteArray &dest)
@@ -130,16 +99,16 @@ void KDSoapUnitTestHelpers::httpGet(const QUrl &url)
QNetworkRequest request(url);
QNetworkAccessManager manager;
QNetworkReply *reply = manager.get(request);
- //QObject::connect(reply, SIGNAL(sslErrors(QList<QSslError>)), reply, SLOT(ignoreSslErrors()));
+ // QObject::connect(reply, SIGNAL(sslErrors(QList<QSslError>)), reply, SLOT(ignoreSslErrors()));
QEventLoop ev;
- QObject::connect(reply, SIGNAL(finished()), &ev, SLOT(quit()));
+ QObject::connect(reply, &QNetworkReply::finished, &ev, &QEventLoop::quit);
ev.exec();
- //QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
- //QTestEventLoop::instance().enterLoop(11);
+ // QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+ // QTestEventLoop::instance().enterLoop(11);
- //qDebug() << "httpGet:" << reply->readAll();
+ // qDebug() << "httpGet:" << reply->readAll();
delete reply;
}
@@ -150,7 +119,7 @@ void KDSoapUnitTestHelpers::httpGet(const QUrl &url)
static void setupSslServer(QSslSocket *serverSocket)
{
Q_INIT_RESOURCE(testtools);
- //qDebug() << "setupSslServer";
+ // qDebug() << "setupSslServer";
serverSocket->setProtocol(QSsl::AnyProtocol);
serverSocket->setLocalCertificate(QString::fromLatin1(":/certs/test-127.0.0.1-cert.pem"));
serverSocket->setPrivateKey(QString::fromLatin1(":/certs/test-127.0.0.1-key.pem"));
@@ -167,22 +136,7 @@ bool KDSoapUnitTestHelpers::setSslConfiguration()
// To make SSL work, we need to tell Qt about our local certificate
- // Both ways work:
-#if 0
QSslConfiguration defaultConfig = QSslConfiguration::defaultConfiguration();
- QFile certFile(QString::fromLatin1(":/certs/cacert.pem"));
- if (!certFile.open(QIODevice::ReadOnly)) {
- qDebug() << "Could not open cacert.pem";
- return false;
- }
- QSslCertificate cert(&certFile);
- if (!cert.isValid()) {
- return false;
- }
- defaultConfig.setCaCertificates(QList<QSslCertificate>() << cert);
- QSslConfiguration::setDefaultConfiguration(defaultConfig);
-#endif
-
QFile certFile(QString::fromLatin1(":/certs/cacert.pem"));
if (!certFile.open(QIODevice::ReadOnly)) {
qDebug() << "Could not open cacert.pem";
@@ -190,13 +144,13 @@ bool KDSoapUnitTestHelpers::setSslConfiguration()
}
QSslCertificate cert(&certFile);
const QDateTime currentTime = QDateTime::currentDateTime();
- if (cert.effectiveDate() > currentTime
- || cert.expiryDate() < currentTime) {
+ if (cert.effectiveDate() > currentTime || cert.expiryDate() < currentTime) {
qDebug() << "Certificate" << certFile.fileName() << "is not valid";
qDebug() << "It is valid from" << cert.effectiveDate() << "to" << cert.expiryDate();
return false;
}
- QSslSocket::addDefaultCaCertificate(cert);
+ defaultConfig.setCaCertificates({cert});
+ QSslConfiguration::setDefaultConfiguration(defaultConfig);
return true;
}
@@ -207,46 +161,41 @@ class BlockingHttpServer : public QTcpServer
{
Q_OBJECT
public:
- BlockingHttpServer(bool ssl) : doSsl(ssl), sslSocket(0) {}
- ~BlockingHttpServer() {}
+ BlockingHttpServer(bool ssl)
+ : doSsl(ssl)
+ , sslSocket(0)
+ {
+ }
+ ~BlockingHttpServer()
+ {
+ }
QTcpSocket *waitForNextConnectionSocket()
{
if (!waitForNewConnection(20000)) { // 2000 would be enough, except in valgrind
return 0;
}
- if (doSsl) {
- Q_ASSERT(sslSocket);
- return sslSocket;
- } else {
- //qDebug() << "returning nextPendingConnection";
- return nextPendingConnection();
- }
+ return nextPendingConnection();
}
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
virtual void incomingConnection(qintptr socketDescriptor) override
-#else
- virtual void incomingConnection(int socketDescriptor) override
-#endif
{
#ifndef QT_NO_OPENSSL
if (doSsl) {
QSslSocket *serverSocket = new QSslSocket;
serverSocket->setParent(this);
serverSocket->setSocketDescriptor(socketDescriptor);
- connect(serverSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
+ connect(serverSocket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &BlockingHttpServer::slotSslErrors);
setupSslServer(serverSocket);
- //qDebug() << "Created QSslSocket, starting server encryption";
+ // qDebug() << "Created QSslSocket, starting server encryption";
serverSocket->startServerEncryption();
sslSocket = serverSocket;
- // If startServerEncryption fails internally [and waitForEncrypted hangs],
+ // If startServerEncryption fails internally,
// then this is how to debug it.
// A way to catch such errors is really missing in Qt..
- //qDebug() << "startServerEncryption said:" << sslSocket->errorString();
- bool ok = serverSocket->waitForEncrypted();
- Q_ASSERT(ok);
- Q_UNUSED(ok);
+ // qDebug() << "startServerEncryption said:" << sslSocket->errorString();
+ serverSocket->waitForEncrypted();
+ addPendingConnection(serverSocket);
} else
#endif
QTcpServer::incomingConnection(socketDescriptor);
@@ -265,6 +214,7 @@ private slots:
Q_UNUSED(errors);
#endif
}
+
private:
bool doSsl;
QTcpSocket *sslSocket;
@@ -312,7 +262,7 @@ static HeadersMap parseHeaders(const QByteArray &headerData)
}
const QByteArray header = line.left(pos);
const QByteArray value = line.mid(pos + 1).trimmed(); // remove space before and \r\n after
- //qDebug() << "HEADER" << header << "VALUE" << value;
+ // qDebug() << "HEADER" << header << "VALUE" << value;
headersMap.insert(header, value);
}
return headersMap;
@@ -336,7 +286,7 @@ void HttpServerThread::run()
lock.unlock();
m_ready.release();
- const bool doDebug = qgetenv("KDSOAP_DEBUG").toInt();
+ const bool doDebug = qEnvironmentVariableIsSet("KDSOAP_DEBUG");
if (doDebug) {
qDebug() << "HttpServerThread listening on port" << m_port;
@@ -351,13 +301,13 @@ void HttpServerThread::run()
return;
}
- Q_FOREVER {
+ Q_FOREVER
+ {
// get the "request" packet
if (doDebug) {
qDebug() << "HttpServerThread: waiting for read";
}
- if (clientSocket->state() == QAbstractSocket::UnconnectedState ||
- !clientSocket->waitForReadyRead(2000)) {
+ if (clientSocket->state() == QAbstractSocket::UnconnectedState || !clientSocket->waitForReadyRead(2000)) {
if (clientSocket->state() == QAbstractSocket::UnconnectedState) {
delete clientSocket;
if (doDebug) {
@@ -380,7 +330,7 @@ void HttpServerThread::run()
lock.relock();
const bool splitOK = splitHeadersAndData(request, m_receivedHeaders, m_receivedData);
if (!splitOK) {
- //if (doDebug)
+ // if (doDebug)
// qDebug() << "Storing partial request" << request;
m_partialRequest = request;
continue;
@@ -389,7 +339,7 @@ void HttpServerThread::run()
m_headers = parseHeaders(m_receivedHeaders);
if (m_headers.value("Content-Length").toInt() > m_receivedData.size()) {
- //if (doDebug)
+ // if (doDebug)
// qDebug() << "Storing partial request" << request;
m_partialRequest = request;
continue;
@@ -398,42 +348,69 @@ void HttpServerThread::run()
m_partialRequest.clear();
if (m_headers.value("_path").endsWith("terminateThread")) { // we're asked to exit
- break; // normal exit
+ break; // normal exit
}
- // TODO compared with expected SoapAction
QList<QByteArray> contentTypes = m_headers.value("Content-Type").split(';');
- if (contentTypes[0] == "text/xml" && m_headers.value("SoapAction").isEmpty()) {
- qDebug() << "ERROR: no SoapAction set for Soap 1.1";
- break;
- } else if (contentTypes[0] == "application/soap+xml" && !contentTypes[2].startsWith("action")) {
- qDebug() << "ERROR: no SoapAction set for Soap 1.2";
- break;
+ if (contentTypes[0] == "text/xml") {
+ if (m_headers.value("SoapAction").isEmpty()) {
+ qDebug() << "ERROR: no SoapAction set for Soap 1.1";
+ break;
+ }
+
+ if (!m_expectedSoapAction.isEmpty() && m_headers.value("SoapAction") != m_expectedSoapAction) {
+ qDebug("ERROR: Client sent SoapAction HTTP header (\"%s\") which does not match the expected (\"%s\")",
+ m_headers.value("SoapAction").constData(), m_expectedSoapAction.constData());
+ break;
+ }
+ } else if (m_clientSendsActionInHttpHeader
+ && contentTypes[0] == "application/soap+xml") {
+ if (!contentTypes[2].startsWith("action")) {
+ qDebug() << "ERROR: no SoapAction set for Soap 1.2";
+ break;
+ }
+
+ QList<QByteArray> actionParts = contentTypes[2].split('=');
+ if (actionParts.length() < 2) {
+ qDebug("ERROR: The action parameter is malformed in the HTTP Content-type header: \"%s\"",
+ contentTypes[2].constData());
+ break;
+ }
+
+ if (!m_expectedSoapAction.isEmpty()) {
+ actionParts = actionParts[1].split(';');
+ if (actionParts[0] != m_expectedSoapAction) {
+ qDebug("ERROR: The 'action' parameter which was sent in the HTTP Content-type header (\"%s\") "
+ "does not match the expected SOAP action: \"%s\"",
+ m_headers.value("SoapAction").constData(), m_expectedSoapAction.constData());
+ break;
+ }
+ }
}
lock.unlock();
- //qDebug() << "headers received:" << m_receivedHeaders;
- //qDebug() << headers;
- //qDebug() << "data received:" << m_receivedData;
+ // qDebug() << "headers received:" << m_receivedHeaders;
+ // qDebug() << headers;
+ // qDebug() << "data received:" << m_receivedData;
if (m_features & BasicAuth) {
QByteArray authValue = m_headers.value("Authorization");
if (authValue.isEmpty()) {
- authValue = m_headers.value("authorization"); // as sent by Qt-4.5
+ authValue = m_headers.value("authorization"); // as sent by Qt-4.5
}
bool authOk = false;
if (!authValue.isEmpty()) {
- //qDebug() << "got authValue=" << authValue; // looks like "Basic <base64 of user:pass>"
+ // qDebug() << "got authValue=" << authValue; // looks like "Basic <base64 of user:pass>"
Method method;
QString headerVal;
parseAuthLine(QString::fromLatin1(authValue.data(), authValue.size()), &method, &headerVal);
- //qDebug() << "method=" << method << "headerVal=" << headerVal;
+ // qDebug() << "method=" << method << "headerVal=" << headerVal;
switch (method) {
case None: // we want auth, so reject "None"
break;
case Basic: {
const QByteArray userPass = QByteArray::fromBase64(headerVal.toLatin1());
- //qDebug() << userPass;
+ // qDebug() << userPass;
// TODO if (validateAuth(userPass)) {
if (userPass == ("kdab:testpass")) {
authOk = true;
@@ -447,7 +424,8 @@ void HttpServerThread::run()
if (!authOk) {
// send auth request (Qt supports basic, ntlm and digest)
- const QByteArray unauthorized = "HTTP/1.1 401 Authorization Required\r\nWWW-Authenticate: Basic realm=\"example\"\r\nContent-Length: 0\r\n\r\n";
+ const QByteArray unauthorized =
+ "HTTP/1.1 401 Authorization Required\r\nWWW-Authenticate: Basic realm=\"example\"\r\nContent-Length: 0\r\n\r\n";
clientSocket->write(unauthorized);
if (!clientSocket->waitForBytesWritten(2000)) {
qDebug() << "HttpServerThread:" << clientSocket->error() << "writing auth request";
@@ -474,16 +452,48 @@ void HttpServerThread::run()
}
}
+QByteArray HttpServerThread::expectedSoapAction() const
+{
+ return m_expectedSoapAction;
+}
+
+void HttpServerThread::setExpectedSoapAction(const QByteArray &expectedSoapAction)
+{
+ m_expectedSoapAction = expectedSoapAction;
+}
+
+bool HttpServerThread::clientSendsActionInHttpHeader() const
+{
+ return m_clientSendsActionInHttpHeader;
+}
+
+void HttpServerThread::setClientSendsActionInHttpHeader(bool clientUseWSAddressing)
+{
+ m_clientSendsActionInHttpHeader = clientUseWSAddressing;
+}
+
const char *KDSoapUnitTestHelpers::xmlEnvBegin11()
{
- return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- "<soap:Envelope"
- " xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\""
- " xmlns:soap-enc=\"http://schemas.xmlsoap.org/soap/encoding/\""
- " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
- " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
+ return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<soap:Envelope"
+ " xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\""
+ " xmlns:soap-enc=\"http://schemas.xmlsoap.org/soap/encoding/\""
+ " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
}
+const char *KDSoapUnitTestHelpers::xmlEnvBegin11WithWSAddressing()
+{
+ return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<soap:Envelope"
+ " xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\""
+ " xmlns:soap-enc=\"http://schemas.xmlsoap.org/soap/encoding/\""
+ " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
+ " xmlns:wsa=\"http://www.w3.org/2005/08/addressing\"";
+}
+
+
const char *KDSoapUnitTestHelpers::xmlEnvBegin12()
{
return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -494,10 +504,22 @@ const char *KDSoapUnitTestHelpers::xmlEnvBegin12()
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
}
+const char *KDSoapUnitTestHelpers::xmlEnvBegin12WithWSAddressing()
+{
+ return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<soap:Envelope"
+ " xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\""
+ " xmlns:soap-enc=\"http://www.w3.org/2003/05/soap-encoding\""
+ " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
+ " xmlns:wsa=\"http://www.w3.org/2005/08/addressing\""
+ " xmlns:n1=\"http://www.kdab.com/xml/MyWsdl/\"";
+}
+
const char *KDSoapUnitTestHelpers::xmlEnvEnd()
{
return "</soap:Envelope>";
}
-#include "moc_httpserver_p.cpp"
#include "httpserver_p.moc"
+#include "moc_httpserver_p.cpp"
diff --git a/testtools/httpserver_p.h b/testtools/httpserver_p.h
index e2d3553..efbec12 100644
--- a/testtools/httpserver_p.h
+++ b/testtools/httpserver_p.h
@@ -1,53 +1,41 @@
/****************************************************************************
-** Copyright (C) 2010-2020 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com.
-** All rights reserved.
**
-** This file is part of the KD Soap library.
+** This file is part of the KD Soap project.
**
-** Licensees holding valid commercial KD Soap licenses may use this file in
-** accordance with the KD Soap Commercial License Agreement provided with
-** the Software.
+** SPDX-FileCopyrightText: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
+** SPDX-License-Identifier: MIT
**
-** This file may be distributed and/or modified under the terms of the
-** GNU Lesser General Public License version 2.1 and version 3 as published by the
-** Free Software Foundation and appearing in the file LICENSE.LGPL.txt included.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** Contact info@kdab.com if any conditions of this licensing are not
-** clear to you.
-**
-**********************************************************************/
+****************************************************************************/
#ifndef HTTPSERVER_P_H
#define HTTPSERVER_P_H
#include "KDSoapGlobal.h"
#include <QBuffer>
-#include <QThread>
#include <QMutex>
#include <QSemaphore>
#include <QTcpServer>
#include <QTcpSocket>
+#include <QThread>
#ifndef QT_NO_OPENSSL
#include <QSslSocket>
#endif
-#include <QUrl>
-#include <QStringList>
#include <QSslCertificate>
#include <QSslKey>
+#include <QStringList>
+#include <QUrl>
class BlockingHttpServer;
-namespace KDSoapUnitTestHelpers
-{
+namespace KDSoapUnitTestHelpers {
bool xmlBufferCompare(const QByteArray &source, const QByteArray &dest);
void httpGet(const QUrl &url);
bool setSslConfiguration();
const char *xmlEnvBegin11();
+const char *xmlEnvBegin11WithWSAddressing();
const char *xmlEnvBegin12();
+const char *xmlEnvBegin12WithWSAddressing();
const char *xmlEnvEnd();
}
@@ -55,21 +43,24 @@ class HttpServerThread : public QThread
{
Q_OBJECT
public:
- enum Feature {
- Public = 0, // HTTP with no ssl and no authentication needed
- Ssl = 1, // HTTPS
- BasicAuth = 2, // Requires authentication
- Error404 = 4 // Return "404 not found"
- // bitfield, next item is 8
+ enum Feature
+ {
+ Public = 0, // HTTP with no ssl and no authentication needed
+ Ssl = 1, // HTTPS
+ BasicAuth = 2, // Requires authentication
+ Error404 = 4 // Return "404 not found"
+ // bitfield, next item is 8
};
Q_DECLARE_FLAGS(Features, Feature)
HttpServerThread(const QByteArray &dataToSend, Features features)
- : m_dataToSend(dataToSend), m_port(0), m_features(features), m_server(0)
+ : m_dataToSend(dataToSend)
+ , m_port(0)
+ , m_features(features)
+ , m_server(0)
{
start();
m_ready.acquire();
-
}
~HttpServerThread()
{
@@ -85,14 +76,12 @@ public:
}
QString endPoint() const
{
- return QString::fromLatin1("%1://127.0.0.1:%2/path")
- .arg(QString::fromLatin1((m_features & Ssl) ? "https" : "http"))
- .arg(serverPort());
+ return QString::fromLatin1("%1://127.0.0.1:%2/path").arg(QString::fromLatin1((m_features & Ssl) ? "https" : "http")).arg(serverPort());
}
inline void finish()
{
- KDSoapUnitTestHelpers::httpGet(endPoint() + QLatin1String("/terminateThread"));
+ KDSoapUnitTestHelpers::httpGet(QUrl(endPoint() + QLatin1String("/terminateThread")));
}
QByteArray receivedData() const
@@ -118,12 +107,58 @@ public:
return m_headers.value(value);
}
+ /**
+ * @brief clientUseWSAddressing
+ * @return
+ * Returns true if the server expects clients to use WS-Addressing.
+ */
+ bool clientSendsActionInHttpHeader() const;
+
+ /**
+ * @brief setClientSendsActionInHttpHeader
+ * @param clientSendsActionInHttpHeader
+ * If this function is called with clientSendsActionInHttpHeader set to false then
+ * (in the case of SOAP 1.2 requests) the Content-type HTTP header will not checked
+ * for containing the proper SOAP action. In this case the client should send the SOAP action
+ * embedded to the SOAP envelope's header section).
+ */
+ void setClientSendsActionInHttpHeader(bool clientSendsActionInHttpHeader);
+
+ /**
+ * @brief setExpectedSoapAction
+ * @param expectedSoapAction
+ * This function could be used to specify the expected SOAP action in the incoming request's header.
+ * In the case of SOAP 1.1 requests the SOAP action should be in the SoapAction HTTP header,
+ * in the case of SOAP 1.2 requests the SOAP action is sent in the Content-Type HTTP header's
+ * action parameter. Please note if setClientSendsActionInHttpHeader is called with false argument
+ * then this check is skipped. (In this case the SOAP action should be passed in the envelope's
+ * header). To disable the SOAP action checking call this function with an empty expectedSoapAction
+ * parameter. (This is the default behaviour of the HttpServerThread).
+ */
+ void setExpectedSoapAction(const QByteArray &expectedSoapAction);
+
+ /**
+ * @brief expectedSoapAction
+ * @return the expected SOAP action against which the request's headers will be checked.
+ * If the function returns an empty string then the SOAP actions of the incoming requests
+ * will not be checked.
+ */
+ QByteArray expectedSoapAction() const;
+
protected:
/* \reimp */ void run() override;
private:
-
- enum Method { None, Basic, Plain, Login, Ntlm, CramMd5, DigestMd5 };
+ enum Method
+ {
+ None,
+ Basic,
+ Plain,
+ Login,
+ Ntlm,
+ CramMd5,
+ DigestMd5
+ };
static void parseAuthLine(const QString &str, Method *method, QString *headerVal)
{
*method = None;
@@ -131,7 +166,7 @@ private:
// is supposed to be run in a loop, apparently
// (multiple WWW-Authenticate lines? multiple values in the line?)
- //qDebug() << "parseAuthLine() " << str;
+ // qDebug() << "parseAuthLine() " << str;
if (*method < Basic && str.startsWith(QLatin1String("Basic"), Qt::CaseInsensitive)) {
*method = Basic;
*headerVal = str.mid(6);
@@ -159,7 +194,7 @@ private:
// We don't support multiple connexions so let's ask the client
// to close the connection every time. See testCallNoReply which performs
- // multiple connexions at the same time (QNAM keeps the old connexion open).
+ // multiple connexions at the same time (QNAM keeps the old connection open).
httpResponse += "Connection: close\r\n";
httpResponse += "\r\n";
httpResponse += responseData;
@@ -179,6 +214,8 @@ private:
Features m_features;
BlockingHttpServer *m_server;
+ bool m_clientSendsActionInHttpHeader = true;
+ QByteArray m_expectedSoapAction;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(HttpServerThread::Features)
@@ -188,11 +225,15 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(HttpServerThread::Features)
// so that the main thread can use synchronous calls. Note that this is
// really specific to unit tests and doesn't need to be done in a real
// KDSoap-based server.
-template <class ServerObjectType>
+template<class ServerObjectType>
class TestServerThread
{
public:
- TestServerThread() : m_thread(0), m_pServer(0) {}
+ TestServerThread()
+ : m_thread(0)
+ , m_pServer(0)
+ {
+ }
~TestServerThread()
{
if (m_thread) {
@@ -211,7 +252,7 @@ public:
}
m_thread = new QThread;
- QObject::connect(m_thread, SIGNAL(finished()), m_pServer, SLOT(deleteLater()));
+ QObject::connect(m_thread, &QThread::finished, m_pServer, &ServerObjectType::deleteLater);
m_pServer->moveToThread(m_thread);
m_thread->start();
diff --git a/testtools/testtools.pro b/testtools/testtools.pro
deleted file mode 100644
index aac19fd..0000000
--- a/testtools/testtools.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-# Private library used by unittests
-
-TEMPLATE = lib
-CONFIG += staticlib
-TARGET = testtools
-CONFIG(debug, debug|release):!unix:TARGET = $${TARGET}d
-QT -= gui
-
-QT += network
-
-# for QDomDocument in httpserver_p.cpp
-QT += xml
-
-# Workaround for visual studio integration
-DESTDIR = $${TOP_BUILD_DIR}/lib
-win32:DLLDESTDIR = $${TOP_BUILD_DIR}/bin
-
-include($${TOP_SOURCE_DIR}/variables.pri)
-# To link to KDSoap
-include($${TOP_SOURCE_DIR}/examples/examples.pri)
-
-SOURCES = httpserver_p.cpp
-HEADERS = httpserver_p.h
-
-RESOURCES += testtools.qrc
-
diff --git a/variables.pri b/variables.pri
deleted file mode 100644
index 2d013a1..0000000
--- a/variables.pri
+++ /dev/null
@@ -1,54 +0,0 @@
-CONFIG += qt warn_on
-
-exists( g++.pri ):include( g++.pri )
-
-DEFINES += USE_EXCEPTIONS QT_FATAL_ASSERT
-
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY
-
-solaris-cc:DEFINES += SUN7
-
-# for C++11 support
-mac: QMAKE_CXXFLAGS += -stdlib=libc++
-
-win32-msvc*:DEFINES += _SCL_SECURE_NO_WARNINGS
-
-win32-msvc*:QMAKE_CXXFLAGS += /GR /EHsc /wd4251
-unix:!macx:QMAKE_LFLAGS += -Wl,-no-undefined
-macx:QMAKE_SONAME_PREFIX = @rpath
-
-CONFIG += depend_includepath
-
-QT += network
-
-contains(TEMPLATE, lib) {
- DESTDIR = $${TOP_BUILD_DIR}/lib
-}
-
-contains(TEMPLATE, app) {
- DESTDIR = $${TOP_BUILD_DIR}/bin
-}
-
-staticlib {
-} else {
- contains(TEMPLATE, lib) {
- win32 {
- DLLDESTDIR = $${TOP_BUILD_DIR}/bin
- CONFIG += dll
-#skip_target_version_ext was introduced in Qt5.3 so we can't use it for Qt4.8 builds
-#so fallback to setting the empty VERSION trick.
- VERSION=
-# CONFIG += skip_target_version_ext
- }
- }
-}
-
-unix:!symbian {
- MOC_DIR = .moc
- OBJECTS_DIR = .obj
- UI_DIR = .ui
-} else {
- MOC_DIR = _moc
- OBJECTS_DIR = _obj
- UI_DIR = _ui
-}
More details
Historical runs
- failed: Please do git submodule update --init --recursive
- push-failed: Failed to push result branch: Connection closed: Connection closed early The remote server unexpectedly closed the connection.
- push-failed: Failed to push result branch: Connection closed: Connection closed early The remote server unexpectedly closed the connection.
- build-failed-stage-build: Please do git submodule update --init --recursive
- build-failed-stage-build: Please do git submodule update --init --recursive
- build-failed-stage-build: Please do git submodule update --init --recursive
- build-failed-stage-explain-bd-uninstallable: build failed stage explain-bd-uninstallable