Remove spellchecking support

Spellchecking API needs a bit more reviews and love.
Current API is not intuitive and partly broken.

Change-Id: Ie9cd371f38cca2f6b3f56a8699ad874cd332c318
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

6 files changed, 1 insertions, 141 deletions

diff --git a/src/webengine/api/qquickwebenginecontextmenudata.cpp b/src/webengine/api/qquickwebenginecontextmenudata.cpp
index 221b42245..684903ec0 100644
--- a/src/webengine/api/qquickwebenginecontextmenudata.cpp
+++ b/src/webengine/api/qquickwebenginecontextmenudata.cpp
@@ -170,30 +170,6 @@ bool QQuickWebEngineContextMenuData::isContentEditable() const
     return d ? d->isEditable : false;
 }
 
-/*!
-    \qmlproperty QString WebEngineDownloadItem::misspelledWord
-
-    If the context is a word considered misspelled by the spell-checker, returns the misspelled word.
-*/
-QString QQuickWebEngineContextMenuData::misspelledWord() const
-{
-    if (d)
-        return d->misspelledWord;
-    return QString();
-}
-
-/*!
-    \qmlproperty QStringList WebEngineDownloadItem::spellCheckerSuggestions
-
-    If the context is a word considered misspelled by the spell-checker, returns a list of suggested replacements.
-*/
-QStringList QQuickWebEngineContextMenuData::spellCheckerSuggestions() const
-{
-    if (d)
-        return d->spellCheckerSuggestions;
-    return QStringList();
-}
-
 void QQuickWebEngineContextMenuData::update(const QtWebEngineCore::WebEngineContextMenuData &update)
 {
     const QQuickWebEngineContextMenuData old(d);
@@ -222,12 +198,6 @@ void QQuickWebEngineContextMenuData::update(const QtWebEngineCore::WebEngineCont
 
     if (isContentEditable() != old.isContentEditable())
         Q_EMIT isContentEditableChanged();
-
-    if (misspelledWord() != old.misspelledWord())
-        Q_EMIT misspelledWordChanged();
-
-    if (spellCheckerSuggestions() != old.spellCheckerSuggestions())
-        Q_EMIT spellCheckerSuggestionsChanged();
 }
 
 QQuickWebEngineContextMenuData::QQuickWebEngineContextMenuData(const QQuickWebEngineContextMenuDataPrivate *p, QObject *parent)
diff --git a/src/webengine/api/qquickwebenginecontextmenudata_p.h b/src/webengine/api/qquickwebenginecontextmenudata_p.h
index 0989eaa5a..aa081cbe6 100644
--- a/src/webengine/api/qquickwebenginecontextmenudata_p.h
+++ b/src/webengine/api/qquickwebenginecontextmenudata_p.h
@@ -92,8 +92,6 @@ public:
     Q_PROPERTY(QUrl mediaUrl READ mediaUrl NOTIFY mediaUrlChanged)
     Q_PROPERTY(MediaType mediaType READ mediaType NOTIFY mediaTypeChanged)
     Q_PROPERTY(bool isContentEditable READ isContentEditable NOTIFY isContentEditableChanged)
-    Q_PROPERTY(QString misspelledWord READ misspelledWord NOTIFY misspelledWordChanged)
-    Q_PROPERTY(QStringList spellCheckerSuggestions READ spellCheckerSuggestions NOTIFY spellCheckerSuggestionsChanged)
 
     bool isValid() const;
 
@@ -105,9 +103,6 @@ public:
     MediaType mediaType() const;
     bool isContentEditable() const;
 
-    QString misspelledWord() const;
-    QStringList spellCheckerSuggestions() const;
-
 Q_SIGNALS:
     void isValidChanged();
     void positionChanged();
@@ -117,8 +112,6 @@ Q_SIGNALS:
     void mediaUrlChanged();
     void mediaTypeChanged();
     void isContentEditableChanged();
-    void misspelledWordChanged();
-    void spellCheckerSuggestionsChanged();
 
 private:
     void update(const QtWebEngineCore::WebEngineContextMenuData &update);
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index 6901b3e0e..c1f8f3179 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -613,85 +613,6 @@ QQuickWebEngineProfile *QQuickWebEngineProfile::defaultProfile()
 }
 
 /*!
-    \property QQuickWebEngineProfile::spellCheckLanguage
-    \brief the language used by the spell checker.
-
-    \since QtWebEngine 1.3
-*/
-
-/*!
-    \qmlproperty QString WebEngineProfile::spellCheckLanguage
-
-    This property holds the language used by the spell checker.
-    The language should match the name of the \c .bdic dictionary.
-    For example, the \a language \c en-US will load the \c en-US.bdic
-    dictionary file.
-
-    The web engine checks for the \c qtwebengine_dictionaries subdirectory
-    first in the local directory and if it is not found in the Qt
-    installation directory:
-
-    \list
-        \li QCoreApplication::applicationDirPath()/qtwebengine_dictionaries
-        \li [QLibraryInfo::DataPath]/qtwebengine_dictionaries
-    \endlist
-
-    For more information about how to compile \c .bdic dictionaries, see the
-    \l{WebEngine Widgets Spellchecker Example}{Spellchecker Example}.
-
-    \since QtWebEngine 1.3
-*/
-void QQuickWebEngineProfile::setSpellCheckLanguage(const QString &language)
-{
-    Q_D(QQuickWebEngineProfile);
-    if (language != d->browserContext()->spellCheckLanguage()) {
-        d->browserContext()->setSpellCheckLanguage(language);
-        emit spellCheckLanguageChanged();
-    }
-}
-
-/*!
-    \since 5.7
-
-    Returns the language used by the spell checker.
-*/
-QString QQuickWebEngineProfile::spellCheckLanguage() const
-{
-    const Q_D(QQuickWebEngineProfile);
-    return d->browserContext()->spellCheckLanguage();
-}
-
-/*!
-    \property QQuickWebEngineProfile::spellCheckEnabled
-    \brief whether the web engine spell checker is enabled.
-
-    \since QtWebEngine 1.3
-*/
-
-/*!
-    \qmlproperty QString WebEngineProfile::spellCheckEnabled
-
-    This property holds whether the web engine spell checker is enabled.
-
-    \since QtWebEngine 1.3
-*/
-void QQuickWebEngineProfile::setSpellCheckEnabled(bool enable)
-{
-     Q_D(QQuickWebEngineProfile);
-    if (enable != isSpellCheckEnabled()) {
-        d->browserContext()->setSpellCheckEnabled(enable);
-        emit spellCheckEnabledChanged();
-    }
-}
-
-bool QQuickWebEngineProfile::isSpellCheckEnabled() const
-{
-     const Q_D(QQuickWebEngineProfile);
-     return d->browserContext()->isSpellCheckEnabled();
-}
-
-/*!
-
     Returns the cookie store for this profile.
 */
 QWebEngineCookieStore *QQuickWebEngineProfile::cookieStore() const
diff --git a/src/webengine/api/qquickwebengineprofile.h b/src/webengine/api/qquickwebengineprofile.h
index 273375fc6..5c1218de9 100644
--- a/src/webengine/api/qquickwebengineprofile.h
+++ b/src/webengine/api/qquickwebengineprofile.h
@@ -71,8 +71,6 @@ class Q_WEBENGINE_EXPORT QQuickWebEngineProfile : public QObject {
     Q_PROPERTY(QString httpAcceptLanguage READ httpAcceptLanguage WRITE setHttpAcceptLanguage NOTIFY httpAcceptLanguageChanged FINAL REVISION 1)
     Q_PROPERTY(PersistentCookiesPolicy persistentCookiesPolicy READ persistentCookiesPolicy WRITE setPersistentCookiesPolicy NOTIFY persistentCookiesPolicyChanged FINAL)
     Q_PROPERTY(int httpCacheMaximumSize READ httpCacheMaximumSize WRITE setHttpCacheMaximumSize NOTIFY httpCacheMaximumSizeChanged FINAL)
-    Q_PROPERTY(QString spellCheckLanguage READ spellCheckLanguage WRITE setSpellCheckLanguage NOTIFY spellCheckLanguageChanged FINAL REVISION 2)
-    Q_PROPERTY(bool spellCheckEnabled READ isSpellCheckEnabled WRITE setSpellCheckEnabled NOTIFY spellCheckEnabledChanged FINAL REVISION 2)
 
 public:
     QQuickWebEngineProfile(QObject *parent = Q_NULLPTR);
@@ -131,11 +129,6 @@ public:
 
     void clearHttpCache();
 
-    Q_REVISION(2) void setSpellCheckLanguage(const QString &language);
-    Q_REVISION(2) QString spellCheckLanguage() const;
-    Q_REVISION(2) void setSpellCheckEnabled(bool enabled);
-    Q_REVISION(2) bool isSpellCheckEnabled() const;
-
     static QQuickWebEngineProfile *defaultProfile();
 
 Q_SIGNALS:
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index f265ccfb6..1b1dcec25 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -202,16 +202,7 @@ bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenu
 
     // Populate our menu
     MenuItemHandler *item = 0;
-    if (contextMenuData.isContentEditable() && !contextMenuData.spellCheckerSuggestions().isEmpty()) {
-        const QPointer<QQuickWebEngineView> qRef(q);
-        for (int i=0; i < contextMenuData.spellCheckerSuggestions().count() && i < 4; i++) {
-            item = new MenuItemHandler(menu);
-            QString replacement = contextMenuData.spellCheckerSuggestions().at(i);
-            QObject::connect(item, &MenuItemHandler::triggered, [qRef, replacement] { qRef->replaceMisspelledWord(replacement); });
-            ui()->addMenuItem(item, replacement);
-        }
-        ui()->addMenuSeparator(menu);
-    }
+
     if (!data.linkText.isEmpty() && data.linkUrl.isValid()) {
         item = new MenuItemHandler(menu);
         QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::OpenLinkInThisWindow); });
@@ -1237,12 +1228,6 @@ void QQuickWebEngineView::printToPdf(const QJSValue &callback, PrintedPageSizeId
     d->m_callbacks.insert(requestId, callback);
 }
 
-void QQuickWebEngineView::replaceMisspelledWord(const QString &replacement)
-{
-    Q_D(QQuickWebEngineView);
-    d->adapter->replaceMisspelling(replacement);
-}
-
 bool QQuickWebEngineView::isFullScreen() const
 {
     Q_D(const QQuickWebEngineView);
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 843e34f42..d287b46ca 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -471,8 +471,6 @@ public Q_SLOTS:
     Q_REVISION(2) void triggerWebAction(WebAction action);
     Q_REVISION(3) void printToPdf(const QString &filePath, PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait);
     Q_REVISION(3) void printToPdf(const QJSValue &callback, PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait);
-    Q_REVISION(3) void replaceMisspelledWord(const QString &replacement);
-
 private Q_SLOTS:
     void lazyInitialize();