Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / forms / librarywidget.cpp

diff --git a/src/forms/librarywidget.cpp b/src/forms/librarywidget.cpp
index 607b5a1ad040d29021e1e36326c6188176f706cd..19a194dd1feff2c60931e27edad4fcf00e5b8485 100644 (file)
--- a/src/forms/librarywidget.cpp
+++ b/src/forms/librarywidget.cpp
@@ -44,7 +44,7 @@ std::cout << "LibraryWidget::LibraryWidget()" << std::endl;
        ui.setupUi(this);
        ui.lvDirectory->setColumnCount(1);
 
-       QStringList directoryList = RS_SYSTEM->getDirectoryList("library");
+       QStringList directoryList = SYSTEM->getDirectoryList("library");
 #if 0
 std::cout << "directorySize = " << directoryList.size() << std::endl;
 
@@ -105,14 +105,14 @@ void LibraryWidget::insert()
                        }
                        else
                        {
-                               RS_DEBUG->print(RS_Debug::D_ERROR, "LibraryWidget::insert:"
+                               DEBUG->print(Debug::D_ERROR, "LibraryWidget::insert:"
                                        "Cannot create action ActionLibraryInsert");
                        }
                }
        }
        else
        {
-               RS_DEBUG->print(RS_Debug::D_ERROR,
+               DEBUG->print(Debug::D_ERROR,
                        "LibraryWidget::insert: Can't read file: '%s'", dxfPath.toLatin1().data());
        }
 }
@@ -186,7 +186,7 @@ void LibraryWidget::updatePreview(QTreeWidgetItem * item, int /*column*/)
        ui.ivPreview->clear();
 
        // List of all directories that contain part libraries:
-       QStringList directoryList = RS_SYSTEM->getDirectoryList("library");
+       QStringList directoryList = SYSTEM->getDirectoryList("library");
        QStringList::Iterator it;
        QDir itemDir;
        QStringList itemPathList;
@@ -253,7 +253,7 @@ QString LibraryWidget::getItemPath(QListWidgetItem * item)
        if (item)
        {
                // List of all directories that contain part libraries:
-               QStringList directoryList = RS_SYSTEM->getDirectoryList("library");
+               QStringList directoryList = SYSTEM->getDirectoryList("library");
                QStringList::Iterator it;
                QDir itemDir;
 
@@ -305,12 +305,12 @@ QPixmap LibraryWidget::getPixmap(const QString & dir, const QString & dxfFile,
 QString LibraryWidget::getPathToPixmap(const QString & dir, const QString & dxfFile,
        const QString & dxfPath)
 {
-       RS_DEBUG->print("LibraryWidget::getPathToPixmap: dir: '%s' dxfFile: '%s' dxfPath: '%s'",
+       DEBUG->print("LibraryWidget::getPathToPixmap: dir: '%s' dxfFile: '%s' dxfPath: '%s'",
                dir.toLatin1().data(), dxfFile.toLatin1().data(), dxfPath.toLatin1().data());
 
        // List of all directories that contain part libraries:
-       QStringList directoryList = RS_SYSTEM->getDirectoryList("library");
-       directoryList.prepend(RS_SYSTEM->getHomeDir() + "/.architektonas/library");
+       QStringList directoryList = SYSTEM->getDirectoryList("library");
+       directoryList.prepend(SYSTEM->getHomeDir() + "/.architektonas/library");
        QStringList::Iterator it;
 
        QFileInfo fiDxf(dxfPath);
@@ -323,25 +323,25 @@ QString LibraryWidget::getPathToPixmap(const QString & dir, const QString & dxfF
        {
                itemDir = (*it) + dir;
                pngPath = itemDir + "/" + fiDxf.completeBaseName() + ".png";
-               RS_DEBUG->print("LibraryWidget::getPathToPixmap: checking: '%s'",
+               DEBUG->print("LibraryWidget::getPathToPixmap: checking: '%s'",
                        pngPath.toLatin1().data());
                QFileInfo fiPng(pngPath);
 
                // the thumbnail exists:
                if (fiPng.isFile())
                {
-                       RS_DEBUG->print("LibraryWidget::getPathToPixmap: dxf date: %s, png date: %s",
+                       DEBUG->print("LibraryWidget::getPathToPixmap: dxf date: %s, png date: %s",
                                fiDxf.lastModified().toString().toLatin1().data(), fiPng.lastModified().toString().toLatin1().data());
 
                        if (fiPng.lastModified() > fiDxf.lastModified())
                        {
-                               RS_DEBUG->print("LibraryWidget::getPathToPixmap: thumbnail found: '%s'",
+                               DEBUG->print("LibraryWidget::getPathToPixmap: thumbnail found: '%s'",
                                        pngPath.toLatin1().data());
                                return pngPath;
                        }
                        else
                        {
-                               RS_DEBUG->print("LibraryWidget::getPathToPixmap: thumbnail needs to be updated: '%s'",
+                               DEBUG->print("LibraryWidget::getPathToPixmap: thumbnail needs to be updated: '%s'",
                                        pngPath.toLatin1().data());
                        }
                }
@@ -349,8 +349,8 @@ QString LibraryWidget::getPathToPixmap(const QString & dir, const QString & dxfF
 
        // The thumbnail must be created in the user's home.
        // So, create all directories needed:
-       RS_SYSTEM->createHomePath("/.architektonas/library" + dir);
-       QString d = RS_SYSTEM->getHomeDir() + "/.architektonas/library" + dir;
+       SYSTEM->createHomePath("/.architektonas/library" + dir);
+       QString d = SYSTEM->getHomeDir() + "/.architektonas/library" + dir;
        pngPath = d + "/" + fiDxf.completeBaseName() + ".png";
 
        QPixmap buffer(128, 128);
@@ -359,17 +359,17 @@ QString LibraryWidget::getPathToPixmap(const QString & dir, const QString & dxfF
        qpntr.setBackground(Qt::white);
        qpntr.eraseRect(0, 0, 128, 128);
 
-       RS_StaticGraphicView view(128, 128, painter);
+       StaticGraphicView view(128, 128, painter);
        Drawing drawing;
 
        if (drawing.open(dxfPath, RS2::FormatUnknown))
        {
-               RS_Color black(0, 0, 0);
+               Color black(0, 0, 0);
 
                // Set all pens in the drawing to BLACK
-               for(RS_Entity * e=drawing.firstEntity(RS2::ResolveAll); e!=NULL; e=drawing.nextEntity(RS2::ResolveAll))
+               for(Entity * e=drawing.firstEntity(RS2::ResolveAll); e!=NULL; e=drawing.nextEntity(RS2::ResolveAll))
                {
-                       RS_Pen pen = e->getPen();
+                       Pen pen = e->getPen();
                        pen.setColor(black);
                        e->setPen(pen);
                }
@@ -386,7 +386,7 @@ QString LibraryWidget::getPathToPixmap(const QString & dir, const QString & dxfF
 
                if (!writer.write(image))
                {
-                       RS_DEBUG->print(RS_Debug::D_ERROR,
+                       DEBUG->print(Debug::D_ERROR,
                                "LibraryWidget::getPathToPixmap: Cannot write thumbnail: '%s'",
                                pngPath.toLatin1().data());
                        pngPath = "";
@@ -394,7 +394,7 @@ QString LibraryWidget::getPathToPixmap(const QString & dir, const QString & dxfF
        }
        else
        {
-               RS_DEBUG->print(RS_Debug::D_ERROR, "LibraryWidget::getPathToPixmap: Cannot open file: '%s'", dxfPath.toLatin1().data());
+               DEBUG->print(Debug::D_ERROR, "LibraryWidget::getPathToPixmap: Cannot open file: '%s'", dxfPath.toLatin1().data());
        }
 
        delete painter;