Skip to content

Feature/qtc 17 #183

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.

Sign up for GitHub

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

Merged
CJCombrink merged 7 commits into from
Jul 7, 2025
Merged

Feature/qtc 17 #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a0ec64
Update build.yaml for QtC 17 build
CJCombrink Jun 18, 2025
793316d
Update SpellChecker.json.in for new version
CJCombrink Jun 18, 2025
d7f228f
Adapted initialize method to new signature
miemoe Jun 29, 2025
c46e105
Use override to check for signature changes
miemoe Jun 30, 2025
2e425f9
Merge pull request #182 from miemoe/fixQtC17
CJCombrink Jun 30, 2025
d3cbb4e
Editor->widget has type TextEditor::TextEditorWidget
miemoe Jul 1, 2025
3711d50
Merge pull request #184 from miemoe/fixQtC17
CJCombrink Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on: [push]

env:
QT_VERSION: "6.6.2"
QT_CREATOR_VERSION: "16.0.0"
QT_CREATOR_VERSION: "17.0.0"
QT_MIRRORS: download.qt.io;mirrors.ocf.berkeley.edu/qt;ftp.fau.de/qtproject;mirror.bit.edu.cn/qtproject

# The Jobs
Expand Down
4 changes: 2 additions & 2 deletions SpellChecker.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"Id" : "spellchecker",
"Name" : "SpellChecker",
"Version" : "3.9.0",
"CompatVersion" : "3.9.0",
"Version" : "3.10.0",
"CompatVersion" : "3.10.0",
"VendorId" : "carel_combrink",
"Vendor" : "Carel Combrink",
"Copyright" : "(C) 2015 - 2025 Carel Combrink",
Expand Down
6 changes: 4 additions & 2 deletions src/spellcheckercore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,8 @@ void SpellCheckerCore::editorOpened( Core::IEditor* editor )
if( editor == nullptr ) {
return;
}
connect( qobject_cast<QPlainTextEdit*>( editor->widget() ), &QPlainTextEdit::cursorPositionChanged, this, &SpellCheckerCore::cursorPositionChanged );
TextEditor::TextEditorWidget* tew = qobject_cast<TextEditor::TextEditorWidget*>(editor->widget());
connect( tew, &TextEditor::TextEditorWidget::cursorPositionChanged, this, &SpellCheckerCore::cursorPositionChanged );
}
// --------------------------------------------------

Expand All @@ -806,7 +807,8 @@ void SpellCheckerCore::editorAboutToClose( Core::IEditor* editor )
if( editor == nullptr ) {
return;
}
disconnect( qobject_cast<QPlainTextEdit*>( editor->widget() ), &QPlainTextEdit::cursorPositionChanged, this, &SpellCheckerCore::cursorPositionChanged );
TextEditor::TextEditorWidget* tew = qobject_cast<TextEditor::TextEditorWidget*>(editor->widget());
disconnect( tew, &TextEditor::TextEditorWidget::cursorPositionChanged, this, &SpellCheckerCore::cursorPositionChanged );
}
// --------------------------------------------------

Expand Down
5 changes: 2 additions & 3 deletions src/spellcheckerplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ SpellCheckerPlugin::~SpellCheckerPlugin()
delete d;
}

bool SpellCheckerPlugin::initialize( const QStringList& arguments, QString* errorString )
Utils::Result<> SpellCheckerPlugin::initialize(const QStringList& arguments)
{
// Create the core
// Load settings
Expand All @@ -112,7 +112,6 @@ bool SpellCheckerPlugin::initialize( const QStringList& arguments, QString* erro
// depends on have initialized their members.

Q_UNUSED( arguments )
Q_UNUSED( errorString )
#ifdef DEBUG_INSTALL_MESSAGE_HANDLER
qInstallMessageHandler( myMessageOutput );
#endif /* DEBUG_INSTALL_MESSAGE_HANDLER */
Expand Down Expand Up @@ -189,7 +188,7 @@ bool SpellCheckerPlugin::initialize( const QStringList& arguments, QString* erro
/* Quick fix provider */
d->quickFixFactory = std::make_unique<SpellCheckCppQuickFixFactory>();

return true;
return Utils::ResultOk;
}

void SpellCheckerPlugin::extensionsInitialized()
Expand Down
7 changes: 4 additions & 3 deletions src/spellcheckerplugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ class SpellCheckerPlugin
SpellCheckerPlugin();
~SpellCheckerPlugin();

bool initialize( const QStringList& arguments, QString* errorString );
void extensionsInitialized();
ShutdownFlag aboutToShutdown();
Utils::Result<> initialize(const QStringList& arguments) override;
void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() override;

private:
SpellCheckerPluginPrivate* const d;
};
Expand Down
Loading