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/mainwindow.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/mainwindow.h')
| -rw-r--r-- | src/mainwindow.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index 0395db4d..33fd2021 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -84,7 +84,7 @@ private: void setupToolbars(); void setupPanels(); -public slots: +public Q_SLOTS: void homePage(Qt::MouseButtons = Qt::LeftButton, Qt::KeyboardModifiers = Qt::NoModifier); /** @@ -108,12 +108,15 @@ public slots: void findPrevious(); void updateHighlight(); -signals: +Q_SIGNALS: // switching tabs void ctrlTabPressed(); void shiftCtrlTabPressed(); - -protected slots: + + void triggerPartPrint(); + void triggerPartFind(); + +protected Q_SLOTS: void saveNewToolbarConfig(); protected: @@ -126,7 +129,7 @@ protected: bool queryClose(); -private slots: +private Q_SLOTS: void postLaunch(); void browserLoading(bool); void updateWindowTitle(const QString &title = QString()); |