From 5afe88df2538274859a162ffd63ed52118e80c19 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Fri, 26 Jan 2024 16:07:54 +0100 Subject: Apply C++11 fixits modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using --- src/gui/widgets/browserbox.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui/widgets/browserbox.cpp') diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 29847639..d5b853b2 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -86,7 +86,7 @@ void BrowserBox::addRow(const std::string &row) const int fontHeight = font->getHeight(); int lineHeight = fontHeight; - if (TrueTypeFont *ttf = dynamic_cast(font)) + if (auto *ttf = dynamic_cast(font)) lineHeight = ttf->getLineHeight(); // Use links and user defined colors @@ -185,7 +185,7 @@ void BrowserBox::addRow(const std::string &row) int tildeWidth = font->getWidth(tilde); int x = 0; - for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); i++) + for (auto i = mTextRows.begin(); i != mTextRows.end(); i++) { std::string row = *i; for (unsigned int j = 0; j < row.size(); ++j) @@ -259,7 +259,7 @@ struct MouseOverLink void BrowserBox::mousePressed(gcn::MouseEvent &event) { if (!mLinkHandler) return; - LinkIterator i = find_if(mLinks.begin(), mLinks.end(), + auto i = find_if(mLinks.begin(), mLinks.end(), MouseOverLink(event.getX(), event.getY())); if (i != mLinks.end()) @@ -268,7 +268,7 @@ void BrowserBox::mousePressed(gcn::MouseEvent &event) void BrowserBox::mouseMoved(gcn::MouseEvent &event) { - LinkIterator i = find_if(mLinks.begin(), mLinks.end(), + auto i = find_if(mLinks.begin(), mLinks.end(), MouseOverLink(event.getX(), event.getY())); mSelectedLink = (i != mLinks.end()) @@ -316,7 +316,7 @@ void BrowserBox::draw(gcn::Graphics *graphics) } } - for (LinePartIterator i = mLineParts.begin(); + for (auto i = mLineParts.begin(); i != mLineParts.end(); i ++) { @@ -377,7 +377,7 @@ int BrowserBox::calcHeight() const int tildeWidth = font->getWidth("~"); int lineHeight = fontHeight; - if (TrueTypeFont *ttf = dynamic_cast(font)) + if (auto *ttf = dynamic_cast(font)) lineHeight = ttf->getLineHeight(); gcn::Color selColor = Theme::getThemeColor(Theme::TEXT); @@ -385,7 +385,7 @@ int BrowserBox::calcHeight() mLineParts.clear(); - for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); i++) + for (auto i = mTextRows.begin(); i != mTextRows.end(); i++) { const std::string row = *(i); bool wrapped = false; -- cgit v1.2.3-70-g09d2