Remove Qt from ModelEditor Ruby bindings#864
Merged
Conversation
20 tasks
…tor.rb to maintain backwards compatibility w plugin for now
…tor.rb to maintain backwards compatibility w plugin for now
Collaborator
|
A couple of questions here:
|
Collaborator
* Update QRegExp to QRegularExpression * Remove Qt5Compat QXmlDefaultHandler and replace with QXmlStreamReader * Remove qt5compat (QtCore5Compat) * Fixup QRegexp replacement: use a lazy matcher... Not sure why QRegexp was working * ResultsTabView: fix pre-existing bug where 10_xxx shows before 2_xxx before: `(\\d)+`: + outside group, captured only the last digit of a multi-digit prefix; after: `(\\d+)` (+ inside group)
…tudioApplication into remove_qt_ruby
Collaborator
Author
|
Good to merge this @jmarrec ? |
There was a problem hiding this comment.
Pull request overview
This PR removes the legacy QtWinMigrate/SketchUp integration paths and the ModelEditor Ruby binding build, while modernizing parts of the Qt usage (QRegularExpression) and updating build/packaging metadata accordingly.
Changes:
- Removed the
qtwinmigratelibrary (QWinWidget/QWinHost/QMfcApp) and stopped linking it on Windows. - Removed ModelEditor Ruby bindings artifacts (SWIG target, compiled Ruby extension, and related Ruby tests), leaving
openstudio_modeleditor.rbas a lightweight loader. - Migrated remaining
QRegExpusage toQRegularExpression, updated AboutBox/CMake/CI to dropQt6Core5Compat, and refreshed translation catalogs.
Reviewed changes
Copilot reviewed 49 out of 49 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| translations/OpenStudioApp_zh_CN.ts | Updated source locations and added new Location tab strings (some untranslated). |
| translations/OpenStudioApp_vi.ts | Updated source locations and added new Location tab strings (some untranslated). |
| translations/OpenStudioApp_fr.ts | Updated source locations and added new Location tab strings (some untranslated). |
| translations/OpenStudioApp_es.ts | Updated source locations and added new Location tab strings (some untranslated). |
| translations/OpenStudioApp_ar.ts | Updated source locations and added new Location tab strings (untranslated). |
| src/qtwinmigrate/qwinwidget.h | Removed legacy QtWinMigrate QWinWidget header. |
| src/qtwinmigrate/qwinwidget.cpp | Removed legacy QtWinMigrate QWinWidget implementation. |
| src/qtwinmigrate/qwinhost.h | Removed legacy QtWinMigrate QWinHost header. |
| src/qtwinmigrate/qwinhost.cpp | Removed legacy QtWinMigrate QWinHost implementation. |
| src/qtwinmigrate/qmfcapp.h | Removed legacy QtWinMigrate QMfcApp header. |
| src/qtwinmigrate/qmfcapp.cpp | Removed legacy QtWinMigrate QMfcApp implementation. |
| src/qtwinmigrate/QWinWidget | Removed forwarding include for QWinWidget. |
| src/qtwinmigrate/QWinHost | Removed forwarding include for QWinHost. |
| src/qtwinmigrate/QMfcApp | Removed forwarding include for QMfcApp. |
| src/qtwinmigrate/CMakeLists.txt | Removed qtwinmigrate library build definition. |
| src/openstudio_lib/ResultsTabView.cpp | Switched from QRegExp to QRegularExpression for results path sorting. |
| src/openstudio_lib/LocationTabView.cpp | Switched from QRegExp to QRegularExpression in design day parsing. |
| src/openstudio_lib/CMakeLists.txt | Removed Windows-only linkage to qtwinmigrate. |
| src/openstudio_app/AboutBox.hpp.in | Removed Core5Compat from the About box Qt modules list. |
| src/model_editor/test/InspectorDialog_GTest.cpp | Removed SketchUpPlugin-specific test case. |
| src/model_editor/ModelEditor.i | Reduced SWIG interface surface, leaving OSSimpleProgressBar exposure. |
| src/model_editor/InspectorDialog.hpp | Removed SketchUpPlugin from InspectorDialogClient enum. |
| src/model_editor/InspectorDialog.cpp | Removed SketchUp policy branch; adjusted selection message text. |
| src/model_editor/CMakeLists.txt | Removed Windows-only qtwinmigrate link and removed SWIG Ruby binding target generation. |
| src/model_editor/Application.hpp | Removed SketchUp window wrapper API. |
| src/model_editor/Application.cpp | Removed Windows SketchUp process/window detection and QWinWidget usage. |
| src/model_editor/AccessPolicyStore.hpp | Adjusted friend declarations after XML parser refactor. |
| src/model_editor/AccessPolicyStore.cpp | Replaced deprecated SAX-style Qt XML parsing with QXmlStreamReader. |
| src/bimserver/CMakeLists.txt | Removed Windows-only qtwinmigrate linkage. |
| ruby/test/WorkspaceWatcher_Test.rb | Removed Ruby test that depended on modeleditor Ruby bindings. |
| ruby/test/PathWatcher_Test.rb | Removed Ruby test that depended on modeleditor Ruby bindings. |
| ruby/openstudio_modeleditor_rb.cpp | Removed compiled Ruby extension entrypoint. |
| ruby/openstudio_modeleditor.rb | Updated loader to set DLL directory based on OpenStudioApp presence and removed .so require. |
| ruby/RubyAPI.hpp | Removed Ruby export/import macro header used by the deleted extension. |
| ruby/CMakeLists.txt | Replaced Ruby extension build with a stub install rule for openstudio_modeleditor.rb. |
| SketchUpInstallName.rb | Removed SketchUp-specific macOS install_name_tool helper script. |
| CMakeLists.txt | Bumped app version, removed Qt6Core5Compat dependency, and removed qtwinmigrate subdir/exports. |
| CMake/CPackSignAndNotarizeDmg.cmake | Added a wait/retry check to ensure package files exist before signing. |
| .github/workflows/app_build.yml | Dropped qt5compat module from Qt installation step. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.