diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-11-07 22:33:11 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-11-07 22:33:11 +0100 |
| commit | 4bb3ca9452cb165d8ca8da5e3fc5bcfe1b9cfd1a (patch) | |
| tree | 151d078b89a94ea10142c0979db8306119ad6865 /src/history | |
| parent | Let suggestions work also without search engines ones. (diff) | |
| parent | Bug when a bookmark contains a '&' fixed in some cases (diff) | |
| download | rekonq-4bb3ca9452cb165d8ca8da5e3fc5bcfe1b9cfd1a.tar.xz | |
Merge branch 'master' of git.kde.org:rekonq
Diffstat (limited to 'src/history')
| -rw-r--r-- | src/history/historypanel.cpp | 2 | ||||
| -rw-r--r-- | src/history/historypanel.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp index 28f7f4ee..d1b02c42 100644 --- a/src/history/historypanel.cpp +++ b/src/history/historypanel.cpp @@ -144,7 +144,7 @@ void HistoryPanel::setup() } -QAbstractItemModel* HistoryPanel::getModel() +QAbstractItemModel* HistoryPanel::model() { return Application::historyManager()->historyTreeModel(); } diff --git a/src/history/historypanel.h b/src/history/historypanel.h index 0a5ae216..00aca4a9 100644 --- a/src/history/historypanel.h +++ b/src/history/historypanel.h @@ -53,7 +53,7 @@ private Q_SLOTS: private: virtual void setup(); - virtual QAbstractItemModel* getModel(); + virtual QAbstractItemModel* model(); }; #endif // HISTORYPANEL_H |