Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / widgets / layerwidget.cpp

diff --git a/src/widgets/layerwidget.cpp b/src/widgets/layerwidget.cpp
index 0a5c4d55691ccbc07d73182b0e094e0bd2d83835..5dfe475591f5a6eb00e03e803144fb58b334bd77 100644 (file)
--- a/src/widgets/layerwidget.cpp
+++ b/src/widgets/layerwidget.cpp
@@ -137,7 +137,7 @@ LayerWidget::~LayerWidget()
  *                    it exists.
  *                    false: don't show special layer "ByBlock"
  */
-void LayerWidget::setLayerList(RS_LayerList * layerList, bool showByBlock)
+void LayerWidget::setLayerList(LayerList * layerList, bool showByBlock)
 {
        this->layerList = layerList;
        this->showByBlock = showByBlock;
@@ -149,30 +149,30 @@ void LayerWidget::setLayerList(RS_LayerList * layerList, bool showByBlock)
  */
 void LayerWidget::update()
 {
-       RS_DEBUG->print("LayerWidget::update() begin");
+       DEBUG->print("LayerWidget::update() begin");
 
 #warning "!!!"
 //     int yPos = listBox->contentsY();
 
-       RS_Layer * activeLayer = NULL;
+       Layer * activeLayer = NULL;
 
        if (layerList)
                activeLayer = layerList->getActive();
 
-       RS_DEBUG->print("LayerWidget::update() clearing listBox");
+       DEBUG->print("LayerWidget::update() clearing listBox");
        listBox->clear();
 
        if (!layerList)
        {
-               RS_DEBUG->print("LayerWidget::update() abort");
+               DEBUG->print("LayerWidget::update() abort");
                return;
        }
 
-       RS_DEBUG->print("LayerWidget::update() filling in layers");
+       DEBUG->print("LayerWidget::update() filling in layers");
 
        for(uint i=0; i<layerList->count(); ++i)
        {
-               RS_Layer * layer = layerList->at(i);
+               Layer * layer = layerList->at(i);
 
                // hide layer "ByBlock"?
                if (showByBlock || layer->getName() != "ByBlock")
@@ -189,36 +189,36 @@ void LayerWidget::update()
                }
        }
 
-       RS_DEBUG->print("LayerWidget::update() sorting");
+       DEBUG->print("LayerWidget::update() sorting");
 //     listBox->sort();
        listBox->sortItems(Qt::AscendingOrder);
-       RS_DEBUG->print("LayerWidget::update() reactivating current layer");
+       DEBUG->print("LayerWidget::update() reactivating current layer");
 
-       RS_Layer * l = lastLayer;
+       Layer * l = lastLayer;
        highlightLayer(activeLayer);
        lastLayer = l;
 #warning "!!!"
 //     listBox->setContentsPos(0, yPos);
-       RS_DEBUG->print("LayerWidget::update() end");
+       DEBUG->print("LayerWidget::update() end");
 }
 
 /**
  * Highlights (activates) the given layer and makes it
  * the active layer in the layerlist.
  */
-void LayerWidget::highlightLayer(RS_Layer * layer)
+void LayerWidget::highlightLayer(Layer * layer)
 {
-       RS_DEBUG->print("LayerWidget::highlightLayer() begin");
+       DEBUG->print("LayerWidget::highlightLayer() begin");
 
        if (!layer || !layerList)
        {
-               RS_DEBUG->print("LayerWidget::highlightLayer() abort");
+               DEBUG->print("LayerWidget::highlightLayer() abort");
                return;
        }
 
        QString name = layer->getName();
        highlightLayer(name);
-       RS_DEBUG->print("LayerWidget::highlightLayer() end");
+       DEBUG->print("LayerWidget::highlightLayer() end");
 }
 
 /**
@@ -227,11 +227,11 @@ void LayerWidget::highlightLayer(RS_Layer * layer)
  */
 void LayerWidget::highlightLayer(const QString & name)
 {
-       RS_DEBUG->print("LayerWidget::highlightLayer(name) begin");
+       DEBUG->print("LayerWidget::highlightLayer(name) begin");
 
        if (!layerList)
        {
-               RS_DEBUG->print("LayerWidget::highlightLayer(name) abort");
+               DEBUG->print("LayerWidget::highlightLayer(name) abort");
                return;
        }
 
@@ -249,32 +249,32 @@ void LayerWidget::highlightLayer(const QString & name)
                }
        }
 
-       RS_DEBUG->print("LayerWidget::highlightLayer(name) end");
+       DEBUG->print("LayerWidget::highlightLayer(name) end");
 }
 
-void LayerWidget::layerActivated(RS_Layer * layer)
+void LayerWidget::layerActivated(Layer * layer)
 {
        highlightLayer(layer);
 }
 
-void LayerWidget::layerAdded(RS_Layer * layer)
+void LayerWidget::layerAdded(Layer * layer)
 {
        update();
        highlightLayer(layer);
 }
 
-void LayerWidget::layerEdited(RS_Layer *)
+void LayerWidget::layerEdited(Layer *)
 {
        update();
 }
 
-void LayerWidget::layerRemoved(RS_Layer *)
+void LayerWidget::layerRemoved(Layer *)
 {
        update();
        highlightLayer(layerList->at(0));
 }
 
-void LayerWidget::layerToggled(RS_Layer *)
+void LayerWidget::layerToggled(Layer *)
 {
        update();
 }
@@ -286,7 +286,7 @@ void LayerWidget::layerToggled(RS_Layer *)
 void LayerWidget::slotActivated(void)
 {
        QString layerName = listBox->currentItem()->text();
-       RS_DEBUG->print("LayerWidget::slotActivated(): %s", layerName.toLatin1().data());
+       DEBUG->print("LayerWidget::slotActivated(): %s", layerName.toLatin1().data());
 
        if (!layerList)
                return;
@@ -301,10 +301,10 @@ void LayerWidget::slotActivated(void)
 //void LayerWidget::slotMouseButtonClicked(int /*button*/, Q3ListBoxItem * item, const QPoint & pos)
 void LayerWidget::slotMouseButtonClicked(QListWidgetItem * item)
 {
-       RS_DEBUG->print("LayerWidget::slotMouseButtonClicked()");
+       DEBUG->print("LayerWidget::slotMouseButtonClicked()");
        QPoint p = mapFromGlobal(QCursor::pos());
        // only change state / no activation
-       RS_Layer * l = lastLayer;
+       Layer * l = lastLayer;
 
 #warning "!!! Bad implementation of lock/freeze functionality !!!"
 //This is crap.