Standardize on 'event' as name for all Qt events.

[pulseview.git] / pv / view / view.cpp

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index c9b08bf8c0445de0783d5bbb16d4d4275f5066f1..9a46bab8c4c4d41ea9f91e36b05d84c96c05b9c7 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -43,7 +43,6 @@
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "analogsignal.hpp"
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "analogsignal.hpp"

-#include "decodetrace.hpp"

 #include "header.hpp"
 #include "logicsignal.hpp"
 #include "ruler.hpp"
 #include "header.hpp"
 #include "logicsignal.hpp"
 #include "ruler.hpp"


@@ -59,6 +58,10 @@
 #include "pv/data/logicsegment.hpp"
 #include "pv/util.hpp"
 
 #include "pv/data/logicsegment.hpp"
 #include "pv/util.hpp"
 

+#ifdef ENABLE_DECODE
+#include "decodetrace.hpp"
+#endif
+

 using boost::shared_lock;
 using boost::shared_mutex;
 
 using boost::shared_lock;
 using boost::shared_mutex;
 


@@ -455,9 +458,11 @@ void View::enable_coloured_bg(bool state)
                if (l)
                        l->set_coloured_bg(state);
 
                if (l)
                        l->set_coloured_bg(state);
 

+#ifdef ENABLE_DECODE

                shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
                if (d)
                        d->set_coloured_bg(state);
                shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
                if (d)
                        d->set_coloured_bg(state);

+#endif

        }
 
        viewport_->update();
        }
 
        viewport_->update();


@@ -821,9 +826,9 @@ bool View::eventFilter(QObject *object, QEvent *event)
        return QObject::eventFilter(object, event);
 }
 
        return QObject::eventFilter(object, event);
 }
 

-bool View::viewportEvent(QEvent *e)
+bool View::viewportEvent(QEvent *event)

 {
 {

-       switch (e->type()) {
+       switch (event->type()) {

        case QEvent::Paint:
        case QEvent::MouseButtonPress:
        case QEvent::MouseButtonRelease:
        case QEvent::Paint:
        case QEvent::MouseButtonPress:
        case QEvent::MouseButtonRelease:


@@ -835,7 +840,7 @@ bool View::viewportEvent(QEvent *e)
        case QEvent::TouchEnd:
                return false;
        default:
        case QEvent::TouchEnd:
                return false;
        default:

-               return QAbstractScrollArea::viewportEvent(e);
+               return QAbstractScrollArea::viewportEvent(event);

        }
 }
 
        }
 }