Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetToolbox.h

diff --git a/src/ModuleBase/ModuleBase_WidgetToolbox.h b/src/ModuleBase/ModuleBase_WidgetToolbox.h
index 2e106a720903b35294ad6a48600260e28b3ca633..639e90f14da10fd57faa7e709d67af45d574207e 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetToolbox.h
+++ b/src/ModuleBase/ModuleBase_WidgetToolbox.h
@@ -8,38 +8,32 @@
 #ifndef MODULEBASE_WIDGETTOOLBOX_H_
 #define MODULEBASE_WIDGETTOOLBOX_H_
 
-#include <ModuleBase_ModelWidget.h>
+#include <ModuleBase.h>
+#include <ModuleBase_PagedContainer.h>
 
 #include <QToolBox>
 
 class ModuleBase_PageBase;
 
-class ModuleBase_WidgetToolbox : public ModuleBase_ModelWidget
+class MODULEBASE_EXPORT ModuleBase_WidgetToolbox : public ModuleBase_PagedContainer
 {
   Q_OBJECT
  public:
   ModuleBase_WidgetToolbox(QWidget* theParent, const Config_WidgetAPI* theData,
                            const std::string& theParentId);
   virtual ~ModuleBase_WidgetToolbox();
-
-  virtual bool restoreValue();
-  virtual QList<QWidget*> getControls() const;
-  virtual bool focusTo();
-
+  /// Overrides ModuleBase_PagedContainer
   int addPage(ModuleBase_PageBase* theWidget,
               const QString& theName, const QString& theCaseId);
 
  protected:
-  virtual void activateCustom();
-  virtual bool storeValueCustom() const;
-
- protected slots:
-  void onPageChanged();
+  /// Implements ModuleBase_PagedContainer
+  virtual int currentPageIndex() const;
+  /// Implements ModuleBase_PagedContainer
+  virtual void setCurrentPageIndex(int);
 
  private:
   QToolBox* myToolBox;
-  QStringList myCaseIds;
-  QList<ModuleBase_PageBase*> myPages;
 };
 
 #endif /* MODULEBASE_WIDGETTOOLBOX_H_ */