Improve separation of ToolBoxPages and the RCW.

Instead of adding themselves to the RCW in the constructor, just
initialize the page there and count on the user to add the page when
needed.

1 files changed, 5 insertions, 4 deletions

diff --git a/library/components/locationui.cpp b/library/components/locationui.cpp
index 4d1f6ff..b0a08e7 100644
--- a/library/components/locationui.cpp
+++ b/library/components/locationui.cpp
@@ -1,7 +1,7 @@
 #include "locationui.h"
 
 #include "optionsitem.h"
-#include "remotecontrolwidget.h"
+#include "toolbox.h"
 
 #include <QtGui/QLineEdit>
 #include <QtGui/QDoubleValidator>
@@ -9,8 +9,8 @@
 #include <QtGui/QBoxLayout>
 #include <QtGui/QDateTimeEdit>
 
-LocationUi::LocationUi(RemoteControlWidget *w)
-    : QObject(w)
+LocationUi::LocationUi(QWidget *parent)
+    : ToolBoxPage(parent)
     , mLatitudeEdit(0)
     , mLongitudeEdit(0)
     , mAltitudeEdit(0)
@@ -56,7 +56,8 @@ LocationUi::LocationUi(RemoteControlWidget *w)
     item->setTags(tags);
     optionsList << item;
 
-    w->addToolBoxPage(tr("Location"), optionsList);
+    setOptions(optionsList);
+    setTitle(tr("Location"));
 }
 
 void LocationUi::updateLocationTime()