X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fmdiwindow.cpp;h=1e7dc797f7e582a624251eed1c8aa0315eb589e8;hb=f34fe4370628985ef1a4a4527cfa85165624e27c;hp=ee6cc3fe009cef478b21250225c836f19c9b97a8;hpb=52b41ea9bcb03acb96393b36fe29f27ca0163565;p=architektonas diff --git a/src/mainapp/mdiwindow.cpp b/src/mainapp/mdiwindow.cpp index ee6cc3f..1e7dc79 100644 --- a/src/mainapp/mdiwindow.cpp +++ b/src/mainapp/mdiwindow.cpp @@ -3,7 +3,9 @@ // Part of the Architektonas Project // Originally part of QCad Community Edition by Andrew Mustun // Extensively rewritten and refactored by James L. Hammons -// (C) 2010 Underground Software +// Portions copyright (C) 2001-2003 RibbonSoft +// Copyright (C) 2010 Underground Software +// See the README and GPLv2 files for licensing and warranty information // // JLH = James L. Hammons // @@ -17,7 +19,7 @@ #include "drawing.h" #include "rs_eventhandler.h" #include "exitdialog.h" -#include "qg_filedialog.h" +#include "filedialog.h" #include "qg_graphicview.h" // Class variable @@ -42,6 +44,8 @@ MDIWindow::MDIWindow(RS_Document * doc, QWidget * parent, const char * name/*= N id = idCounter++; parentWindow = NULL; +//not using this anymore +#if 0 if (document) { if (document->getLayerList()) @@ -52,6 +56,7 @@ MDIWindow::MDIWindow(RS_Document * doc, QWidget * parent, const char * name/*= N // Link the graphic view to the block widget document->getBlockList()->addListener(graphicView); } +#endif //hm. setFocus(/*Qt::StrongFocus*/); @@ -64,11 +69,13 @@ MDIWindow::MDIWindow(RS_Document * doc, QWidget * parent, const char * name/*= N */ MDIWindow::~MDIWindow() { +#if 0 if (document->getLayerList()) document->getLayerList()->removeListener(graphicView); if (document->getBlockList()) document->getBlockList()->removeListener(graphicView); +#endif if (owner && document) delete document; @@ -341,7 +348,7 @@ bool MDIWindow::slotFileSaveAs(bool & cancelled) cancelled = false; RS2::FormatType t = RS2::FormatDXF; - QString fn = QG_FileDialog::getSaveFileName(this, &t); + QString fn = FileDialog::getSaveFileName(this, &t); if (document != NULL && !fn.isEmpty()) {