Bugfixes related to removing Snapper class.

[architektonas] / src / widgets / layerwidget.cpp

diff --git a/src/widgets/layerwidget.cpp b/src/widgets/layerwidget.cpp
index 447d4e7e1f991d1c98729c5ebde2e5ac3b8fc585..5dfe475591f5a6eb00e03e803144fb58b334bd77 100644 (file)
--- a/src/widgets/layerwidget.cpp
+++ b/src/widgets/layerwidget.cpp
@@ -17,9 +17,9 @@
 #include "layerwidget.h"
 
 #include "actionhandler.h"
-#include "rs_debug.h"
-#include "rs_layer.h"
-#include "rs_layerlist.h"
+#include "debug.h"
+#include "layer.h"
+#include "layerlist.h"
 
 /**
  * Constructor.
@@ -128,8 +128,6 @@ LayerWidget::LayerWidget(ActionHandler * ah, QWidget * parent,
 LayerWidget::~LayerWidget()
 {
        delete listBox;
-       //delete pxmVisible;
-       //delete pxmHidden;
 }
 
 /**
@@ -139,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;
@@ -151,102 +149,76 @@ 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 != NULL)
+       if (layerList)
                activeLayer = layerList->getActive();
 
-       RS_DEBUG->print("LayerWidget::update() clearing listBox");
-
+       DEBUG->print("LayerWidget::update() clearing listBox");
        listBox->clear();
 
-       if (layerList == NULL)
+       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")
+               if (showByBlock || layer->getName() != "ByBlock")
                {
                        QPixmap * pm = NULL;
 
                        if (!layer->isFrozen())
-                       {
-                               if (!layer->isLocked())
-                               {
-                                       pm = &pxmLayerStatus10;
-                               }
-                               else
-                               {
-                                       pm = &pxmLayerStatus11;
-                               }
-                       }
+                               pm = (!layer->isLocked() ? &pxmLayerStatus10 : &pxmLayerStatus11);
                        else
-                       {
-                               if (!layer->isLocked())
-                               {
-                                       pm = &pxmLayerStatus00;
-                               }
-                               else
-                               {
-                                       pm = &pxmLayerStatus01;
-                               }
-                       }
-
-                       if (pm != NULL)
-                       {
-//                             listBox->insertItem(*pm, layer->getName());
-                               listBox->addItem(new QListWidgetItem(*pm, layer->getName()));
-                       }
+                               pm = (!layer->isLocked() ? &pxmLayerStatus00 : &pxmLayerStatus01);
+
+//                     listBox->insertItem(*pm, layer->getName());
+                       listBox->addItem(new QListWidgetItem(*pm, layer->getName()));
                }
        }
 
-       RS_DEBUG->print("LayerWidget::update() sorting");
-
+       DEBUG->print("LayerWidget::update() sorting");
 //     listBox->sort();
        listBox->sortItems(Qt::AscendingOrder);
+       DEBUG->print("LayerWidget::update() reactivating current layer");
 
-       RS_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 == NULL || layerList == NULL)
+       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");
 }
 
 /**
@@ -255,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 == NULL)
+       if (!layerList)
        {
-               RS_DEBUG->print("LayerWidget::highlightLayer(name) abort");
+               DEBUG->print("LayerWidget::highlightLayer(name) abort");
                return;
        }
 
@@ -277,32 +249,32 @@ void LayerWidget::highlightLayer(const QString & name)
                }
        }
 
-       RS_DEBUG->print("LayerWidget::highlightLayer(name) end");
+       DEBUG->print("LayerWidget::highlightLayer(name) end");
 }
 
-/*virtual*/ void LayerWidget::layerActivated(RS_Layer * layer)
+void LayerWidget::layerActivated(Layer * layer)
 {
        highlightLayer(layer);
 }
 
-/*virtual*/ void LayerWidget::layerAdded(RS_Layer * layer)
+void LayerWidget::layerAdded(Layer * layer)
 {
        update();
        highlightLayer(layer);
 }
 
-/*virtual*/ void LayerWidget::layerEdited(RS_Layer *)
+void LayerWidget::layerEdited(Layer *)
 {
        update();
 }
 
-/*virtual*/ void LayerWidget::layerRemoved(RS_Layer *)
+void LayerWidget::layerRemoved(Layer *)
 {
        update();
        highlightLayer(layerList->at(0));
 }
 
-/*virtual*/ void LayerWidget::layerToggled(RS_Layer *)
+void LayerWidget::layerToggled(Layer *)
 {
        update();
 }
@@ -314,9 +286,9 @@ void LayerWidget::highlightLayer(const QString & name)
 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 == NULL)
+       if (!layerList)
                return;
 
        lastLayer = layerList->getActive();
@@ -329,11 +301,13 @@ 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.
        if (p.x() < 23)
        {
                actionHandler->slotLayersToggleView();
@@ -346,7 +320,7 @@ void LayerWidget::slotMouseButtonClicked(QListWidgetItem * item)
        }
        else
        {
-               if (item != NULL && layerList != NULL)
+               if (item && layerList)
                        lastLayer = layerList->find(item->text());
        }
 }
@@ -402,4 +376,3 @@ void LayerWidget::keyPressEvent(QKeyEvent * e)
         break;
     }
 }
-