Changeset 97409 in webkit

Timestamp:

Oct 13, 2011 3:11:36 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] GeolocationClient cleanups
​https://bugs.webkit.org/show_bug.cgi?id=69737

Patch by Adenilson Cavalcanti <​adenilson.silva@openbossa.org> on 2011-10-13
Reviewed by Kenneth Rohde Christiansen.

Qt5 has a location module, so no need to use an external
library like Qt Mobility. This patch will allow the GeolocationClientQt
to compile with both Qt5 and Qt4.

• QtWebKit.pro:
• WebCoreSupport/GeolocationClientQt.cpp:

(WebCore::GeolocationClientQt::positionUpdated):

• WebCoreSupport/GeolocationClientQt.h:

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• QtWebKit.pro (modified) (1 diff)
• WebCoreSupport/GeolocationClientQt.cpp (modified) (2 diffs)
• WebCoreSupport/GeolocationClientQt.h (modified) (4 diffs)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-10-13  Adenilson Cavalcanti  <adenilson.silva@openbossa.org>
+
+        [Qt] GeolocationClient cleanups
+        https://bugs.webkit.org/show_bug.cgi?id=69737
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Qt5 has a location module, so no need to use an external
+        library like Qt Mobility. This patch will allow the GeolocationClientQt
+        to compile with both Qt5 and Qt4.
+
+        * QtWebKit.pro:
+        * WebCoreSupport/GeolocationClientQt.cpp:
+        (WebCore::GeolocationClientQt::positionUpdated):
+        * WebCoreSupport/GeolocationClientQt.h:
+
 2011-10-11  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/qt/QtWebKit.pro

@@ -288 +288 @@
 
 contains(DEFINES, ENABLE_GEOLOCATION=1) {
+     qt5: QT += location
+
      HEADERS += \
         $$PWD/WebCoreSupport/GeolocationClientQt.h

trunk/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.cpp

@@ -38 +38 @@
 #include "qwebpage_p.h"
 
-using namespace QtMobility;
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#include <QGeoPositionInfoSource>
+#elif QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtLocation/QGeoPositionInfoSource>
+#endif
 
 namespace WebCore {
@@ -61 +65 @@
 }
 
-void GeolocationClientQt::positionUpdated(const QGeoPositionInfo &geoPosition)
+void GeolocationClientQt::positionUpdated(const QGeoPositionInfo& geoPosition)
 {
     if (!geoPosition.isValid())

trunk/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h

@@ -28 +28 @@
 
 #include "GeolocationClient.h"
-#include <QGeoPositionInfoSource>
+
+#include <QObject>
 #include <wtf/RefPtr.h>
 
-// FIXME: Remove usage of "using namespace" in a header file.
-// There is bug in qtMobility signal names are not full qualified when used with namespace
-// QtMobility namespace in slots throws up error and its required to be fixed in qtmobility.
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#include <QGeoPositionInfo>
+namespace QtMobility {
+class QGeoPositionInfoSource;
+};
 using namespace QtMobility;
+#elif QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtLocation/QGeoPositionInfo>
+class QGeoPositionInfoSource;
+#endif
+
 
 class QWebPage;
@@ -40 +48 @@
 namespace WebCore {
 
-// This class provides a implementation of a GeolocationService for qtWebkit.
-// It uses QtMobility (v1.0.0) location service to get positions
+// This class provides an implementation of a GeolocationService for QtWebkit.
 class GeolocationClientQt : public QObject, public GeolocationClient {
     Q_OBJECT
@@ -60 +67 @@
 
 private Q_SLOTS:
-    // QGeoPositionInfoSource
     void positionUpdated(const QGeoPositionInfo&);
 
@@ -66 +72 @@
     const QWebPage* m_page;
     RefPtr<GeolocationPosition> m_lastPosition;
-    QtMobility::QGeoPositionInfoSource* m_location;
+    QGeoPositionInfoSource* m_location;
 };