Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / widgets / blockwidget.cpp

diff --git a/src/widgets/blockwidget.cpp b/src/widgets/blockwidget.cpp
index 34e0542f5ad3cb3d1315844c8071946c9bb2cff4..a6b2e47df5c4247c9b223fdd6a897c5ffdf875d4 100644 (file)
--- a/src/widgets/blockwidget.cpp
+++ b/src/widgets/blockwidget.cpp
@@ -155,13 +155,13 @@ BlockWidget::~BlockWidget()
        delete listBox;
 }
 
-void BlockWidget::setBlockList(RS_BlockList * blockList)
+void BlockWidget::setBlockList(BlockList * blockList)
 {
        this->blockList = blockList;
        update();
 }
 
-RS_BlockList * BlockWidget::getBlockList()
+BlockList * BlockWidget::getBlockList()
 {
        return blockList;
 }
@@ -171,12 +171,12 @@ RS_BlockList * BlockWidget::getBlockList()
  */
 void BlockWidget::update()
 {
-       RS_DEBUG->print("BlockWidget::update()");
+       DEBUG->print("BlockWidget::update()");
 
 #warning "!!!"
 //     int yPos = listBox->contentsY();
 
-       RS_Block * activeBlock = NULL;
+       Block * activeBlock = NULL;
 
        if (blockList)
                activeBlock = blockList->getActive();
@@ -185,13 +185,13 @@ void BlockWidget::update()
 
        if (!blockList)
        {
-               RS_DEBUG->print("BlockWidget::update(): blockList is NULL");
+               DEBUG->print("BlockWidget::update(): blockList is NULL");
                return;
        }
 
        for(uint i=0; i<blockList->count(); ++i)
        {
-               RS_Block * blk = blockList->at(i);
+               Block * blk = blockList->at(i);
 
                if (!blk->isFrozen())
 //                     listBox->insertItem(pxmVisible, blk->getName());
@@ -204,7 +204,7 @@ void BlockWidget::update()
 //     listBox->sort();
        listBox->sortItems(Qt::AscendingOrder);
 
-       RS_Block * b = lastBlock;
+       Block * b = lastBlock;
        highlightBlock(activeBlock);
        lastBlock = b;
 #warning "!!!"
@@ -212,16 +212,16 @@ void BlockWidget::update()
 
        //highlightBlock(blockList->getActiveBlock());
        //listBox->setContentsPos(0, yPos);
-       RS_DEBUG->print("BlockWidget::update() done");
+       DEBUG->print("BlockWidget::update() done");
 }
 
 /**
  * Highlights (activates) the given block and makes it
  * the active block in the blocklist.
  */
-void BlockWidget::highlightBlock(RS_Block * block)
+void BlockWidget::highlightBlock(Block * block)
 {
-       RS_DEBUG->print("BlockWidget::highlightBlock()");
+       DEBUG->print("BlockWidget::highlightBlock()");
 
        if (!block || !listBox)
                return;
@@ -241,22 +241,22 @@ void BlockWidget::highlightBlock(RS_Block * block)
        }
 }
 
-/*virtual*/ void BlockWidget::blockAdded(RS_Block *)
+/*virtual*/ void BlockWidget::blockAdded(Block *)
 {
        update();
 }
 
-/*virtual*/ void BlockWidget::blockEdited(RS_Block *)
+/*virtual*/ void BlockWidget::blockEdited(Block *)
 {
        update();
 }
 
-/*virtual*/ void BlockWidget::blockRemoved(RS_Block *)
+/*virtual*/ void BlockWidget::blockRemoved(Block *)
 {
        update();
 }
 
-/*virtual*/ void BlockWidget::blockToggled(RS_Block *)
+/*virtual*/ void BlockWidget::blockToggled(Block *)
 {
        update();
 }
@@ -267,14 +267,14 @@ void BlockWidget::highlightBlock(RS_Block * block)
  */
 /*
 void BlockWidget::slotToggleView(QListBoxItem* item) {
-    RS_DEBUG->print("BlockWidget::slotToggleView()");
+    DEBUG->print("BlockWidget::slotToggleView()");
 
     if (item==NULL || blockList==NULL) {
         return;
     }
 
     int index = listBox->index(item);
-    RS_Block* block = blockList->find(item->text());
+    Block* block = blockList->find(item->text());
 
     if (block!=NULL) {
         blockList->toggleBlock(item->text());
@@ -295,7 +295,7 @@ void BlockWidget::slotToggleView(QListBoxItem* item) {
 void BlockWidget::slotActivated(void)
 {
        QString blockName = listBox->currentItem()->text();
-       RS_DEBUG->print("BlockWidget::slotActivated(): %s", blockName.toLatin1().data());
+       DEBUG->print("BlockWidget::slotActivated(): %s", blockName.toLatin1().data());
 
        if (!blockList)
                return;
@@ -311,7 +311,7 @@ void BlockWidget::slotActivated(void)
 void BlockWidget::slotMouseButtonClicked(QListWidgetItem * item)
 {
        QPoint p = mapFromGlobal(QCursor::pos());
-       RS_Block * b = lastBlock;
+       Block * b = lastBlock;
 
 //This is crap. We need to fix this so it's not so shitty.
        if (p.x() < 23)