Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / forms / blockdialog.cpp

diff --git a/src/forms/blockdialog.cpp b/src/forms/blockdialog.cpp
index 335e5497b004fb8f7a3ccb98f308f5ad2151e45b..a97acbca92e7b3f0b1e38cfb388bcbbf202d8aa2 100644 (file)
--- a/src/forms/blockdialog.cpp
+++ b/src/forms/blockdialog.cpp
@@ -29,26 +29,26 @@ BlockDialog::~BlockDialog()
 {
 }
 
-void BlockDialog::setBlockList(RS_BlockList * l)
+void BlockDialog::setBlockList(BlockList * l)
 {
-       RS_DEBUG->print("BlockDialog::setBlockList");
+       DEBUG->print("BlockDialog::setBlockList");
        blockList = l;
 
        if (blockList != NULL)
        {
-               RS_Block * block = blockList->getActive();
+               Block * block = blockList->getActive();
 
                if (block != NULL)
                        ui.leName->setText(block->getName());
                else
-                       RS_DEBUG->print(RS_Debug::D_ERROR, "BlockDialog::setBlockList: No block active.");
+                       DEBUG->print(Debug::D_ERROR, "BlockDialog::setBlockList: No block active.");
        }
 }
 
-RS_BlockData BlockDialog::getBlockData()
+BlockData BlockDialog::getBlockData()
 {
     /*if (blockList!=NULL) {
-      RS_Block* block = blockList->getActive();
+      Block* block = blockList->getActive();
         if (block!=NULL) {
            return blockList->rename(block, leName->text().latin1());
         }
@@ -56,7 +56,7 @@ RS_BlockData BlockDialog::getBlockData()
 
     return false;*/
 
-       return RS_BlockData(ui.leName->text(), Vector(0.0, 0.0), false);
+       return BlockData(ui.leName->text(), Vector(0.0, 0.0), false);
 }
 
 void BlockDialog::validate()