diff --git a/example/QCefViewTest/MainWindow.cpp b/example/QCefViewTest/MainWindow.cpp index df7a6787..5afb8f1d 100644 --- a/example/QCefViewTest/MainWindow.cpp +++ b/example/QCefViewTest/MainWindow.cpp @@ -193,10 +193,10 @@ MainWindow::onLoadingStateChanged(int browserId, bool isLoading, bool canGoBack, } void -MainWindow::onLoadStart(int browserId, qint64 frameId, bool isMainFrame, int transition_type) +MainWindow::onLoadStart(int browserId, qint64 frameId, bool isMainFrame, int transitionType) { qDebug() << "onLoadStart, browserId:" << browserId << ", frameId:" << frameId << ", isMainFrame:" << isMainFrame - << ", transitionType:" << transition_type; + << ", transitionType:" << transitionType; } void diff --git a/example/QCefViewTest/MainWindow.h b/example/QCefViewTest/MainWindow.h index f65369cc..5602d9e1 100644 --- a/example/QCefViewTest/MainWindow.h +++ b/example/QCefViewTest/MainWindow.h @@ -32,7 +32,7 @@ protected slots: void onLoadingStateChanged(int browserId, bool isLoading, bool canGoBack, bool canGoForward); - void onLoadStart(int browserId, qint64 frameId, bool isMainFrame, int transition_type); + void onLoadStart(int browserId, qint64 frameId, bool isMainFrame, int transitionType); void onLoadEnd(int browserId, qint64 frameId, bool isMainFrame, int httpStatusCode); diff --git a/include/QCefView.h b/include/QCefView.h index d68c9abd..b2e505d4 100644 --- a/include/QCefView.h +++ b/include/QCefView.h @@ -272,8 +272,8 @@ class QCEFVIEW_EXPORT QCefView : public QWidget /// Indicates the browser id /// Indicates the frame id /// Indicates the whether this is the main frame - /// transition type - void loadStart(int browserId, qint64 frameId, bool isMainFrame, int transition_type); + /// transition type + void loadStart(int browserId, qint64 frameId, bool isMainFrame, int transitionType); /// /// Gets called on loading ends @@ -321,13 +321,13 @@ class QCEFVIEW_EXPORT QCefView : public QWidget void titleChanged(const QString& title); /// - /// Gets called on title changed + /// Gets called on favicon url changed /// /// The urls void faviconURLChanged(const QStringList& urls); /// - /// Gets called on title changed + /// Gets called on favicon changed /// /// The icon void faviconChanged(const QIcon& icon); @@ -426,7 +426,7 @@ class QCEFVIEW_EXPORT QCefView : public QWidget /// Ignore the download item to disallow the download /// /// The new download item - /// The nesuggested name + /// The new suggested name virtual void onNewDownloadItem(const QSharedPointer& item, const QString& suggestedName); /// diff --git a/src/details/CCefClientDelegate.h b/src/details/CCefClientDelegate.h index a29373f1..b16cdca5 100644 --- a/src/details/CCefClientDelegate.h +++ b/src/details/CCefClientDelegate.h @@ -101,7 +101,7 @@ class CCefClientDelegate bool isLoading, bool canGoBack, bool canGoForward) override; - virtual void loadStart(CefRefPtr& browser, CefRefPtr& frame, int transition_type) override; + virtual void loadStart(CefRefPtr& browser, CefRefPtr& frame, int transitionType) override; virtual void loadEnd(CefRefPtr& browser, CefRefPtr& frame, int httpStatusCode) override; virtual void loadError(CefRefPtr& browser, CefRefPtr& frame, diff --git a/src/details/CCefClientDelegate_LoadHandler.cpp b/src/details/CCefClientDelegate_LoadHandler.cpp index d5ea5b52..3077cd23 100644 --- a/src/details/CCefClientDelegate_LoadHandler.cpp +++ b/src/details/CCefClientDelegate_LoadHandler.cpp @@ -15,13 +15,13 @@ CCefClientDelegate::loadingStateChanged(CefRefPtr& browser, } void -CCefClientDelegate::loadStart(CefRefPtr& browser, CefRefPtr& frame, int transition_type) +CCefClientDelegate::loadStart(CefRefPtr& browser, CefRefPtr& frame, int transitionType) { if (!IsValidBrowser(browser)) return; pCefViewPrivate_->q_ptr->loadStart( - browser->GetIdentifier(), frame->GetIdentifier(), frame->IsMain(), transition_type); + browser->GetIdentifier(), frame->GetIdentifier(), frame->IsMain(), transitionType); } void