Skip to content

Commit

Permalink
1. fixed wrong comment
Browse files Browse the repository at this point in the history
2. unified naming style
  • Loading branch information
L-Super authored and tishion committed May 23, 2023
1 parent 61f70b6 commit 55247bd
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions example/QCefViewTest/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/QCefViewTest/MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
10 changes: 5 additions & 5 deletions include/QCefView.h
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ class QCEFVIEW_EXPORT QCefView : public QWidget
/// <param name="browserId">Indicates the browser id</param>
/// <param name="frameId">Indicates the frame id</param>
/// <param name="isMainFrame">Indicates the whether this is the main frame</param>
/// <param name="transition_type">transition type</param>
void loadStart(int browserId, qint64 frameId, bool isMainFrame, int transition_type);
/// <param name="transitionType">transition type</param>
void loadStart(int browserId, qint64 frameId, bool isMainFrame, int transitionType);

/// <summary>
/// Gets called on loading ends
Expand Down Expand Up @@ -321,13 +321,13 @@ class QCEFVIEW_EXPORT QCefView : public QWidget
void titleChanged(const QString& title);

/// <summary>
/// Gets called on title changed
/// Gets called on favicon url changed
/// </summary>
/// <param name="urls">The urls</param>
void faviconURLChanged(const QStringList& urls);

/// <summary>
/// Gets called on title changed
/// Gets called on favicon changed
/// </summary>
/// <param name="icon">The icon</param>
void faviconChanged(const QIcon& icon);
Expand Down Expand Up @@ -426,7 +426,7 @@ class QCEFVIEW_EXPORT QCefView : public QWidget
/// Ignore the download item to disallow the download
/// </summary>
/// <param name="item">The new download item</param>
/// <param name="suggestedName">The nesuggested name</param>
/// <param name="suggestedName">The new suggested name</param>
virtual void onNewDownloadItem(const QSharedPointer<QCefDownloadItem>& item, const QString& suggestedName);

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/details/CCefClientDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class CCefClientDelegate
bool isLoading,
bool canGoBack,
bool canGoForward) override;
virtual void loadStart(CefRefPtr<CefBrowser>& browser, CefRefPtr<CefFrame>& frame, int transition_type) override;
virtual void loadStart(CefRefPtr<CefBrowser>& browser, CefRefPtr<CefFrame>& frame, int transitionType) override;
virtual void loadEnd(CefRefPtr<CefBrowser>& browser, CefRefPtr<CefFrame>& frame, int httpStatusCode) override;
virtual void loadError(CefRefPtr<CefBrowser>& browser,
CefRefPtr<CefFrame>& frame,
Expand Down
4 changes: 2 additions & 2 deletions src/details/CCefClientDelegate_LoadHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ CCefClientDelegate::loadingStateChanged(CefRefPtr<CefBrowser>& browser,
}

void
CCefClientDelegate::loadStart(CefRefPtr<CefBrowser>& browser, CefRefPtr<CefFrame>& frame, int transition_type)
CCefClientDelegate::loadStart(CefRefPtr<CefBrowser>& browser, CefRefPtr<CefFrame>& 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
Expand Down

0 comments on commit 55247bd

Please sign in to comment.