X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fqg_dialogfactory.h;h=8696e997811fbe64b53836fbfec1a381cd478c2a;hb=c5e595b3156fdf5f93ab6a1032dcc77e859ac6fa;hp=d901cd7e07ab0cca17255254704cfbf03d50e6d5;hpb=3f46c180da0806c9c263e6d87d0f1404632402da;p=architektonas diff --git a/src/widgets/qg_dialogfactory.h b/src/widgets/qg_dialogfactory.h index d901cd7..8696e99 100644 --- a/src/widgets/qg_dialogfactory.h +++ b/src/widgets/qg_dialogfactory.h @@ -7,12 +7,13 @@ #include "rs_debug.h" class CadToolBar; -class CoordinateWidget; -class SelectionWidget; -class MouseWidget; class CommandWidget; -class QG_MainWindowInterface; +class CoordinateWidget; class RS_Document; +class GraphicView; +class QG_MainWindowInterface; +class MouseWidget; +class SelectionWidget; #define QG_DIALOGFACTORY (RS_DialogFactory::instance()->getFactoryObject()->isAdapter()==false ? ((QG_DialogFactory*)RS_DialogFactory::instance()->getFactoryObject()) : NULL) @@ -24,12 +25,10 @@ class RS_Document; class QG_DialogFactory: public RS_DialogFactoryInterface { public: -// QG_DialogFactory(QWidget * parent, QWidget * ow); QG_DialogFactory(QWidget * parent, QToolBar * ow); virtual ~QG_DialogFactory(); protected: -// virtual void setOptionWidget(QWidget * ow); virtual void setOptionWidget(QToolBar * ow); public: @@ -43,7 +42,7 @@ class QG_DialogFactory: public RS_DialogFactoryInterface virtual void setMainWindow(QG_MainWindowInterface * mw); virtual void requestWarningDialog(const QString& warning); - virtual RS_GraphicView * requestNewDocument(const QString& fileName = QString::null, + virtual GraphicView * requestNewDocument(const QString & fileName = QString::null, RS_Document * doc = NULL); virtual void requestSimulationControls(); @@ -129,8 +128,6 @@ class QG_DialogFactory: public RS_DialogFactoryInterface //! Pointer to the widget which can host dialogs QWidget * parent; //! Pointer to the widget which can host individual tool options -//[DONE]#warning "!!! Need to change optionWidget from class QWidget to QToolBar !!!" -// QWidget * optionWidget; QToolBar * optionWidget; //! Pointer to the coordinate widget. CoordinateWidget * coordinateWidget;