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/webtab.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/webtab.h')
| -rw-r--r-- | src/webtab.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/webtab.h b/src/webtab.h index 04d0a6e3..12f528d9 100644 --- a/src/webtab.h +++ b/src/webtab.h @@ -35,6 +35,9 @@ // Local Includes #include "webview.h" +// KDE Includes +#include <KParts/Part> + // Qt Includes #include <QtGui/QWidget> @@ -65,16 +68,20 @@ public: bool hasRSSInfo(); bool isPageLoading(); -private slots: + KParts::ReadOnlyPart *part() { return m_part; } + void setPart(KParts::ReadOnlyPart *p, const KUrl &u); + +private Q_SLOTS: void updateProgress(int progress); void loadFinished(bool); void createWalletBar(const QString &, const QUrl &); void showRSSInfo(QPoint pos); -signals: +Q_SIGNALS: void loadProgressing(); - + void titleChanged(const QString &); + private: WebView *const m_webView; UrlBar *const m_urlBar; @@ -83,6 +90,8 @@ private: QWeakPointer<WalletBar> m_walletBar; QWeakPointer<PreviewSelectorBar> m_previewSelectorBar; + + KParts::ReadOnlyPart *m_part; }; #endif |