Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream merge conflict #1

Draft
wants to merge 4,621 commits into
base: master
Choose a base branch
from
Draft

Upstream merge conflict #1

wants to merge 4,621 commits into from

Conversation

shahmoradi
Copy link
Member

Upstream merge conflict with the fork by @shahmoradi

doxygen and others added 30 commits December 21, 2024 19:07
When having a function like:
```
/// the text
/// \param __a__, __b__ b_fie
void b_fie(int __a__, int __b__);
```
we get warnings like:
```
.../bb.h:3: warning: argument 'strong' of command @param is not found in the argument list of b_fie(int __a__, int __b__)
.../bb.h:3: warning: argument 'b' of command @param is not found in the argument list of b_fie(int __a__, int __b__)
.../bb.h:3: warning: argument 'strong' of command @param is not found in the argument list of b_fie(int __a__, int __b__)
.../bb.h:3: warning: The following parameter of b_fie(int __a__, int __b__) is not documented:
  parameter '__b__'
```

Actually this is a follow up on  #6128 (Usage of underscore's in parameter names (Origin: bugzilla 775493))
Spelling correction
When having a simile input for the doxycommentview like:
```
In the examples, the `→` character is used to represent tabs.
```

the server throws an exception like:
```
Exception occurred during processing of request from ('127.0.0.1', 64755)
Traceback (most recent call last):
  File "D:\Programs\Python\Python312\Lib\socketserver.py", line 318, in _handle_request_noblock
    self.process_request(request, client_address)
  File "D:\Programs\Python\Python312\Lib\socketserver.py", line 349, in process_request
    self.finish_request(request, client_address)
  File "D:\Programs\Python\Python312\Lib\socketserver.py", line 362, in finish_request
    self.RequestHandlerClass(request, client_address, self)
  File "D:\Programs\Python\Python312\Lib\http\server.py", line 672, in __init__
    super().__init__(*args, **kwargs)
  File "D:\Programs\Python\Python312\Lib\socketserver.py", line 761, in __init__
    self.handle()
  File "D:\Programs\Python\Python312\Lib\http\server.py", line 436, in handle
    self.handle_one_request()
  File "D:\Programs\Python\Python312\Lib\http\server.py", line 424, in handle_one_request
    method()
  File "D:\speeltuin\tst_commentview\ex_2\doxycommentview.py", line 46, in do_POST
    result = subprocess.run([DOXYGEN, '-c', '-', DOXYFILE], \
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "D:\Programs\Python\Python312\Lib\subprocess.py", line 550, in run
    stdout, stderr = process.communicate(input, timeout=timeout)
                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "D:\Programs\Python\Python312\Lib\subprocess.py", line 1209, in communicate
    stdout, stderr = self._communicate(input, endtime, timeout)
                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "D:\Programs\Python\Python312\Lib\subprocess.py", line 1622, in _communicate
    self._stdin_write(input)
  File "D:\Programs\Python\Python312\Lib\subprocess.py", line 1143, in _stdin_write
    self.stdin.write(input)
  File "D:\Programs\Python\Python312\Lib\encodings\cp1252.py", line 19, in encode
    return codecs.charmap_encode(input,self.errors,encoding_table)[0]
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
UnicodeEncodeError: 'charmap' codec can't encode character '\u2192' in position 22: character maps to <undefined>
```

The line File "D:\Programs\Python\Python312\Lib\encodings\cp1252.py" gives the clue that the output, on Windows, uses a default code page / encoding.
Setting the output encoding explicitly solves the issue.
…the tag if the image is in the IMAGE_PATH

Adding possibility to use a `~` in the file / directory name except on the first position of a file / directory name
…iew_encoding

Encoding `doxycommentview` output
update TinyDeflate.hh to get fix clang 19.0
Could happen for projects using older (pre 1.9.2) config files that do not
yet include the FULL_SIDEBAR option.
Don't convert CMake environment variables when using `-x_noenv` option
Created endOfLabels lambda as a generic replacement for endOfLabel and
endOfLabel2 lamdas and make endOfLabel a wrapper for endOfLabels.
Temporary solution: disable the fix
Running a spelling checker and  a xml-lint checker over the documentation revealed:
- superfluous `</li>` tag.
- spelling errors
- missing entity for the question mark in the dtd (is a doxygen extension)
… template with object in other namespace
gmitch215 and others added 30 commits March 3, 2025 14:18
…er/build-push-action-6.15.0

Bump docker/build-push-action from 6.14.0 to 6.15.0
…er/metadata-action-5.7.0

Bump docker/metadata-action from 5.6.1 to 5.7.0
When more `#endif``s  present than `#if`s we got a warning, but not wen it is the other way around.
Small consistency improvement
Messages about the devUsage should all be written by means of the same set of routines (otherwise they might land in different files upon redirection of the output)
Bumps [jdpurcell/install-qt-action](https://github.com/jdpurcell/install-qt-action) from 4 to 5.
- [Commits](jdpurcell/install-qt-action@v4...v5)

---
updated-dependencies:
- dependency-name: jdpurcell/install-qt-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
issue #9437,#11179 Add docs about markdown page exceptions
…ammy

Update docker base os from focal to jammy
…rcell/install-qt-action-5

Bump jdpurcell/install-qt-action from 4 to 5
…match

Warning when more `#if` than `#endif` statements
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.