X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fqg_dialogfactory.h;h=8696e997811fbe64b53836fbfec1a381cd478c2a;hb=f7188d32d0beaef31fc3475be05daea2f018ebec;hp=aee54b575fa2a59e133088a771e699ebeb216094;hpb=89e127aa3dbd74d3158e6dbe0ca1703420c04395;p=architektonas diff --git a/src/widgets/qg_dialogfactory.h b/src/widgets/qg_dialogfactory.h index aee54b5..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,11 +25,11 @@ 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: virtual void setCoordinateWidget(CoordinateWidget * cw); @@ -41,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(); @@ -127,7 +128,7 @@ 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 - QWidget * optionWidget; + QToolBar * optionWidget; //! Pointer to the coordinate widget. CoordinateWidget * coordinateWidget; //! Pointer to the mouse widget.