Cleaned out commented code (deprecated parts replaced by new approach).

sailfishos · Oct 19, 2010 · 3df9da6 · 3df9da6
1 parent 830c4e2
commit 3df9da6
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 128 deletions.
diff --git a/chains/accelerometerchain/accelerometerchain.cpp b/chains/accelerometerchain/accelerometerchain.cpp
@@ -86,10 +86,6 @@ AccelerometerChain::AccelerometerChain(const QString& id) :
     filterBin_->join("acccoordinatealigner", "source", "buffer", "sink");
 
     // Join datasources to the chain
-    //~ RingBufferBase* rb;
-    //~ rb = accelerometerAdaptor_->findBuffer("accelerometer");
-    //~ Q_ASSERT(rb);
-    //~ rb->join(accelerometerReader_);
     connectToSource(accelerometerAdaptor_, "accelerometer", accelerometerReader_);
 
 
@@ -103,10 +99,6 @@ AccelerometerChain::~AccelerometerChain()
 {
     SensorManager& sm = SensorManager::instance();
 
-    //~ RingBufferBase* rb;
-    //~ rb = accelerometerAdaptor_->findBuffer("accelerometer");
-    //~ Q_ASSERT(rb);
-    //~ rb->unjoin(accelerometerReader_);
     disconnectFromSource(accelerometerAdaptor_, "accelerometer", accelerometerReader_);
 
     sm.releaseDeviceAdaptor("accelerometeradaptor");

diff --git a/chains/orientationchain/orientationchain.cpp b/chains/orientationchain/orientationchain.cpp
@@ -72,10 +72,6 @@ OrientationChain::OrientationChain(const QString& id) :
     filterBin_->join("orientationinterpreter", "orientation", "orientationbuffer", "sink");
 
     // Join datasources to the chain
-    //~ RingBufferBase* rb;
-    //~ rb = accelerometerChain_->findBuffer("accelerometer");
-    //~ Q_ASSERT(rb);
-    //~ rb->join(accelerometerReader_);
     connectToSource(accelerometerChain_, "accelerometer", accelerometerReader_);
 
     setDescription("Device orientation interpretations (in different flavors)");
@@ -86,10 +82,6 @@ OrientationChain::OrientationChain(const QString& id) :
 
 OrientationChain::~OrientationChain()
 {
-    //~ RingBufferBase* rb;
-    //~ rb = accelerometerChain_->findBuffer("accelerometer");
-    //~ Q_ASSERT(rb);
-    //~ rb->unjoin(accelerometerReader_);
     disconnectFromSource(accelerometerChain_, "accelerometer", accelerometerReader_);
 
     delete accelerometerReader_;
@@ -98,7 +90,6 @@ OrientationChain::~OrientationChain()
     delete filterBin_;
 }
 
-// TODO: Solve thread safety for start...
 bool OrientationChain::start()
 {
     if (AbstractSensorChannel::start()) {

diff --git a/sensord/abstractsensor.h b/sensord/abstractsensor.h
@@ -150,7 +150,6 @@ public Q_SLOTS:
     int                 cnt_;
 
     QList<int>          activeSessions_;
-    QStringList         adaptorList_;
 
     QList<DataRange>        intervalList_;
 };

diff --git a/sensors/accelerometersensor/accelerometersensor.cpp b/sensors/accelerometersensor/accelerometersensor.cpp
@@ -58,20 +58,13 @@ AccelerometerSensorChannel::AccelerometerSensorChannel(const QString& id) :
     filterBin_->join("accelerometer", "source", "buffer", "sink");
 
     // Join datasources to the chain
-    //~ RingBufferBase* rb;
-    //~ rb = accelerometerChain_->findBuffer("accelerometer");
-    //~ Q_ASSERT(rb);
-    //~ rb->join(accelerometerReader_);
     connectToSource(accelerometerChain_, "accelerometer", accelerometerReader_);
 
     marshallingBin_ = new Bin;
     marshallingBin_->add(this, "sensorchannel");
 
     outputBuffer_->join(this);
 
-    // Enlist used adaptors
-    adaptorList_ << "accelerometeradaptor";
-
     // Set MetaData
     setDescription("x, y, and z axes accelerations in mG");
     setRangeSource(accelerometerChain_);
@@ -83,10 +76,6 @@ AccelerometerSensorChannel::~AccelerometerSensorChannel()
 {
     SensorManager& sm = SensorManager::instance();
 
-    //~ RingBufferBase* rb;
-    //~ rb = accelerometerChain_->findBuffer("accelerometer");
-    //~ Q_ASSERT(rb);
-    //~ rb->unjoin(accelerometerReader_);
     disconnectFromSource(accelerometerChain_, "accelerometer", accelerometerReader_);
 
     sm.releaseChain("accelerometerchain");

diff --git a/sensors/accelerometersensor/accelerometersensor.h b/sensors/accelerometersensor/accelerometersensor.h
@@ -93,4 +93,4 @@ public Q_SLOTS:
     void emitToDbus(const AccelerationData& value);
 };
 
-#endif // ACCELERATION_SENSOR_CHANNEL_H
+#endif
diff --git a/sensors/alssensor/alssensor.cpp b/sensors/alssensor/alssensor.cpp
@@ -62,10 +62,6 @@ ALSSensorChannel::ALSSensorChannel(const QString& id) :
     filterBin_->join("als", "source", "buffer", "sink");
 
     // Join datasources to the chain
-    //~ RingBufferBase* rb;
-    //~ rb = alsAdaptor_->findBuffer("als");
-    //~ Q_ASSERT(rb);
-    //~ rb->join(alsReader_);
     connectToSource(alsAdaptor_, "als", alsReader_);
 
     marshallingBin_ = new Bin;
@@ -87,10 +83,6 @@ ALSSensorChannel::ALSSensorChannel(const QString& id) :
 
 #endif
 
-
-    // Enlist used adaptors
-    adaptorList_ << "alsadaptor";
-
     setDescription("ambient light intensity in lux");
     setRangeSource(alsAdaptor_);
     addStandbyOverrideSource(alsAdaptor_);
@@ -103,10 +95,6 @@ ALSSensorChannel::~ALSSensorChannel()
 {
     SensorManager& sm = SensorManager::instance();
 
-    //~ RingBufferBase* rb;
-    //~ rb = alsAdaptor_->findBuffer("als");
-    //~ Q_ASSERT(rb);
-    //~ rb->unjoin(alsReader_);
     disconnectFromSource(alsAdaptor_, "als", alsReader_);
 
     sm.releaseDeviceAdaptor("alsadaptor");

diff --git a/sensors/compasssensor/compasssensor.cpp b/sensors/compasssensor/compasssensor.cpp
@@ -60,17 +60,14 @@ CompassSensorChannel::CompassSensorChannel(const QString& id) :
     // Join filterchain buffers
     filterBin_->join("input", "source", "output", "sink");
 
-    // Pick input depending on declination correctin value (to func)
+    // TODO: Pick input depending on declination correctin value (to func)
     connectToSource(compassChain_, "magneticnorth", inputReader_);
 
     marshallingBin_ = new Bin;
     marshallingBin_->add(this, "sensorchannel");
 
     outputBuffer_->join(this);
 
-    // Enlist used adaptors
-    adaptorList_ << "accelerometeradaptor" << "magnetometeradaptor" << "kbslideradaptor";
-
     setDescription("compass north in degrees");
     addStandbyOverrideSource(compassChain_);
     setIntervalSource(compassChain_);
@@ -82,17 +79,11 @@ CompassSensorChannel::~CompassSensorChannel()
     SensorManager& sm = SensorManager::instance();
 
     // TODO: Put this to separate function
-    //~ RingBufferBase* rb;
     if (declinationCorrection_) {
         disconnectFromSource(compassChain_, "truenorth", inputReader_);
-        //~ rb = compassChain_->findBuffer("truenorth");
     } else {
-        //~ rb = compassChain_->findBuffer("magneticnorth");
         disconnectFromSource(compassChain_, "magneticnorth", inputReader_);
     }
-    //~ Q_ASSERT(rb);
-
-    //~ rb->unjoin(inputReader_);
     sm.releaseChain("compasschain");
 
     delete inputReader_;

diff --git a/sensors/contextplugin/compassbin.cpp b/sensors/contextplugin/compassbin.cpp
@@ -69,24 +69,16 @@ void CompassBin::startRun()
     start();
     if (compassChain) {
         compassChain->start();
-        compassChain->setProperty("compassEnabled", true);
 
         // Set interval for compass, as sane operation requires 10HZ!
         compassChain->requestDefaultInterval(SESSION_ID);
-        //~ SensorManager::instance().propertyHandler().setRequest("interval", "accelerometeradaptor", SESSION_ID, 100);
-        //~ SensorManager::instance().propertyHandler().setRequest("interval", "magnetometeradaptor", SESSION_ID, 100);
     }
 }
 
 void CompassBin::stopRun()
 {
     if (compassChain) {
-        // Release interval requests... running with default, no need to release.
-        //~ SensorManager::instance().propertyHandler().setRequest("interval", "accelerometeradaptor", SESSION_ID, 0);
-        //~ SensorManager::instance().propertyHandler().setRequest("interval", "magnetometeradaptor", SESSION_ID, 0);
-
         compassChain->stop();
-        compassChain->setProperty("compassEnabled", false);
     }
     stop();
 }
diff --git a/sensors/magnetometersensor/magnetometersensor.cpp b/sensors/magnetometersensor/magnetometersensor.cpp
@@ -80,10 +80,6 @@ MagnetometerSensorChannel::MagnetometerSensorChannel(const QString& id) :
     }
 
     // Join datasources to the chain
-    //~ RingBufferBase* rb;
-    //~ rb = compassChain_->findBuffer("calibratedmagnetometerdata");
-    //~ Q_ASSERT(rb);
-    //~ rb->join(magnetometerReader_);
     connectToSource(compassChain_, "calibratedmagnetometerdata", magnetometerReader_);
 
     marshallingBin_ = new Bin;
@@ -105,9 +101,6 @@ MagnetometerSensorChannel::MagnetometerSensorChannel(const QString& id) :
         setRangeSource(compassChain_);
     }
 
-    // Enlist used adaptors
-    adaptorList_ << "magnetometeradaptor" << "kbslideradaptor";
-
     setDescription("magnetic flux density in nT");
     setRangeSource(compassChain_);
     addStandbyOverrideSource(compassChain_);
@@ -118,10 +111,6 @@ MagnetometerSensorChannel::~MagnetometerSensorChannel()
 {
     SensorManager& sm = SensorManager::instance();
 
-    //~ RingBufferBase* rb;
-    //~ rb = compassChain_->findBuffer("calibratedmagnetometerdata");
-    //~ Q_ASSERT(rb);
-    //~ rb->unjoin(magnetometerReader_);
     disconnectFromSource(compassChain_, "calibratedmagnetometerdata", magnetometerReader_);
     sm.releaseChain("magcalibrationchain");
 

diff --git a/sensors/orientationsensor/orientationsensor.cpp b/sensors/orientationsensor/orientationsensor.cpp
@@ -61,20 +61,13 @@ OrientationSensorChannel::OrientationSensorChannel(const QString& id) :
     filterBin_->join("face", "source", "buffer", "sink");
 
     // Join datasources to the chain
-    //~ RingBufferBase* rb;
-    //~ rb = orientationChain_->findBuffer("orientation");
-    //~ Q_ASSERT(rb);
-    //~ rb->join(orientationReader_);
     connectToSource(orientationChain_, "orientation", orientationReader_);
 
     marshallingBin_ = new Bin;
     marshallingBin_->add(this, "sensorchannel");
 
     outputBuffer_->join(this);
 
-    // Enlist used adaptors
-    adaptorList_ << "accelerometeradaptor";
-
     setDescription("orientation of the device screen as 6 pre-defined positions");
     setRangeSource(orientationChain_);
     addStandbyOverrideSource(orientationChain_);
@@ -85,10 +78,6 @@ OrientationSensorChannel::~OrientationSensorChannel()
 {
     SensorManager& sm = SensorManager::instance();
 
-    //~ RingBufferBase* rb;
-    //~ rb = orientationChain_->findBuffer("orientation");
-    //~ Q_ASSERT(rb);
-    //~ rb->unjoin(orientationReader_);
     disconnectFromSource(orientationChain_, "orientation", orientationReader_);
 
     sm.releaseChain("orientationchain");

diff --git a/sensors/orientationsensor/orientationsensor.h b/sensors/orientationsensor/orientationsensor.h
@@ -77,25 +77,6 @@ class OrientationSensorChannel :
         return Unsigned(o);
     }
 
-    /**
-     * Property method returning currently used threshold value.
-     * @return Current threshold value.
-     */
-    //int threshold() const
-    //{
-        //return qvariant_cast< int >(((OrientationInterpreter *)orientationInterpreterFilter_)->property("threshold"));
-    //}
-
-    /**
-     * Property method for setting the threshold value.
-     * @param threshold New threshold value.
-     */
-    //void setThreshold(int threshold)
-    //{
-        //signalPropertyChanged("threshold");
-        //((OrientationInterpreter*)orientationInterpreterFilter_)->setProperty("threshold", threshold);
-    //}
-
 public Q_SLOTS:
     bool start();
     bool stop();

diff --git a/sensors/proximitysensor/proximitysensor.cpp b/sensors/proximitysensor/proximitysensor.cpp
@@ -53,10 +53,6 @@ ProximitySensorChannel::ProximitySensorChannel(const QString& id) :
     filterBin_->join("proximity", "source", "buffer", "sink");
 
     // Join datasources to the chain
-    //~ RingBufferBase* rb;
-    //~ rb = proximityAdaptor_->findBuffer("proximity");
-    //~ Q_ASSERT(rb);
-    //~ rb->join(proximityReader_);
     connectToSource(proximityAdaptor_, "proximity", proximityReader_);
 
     marshallingBin_ = new Bin;
@@ -66,9 +62,6 @@ ProximitySensorChannel::ProximitySensorChannel(const QString& id) :
 
     isValid_ = true;
 
-    // Enlist used adaptors
-    adaptorList_ << "proximityadaptor";
-
     setDescription("whether an object is close to device screen");
     setRangeSource(proximityAdaptor_);
     addStandbyOverrideSource(proximityAdaptor_);
@@ -79,10 +72,6 @@ ProximitySensorChannel::~ProximitySensorChannel()
 {
     SensorManager& sm = SensorManager::instance();
 
-    //~ RingBufferBase* rb;
-    //~ rb = proximityAdaptor_->findBuffer("proximity");
-    //~ Q_ASSERT(rb);
-    //~ rb->unjoin(proximityReader_);
     disconnectFromSource(proximityAdaptor_, "proximity", proximityReader_);
 
     sm.releaseDeviceAdaptor("proximityadaptor");

diff --git a/sensors/rotationsensor/rotationsensor.cpp b/sensors/rotationsensor/rotationsensor.cpp
@@ -83,17 +83,13 @@ RotationSensorChannel::RotationSensorChannel(const QString& id) :
     {
         connectToSource(compassChain_, "truenorth", compassReader_);
         addStandbyOverrideSource(compassChain_);
-        adaptorList_ << "magnetometeradaptor";
     }
 
     marshallingBin_ = new Bin;
     marshallingBin_->add(this, "sensorchannel");
 
     outputBuffer_->join(this);
 
-    // Enlist used adaptors
-    adaptorList_ << "accelerometeradaptor" << "kbslideradaptor";
-
     setDescription("x, y, and z axes rotation in degrees");
     introduceAvailableDataRange(DataRange(-179, 180, 1));
     addStandbyOverrideSource(accelerometerChain_);

diff --git a/sensors/tapsensor/tapsensor.cpp b/sensors/tapsensor/tapsensor.cpp
@@ -52,10 +52,6 @@ TapSensorChannel::TapSensorChannel(const QString& id) :
     filterBin_->join("tap", "source", "buffer", "sink");
 
     // Join datasources to the chain
-    //~ RingBufferBase* rb;
-    //~ rb = tapAdaptor_->findBuffer("tap");
-    //~ Q_ASSERT(rb);
-    //~ rb->join(tapReader_);
     connectToSource(tapAdaptor_, "tap", tapReader_);
 
     marshallingBin_ = new Bin;
@@ -69,10 +65,6 @@ TapSensorChannel::TapSensorChannel(const QString& id) :
     setRangeSource(tapAdaptor_);
     setIntervalSource(tapAdaptor_);
 
-    // Enlist used adaptors
-    // TODO: Should tap control anything? Probably not.
-    adaptorList_ << "tapadaptor";
-
     // Tap needs to work with display off
     addStandbyOverrideSource(tapAdaptor_);
 }
@@ -81,10 +73,6 @@ TapSensorChannel::~TapSensorChannel()
 {
     SensorManager& sm = SensorManager::instance();
 
-    //~ RingBufferBase* rb;
-    //~ rb = tapAdaptor_->findBuffer("tap");
-    //~ Q_ASSERT(rb);
-    //~ rb->unjoin(tapReader_);
     disconnectFromSource(tapAdaptor_, "tap", tapReader_);
     sm.releaseDeviceAdaptor("tapadaptor");