Update to trunk

(bzr r15295.1.2)

2 files changed, 14 insertions, 14 deletions

diff --git a/src/live_effects/lpe-measure-line.cpp b/src/live_effects/lpe-measure-line.cpp
index 9238f2571..ef270d849 100644
--- a/src/live_effects/lpe-measure-line.cpp
+++ b/src/live_effects/lpe-measure-line.cpp
@@ -677,22 +677,22 @@ LPEMeasureLine::doBeforeEffect (SPLPEItem const* lpeitem)
 void
 LPEMeasureLine::doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/)
 {
-    processObjects(MA_VISIBILITY);
+    processObjects(LPE_VISIBILITY);
 }
 
 void 
 LPEMeasureLine::doOnRemove (SPLPEItem const* /*lpeitem*/)
 {
     if (!erase_extra_objects) {
-        processObjects(MA_TO_OBJECTS);
+        processObjects(LPE_TO_OBJECTS);
         ml_elements.clear();
         return;
     }
-    processObjects(MA_ERASE);
+    processObjects(LPE_ERASE);
 }
 
 void 
-LPEMeasureLine::processObjects(MeasureAction measure_action)
+LPEMeasureLine::processObjects(LpeAction lpe_action)
 {
 
     if (SPDesktop *desktop = SP_ACTIVE_DESKTOP) {
@@ -704,14 +704,14 @@ LPEMeasureLine::processObjects(MeasureAction measure_action)
             SVGElemRef->attach(SVGElem_uri);
             SPObject *elemref = NULL;
             if (elemref = SVGElemRef->getObject()) {
-                switch (measure_action){
-                case MA_TO_OBJECTS:
+                switch (lpe_action){
+                case LPE_TO_OBJECTS:
                     elemref->getRepr()->setAttribute("sodipodi:insensitive", NULL);
                 break;
-                case MA_ERASE:
+                case LPE_ERASE:
                     elemref->deleteObject();
                 break;
-                default: //MA_VISIBILITY
+                default: //LPE_VISIBILITY
                     if (!this->isVisible()) {
                         elemref->getRepr()->setAttribute("style", "display:none");
                     } else {
@@ -721,7 +721,7 @@ LPEMeasureLine::processObjects(MeasureAction measure_action)
                 }
             }
         }
-        if (measure_action == MA_ERASE) {
+        if (lpe_action == LPE_ERASE) {
             ml_elements.clear();
         }
     }
diff --git a/src/live_effects/lpe-measure-line.h b/src/live_effects/lpe-measure-line.h
index ed8224ab6..a05189039 100644
--- a/src/live_effects/lpe-measure-line.h
+++ b/src/live_effects/lpe-measure-line.h
@@ -32,10 +32,10 @@ enum OrientationMethod {
     OM_END
 };
 
-enum MeasureAction {
-    MA_ERASE = 0,
-    MA_TO_OBJECTS,
-    MA_VISIBILITY
+enum LpeAction {
+    LPE_ERASE = 0,
+    LPE_TO_OBJECTS,
+    LPE_VISIBILITY
 };
 
 class LPEMeasureLine : public Effect {
@@ -47,7 +47,7 @@ public:
     virtual void doOnRemove (SPLPEItem const* /*lpeitem*/);
     virtual void doOnVisibilityToggled(SPLPEItem const* /*lpeitem*/);
     virtual Geom::PathVector doEffect_path(Geom::PathVector const &path_in);
-    void processObjects(MeasureAction measure_action);
+    void processObjects(LpeAction lpe_action);
     void createLine(Geom::Point start,Geom::Point end,Glib::ustring id, bool main, bool overflow, bool remove, bool arrows = false);
     void createTextLabel(Geom::Point pos, double length, Geom::Coord angle, bool remove, bool valid);
     void onExpanderChanged();