summaryrefslogtreecommitdiff
path: root/src/mainwindow.h
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-08-10 23:47:57 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-08-10 23:47:57 +0200
commit8b6d7ed54e48940bc98d26fc1b67547ca12993ce (patch)
tree17fd3694356020dc41454815b3b4f97b4e8afc41 /src/mainwindow.h
parentMerge branch 'master' of gitorious.org:rekonq/mainline (diff)
parentFix comments (diff)
downloadrekonq-8b6d7ed54e48940bc98d26fc1b67547ca12993ce.tar.xz
Merge commit 'refs/merge-requests/159' of git://gitorious.org/rekonq/mainline into m159
Diffstat (limited to 'src/mainwindow.h')
-rw-r--r--src/mainwindow.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 96fe0f2d..e5a43649 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -45,6 +45,7 @@
// Forward Declarations
class FindBar;
+class ZoomBar;
class HistoryPanel;
class BookmarksPanel;
class WebInspectorPanel;
@@ -102,8 +103,6 @@ public slots:
void updateActions();
- void setZoomSliderFactor(qreal factor);
-
signals:
// switching tabs
void ctrlTabPressed();
@@ -135,12 +134,6 @@ private slots:
void findPrevious();
void highlightAll();
- // Zoom slots
- void zoomIn();
- void zoomNormal();
- void zoomOut();
- void setZoomFactor(int factor);
-
// File Menu slots
void openLocation();
void fileOpen();
@@ -170,6 +163,7 @@ private slots:
private:
MainView *m_view;
FindBar *m_findBar;
+ ZoomBar *m_zoomBar;
HistoryPanel *m_historyPanel;
BookmarksPanel *m_bookmarksPanel;
@@ -181,8 +175,6 @@ private:
KMenu *m_encodingMenu;
BookmarkToolBar *m_bookmarksBar;
-
- QSlider *m_zoomSlider;
QString m_lastSearch;