-
Notifications
You must be signed in to change notification settings - Fork 250
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
Fix export rules header #608
Conversation
This one is truly independent of QtGlobal header Previous attempt to avoid C++ header in C code appeared to be incomplete. The header QtGlobal was removed, but macros defined in that header remained in export_rules.h The compilation did not fail until now most probably because by accident all C++ file including export_rules.h also explicitely or implicitly include QtGlobal. Signed-off-by: Viktor Kopp <[email protected]>
Signed-off-by: Viktor Kopp <[email protected]>
Remove dead code Signed-off-by: Viktor Kopp <[email protected]>
Cleanup dltargument Signed-off-by: Viktor Kopp <[email protected]>
Signed-off-by: Viktor Kopp <[email protected]>
Remove unnecessary code Signed-off-by: Viktor Kopp <[email protected]>
@vifactor I have integrated the plugin interface changes, but know i have a lot of issues in our internal plugins, similar to what you have changed already in the OSS plugins. Now i have two options. Revert your changes or walk through each issue and fix it. |
@alexmucde you mean you need to do this type of changes in your private plugins, right? If so, give me a couple of hours to think how this can be fixed with minimal nb of changes, because I find changes made in this MR are good. I understand the pain of fixing multiple places, so if you think it is easier, feel free to revert of course, and sorry for that, I did not expect I would break API |
I see you changes are useful, but will break the interface. I will first give it a try to fix it in our plugins. If it works easily we can keep your changes. I hope a find and replace will help. |
okay, so the easiest way to fix your plugins IMO and not revert these changes is to simply define:
I think this should do the job P.S. For the Endianness enum scope, I'm not sure how to handle it in a clean way, unfortunately P.S.2. Dirty way to fix things is just again inherit from QDlt in the QDltMsg class |
The first things were easily fixed. But you also have removed some arrays, which i have used in a plugin: |
oh, I could not imagine those vars were part of the API. They moved to cpp files, fix should be also easy: just move them back to QDlt-header, but keep |
I have fixed it now by adding the vars to the plugin as you have done. The following line still makes some issues qdltbase.h: When i remove "inline" it works, looks like it is incompatible with older C++ standards and our plugins are build with older C++ standard. I will create a PR for this. |
The first commit is the most important, it fixes includes that I missed here: #594
Remove a bit of dead code in follow up commits. Can be reviewed commit-by-commit