From 9cab6e02598d710e83992610e910acd06c2e2576 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 7 May 2009 11:16:51 +0200 Subject: EBN Krazy issues. 3rd round... First chech finished! --- src/cookiejar.cpp | 11 ++++++++--- src/cookiejar.h | 4 +--- src/edittableview.cpp | 8 +++++++- src/edittableview.h | 3 ++- src/edittreeview.cpp | 8 ++++++-- src/edittreeview.h | 3 ++- src/history.h | 3 +++ src/modelmenu.h | 7 +++++-- src/networkaccessmanager.cpp | 1 - src/networkaccessmanager.h | 4 ++-- src/panelhistory.h | 7 ++++--- src/searchbar.h | 1 + src/sidepanel.cpp | 1 - src/sidepanel.h | 7 ++++--- src/stackedurlbar.h | 3 ++- src/tabbar.cpp | 4 +++- src/tabbar.h | 4 ++-- src/urlbar.cpp | 19 ++++++++++--------- src/urlbar.h | 14 +++++++------- src/webview.cpp | 22 +++++++++++++++++----- 20 files changed, 86 insertions(+), 48 deletions(-) diff --git a/src/cookiejar.cpp b/src/cookiejar.cpp index de7d7d7e..fd823553 100644 --- a/src/cookiejar.cpp +++ b/src/cookiejar.cpp @@ -37,9 +37,14 @@ #include // Qt Includes -#include -#include -#include +#include +#include +#include + +#include +#include + +#include static const unsigned int JAR_VERSION = 23; diff --git a/src/cookiejar.h b/src/cookiejar.h index cd2403a2..03802df1 100644 --- a/src/cookiejar.h +++ b/src/cookiejar.h @@ -24,9 +24,6 @@ #define COOKIEJAR_H -// KDE Includes -#include - // Qt Includes #include #include @@ -37,6 +34,7 @@ class QSortFilterProxyModel; class QKeyEvent; class AutoSaver; +class QUrl; class CookieJar : public QNetworkCookieJar diff --git a/src/edittableview.cpp b/src/edittableview.cpp index bf1ef370..8b9bb12d 100644 --- a/src/edittableview.cpp +++ b/src/edittableview.cpp @@ -19,15 +19,19 @@ * ============================================================ */ - +// Self Includes #include "edittableview.h" + +// Qt Includes #include + EditTableView::EditTableView(QWidget *parent) : QTableView(parent) { } + void EditTableView::keyPressEvent(QKeyEvent *event) { if ((event->key() == Qt::Key_Delete @@ -42,6 +46,7 @@ void EditTableView::keyPressEvent(QKeyEvent *event) } } + void EditTableView::removeOne() { if (!model() || !selectionModel()) @@ -54,6 +59,7 @@ void EditTableView::removeOne() selectionModel()->select(idx, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); } + void EditTableView::removeAll() { if (model()) diff --git a/src/edittableview.h b/src/edittableview.h index dbc9a145..d6f88bfe 100644 --- a/src/edittableview.h +++ b/src/edittableview.h @@ -23,8 +23,10 @@ #ifndef EDITTABLEVIEW_H #define EDITTABLEVIEW_H +// Qt Includes #include + class EditTableView : public QTableView { Q_OBJECT @@ -39,4 +41,3 @@ public slots: }; #endif // EDITTABLEVIEW_H - diff --git a/src/edittreeview.cpp b/src/edittreeview.cpp index 49730d67..5547cdb0 100644 --- a/src/edittreeview.cpp +++ b/src/edittreeview.cpp @@ -19,16 +19,19 @@ * ============================================================ */ - +// Self Includes #include "edittreeview.h" +// Qt includes #include + EditTreeView::EditTreeView(QWidget *parent) : QTreeView(parent) { } + void EditTreeView::keyPressEvent(QKeyEvent *event) { if ((event->key() == Qt::Key_Delete @@ -43,6 +46,7 @@ void EditTreeView::keyPressEvent(QKeyEvent *event) } } + void EditTreeView::removeOne() { if (!model()) @@ -52,10 +56,10 @@ void EditTreeView::removeOne() model()->removeRow(row, ci.parent()); } + void EditTreeView::removeAll() { if (!model()) return; model()->removeRows(0, model()->rowCount(rootIndex()), rootIndex()); } - diff --git a/src/edittreeview.h b/src/edittreeview.h index 5be0dc45..aeb32f37 100644 --- a/src/edittreeview.h +++ b/src/edittreeview.h @@ -22,8 +22,10 @@ #ifndef EDITTREEVIEW_H #define EDITTREEVIEW_H +// Qt Includes #include + class EditTreeView : public QTreeView { Q_OBJECT @@ -38,4 +40,3 @@ public slots: }; #endif // EDITTREEVIEW_H - diff --git a/src/history.h b/src/history.h index dabd6883..1bc1aa91 100644 --- a/src/history.h +++ b/src/history.h @@ -76,6 +76,7 @@ public: // --------------------------------------------------------------------------------------------------------------- +// Forward Declarations class AutoSaver; class HistoryModel; class HistoryFilterModel; @@ -384,6 +385,8 @@ protected: // ------------------------------------------------------------------------------------------ + +// Ui includes #include "ui_history.h" class HistoryDialog : public QDialog, public Ui_HistoryDialog diff --git a/src/modelmenu.h b/src/modelmenu.h index af0d1043..d55bd6ce 100644 --- a/src/modelmenu.h +++ b/src/modelmenu.h @@ -41,7 +41,11 @@ class QPersistentModelIndex; class KIcon; -// A QMenu that is dynamically populated from a QAbstractItemModel +/** + * A KMenu that is dynamically populated + * from a QAbstractItemModel + * + */ class ModelMenu : public KMenu { Q_OBJECT @@ -98,4 +102,3 @@ private: }; #endif // MODELMENU_H - diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index c9b94a8d..deae42dd 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -165,4 +165,3 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QListignoreSslErrors(); } #endif - diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h index ebcd952d..7da2f54f 100644 --- a/src/networkaccessmanager.h +++ b/src/networkaccessmanager.h @@ -22,8 +22,8 @@ #ifndef NETWORKACCESSMANAGER_H #define NETWORKACCESSMANAGER_H - -#include +// Qt Includes +#include class NetworkAccessManager : public QNetworkAccessManager diff --git a/src/panelhistory.h b/src/panelhistory.h index 89759a84..c6fe1380 100644 --- a/src/panelhistory.h +++ b/src/panelhistory.h @@ -20,12 +20,13 @@ #ifndef PANELHISTORY_H #define PANELHISTORY_H -// Qt Includes -#include - // Local Includes #include "application.h" +// Qt Includes +#include + +// Forward Declarations class QTreeView; class KUrl; class TreeProxyModel; diff --git a/src/searchbar.h b/src/searchbar.h index 3fdf55b4..29588c58 100644 --- a/src/searchbar.h +++ b/src/searchbar.h @@ -34,6 +34,7 @@ class QNetworkReply; /** * This class defines an internet search bar. + * */ class SearchBar : public KLineEdit { diff --git a/src/sidepanel.cpp b/src/sidepanel.cpp index 0fab81c0..85e11920 100644 --- a/src/sidepanel.cpp +++ b/src/sidepanel.cpp @@ -50,4 +50,3 @@ SidePanel::~SidePanel() delete m_panelHistory; } - diff --git a/src/sidepanel.h b/src/sidepanel.h index c0af7827..7c0612ad 100644 --- a/src/sidepanel.h +++ b/src/sidepanel.h @@ -20,12 +20,13 @@ #ifndef SIDEPANEL_H #define SIDEPANEL_H -// Qt Includes -#include - // Local Includes #include "application.h" +// Qt Includes +#include + +// Forward Declarations class KUrl; class PanelHistory; diff --git a/src/stackedurlbar.h b/src/stackedurlbar.h index d3aea16f..ef3392e9 100644 --- a/src/stackedurlbar.h +++ b/src/stackedurlbar.h @@ -26,10 +26,12 @@ // Qt Includes #include +// Forward Declarations class KCompletion; class HistoryCompletionModel; class UrlBar; + class StackedUrlBar : public QStackedWidget { Q_OBJECT @@ -61,4 +63,3 @@ private: }; #endif // STACKEDURLBAR_H - diff --git a/src/tabbar.cpp b/src/tabbar.cpp index be1b05fd..bf3f0b4e 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -39,7 +39,9 @@ #include // Qt Includes -#include +#include + +#include TabBar::TabBar(QWidget *parent) diff --git a/src/tabbar.h b/src/tabbar.h index 8563793f..14f2e35b 100644 --- a/src/tabbar.h +++ b/src/tabbar.h @@ -26,8 +26,8 @@ // KDE Includes #include -// Qt Includes -#include +// Forward Declarations +class QPoint; /** * Tab bar with a few more features such as diff --git a/src/urlbar.cpp b/src/urlbar.cpp index 29eaed70..e2756aa6 100644 --- a/src/urlbar.cpp +++ b/src/urlbar.cpp @@ -24,15 +24,6 @@ #include "urlbar.h" #include "urlbar.moc" -// Qt Includes -#include -#include - -// KDE Includes -#include -#include -#include - // Local Includes #include "application.h" #include "history.h" @@ -40,6 +31,16 @@ #include "mainwindow.h" #include "webview.h" +// KDE Includes +#include +#include +#include + +// Qt Includes +#include +#include +#include + QColor UrlBar::s_defaultBaseColor; diff --git a/src/urlbar.h b/src/urlbar.h index 236792bd..d8fb9029 100644 --- a/src/urlbar.h +++ b/src/urlbar.h @@ -23,18 +23,18 @@ #ifndef URLBAR_H #define URLBAR_H -// Qt Includes -#include -#include -#include + +// Local Includes +#include "lineedit.h" // KDE Includes #include #include -// Local Includes -#include "lineedit.h" - +// Qt Includes +#include +#include +#include // Forward Declarations class QLinearGradient; diff --git a/src/webview.cpp b/src/webview.cpp index c90b65d5..a8efaa2d 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -45,10 +45,22 @@ #include // Qt Includes -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include WebPage::WebPage(QObject *parent) @@ -210,7 +222,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) { path = QString("http://doc.trolltech.com/4.5/%1.html").arg(className); } - QUrl url(path); + KUrl url(path); Application::instance()->mainWindow()->loadUrl(url); return; -- cgit v1.2.1