GPL compliance check...

[architektonas] / src / forms / librarywidget.cpp

diff --git a/src/forms/librarywidget.cpp b/src/forms/librarywidget.cpp
index 193914e9941e8158fddbdb5cd6a6925814817e5d..a776438de4d8462fa6c63216afe7addff05f0512 100644 (file)
--- a/src/forms/librarywidget.cpp
+++ b/src/forms/librarywidget.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 <jlhamm@acm.org>
 //
@@ -14,10 +16,10 @@
 
 #include "librarywidget.h"
 
-#include "rs_graphic.h"
+#include "drawing.h"
 #include "rs_staticgraphicview.h"
 #include "rs_system.h"
-#include "paintintf.h"
+#include "paintinterface.h"
 
 LibraryWidget::LibraryWidget(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
        QWidget(parent, flags), actionHandler(NULL)
@@ -70,17 +72,17 @@ void LibraryWidget::insert()
        {
                if (actionHandler != NULL)
                {
-                       RS_ActionInterface * a = actionHandler->setCurrentAction(RS2::ActionLibraryInsert);
+                       ActionInterface * a = actionHandler->setCurrentAction(RS2::ActionLibraryInsert);
 
                        if (a != NULL)
                        {
-                               RS_ActionLibraryInsert * action = (RS_ActionLibraryInsert *)a;
+                               ActionLibraryInsert * action = (ActionLibraryInsert *)a;
                                action->setFile(dxfPath);
                        }
                        else
                        {
                                RS_DEBUG->print(RS_Debug::D_ERROR, "LibraryWidget::insert:"
-                                       "Cannot create action RS_ActionLibraryInsert");
+                                       "Cannot create action ActionLibraryInsert");
                        }
                }
        }
@@ -385,7 +387,7 @@ QString LibraryWidget::getPathToPixmap(const QString & dir, const QString & dxfF
        qpntr.eraseRect(0, 0, 128, 128);
 
        RS_StaticGraphicView gv(128, 128, painter);
-       RS_Graphic graphic;
+       Drawing graphic;
 
        if (graphic.open(dxfPath, RS2::FormatUnknown))
        {