diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-11-20 19:05:33 +0100 |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-11-20 19:10:14 +0100 |
| commit | 11769558f3f9107c45457ba7c735a1991e42f625 (patch) | |
| tree | ffd7057c77794364291a030aa73aa534fb0ea863 /src/mainview.h | |
| parent | Remove the destructor of MainView (diff) | |
| parent | Fix markup: (diff) | |
| download | rekonq-11769558f3f9107c45457ba7c735a1991e42f625.tar.xz | |
Merge branch 'master' of git://git.kde.org/rekonq
Conflicts:
src/mainview.cpp
src/mainview.h
src/webtab.cpp
src/webtab.h
Diffstat (limited to 'src/mainview.h')
| -rw-r--r-- | src/mainview.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mainview.h b/src/mainview.h index 46e4133b..3cb34886 100644 --- a/src/mainview.h +++ b/src/mainview.h @@ -68,11 +68,13 @@ public: MainView(MainWindow *parent); inline StackedUrlBar *widgetBar() const { return m_widgetBar; } - UrlBar *urlBar() const; - WebTab *webTab(int index) const; TabBar *tabBar() const; + WebTab *currentWebTab() const; + UrlBar *currentUrlBar() const; + + WebTab *webTab(int index) const; /** * show and hide TabBar if user doesn't choose @@ -96,7 +98,7 @@ public: inline QList<HistoryItem> recentlyClosedTabs() { return m_recentlyClosedTabs; } -signals: +Q_SIGNALS: // tab widget signals void tabsChanged(); void lastTabClosed(); @@ -109,7 +111,7 @@ signals: void printRequested(QWebFrame *frame); -public slots: +public Q_SLOTS: /** * Core browser slot. This create a new tab with a WebView inside * for browsing and follows rekonq settings about opening there a @@ -142,7 +144,7 @@ public slots: void webReload(); void webStop(); -private slots: +private Q_SLOTS: void currentChanged(int index); void webViewLoadStarted(); |