Changeset 846 for trunk/tools/runonphone/symbianutils/symbiandevicemanager.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/runonphone/symbianutils/symbiandevicemanager.cpp (modified) (19 diffs)

trunk/tools/runonphone/symbianutils/symbiandevicemanager.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -41 +41 @@
 
 #include "symbiandevicemanager.h"
+
 
 #include <QtCore/QSettings>
@@ -49 +50 @@
 #include <QtCore/QSharedData>
 #include <QtCore/QScopedPointer>
+
 
 namespace SymbianUtils {
@@ -62 +64 @@
 class SymbianDeviceData : public QSharedData {
 public:
-    SymbianDeviceData() : type(SerialPortCommunication) {}
+    SymbianDeviceData();
+    ~SymbianDeviceData();
+
+    inline bool isOpen() const { return !device.isNull() && device->isOpen(); }
+    void forcedClose();
 
     QString portName;
@@ -68 +74 @@
     QString deviceDesc;
     QString manufacturer;
+
+
     DeviceCommunicationType type;
+
+
 };
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 SymbianDevice::SymbianDevice(SymbianDeviceData *data) :
     m_data(data)
 {
-
 }
 
@@ -97 +131 @@
 }
 
+
+
+
+
+
 QString SymbianDevice::portName() const
 {
@@ -107 +146 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+