From 85af7572d7326b0580970e8871b3f540b04fd484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Mon, 12 May 2014 11:55:58 +0200 Subject: Append MessageLevel postfix to the JavaScriptConsoleMessageLevel. This keeps consistency with the other enum names. Change-Id: Idaedb8566fd770b05effeeba377b09a84bf0af12 Reviewed-by: Jocelyn Turcotte --- src/webengine/api/qquickwebengineview_p.h | 6 +++--- src/webenginewidgets/api/qwebenginepage.h | 6 +++--- tests/auto/quick/publicapi/tst_publicapi.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 2956c61a5..78499081c 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -103,9 +103,9 @@ public: // must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel enum JavaScriptConsoleMessageLevel { - Info = 0, - Warning, - Error + InfoMessageLevel = 0, + WarningMessageLevel, + ErrorMessageLevel }; public Q_SLOTS: diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index 9ef6e6840..4c24db61e 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -133,9 +133,9 @@ public: // must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel enum JavaScriptConsoleMessageLevel { - Info = 0, - Warning, - Error + InfoMessageLevel = 0, + WarningMessageLevel, + ErrorMessageLevel }; explicit QWebEnginePage(QObject *parent = 0); diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 3edc85ce8..57b6e9001 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -87,9 +87,9 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.NewViewInWindow --> NewViewDestination" << "QQuickWebEngineView.NewViewInTab --> NewViewDestination" << "QQuickWebEngineView.NewViewInDialog --> NewViewDestination" - << "QQuickWebEngineView.Info --> JavaScriptConsoleMessageLevel" - << "QQuickWebEngineView.Warning --> JavaScriptConsoleMessageLevel" - << "QQuickWebEngineView.Error --> JavaScriptConsoleMessageLevel" + << "QQuickWebEngineView.InfoMessageLevel --> JavaScriptConsoleMessageLevel" + << "QQuickWebEngineView.WarningMessageLevel --> JavaScriptConsoleMessageLevel" + << "QQuickWebEngineView.ErrorMessageLevel --> JavaScriptConsoleMessageLevel" << "QQuickWebEngineView.title --> QString" << "QQuickWebEngineView.url --> QUrl" << "QQuickWebEngineView.icon --> QUrl" -- cgit v1.2.3