* Cleaned used include paths a bit that they better match what is in…

… sensord-dev. Fixes: NB#2442

 * Removed example headers form sensord-dev.
 * Testcase refactoring.

chains/accelerometerchain/accelerometerchain.cpp

@@ -34,7 +34,7 @@
 #include "config.h"
 #include "logging.h"
 
-#include "coordinatealignfilter/coordinatealignfilter.h"
+#include "coordinatealignfilter.h"
 
 AccelerometerChain::AccelerometerChain(const QString& id) :
     AbstractChain(id)

chains/accelerometerchain/accelerometerchain.h

@@ -29,8 +29,8 @@
 
 #include "abstractsensor.h"
 #include "abstractchain.h"
-#include "accelerometeradaptor/accelerometeradaptor.h"
-#include "coordinatealignfilter/coordinatealignfilter.h"
+#include "coordinatealignfilter.h"
+#include "deviceadaptor.h"
 
 class Bin;
 template <class TYPE> class BufferReader;

chains/accelerometerchain/accelerometerchain.pro

@@ -6,4 +6,6 @@ HEADERS += accelerometerchain.h   \
 SOURCES += accelerometerchain.cpp   \
            accelerometerchainplugin.cpp
 
+INCLUDEPATH += ../../filters/coordinatealignfilter
+
 include( ../chain-config.pri )

chains/orientationchain/orientationchain.h

@@ -33,8 +33,8 @@
 #include "bufferreader.h"
 #include "filter.h"
 #include "bin.h"
-#include "orientationdata.h"
-#include "posedata.h"
+#include "datatypes/orientationdata.h"
+#include "datatypes/posedata.h"
 #include "datatypes/unsigned.h"
 
 class Bin;

core/core.pro

@@ -11,6 +11,7 @@ SENSORFW_INCLUDEPATHS = .. \
                         ../include \
                         ../filters \
                         ../datatypes
+
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
@@ -37,7 +38,6 @@ SOURCES += sensormanager.cpp \
     sockethandler.cpp \
     inputdevadaptor.cpp \
     config.cpp \
-    calibrationhandler.cpp \
     nodebase.cpp
 
 HEADERS += sensormanager.h \
@@ -66,7 +66,6 @@ HEADERS += sensormanager.h \
     sockethandler.h \
     inputdevadaptor.h \
     config.h \
-    calibrationhandler.h \
     nodebase.h
 
 !mce_disable {

core/sensormanager.cpp

@@ -34,7 +34,6 @@
 #include "idutils.h"
 #include "logging.h"
 #include "mcewatcher.h"
-#include "calibrationhandler.h"
 
 #include <QSocketNotifier>
 #include <errno.h>

debian/changelog

@@ -3,6 +3,11 @@ sensord (0.6.43) unstable; urgency=low
   [Timo Rongas]
   * TestApp configuration file is now included by default.
 
+  [Antti Virtanen]
+  * Cleaned used include paths a bit that they better match what is in sensord-dev. Fixes: NB#244277.
+  * Removed example headers form sensord-dev.
+  * Testcase refactoring.
+
  -- Timo Rongas <ext-timo.2.rongas@nokia.com>  Fri, 15 Apr 2011 14:05:34 +0300
 
 sensord (0.6.42) unstable; urgency=low

examples/adaptorplugin/adaptorplugin.pro

@@ -3,7 +3,6 @@ CONFIG      += plugin
 
 TARGET       = sampleadaptor
 
-
 include(../../common-config.pri )
 
 HEADERS += sampleadaptor.h \
@@ -12,17 +11,12 @@ HEADERS += sampleadaptor.h \
 SOURCES += sampleadaptor.cpp \
            sampleadaptorplugin.cpp
 
-SENSORFW_INCLUDEPATHS = ../.. \
-                        ../../include \
+SENSORFW_INCLUDEPATHS = ../../include \
                         ../../sensord \
                         ../../datatypes \
                         ../../core \
-                        ../../filters
+                        ../../filters \
+                        ../..
 
 DEPENDPATH  += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
-
-include(../../common-install.pri)
-publicheaders.files += $$HEADERS
-target.path = $$PLUGINPATH
-

examples/chainplugin/chainplugin.pro

@@ -1,8 +1,6 @@
 TEMPLATE     = lib
 CONFIG      += plugin
 
-QT          += dbus
-
 TARGET       = samplechain
 
 include( ../../common-config.pri )
@@ -13,17 +11,13 @@ HEADERS += samplechain.h   \
 SOURCES += samplechain.cpp   \
            samplechainplugin.cpp
 
-SENSORFW_INCLUDEPATHS = ../.. \
-                        ../../include \
+SENSORFW_INCLUDEPATHS = ../../include \
                         ../../sensord \
                         ../../datatypes \
                         ../../filters \
                         ../../core \
-                        ../../adaptors
+                        ../../adaptors \
+                        ../..
 
 DEPENDPATH  += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
-
-include(../../common-install.pri)
-publicheaders.files += $$HEADERS
-target.path = $$PLUGINPATH

examples/filterplugin/filterplugin.pro

@@ -1,18 +1,15 @@
 TEMPLATE = lib
 CONFIG += plugin
-QT -= gui
-QT += dbus
 
 TARGET = samplefilter
 
 include( ../../common-config.pri )
 
-SENSORFW_INCLUDEPATHS = ../.. \
-                        ../../include \
-                        .. \
+SENSORFW_INCLUDEPATHS = ../../include \
                         ../../sensord \
                         ../../core \
-                        ../../datatypes
+                        ../../datatypes \
+                        ../..
 
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
@@ -22,7 +19,3 @@ HEADERS += samplefilter.h \
 
 SOURCES += samplefilter.cpp \
            samplefilterplugin.cpp
-
-include(../../common-install.pri)
-publicheaders.files = $$HEADERS
-target.path = $$PLUGINPATH

examples/sensorplugin/sensorplugin.pro

@@ -1,8 +1,6 @@
 TEMPLATE     = lib
 CONFIG      += plugin
 
-QT          += dbus
-
 TARGET       = samplesensor
 
 include( ../../common-config.pri )
@@ -15,16 +13,12 @@ SOURCES += samplesensor.cpp \
            samplesensor_a.cpp \
            sampleplugin.cpp
 
-SENSORFW_INCLUDEPATHS = ../.. \
-                        ../../include \
+SENSORFW_INCLUDEPATHS = ../../include \
                         ../../sensord \
                         ../../datatypes \
                         ../../core \
-                        ../../filters
+                        ../../filters \
+                        ../..
 
 DEPENDPATH  += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
-
-include(../../common-install.pri)
-publicheaders.files += $$HEADERS
-target.path = $$PLUGINPATH

filters/declinationfilter/declinationfilter.h

@@ -29,12 +29,11 @@
 
 #include <QObject>
 #include <QAtomicInt>
-#include "orientationdata.h"
+#include "datatypes/orientationdata.h"
 #include "filter.h"
 
 /**
- * @brief Filter for calculating declination correction for Compass data..
- *
+ * Filter for calculating declination correction for Compass data.
  */
 class DeclinationFilter : public QObject, public Filter<CompassData, DeclinationFilter, CompassData>
 {

qt-api/abstractsensor_i.h

@@ -141,7 +141,7 @@ class AbstractSensorChannelInterface : public QObject
      * Standby-override is used to keep sensor enabled when display
      * is blanked.
      *
-     * @param standby-override state
+     * @param override standby-override state
      * @return true if succesfully set.
      */
     bool setStandbyOverride(bool override);
@@ -261,7 +261,7 @@ class AbstractSensorChannelInterface : public QObject
      * Request data range. Usable ranges are listed by
      * #getAvailableDataRanges().
      *
-     * @param requested range.
+     * @param range requested range.
      */
     void requestDataRange(DataRange range);
 

core/calibrationhandler.h → sensord/calibrationhandler.h

@@ -31,7 +31,7 @@
 #include <QString>
 #include <QTimer>
 #include "datatypes/magneticfield.h"
-#include "sensors/magnetometersensor/magnetometersensor.h"
+#include "magnetometersensor.h"
 
 /**
  * @brief Helper class for maintaining magnetometer calibration.

sensord/sensord.pro

@@ -12,7 +12,9 @@ SENSORFW_INCLUDEPATHS = .. \
                         ../include \
                         ../filters \
                         ../datatypes \
-                        ../core
+                        ../core \
+                        ../sensors/magnetometersensor
+
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
@@ -22,9 +24,11 @@ QMAKE_LIBDIR_FLAGS += -L../datatypes -lsensordatatypes \
 QMAKE_RPATHDIR += /usr/lib/sensord
 
 SOURCES += main.cpp \
-           parser.cpp
+           parser.cpp \
+           calibrationhandler.cpp
 
-HEADERS += parser.h
+HEADERS += parser.h \
+           calibrationhandler.h
 
 contextprovider {
     DEFINES += PROVIDE_CONTEXT_INFO

tests/adaptors/adaptors.pro

@@ -41,5 +41,4 @@ INCLUDEPATH += ../.. \
     ../../adaptors/kbslideradaptor \
     ../../adaptors/proximityadaptor
 
-QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/ -lsensorfw
-
+QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/ -lsensorfw 

tests/adaptors/adaptortest.cpp

@@ -29,17 +29,15 @@
 #include <QTest>
 #include <QVariant>
 
-#include <cerrno>
-
 #include "adaptortest.h"
 
-#include "adaptors/accelerometeradaptor/accelerometeradaptor.h"
-#include "adaptors/magnetometeradaptor/magnetometeradaptor.h"
-#include "adaptors/alsadaptor/alsadaptor.h"
-#include "adaptors/touchadaptor/touchadaptor.h"
-#include "adaptors/tapadaptor/tapadaptor.h"
-#include "adaptors/kbslideradaptor/kbslideradaptor.h"
-#include "adaptors/proximityadaptor/proximityadaptor.h"
+#include "accelerometeradaptor.h"
+#include "magnetometeradaptor.h"
+#include "alsadaptor.h"
+#include "touchadaptor.h"
+#include "tapadaptor.h"
+#include "kbslideradaptor.h"
+#include "proximityadaptor.h"
 
 #include "config.h"
 
@@ -111,7 +109,7 @@ void AdaptorTest::testTouchAdaptor()
     QString sensorName("touch");
     TouchAdaptor* adaptor = dynamic_cast<TouchAdaptor*>(TouchAdaptor::factoryMethod("touchadaptor"));
     QVERIFY( adaptor );
- 
+
     QVERIFY(adaptor->startAdaptor());
     QVERIFY(adaptor->startSensor(sensorName));
 

tests/benchmark/benchmarktest/benchmarktest.pro

@@ -11,10 +11,11 @@ TARGET = sensorbenchmark-test
 HEADERS += benchmarktests.h signaldump.h
 SOURCES += benchmarktests.cpp
 
-SENSORFW_INCLUDEPATHS = ../../.. \
-                        ../../../include \
+SENSORFW_INCLUDEPATHS = ../../../include \
                         ../../../filters \
-                        ../../../datatypes
+                        ../../../datatypes \
+			../../../qt-api \
+                        ../../..
 
 DEPENDPATH += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS

tests/benchmark/benchmarktest/benchmarktests.cpp

@@ -23,8 +23,8 @@
    </p>
 */
 
-#include "qt-api/sensormanagerinterface.h"
-#include "qt-api/alssensor_i.h"
+#include "sensormanagerinterface.h"
+#include "alssensor_i.h"
 
 #include "benchmarktests.h"
 #include "signaldump.h"

tests/benchmark/dummyclient/dummyclient.pro

@@ -6,8 +6,8 @@ include( ../../common-install.pri)
 
 INCLUDEPATH += ../../../qt-api \
                ../../../core \
-               ../../../ \
-               ../../../include
+               ../../../include \
+               ../../..
 
 SOURCES += dummyclient.cpp
 HEADERS += dummyclient.h

tests/benchmark/fakeadaptor/fakeadaptor.pro

@@ -11,11 +11,11 @@ HEADERS += fakeadaptor.h \
 SOURCES += fakeadaptor.cpp \
            fakeadaptorplugin.cpp
 
-SENSORFW_INCLUDEPATHS = ../../../ \
-                        ../../../include \
+SENSORFW_INCLUDEPATHS = ../../../include \
                         ../../../core \
                         ../../../datatypes \
-                        ../../../filters
+                        ../../../filters \
+                        ../../..
 
 DEPENDPATH  += $$SENSORFW_INCLUDEPATHS
 INCLUDEPATH += $$SENSORFW_INCLUDEPATHS

tests/chains/chains.pro

@@ -1,28 +1,22 @@
 QT += dbus network
 
-LIBS += -Wl,-rpath,/usr/lib/sensord,-E
-
 include(../common-install.pri)
 
 TEMPLATE = app
 TARGET = sensorchains-test
 
 CONFIG += testcase
 
-HEADERS += chainstest.h \
-
-
-
-SOURCES += chainstest.cpp \
-
+HEADERS += chainstest.h
+SOURCES += chainstest.cpp
 
-INCLUDEPATH += ../.. \
-    ../../include \
+INCLUDEPATH += ../../include \
     ../../chains \
     ../../core \
     ../../chains \    
     ../../adaptors \
-    ../../datatypes
+    ../../datatypes \
+    ../..
 
 QMAKE_LIBDIR_FLAGS += -L../../builddir/datatypes -L../../datatypes/ -lsensordatatypes
 QMAKE_LIBDIR_FLAGS += -L../../builddir/core -L../../core/ -lsensorfw