diff options
-rw-r--r-- | src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/bookmarks/bookmarkspanel.cpp | 6 | ||||
-rw-r--r-- | src/bookmarks/bookmarkspanel.h | 4 | ||||
-rw-r--r-- | src/history/historypanel.cpp | 4 | ||||
-rw-r--r-- | src/history/historypanel.h | 4 | ||||
-rw-r--r-- | src/paneltreeview.cpp (renamed from src/urltreeview.cpp) | 25 | ||||
-rw-r--r-- | src/paneltreeview.h (renamed from src/urltreeview.h) | 12 |
7 files changed, 29 insertions, 28 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 102935a6..2ab308de 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,11 +15,11 @@ SET( rekonq_KDEINIT_SRCS mainwindow.cpp networkaccessmanager.cpp newtabpage.cpp + paneltreeview.cpp previewselectorbar.cpp protocolhandler.cpp sessionmanager.cpp tabbar.cpp - urltreeview.cpp walletbar.cpp webinspectorpanel.cpp webpage.cpp diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp index 611031b5..0caf0f31 100644 --- a/src/bookmarks/bookmarkspanel.cpp +++ b/src/bookmarks/bookmarkspanel.cpp @@ -51,9 +51,9 @@ BookmarksPanel::BookmarksPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags) - : QDockWidget(title, parent, flags), - m_treeView(new UrlTreeView(this)), - m_loadingState(false) + : QDockWidget(title, parent, flags) + , m_treeView(new PanelTreeView(this)) + , m_loadingState(false) { setup(); setShown(ReKonfig::showBookmarksPanel()); diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h index 86794d3a..90597c73 100644 --- a/src/bookmarks/bookmarkspanel.h +++ b/src/bookmarks/bookmarkspanel.h @@ -33,7 +33,7 @@ // Local Includes #include "rekonqprivate_export.h" #include "application.h" -#include "urltreeview.h" +#include "paneltreeview.h" // Qt Includes #include <QDockWidget> @@ -73,7 +73,7 @@ private: void setup(); KBookmark bookmarkForIndex(const QModelIndex &index); - UrlTreeView *m_treeView; + PanelTreeView *m_treeView; bool m_loadingState; }; diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp index 87b5fe55..8c36dfa8 100644 --- a/src/history/historypanel.cpp +++ b/src/history/historypanel.cpp @@ -52,8 +52,8 @@ HistoryPanel::HistoryPanel(const QString &title, QWidget *parent, Qt::WindowFlags flags) - : QDockWidget(title, parent, flags), - m_treeView(new UrlTreeView(this)) + : QDockWidget(title, parent, flags) + , m_treeView(new PanelTreeView(this)) { setup(); setShown(ReKonfig::showHistoryPanel()); diff --git a/src/history/historypanel.h b/src/history/historypanel.h index 0c01189c..a4dfaf64 100644 --- a/src/history/historypanel.h +++ b/src/history/historypanel.h @@ -32,7 +32,7 @@ // Local Includes #include "rekonqprivate_export.h" #include "application.h" -#include "urltreeview.h" +#include "paneltreeview.h" // Qt Includes #include <QDockWidget> @@ -62,7 +62,7 @@ private slots: private: void setup(); - UrlTreeView *m_treeView; + PanelTreeView *m_treeView; }; #endif // HISTORYPANEL_H diff --git a/src/urltreeview.cpp b/src/paneltreeview.cpp index aeaef2f7..c13caf4d 100644 --- a/src/urltreeview.cpp +++ b/src/paneltreeview.cpp @@ -25,7 +25,8 @@ // Self Includes -#include "urltreeview.h" +#include "paneltreeview.h" +#include "paneltreeview.moc" // Local Includes #include "application.h" @@ -35,7 +36,7 @@ #include <QClipboard> -UrlTreeView::UrlTreeView(QWidget *parent) +PanelTreeView::PanelTreeView(QWidget *parent) : QTreeView(parent) { connect(this, SIGNAL(itemHovered(const QString &)), parent, SIGNAL(itemHovered(const QString &))); @@ -45,12 +46,12 @@ UrlTreeView::UrlTreeView(QWidget *parent) } -UrlTreeView::~UrlTreeView() +PanelTreeView::~PanelTreeView() { } -void UrlTreeView::mousePressEvent(QMouseEvent *event) +void PanelTreeView::mousePressEvent(QMouseEvent *event) { const QModelIndex index = indexAt(event->pos()); bool expanded = isExpanded(index); @@ -87,7 +88,7 @@ void UrlTreeView::mousePressEvent(QMouseEvent *event) } -void UrlTreeView::mouseReleaseEvent(QMouseEvent *event) +void PanelTreeView::mouseReleaseEvent(QMouseEvent *event) { QTreeView::mouseReleaseEvent(event); @@ -108,7 +109,7 @@ void UrlTreeView::mouseReleaseEvent(QMouseEvent *event) } -void UrlTreeView::keyPressEvent(QKeyEvent *event) +void PanelTreeView::keyPressEvent(QKeyEvent *event) { QTreeView::keyPressEvent(event); QModelIndex index = currentIndex(); @@ -131,7 +132,7 @@ void UrlTreeView::keyPressEvent(QKeyEvent *event) } -void UrlTreeView::validOpenUrl(const KUrl &url, Rekonq::OpenType openType) +void PanelTreeView::validOpenUrl(const KUrl &url, Rekonq::OpenType openType) { // To workaround a crash when the url is about:blank if(url.url() == "about:blank") @@ -141,7 +142,7 @@ void UrlTreeView::validOpenUrl(const KUrl &url, Rekonq::OpenType openType) } -void UrlTreeView::mouseMoveEvent(QMouseEvent *event) +void PanelTreeView::mouseMoveEvent(QMouseEvent *event) { QTreeView::mouseMoveEvent(event); const QModelIndex index = indexAt(event->pos()); @@ -154,7 +155,7 @@ void UrlTreeView::mouseMoveEvent(QMouseEvent *event) } -void UrlTreeView::openInCurrentTab() +void PanelTreeView::openInCurrentTab() { QModelIndex index = currentIndex(); if(!index.isValid()) @@ -164,7 +165,7 @@ void UrlTreeView::openInCurrentTab() } -void UrlTreeView::copyToClipboard() +void PanelTreeView::copyToClipboard() { QModelIndex index = currentIndex(); if(!index.isValid()) @@ -175,7 +176,7 @@ void UrlTreeView::copyToClipboard() } -void UrlTreeView::openInNewTab() +void PanelTreeView::openInNewTab() { QModelIndex index = currentIndex(); if(!index.isValid()) @@ -185,7 +186,7 @@ void UrlTreeView::openInNewTab() } -void UrlTreeView::openInNewWindow() +void PanelTreeView::openInNewWindow() { QModelIndex index = currentIndex(); if(!index.isValid()) diff --git a/src/urltreeview.h b/src/paneltreeview.h index cce7a257..93d7a33e 100644 --- a/src/urltreeview.h +++ b/src/paneltreeview.h @@ -24,8 +24,8 @@ * ============================================================ */ -#ifndef URLTREEVIEW_H -#define URLTREEVIEW_H +#ifndef PANELTREEVIEW_H +#define PANELTREEVIEW_H // Local Includes #include "application.h" @@ -34,13 +34,13 @@ #include <QTreeView> -class UrlTreeView : public QTreeView +class PanelTreeView : public QTreeView { Q_OBJECT public: - UrlTreeView(QWidget *parent = 0); - ~UrlTreeView(); + PanelTreeView(QWidget *parent = 0); + ~PanelTreeView(); signals: void openUrl(const KUrl &, const Rekonq::OpenType &); @@ -66,4 +66,4 @@ private: void validOpenUrl(const KUrl &url, Rekonq::OpenType openType = Rekonq::CurrentTab); }; -#endif // URLTREEVIEW_H +#endif // PANELTREEVIEW_H |