aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--LICENSE.md2
-rw-r--r--lib/bookmarks/bookmarkswidget.cpp9
-rw-r--r--lib/bookmarks/bookmarkswidget.h7
-rw-r--r--lib/downloads/downloadswidget.cpp2
-rw-r--r--lib/downloads/widgets/downloaditemwidget.cpp1
-rw-r--r--lib/downloads/widgets/elidedlabel.cpp1
-rw-r--r--lib/navigation/navigationbutton.cpp5
-rw-r--r--lib/navigation/urllineedit.cpp13
-rw-r--r--lib/navigation/urllineedit.h2
-rw-r--r--lib/settings/settingsdialog.cpp4
-rw-r--r--linux/makepkg/PKGBUILD2
-rw-r--r--src/forms/aboutdialog.cpp2
-rw-r--r--src/forms/cookiesform.cpp1
-rw-r--r--src/forms/searchform.cpp1
-rw-r--r--src/main.cpp2
-rw-r--r--src/mainwindow.cpp10
-rw-r--r--src/mainwindow.h1
-rw-r--r--src/singleapplication.cpp1
-rw-r--r--src/webengine/urlinterceptor.cpp4
-rw-r--r--src/webengine/webview.cpp2
-rw-r--r--src/widgets/mainwindowmenubar.cpp1
-rw-r--r--src/widgets/mainwindowtabbar.cpp2
22 files changed, 12 insertions, 63 deletions
diff --git a/LICENSE.md b/LICENSE.md
index ba69bdb..32549d1 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
# smolbote
-Copyright (C) 2017 xiannox
+Copyright (C) 2017 - 2018 xiannox
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 3 as
diff --git a/lib/bookmarks/bookmarkswidget.cpp b/lib/bookmarks/bookmarkswidget.cpp
index cb191c7..0b13254 100644
--- a/lib/bookmarks/bookmarkswidget.cpp
+++ b/lib/bookmarks/bookmarkswidget.cpp
@@ -66,15 +66,6 @@ void BookmarksWidget::save()
qDebug("Writing bookmarks [%s] %s", qUtf8Printable(m_path), xbel->write(m_path) ? "ok" : "failed");
}
-QStringList BookmarksWidget::bookmarksFor(const QString &term)
-{
- QStringList ret;
- for(int i = 0; i < ui->treeWidget->topLevelItemCount(); ++i) {
- ret += searchItem(ui->treeWidget->topLevelItem(i), term);
- }
- return ret;
-}
-
QAbstractItemModel *BookmarksWidget::model() const
{
return ui->treeWidget->model();
diff --git a/lib/bookmarks/bookmarkswidget.h b/lib/bookmarks/bookmarkswidget.h
index aa188b2..5b815c0 100644
--- a/lib/bookmarks/bookmarkswidget.h
+++ b/lib/bookmarks/bookmarkswidget.h
@@ -23,17 +23,14 @@ class BookmarksWidget : public QWidget
public:
explicit BookmarksWidget(const QString &path, QWidget *parent = 0);
- ~BookmarksWidget();
+ ~BookmarksWidget() override ;
void save();
+ QAbstractItemModel *model() const;
signals:
void openUrl(const QUrl &url);
-public slots:
- QStringList bookmarksFor(const QString &term);
- QAbstractItemModel *model() const;
-
private slots:
void openItem(QTreeWidgetItem *item, int column);
void showItemDetails();
diff --git a/lib/downloads/downloadswidget.cpp b/lib/downloads/downloadswidget.cpp
index f9a8f34..1a5f268 100644
--- a/lib/downloads/downloadswidget.cpp
+++ b/lib/downloads/downloadswidget.cpp
@@ -10,10 +10,8 @@
#include "ui_downloadsform.h"
#include <QWebEngineDownloadItem>
-#include <QUrl>
#include <QFileDialog>
#include <QListWidget>
-#include <QLabel>
#include "widgets/downloaditemwidget.h"
DownloadsWidget::DownloadsWidget(const QString &downloadPath, QWidget *parent) :
diff --git a/lib/downloads/widgets/downloaditemwidget.cpp b/lib/downloads/widgets/downloaditemwidget.cpp
index fff3cfc..a51275e 100644
--- a/lib/downloads/widgets/downloaditemwidget.cpp
+++ b/lib/downloads/widgets/downloaditemwidget.cpp
@@ -10,7 +10,6 @@
#include "ui_downloaditemform.h"
#include <QUrl>
-#include <QLabel>
DownloadItemWidget::DownloadItemWidget(QWebEngineDownloadItem *item, QWidget *parent) :
QWidget(parent),
diff --git a/lib/downloads/widgets/elidedlabel.cpp b/lib/downloads/widgets/elidedlabel.cpp
index dc17d32..2878565 100644
--- a/lib/downloads/widgets/elidedlabel.cpp
+++ b/lib/downloads/widgets/elidedlabel.cpp
@@ -59,7 +59,6 @@
#include <QPainter>
#include <QTextLayout>
-#include <QDebug>
ElidedLabel::ElidedLabel(QWidget *parent)
: QLabel(parent)
diff --git a/lib/navigation/navigationbutton.cpp b/lib/navigation/navigationbutton.cpp
index 13daebc..ecf7c81 100644
--- a/lib/navigation/navigationbutton.cpp
+++ b/lib/navigation/navigationbutton.cpp
@@ -10,7 +10,6 @@
#include <QStyle>
#include <QWebEngineHistory>
-#include <QMenu>
NavigationButton::NavigationButton(Type type, QWidget *parent) :
QToolButton(parent)
@@ -132,9 +131,9 @@ void NavigationButton::prepareMenu()
break;
}
- for(QWebEngineHistoryItem i : items) {
+ for(const QWebEngineHistoryItem &i : qAsConst(items)) {
QAction *a = menu->addAction(i.title());
- connect(a, &QAction::triggered, [i, this]() {
+ connect(a, &QAction::triggered, this, [i, this]() {
m_view->history()->goToItem(i);
});
}
diff --git a/lib/navigation/urllineedit.cpp b/lib/navigation/urllineedit.cpp
index 24924bb..095431b 100644
--- a/lib/navigation/urllineedit.cpp
+++ b/lib/navigation/urllineedit.cpp
@@ -7,21 +7,14 @@
*/
#include "urllineedit.h"
-#include <QUrl>
#include <QTimer>
#include <QMenu>
-#include <QAction>
#include <QStyle>
-
#include <QWidgetAction>
// ssl menu
#include <QLabel>
-#include "../bookmarks/bookmarkswidget.h"
-
-#include <QCompleter>
-
UrlLineEdit::UrlLineEdit(QWidget *parent) :
QLineEdit(parent)
{
@@ -68,12 +61,6 @@ UrlLineEdit::UrlLineEdit(QWidget *parent) :
}
-QAction *UrlLineEdit::sslAction()
-{
- Q_CHECK_PTR(m_sslAction);
- return m_sslAction;
-}
-
QAction *UrlLineEdit::pageAction()
{
Q_CHECK_PTR(m_pageAction);
diff --git a/lib/navigation/urllineedit.h b/lib/navigation/urllineedit.h
index 46366a7..dee4938 100644
--- a/lib/navigation/urllineedit.h
+++ b/lib/navigation/urllineedit.h
@@ -12,7 +12,6 @@
#include <QLineEdit>
#include <QTextLayout>
#include <QAction>
-
#include "urlcompleter.h"
class QAbstractItemModel;
@@ -24,7 +23,6 @@ class UrlLineEdit : public QLineEdit
public:
explicit UrlLineEdit(QWidget *parent = nullptr);
- QAction *sslAction();
QAction *pageAction();
void setCompleterModel(QAbstractItemModel *model);
diff --git a/lib/settings/settingsdialog.cpp b/lib/settings/settingsdialog.cpp
index 9a589d6..478e372 100644
--- a/lib/settings/settingsdialog.cpp
+++ b/lib/settings/settingsdialog.cpp
@@ -74,11 +74,11 @@ inline QHBoxLayout *createEntry(Configuration* config, const std::string &path,
QToolButton *resetButton = new QToolButton(widget);
resetButton->setIcon(widget->style()->standardIcon(QStyle::SP_DialogResetButton));
- QObject::connect(resetButton, &QToolButton::clicked, [config, path, lineEdit]() {
+ QObject::connect(resetButton, &QToolButton::clicked, widget, [config, path, lineEdit]() {
config->resetValue(path.c_str());
lineEdit->setText(QString::fromStdString(config->value<std::string>(path.c_str()).value()));
});
- QObject::connect(lineEdit, &QLineEdit::editingFinished, [config, path, lineEdit]() {
+ QObject::connect(lineEdit, &QLineEdit::editingFinished, widget, [config, path, lineEdit]() {
config->setValue<std::string>(path, lineEdit->text().toStdString());
});
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index 89206d3..9a17f9b 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=smolbote-git
pkgver=0.0.0
pkgrel=1
-pkgdesc='Yet another Qt browser'
+pkgdesc='Yet another no-frills browser'
url="https://neueland.iserlohn-fortress.net/smolbote"
arch=('x86_64')
diff --git a/src/forms/aboutdialog.cpp b/src/forms/aboutdialog.cpp
index 3f89118..0744a5f 100644
--- a/src/forms/aboutdialog.cpp
+++ b/src/forms/aboutdialog.cpp
@@ -43,7 +43,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
QLabel *aboutLabel = new QLabel(this);
aboutLabel->setWordWrap(true);
aboutLabel->setText(tr("<h2>smolbote %1</h2>"
- "<p><i>yet another Qute browser</i></p>")
+ "<p><i>yet another no-frills browser</i></p>")
.arg(qApp->applicationVersion()));
ui->toolBox->addItem(aboutLabel, tr("About"));
diff --git a/src/forms/cookiesform.cpp b/src/forms/cookiesform.cpp
index fb90f4a..94d1854 100644
--- a/src/forms/cookiesform.cpp
+++ b/src/forms/cookiesform.cpp
@@ -9,7 +9,6 @@
#include "cookiesform.h"
#include "ui_cookiesform.h"
-#include <QTreeWidget>
#include <QDateTime>
CookiesForm::CookiesForm(QWebEngineCookieStore *store, QWidget *parent) :
diff --git a/src/forms/searchform.cpp b/src/forms/searchform.cpp
index c05c6b2..b12ff80 100644
--- a/src/forms/searchform.cpp
+++ b/src/forms/searchform.cpp
@@ -10,7 +10,6 @@
#include "ui_searchform.h"
#include "../mainwindow.h"
-#include <QFlags>
#include <settings/configuration.h>
SearchForm::SearchForm(MainWindow *parentWindow, QWidget *parent) :
diff --git a/src/main.cpp b/src/main.cpp
index fb9eeba..b7bd311 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
#endif
QCommandLineParser parser;
- parser.setApplicationDescription("yet another Qt browser");
+ parser.setApplicationDescription("yet another no-frills browser");
parser.addHelpOption();
parser.addVersionOption();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 21914da..b7c4a05 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -12,11 +12,6 @@
#include <QMessageBox>
#include "forms/aboutdialog.h"
-#include <QToolButton>
-#include <QStyle>
-
-#include <QWebEngineHistory>
-
#include <QDockWidget>
#include <settings/configuration.h>
@@ -185,11 +180,6 @@ MainWindow *MainWindow::newWindow(const QUrl &url)
return instance->createSession(m_profile->storageName(), true, QStringList(url.toString()));
}
-void MainWindow::focusAddress()
-{
- m_addressBar->setFocus();
-}
-
void MainWindow::closeEvent(QCloseEvent *event)
{
if(tabBar->count() > 1) {
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 1c568bc..2e6f510 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -66,7 +66,6 @@ protected:
void closeEvent(QCloseEvent *event) override;
private slots:
- void focusAddress();
void handleTabChanged(WebView *view);
void handleTitleUpdated(const QString &title);
diff --git a/src/singleapplication.cpp b/src/singleapplication.cpp
index ae4d510..4810d73 100644
--- a/src/singleapplication.cpp
+++ b/src/singleapplication.cpp
@@ -10,7 +10,6 @@
#include <QLocalServer>
#include <QLocalSocket>
#include <QDataStream>
-#include <cstdlib>
SingleApplication::SingleApplication(int &argc, char **argv) : QApplication(argc, argv)
{
diff --git a/src/webengine/urlinterceptor.cpp b/src/webengine/urlinterceptor.cpp
index 175643e..b8d30cd 100644
--- a/src/webengine/urlinterceptor.cpp
+++ b/src/webengine/urlinterceptor.cpp
@@ -8,7 +8,6 @@
#include "urlinterceptor.h"
#include <QDir>
-#include <QFile>
#include <QTextStream>
UrlRequestInterceptor::UrlRequestInterceptor(const QString &path, QObject *parent) :
@@ -19,7 +18,8 @@ UrlRequestInterceptor::UrlRequestInterceptor(const QString &path, QObject *paren
#endif
QDir hostsD(path);
- for(const QString &file : hostsD.entryList(QDir::Files)) {
+ const QStringList hostFiles = hostsD.entryList(QDir::Files);
+ for(const QString &file : hostFiles) {
qDebug("Parsing hosts.d/%s: %i", qUtf8Printable(file), parseHostfile(hostsD.absoluteFilePath(file)));
}
diff --git a/src/webengine/webview.cpp b/src/webengine/webview.cpp
index 2e51587..ee9b134 100644
--- a/src/webengine/webview.cpp
+++ b/src/webengine/webview.cpp
@@ -7,7 +7,6 @@
*/
#include "webview.h"
-#include <QWebEnginePage>
// copy page URL
#include <QApplication>
@@ -16,7 +15,6 @@
// zoom widget
#include <QWidgetAction>
#include <QVBoxLayout>
-#include <QHBoxLayout>
#include <QLabel>
#include <QToolButton>
#include <QSlider>
diff --git a/src/widgets/mainwindowmenubar.cpp b/src/widgets/mainwindowmenubar.cpp
index f8e8ecd..ada3ad1 100644
--- a/src/widgets/mainwindowmenubar.cpp
+++ b/src/widgets/mainwindowmenubar.cpp
@@ -8,7 +8,6 @@
#include "mainwindowmenubar.h"
#include <QApplication>
-#include <QMenu>
#include <QInputDialog>
#include "forms/profileview.h"
#include "mainwindow.h"
diff --git a/src/widgets/mainwindowtabbar.cpp b/src/widgets/mainwindowtabbar.cpp
index 837de8d..da2cef3 100644
--- a/src/widgets/mainwindowtabbar.cpp
+++ b/src/widgets/mainwindowtabbar.cpp
@@ -7,9 +7,7 @@
*/
#include "mainwindowtabbar.h"
-#include <QAction>
#include <QContextMenuEvent>
-#include <QMenu>
#include <settings/configuration.h>
#include <QShortcut>
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-17 04:57:17 +0000