From e4ffd8374040d36c22125eeb534d884f56978592 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 17 Apr 2018 17:43:38 +0200 Subject: Style pass --- lib/about/aboutdialog.cpp | 14 +++++++------- lib/bookmarks/bookmarksview.h | 1 - lib/bookmarks/bookmarkswidget.cpp | 2 +- lib/bookmarks/bookmarkswidget.h | 4 ++-- lib/bookmarks/xbel.h | 2 +- lib/configuration/configuration.h | 16 ++++++++-------- lib/downloads/widgets/downloaditemwidget.cpp | 2 +- 7 files changed, 20 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/lib/about/aboutdialog.cpp b/lib/about/aboutdialog.cpp index ff4200f..1d60eb4 100644 --- a/lib/about/aboutdialog.cpp +++ b/lib/about/aboutdialog.cpp @@ -33,7 +33,8 @@ AboutDialog::AboutDialog(QWidget *parent) auto *aboutLabel = new QLabel(this); aboutLabel->setWordWrap(true); aboutLabel->setText(tr("

smolbote %1

" - "

yet another no-frills browser

").arg(qApp->applicationVersion())); + "

yet another no-frills browser

") + .arg(qApp->applicationVersion())); ui->toolBox->addItem(aboutLabel, tr("About")); auto *licenseLabel = new QLabel(this); @@ -53,13 +54,12 @@ AboutDialog::AboutDialog(QWidget *parent) auto *detailsLabel = new QLabel(this); detailsLabel->setWordWrap(true); detailsLabel->setText(tr("

Compiled with " compiler "

" - "

")); + "

")); ui->toolBox->addItem(detailsLabel, tr("Details")); - } AboutDialog::~AboutDialog() diff --git a/lib/bookmarks/bookmarksview.h b/lib/bookmarks/bookmarksview.h index 5b408e0..47b3f9c 100644 --- a/lib/bookmarks/bookmarksview.h +++ b/lib/bookmarks/bookmarksview.h @@ -34,5 +34,4 @@ private: QIcon bookmarkIcon; }; - #endif // SMOLBOTE_BOOKMARKSVIEW_H diff --git a/lib/bookmarks/bookmarkswidget.cpp b/lib/bookmarks/bookmarkswidget.cpp index 339e913..cae1eb3 100644 --- a/lib/bookmarks/bookmarkswidget.cpp +++ b/lib/bookmarks/bookmarkswidget.cpp @@ -129,7 +129,7 @@ void BookmarksWidget::save() } } -void BookmarksWidget::search(const QString& term, std::function callback) const +void BookmarksWidget::search(const QString &term, std::function callback) const { QStringList ret; const QList res = ui->treeWidget->findItems(term, Qt::MatchContains | Qt::MatchRecursive, 1); diff --git a/lib/bookmarks/bookmarkswidget.h b/lib/bookmarks/bookmarkswidget.h index 6322918..40f5c04 100644 --- a/lib/bookmarks/bookmarkswidget.h +++ b/lib/bookmarks/bookmarkswidget.h @@ -9,9 +9,9 @@ #ifndef BOOKMARKSDIALOG_H #define BOOKMARKSDIALOG_H +#include #include #include -#include #include namespace Ui @@ -35,7 +35,7 @@ signals: void openUrl(const QUrl &url); public slots: - void search(const QString &term, std::function callback) const; + void search(const QString &term, std::function callback) const; private: Ui::BookmarksDialog *ui; diff --git a/lib/bookmarks/xbel.h b/lib/bookmarks/xbel.h index 6981627..ecc185a 100644 --- a/lib/bookmarks/xbel.h +++ b/lib/bookmarks/xbel.h @@ -9,9 +9,9 @@ #ifndef XBELREADER_H #define XBELREADER_H +#include "bookmarksview.h" #include #include -#include "bookmarksview.h" class XbelReader { diff --git a/lib/configuration/configuration.h b/lib/configuration/configuration.h index 1c919b0..c5e044f 100644 --- a/lib/configuration/configuration.h +++ b/lib/configuration/configuration.h @@ -9,13 +9,13 @@ #ifndef SMOLBOTE_CONFIGURATION_H #define SMOLBOTE_CONFIGURATION_H -#include -#include -#include #include -#include #include #include +#include +#include +#include +#include class Configuration { @@ -43,16 +43,15 @@ public: std::string r; try { r = vm[path].as(); - } catch (boost::bad_any_cast &) { + } catch(boost::bad_any_cast &) { // try int try { r = std::to_string(vm[path].as()); - } catch (boost::bad_any_cast &) { + } catch(boost::bad_any_cast &) { // try bool, and crash if not that either r = vm[path].as() ? "true" : "false"; } - } // check if it's a path @@ -65,7 +64,8 @@ public: return std::optional(vm[path].as()); } - const std::vector> & options() { + const std::vector> &options() + { return desc.options(); } diff --git a/lib/downloads/widgets/downloaditemwidget.cpp b/lib/downloads/widgets/downloaditemwidget.cpp index 576ae0c..2790c5c 100644 --- a/lib/downloads/widgets/downloaditemwidget.cpp +++ b/lib/downloads/widgets/downloaditemwidget.cpp @@ -8,8 +8,8 @@ #include "downloaditemwidget.h" #include "ui_downloaditemform.h" -#include #include +#include DownloadItemWidget::DownloadItemWidget(QWebEngineDownloadItem *item, QWidget *parent) : QWidget(parent) -- cgit v1.2.1