# HG changeset patch
# User Chris Cannam
# Date 1172501708 0
# Node ID 6969f21da18a1828f30166a2076685cbd5281939
# Parent  942cfa1df9664db7d6b283931e44235fd219ee17
* remove some debug and some obsolete moc file includes

diff -r 942cfa1df966 -r 6969f21da18a layer/Colour3DPlotLayer.cpp
--- a/layer/Colour3DPlotLayer.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/layer/Colour3DPlotLayer.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -815,8 +815,3 @@
     setNormalizeVisibleArea(normalizeVisibleArea);
 }
 
-#ifdef INCLUDE_MOCFILES
-#include "Colour3DPlotLayer.moc.cpp"
-#endif
-
-
diff -r 942cfa1df966 -r 6969f21da18a layer/Layer.cpp
--- a/layer/Layer.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/layer/Layer.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -122,8 +122,3 @@
     emit layerParametersChanged();
 }
 
-
-#ifdef INCLUDE_MOCFILES
-#include "Layer.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a layer/TextLayer.cpp
--- a/layer/TextLayer.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/layer/TextLayer.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -776,8 +776,3 @@
     }
 }
 
-
-#ifdef INCLUDE_MOCFILES
-#include "TextLayer.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a layer/TimeInstantLayer.cpp
--- a/layer/TimeInstantLayer.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/layer/TimeInstantLayer.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -778,7 +778,3 @@
     if (ok) setPlotStyle(style);
 }
 
-#ifdef INCLUDE_MOCFILES
-#include "TimeInstantLayer.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a layer/TimeRulerLayer.cpp
--- a/layer/TimeRulerLayer.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/layer/TimeRulerLayer.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -309,8 +309,3 @@
     }
 }
 
-
-#ifdef INCLUDE_MOCFILES
-#include "TimeRulerLayer.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a layer/TimeValueLayer.cpp
--- a/layer/TimeValueLayer.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/layer/TimeValueLayer.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -1441,8 +1441,3 @@
     if (ok) setPlotStyle(style);
 }
 
-
-#ifdef INCLUDE_MOCFILES
-#include "TimeValueLayer.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a view/Pane.cpp
--- a/view/Pane.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/view/Pane.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -219,9 +219,9 @@
             m_vthumb->setValue(layer->getCurrentVerticalZoomStep());
             m_vthumb->blockSignals(false);
 
-            std::cerr << "Vertical thumbwheel: min 0, max " << max
-                      << ", default " << defaultStep << ", value "
-                      << m_vthumb->getValue() << std::endl;
+//            std::cerr << "Vertical thumbwheel: min 0, max " << max
+//                      << ", default " << defaultStep << ", value "
+//                      << m_vthumb->getValue() << std::endl;
 
         }
     }
@@ -236,11 +236,9 @@
                     this, SLOT(zoomLevelChanged()));
         }
         if (haveVThumb) {
-            std::cerr << "vthumb is visible, moving to " << height() -86 << std::endl;
             m_headsUpDisplay->setFixedHeight(m_vthumb->height() + m_hthumb->height());
             m_headsUpDisplay->move(width() - 86, height() - 86);
         } else {
-            std::cerr << "vthumb is invisible, moving to " << height() -51 << std::endl;
             m_headsUpDisplay->setFixedHeight(m_hthumb->height());
             m_headsUpDisplay->move(width() - 86, height() - 16);
         }
@@ -1758,7 +1756,3 @@
 }
 
 
-#ifdef INCLUDE_MOCFILES
-#include "Pane.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a view/PaneStack.cpp
--- a/view/PaneStack.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/view/PaneStack.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -442,7 +442,3 @@
 }
     
 
-#ifdef INCLUDE_MOCFILES
-#include "PaneStack.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a view/View.cpp
--- a/view/View.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/view/View.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -1598,7 +1598,3 @@
 	    this, SIGNAL(propertyChanged(PropertyContainer::PropertyName)));
 }
 
-#ifdef INCLUDE_MOCFILES
-#include "View.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a widgets/AudioDial.cpp
--- a/widgets/AudioDial.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/widgets/AudioDial.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -537,7 +537,3 @@
     emit mouseLeft();
 }
 
-#ifdef INCLUDE_MOCFILES
-#include "AudioDial.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a widgets/PropertyBox.cpp
--- a/widgets/PropertyBox.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/widgets/PropertyBox.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -670,7 +670,3 @@
 }
 
 
-#ifdef INCLUDE_MOCFILES
-#include "PropertyBox.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a widgets/PropertyStack.cpp
--- a/widgets/PropertyStack.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/widgets/PropertyStack.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -217,7 +217,3 @@
     emit viewSelected(m_client);
 }
 
-#ifdef INCLUDE_MOCFILES
-#include "PropertyStack.moc.cpp"
-#endif
-
diff -r 942cfa1df966 -r 6969f21da18a widgets/Thumbwheel.cpp
--- a/widgets/Thumbwheel.cpp	Mon Feb 26 14:18:21 2007 +0000
+++ b/widgets/Thumbwheel.cpp	Mon Feb 26 14:55:08 2007 +0000
@@ -141,7 +141,7 @@
         bool changed = (m_mappedValue != mappedValue);
         m_mappedValue = mappedValue;
         m_noMappedUpdate = true;
-        std::cerr << "Thumbwheel::setMappedValue(" << mappedValue << "): new value is " << newValue << " (visible " << isVisible() << ")" << std::endl;
+//        std::cerr << "Thumbwheel::setMappedValue(" << mappedValue << "): new value is " << newValue << " (visible " << isVisible() << ")" << std::endl;
         if (newValue != getValue()) {
             setValue(newValue);
             changed = true;
@@ -166,8 +166,8 @@
 void
 Thumbwheel::setValue(int value)
 {
-    std::cerr << "Thumbwheel::setValue(" << value << ") (from " << m_value
-              << ", rotation " << m_rotation << ")" << " (visible " << isVisible() << ")" << std::endl;
+//    std::cerr << "Thumbwheel::setValue(" << value << ") (from " << m_value
+//              << ", rotation " << m_rotation << ")" << " (visible " << isVisible() << ")" << std::endl;
 
     if (m_value != value) {
 
@@ -201,7 +201,7 @@
 Thumbwheel::getMappedValue() const
 {
     if (m_rangeMapper) {
-        std::cerr << "Thumbwheel::getMappedValue(): value = " << getValue() << ", mappedValue = " << m_mappedValue << std::endl;
+//        std::cerr << "Thumbwheel::getMappedValue(): value = " << getValue() << ", mappedValue = " << m_mappedValue << std::endl;
         return m_mappedValue;
     }
     return getValue();