From 00d782ea94b36cb2edbc60697ce63c63a758b8ed Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 5 Sep 2012 09:21:03 +0200
Subject: remove vestiges of unistd-based file access

it's all done with QFile now

Change-Id: I0f8147bcedc1514ed7685fb6f8b42f7fbe65a4aa
Reviewed-by: L Potter <lorn.potter@gmail.com>
---
 src/plugins/sensors/linux/linuxsysaccelerometer.cpp | 7 +------
 src/plugins/sensors/linux/linuxsysaccelerometer.h   | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/plugins/sensors/linux/linuxsysaccelerometer.cpp b/src/plugins/sensors/linux/linuxsysaccelerometer.cpp
index e0c6171e..ac8ea7a8 100644
--- a/src/plugins/sensors/linux/linuxsysaccelerometer.cpp
+++ b/src/plugins/sensors/linux/linuxsysaccelerometer.cpp
@@ -48,10 +48,7 @@
 
 #include <QtCore/QStringList>
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <time.h>
-#include <fcntl.h>
 
 char const * const LinuxSysAccelerometer::id("linuxsys.accelerometer");
 
@@ -85,7 +82,6 @@ quint64 produceTimestamp()
 LinuxSysAccelerometer::LinuxSysAccelerometer(QSensor *sensor)
     : QSensorBackend(sensor)
     , m_timerid(0)
-    , fd(0)
     , path(QString())
     , divisor(0)
     , delimiter(QString())
@@ -107,7 +103,6 @@ LinuxSysAccelerometer::LinuxSysAccelerometer(QSensor *sensor)
 
 LinuxSysAccelerometer::~LinuxSysAccelerometer()
 {
-    closeFile();
 }
 
 void LinuxSysAccelerometer::start()
@@ -188,7 +183,7 @@ bool LinuxSysAccelerometer::openFile()
 
 void LinuxSysAccelerometer::closeFile()
 {
-    ::close(fd);
+    file.close();
 }
 
 
diff --git a/src/plugins/sensors/linux/linuxsysaccelerometer.h b/src/plugins/sensors/linux/linuxsysaccelerometer.h
index 939ea310..badc5f3a 100644
--- a/src/plugins/sensors/linux/linuxsysaccelerometer.h
+++ b/src/plugins/sensors/linux/linuxsysaccelerometer.h
@@ -66,7 +66,6 @@ private:
 
     bool openFile();
     void closeFile();
-    int fd;
     QString path;
     QFile file;
     float divisor;
-- 
cgit v1.2.3