diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 528eac5..b69cb73 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 diff --git a/SpellChecker.json.in b/SpellChecker.json.in index a351a37..a029c89 100644 --- a/SpellChecker.json.in +++ b/SpellChecker.json.in @@ -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", diff --git a/src/spellcheckercore.cpp b/src/spellcheckercore.cpp index 706087b..25132b0 100644 --- a/src/spellcheckercore.cpp +++ b/src/spellcheckercore.cpp @@ -797,7 +797,8 @@ void SpellCheckerCore::editorOpened( Core::IEditor* editor ) if( editor == nullptr ) { return; } - connect( qobject_cast( editor->widget() ), &QPlainTextEdit::cursorPositionChanged, this, &SpellCheckerCore::cursorPositionChanged ); + TextEditor::TextEditorWidget* tew = qobject_cast(editor->widget()); + connect( tew, &TextEditor::TextEditorWidget::cursorPositionChanged, this, &SpellCheckerCore::cursorPositionChanged ); } // -------------------------------------------------- @@ -806,7 +807,8 @@ void SpellCheckerCore::editorAboutToClose( Core::IEditor* editor ) if( editor == nullptr ) { return; } - disconnect( qobject_cast( editor->widget() ), &QPlainTextEdit::cursorPositionChanged, this, &SpellCheckerCore::cursorPositionChanged ); + TextEditor::TextEditorWidget* tew = qobject_cast(editor->widget()); + disconnect( tew, &TextEditor::TextEditorWidget::cursorPositionChanged, this, &SpellCheckerCore::cursorPositionChanged ); } // -------------------------------------------------- diff --git a/src/spellcheckerplugin.cpp b/src/spellcheckerplugin.cpp index b862994..6854b07 100644 --- a/src/spellcheckerplugin.cpp +++ b/src/spellcheckerplugin.cpp @@ -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 @@ -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 */ @@ -189,7 +188,7 @@ bool SpellCheckerPlugin::initialize( const QStringList& arguments, QString* erro /* Quick fix provider */ d->quickFixFactory = std::make_unique(); - return true; + return Utils::ResultOk; } void SpellCheckerPlugin::extensionsInitialized() diff --git a/src/spellcheckerplugin.h b/src/spellcheckerplugin.h index b6cee15..0ac83c4 100644 --- a/src/spellcheckerplugin.h +++ b/src/spellcheckerplugin.h @@ -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; };