X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/edb2c4ad62f874b37c7aba6c06479dfdaf647120..328de208710faebaa275e2ef8ddb28a78ea5a2f0:/src/generalsettingspage.cpp

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 64f37161c..0ad747590 100644
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
 #include "generalsettingspage.h"
@@ -38,17 +38,18 @@
 #include <kvbox.h>
 
 #include "dolphinsettings.h"
-#include "dolphin.h"
+#include "dolphinmainwindow.h"
 #include "dolphinview.h"
 #include "generalsettings.h"
 
-GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
+GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* parent) :
     SettingsPageBase(parent),
+    m_mainWindow(mainWin),
     m_homeUrl(0),
     m_startSplit(0),
     m_startEditable(0)
 {
-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(parent, 2, KDialog::spacingHint());
+    Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 2, KDialog::spacingHint());
 
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
@@ -56,7 +57,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
 
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
 
-    KVBox* vBox = new KVBox(parent);
+    KVBox* vBox = new KVBox(this);
     vBox->setSizePolicy(sizePolicy);
     vBox->setSpacing(spacing);
     vBox->setMargin(margin);
@@ -158,7 +159,7 @@ void GeneralSettingsPage::selectHomeUrl()
 
 void GeneralSettingsPage::useCurrentLocation()
 {
-    const DolphinView* view = Dolphin::mainWin().activeView();
+    const DolphinView* view = m_mainWindow->activeView();
     m_homeUrl->setText(view->url().prettyUrl());
 }