Resolve the problem in merging

sailfishos · Feb 24, 2011 · 8860637 · 8860637
1 parent ba3399e
commit 8860637
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 19 deletions.
diff --git a/adaptors/alsadaptor-ascii/alsadaptor-ascii.cpp b/adaptors/alsadaptor-ascii/alsadaptor-ascii.cpp
@@ -11,10 +11,7 @@
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
    @author Matias Muhonen <ext-matias.muhonen@nokia.com>
    @author Tapio Rantala <ext-tapio.rantala@nokia.com>
-<<<<<<< HEAD
    @author Antti Virtanen <antti.i.virtanen@nokia.com>
-=======
->>>>>>> harmattan
    @author Lihan Guo <ext-lihan.4.guo@nokia.com>
 
    This file is part of Sensord.
@@ -36,7 +33,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <string.h>
 #include <QFile>
 
 #include "logging.h"

diff --git a/adaptors/alsadaptor/alsadaptor.cpp b/adaptors/alsadaptor/alsadaptor.cpp
@@ -58,6 +58,10 @@ ALSAdaptor::ALSAdaptor(const QString& id):
     setDescription("Ambient light");
     deviceType_ = (DeviceType)Config::configuration()->value("als/driver_type", "0").toInt();
     powerStatePath_ = Config::configuration()->value("als/powerstate_path").toByteArray();
+#ifdef SENSORFW_MCE_WATCHER
+    dbusIfc = new QDBusInterface(MCE_SERVICE, MCE_REQUEST_PATH, MCE_REQUEST_IF,
+                                 QDBusConnection::systemBus(), this);
+#endif
 }
 
 ALSAdaptor::~ALSAdaptor()

diff --git a/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-ascii.cpp b/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-ascii.cpp
@@ -11,13 +11,9 @@
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
    @author Matias Muhonen <ext-matias.muhonen@nokia.com>
    @author Tapio Rantala <ext-tapio.rantala@nokia.com>
-<<<<<<< HEAD
    @author Antti Virtanen <antti.i.virtanen@nokia.com>
    @author Lihan Guo <ext-lihan.4.guo@nokia.com>
-
-=======
-   @author Lihan Guo <ext-lihan.4.guo@nokia.com>
->>>>>>> harmattan
+   @author Shenghua <ext-shenghua.1.liu@nokia.com>
 
    This file is part of Sensord.
 

diff --git a/adaptors/proximityadaptor-ascii/proximityadaptor-ascii.cpp b/adaptors/proximityadaptor-ascii/proximityadaptor-ascii.cpp
@@ -11,10 +11,7 @@
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
    @author Matias Muhonen <ext-matias.muhonen@nokia.com>
    @author Tapio Rantala <ext-tapio.rantala@nokia.com>
-<<<<<<< HEAD
    @author Antti Virtanen <antti.i.virtanen@nokia.com>
-=======
->>>>>>> harmattan
    @author Lihan Guo <ext-lihan.4.guo@nokia.com>
 
    This file is part of Sensord.

diff --git a/chains/orientationchain/orientationchain.h b/chains/orientationchain/orientationchain.h
@@ -5,11 +5,7 @@
    <p>
    Copyright (C) 2009-2010 Nokia Corporation
 
-<<<<<<< HEAD
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
-=======
-   @author Üstün Ergenoglu <ext-ustun.ergenoglu@nokia.com>
->>>>>>> harmattan
    @author Lihan Guo <ext-lihan.4.guo@nokia.com>
 
    This file is part of Sensord.

diff --git a/core/inputdevadaptor.cpp b/core/inputdevadaptor.cpp
@@ -8,11 +8,9 @@
    @author Timo Rongas <ext-timo.2.rongas@nokia.com>
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
    @author Matias Muhonen <ext-matias.muhonen@nokia.com>
-<<<<<<< HEAD
    @author Antti Virtanen <antti.i.virtanen@nokia.com>
-=======
->>>>>>> harmattan
    @author Lihan Guo <ext-lihan.4.guo@nokia.com>
+   @author Shenghua <ext-shenghua.1.liu@nokia.com>
 
    This file is part of Sensord.