Beginnings of new render path (Snapper)...

[architektonas] / src / base / rs_eventhandler.cpp

diff --git a/src/base/rs_eventhandler.cpp b/src/base/rs_eventhandler.cpp
index 20e748461fc9e5a390f05125c7754145011c0bc7..d12d76bab277ed44e100cd1a3aaed0725b2f15bc 100644 (file)
--- a/src/base/rs_eventhandler.cpp
+++ b/src/base/rs_eventhandler.cpp
@@ -634,14 +634,14 @@ void RS_EventHandler::cleanUp()
        // Resume last used action:
        if (doResume)
        {
-               if (currentActions[resume] != NULL && !currentActions[resume]->isFinished())
+               if (currentActions[resume] && !currentActions[resume]->isFinished())
                {
                        currentActions[resume]->resume();
                        currentActions[resume]->showOptions();
                }
                else
                {
-                       if (defaultAction != NULL)
+                       if (defaultAction)
                        {
                                defaultAction->resume();
                                defaultAction->showOptions();
@@ -658,10 +658,10 @@ void RS_EventHandler::cleanUp()
 void RS_EventHandler::setSnapMode(RS2::SnapMode sm)
 {
        for(int c=0; c<RS_MAXACTIONS; ++c)
-               if (currentActions[c] != NULL)
+               if (currentActions[c])
                        currentActions[c]->setSnapMode(sm);
 
-       if (defaultAction!=NULL)
+       if (defaultAction)
                defaultAction->setSnapMode(sm);
 }
 
@@ -671,10 +671,10 @@ void RS_EventHandler::setSnapMode(RS2::SnapMode sm)
 void RS_EventHandler::setSnapRestriction(RS2::SnapRestriction sr)
 {
        for(int c=0; c<RS_MAXACTIONS; ++c)
-               if (currentActions[c] != NULL)
+               if (currentActions[c])
                        currentActions[c]->setSnapRestriction(sr);
 
-       if (defaultAction != NULL)
+       if (defaultAction)
                defaultAction->setSnapRestriction(sr);
 }