Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / panels / panel.cpp

diff --git a/src/panels/panel.cpp b/src/panels/panel.cpp
index f26086159b4441573695ea80e5f636d456a3902e..7673134456f7ae84c61375f1a88b927dc8cdd431 100644 (file)
--- a/src/panels/panel.cpp
+++ b/src/panels/panel.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
- *   Copyright (C) 2006-2010 by Peter Penz <peter.penz@gmx.at>             *
+ *   Copyright (C) 2006-2010 by Peter Penz <peter.penz19@gmail.com>        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "panel.h"
-#include <kurl.h>
+#include <KUrl>
 
 Panel::Panel(QWidget* parent) :
     QWidget(parent),
@@ -71,4 +71,8 @@ void Panel::setUrl(const KUrl& url)
     }
 }
 
-#include "panel.moc"
+void Panel::readSettings()
+{
+
+}
+