aboutsummaryrefslogtreecommitdiff
path: root/lib/navigation
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-01-07 23:28:42 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2018-01-07 23:28:42 +0100
commitb984992fc92b6dd607732d6dad1c533b36f1ba3a (patch)
tree984c5ede072c2ebb10ad32acb5d5928162feb97f /lib/navigation
parentSearching through BookmarkModel elements (diff)
downloadsmolbote-b984992fc92b6dd607732d6dad1c533b36f1ba3a.tar.xz
Added .clang-format
Diffstat (limited to 'lib/navigation')
-rw-r--r--lib/navigation/navigationbutton.cpp16
-rw-r--r--lib/navigation/navigationbutton.h3
-rw-r--r--lib/navigation/urllineedit.cpp12
-rw-r--r--lib/navigation/urllineedit.h2
4 files changed, 14 insertions, 19 deletions
diff --git a/lib/navigation/navigationbutton.cpp b/lib/navigation/navigationbutton.cpp
index ecf7c81..577c291 100644
--- a/lib/navigation/navigationbutton.cpp
+++ b/lib/navigation/navigationbutton.cpp
@@ -11,13 +11,13 @@
#include <QStyle>
#include <QWebEngineHistory>
-NavigationButton::NavigationButton(Type type, QWidget *parent) :
- QToolButton(parent)
+NavigationButton::NavigationButton(Type type, QWidget *parent)
+ : QToolButton(parent)
{
m_type = type;
menu = new QMenu(this);
- switch (type) {
+ switch(type) {
case BackButton:
setIcon(style()->standardIcon(QStyle::SP_ArrowBack));
setMenu(menu);
@@ -37,10 +37,8 @@ NavigationButton::NavigationButton(Type type, QWidget *parent) :
}
connect(this, &NavigationButton::clicked, this, &NavigationButton::doAction);
-
}
-
void NavigationButton::setView(WebView *view)
{
disconnect(loadStartedConnection);
@@ -57,7 +55,7 @@ void NavigationButton::setView(WebView *view)
void NavigationButton::updateOnLoadStarted()
{
- switch (m_type) {
+ switch(m_type) {
case BackButton:
break;
case ForwardButton:
@@ -73,7 +71,7 @@ void NavigationButton::updateOnLoadStarted()
void NavigationButton::updateOnLoadFinished()
{
- switch (m_type) {
+ switch(m_type) {
case BackButton:
if(m_view->history()->canGoBack()) {
setEnabled(true);
@@ -99,7 +97,7 @@ void NavigationButton::updateOnLoadFinished()
void NavigationButton::doAction()
{
- switch (m_type) {
+ switch(m_type) {
case BackButton:
m_view->history()->back();
break;
@@ -120,7 +118,7 @@ void NavigationButton::prepareMenu()
menu->clear();
QList<QWebEngineHistoryItem> items;
- switch (m_type) {
+ switch(m_type) {
case BackButton:
items = m_view->history()->backItems(10);
break;
diff --git a/lib/navigation/navigationbutton.h b/lib/navigation/navigationbutton.h
index 7c76b9c..e0d358a 100644
--- a/lib/navigation/navigationbutton.h
+++ b/lib/navigation/navigationbutton.h
@@ -9,8 +9,8 @@
#ifndef NAVIGATIONBUTTON_H
#define NAVIGATIONBUTTON_H
-#include <QToolButton>
#include "../../src/webengine/webview.h"
+#include <QToolButton>
class QMenu;
@@ -18,7 +18,6 @@ class NavigationButton : public QToolButton
{
Q_OBJECT
public:
-
enum Type {
BackButton,
ForwardButton,
diff --git a/lib/navigation/urllineedit.cpp b/lib/navigation/urllineedit.cpp
index 85f443d..4c207a1 100644
--- a/lib/navigation/urllineedit.cpp
+++ b/lib/navigation/urllineedit.cpp
@@ -7,9 +7,9 @@
*/
#include "urllineedit.h"
-#include <QTimer>
#include <QMenu>
#include <QStyle>
+#include <QTimer>
#include <QWidgetAction>
// ssl menu
@@ -18,9 +18,9 @@
#include <QListView>
#include <QStringListModel>
-UrlLineEdit::UrlLineEdit(QWidget *parent) :
- QLineEdit(parent),
- m_listView(new QListView(this))
+UrlLineEdit::UrlLineEdit(QWidget *parent)
+ : QLineEdit(parent)
+ , m_listView(new QListView(this))
{
setPlaceholderText(tr("Enter address"));
@@ -66,7 +66,6 @@ UrlLineEdit::UrlLineEdit(QWidget *parent) :
}
this->clearFocus();
});
-
}
QAction *UrlLineEdit::pageAction()
@@ -145,7 +144,7 @@ void UrlLineEdit::keyPressEvent(QKeyEvent *event)
int count = m_listView->model()->rowCount();
QModelIndex currentIndex = m_listView->currentIndex();
- switch (key) {
+ switch(key) {
case Qt::Key_Down:
if(currentIndex.row() + 1 >= count) {
m_listView->setCurrentIndex(m_listView->model()->index(0, 0));
@@ -185,7 +184,6 @@ void UrlLineEdit::setTextFormat(const QTextLayout::FormatRange &format)
attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, format.start, format.length, format.format));
QInputMethodEvent ev(QString(), attributes);
event(&ev);
-
}
void UrlLineEdit::clearTextFormat()
diff --git a/lib/navigation/urllineedit.h b/lib/navigation/urllineedit.h
index a06ba1b..9ac0366 100644
--- a/lib/navigation/urllineedit.h
+++ b/lib/navigation/urllineedit.h
@@ -9,9 +9,9 @@
#ifndef URLLINEEDIT_H
#define URLLINEEDIT_H
+#include <QAction>
#include <QLineEdit>
#include <QTextLayout>
-#include <QAction>
class QAbstractItemModel;
class QMenu;