summaryrefslogtreecommitdiff
path: root/src/settings/settingsdialog.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-12-15 17:01:04 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-12-15 17:01:04 +0100
commit1be07ceabb90b9ca510dd6ff3f2f3bdb6e448543 (patch)
tree8897b7fd209889561a5047f4fdc9edd95f61ee38 /src/settings/settingsdialog.cpp
parentMerge commit 'refs/merge-requests/71' of git://gitorious.org/rekonq/mainline ... (diff)
parentfactor out WebTab class from WebView (diff)
downloadrekonq-1be07ceabb90b9ca510dd6ff3f2f3bdb6e448543.tar.xz
I tried a bit, but this is not working pretty well :(
We are actually creating two widget for request. I'll merge it anyway to let you fix it :) Merge commit 'refs/merge-requests/72' of git://gitorious.org/rekonq/mainline into m72 Conflicts: src/mainview.cpp src/webview.cpp
Diffstat (limited to 'src/settings/settingsdialog.cpp')
-rw-r--r--src/settings/settingsdialog.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index ee0c1794..e37481aa 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -36,7 +36,7 @@
// Local Includes
#include "application.h"
#include "mainwindow.h"
-#include "webview.h"
+#include "webtab.h"
//Ui Includes
#include "ui_settings_general.h"
@@ -235,9 +235,9 @@ bool SettingsDialog::hasChanged()
void SettingsDialog::setHomeToCurrentPage()
{
MainWindow *mw = static_cast<MainWindow*>(parent());
- WebView *webView = mw->currentTab();
- if (webView)
+ WebTab *webTab = mw->currentTab();
+ if (webTab)
{
- d->generalUi.kcfg_homePage->setText(webView->url().prettyUrl());
+ d->generalUi.kcfg_homePage->setText(webTab->url().prettyUrl());
}
}