Title: [103232] trunk/Source/WebKit/qt
- Revision
- 103232
- Author
- commit-qu...@webkit.org
- Date
- 2011-12-19 06:01:00 -0800 (Mon, 19 Dec 2011)
Log Message
[Qt] Cleanup QTM_NAMESPACE usage in DeviceOrientationProviderQt
https://bugs.webkit.org/show_bug.cgi?id=74853
Patch by Alexander Færøy <a...@0x90.dk> on 2011-12-19
Reviewed by Simon Hausmann.
* Api/qwebframe_p.h:
* WebCoreSupport/DeviceOrientationProviderQt.cpp:
* WebCoreSupport/DeviceOrientationProviderQt.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebframe_p.h (103231 => 103232)
--- trunk/Source/WebKit/qt/Api/qwebframe_p.h 2011-12-19 13:35:23 UTC (rev 103231)
+++ trunk/Source/WebKit/qt/Api/qwebframe_p.h 2011-12-19 14:01:00 UTC (rev 103232)
@@ -30,6 +30,9 @@
#include "PlatformString.h"
#if ENABLE(ORIENTATION_EVENTS)
#include "qorientationsensor.h"
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+using QTM_NAMESPACE::QOrientationSensor;
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0).
#endif // ENABLE(ORIENTATION_EVENTS).
#include "qwebelement.h"
#include "wtf/RefPtr.h"
@@ -127,11 +130,7 @@
#endif
#if ENABLE(ORIENTATION_EVENTS)
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- QTM_NAMESPACE::QOrientationSensor m_orientation;
-#else
QOrientationSensor m_orientation;
-#endif // QT_VERSION < QT_VERSION_CHECK(5, 0, 0).
#endif // ENABLE(ORIENTATION_EVENTS).
private:
Modified: trunk/Source/WebKit/qt/ChangeLog (103231 => 103232)
--- trunk/Source/WebKit/qt/ChangeLog 2011-12-19 13:35:23 UTC (rev 103231)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-12-19 14:01:00 UTC (rev 103232)
@@ -1,5 +1,16 @@
2011-12-19 Alexander Færøy <a...@0x90.dk>
+ [Qt] Cleanup QTM_NAMESPACE usage in DeviceOrientationProviderQt
+ https://bugs.webkit.org/show_bug.cgi?id=74853
+
+ Reviewed by Simon Hausmann.
+
+ * Api/qwebframe_p.h:
+ * WebCoreSupport/DeviceOrientationProviderQt.cpp:
+ * WebCoreSupport/DeviceOrientationProviderQt.h:
+
+2011-12-19 Alexander Færøy <a...@0x90.dk>
+
[Qt] Cleanup DeviceMotionClientQt and friends.
https://bugs.webkit.org/show_bug.cgi?id=74849
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.cpp (103231 => 103232)
--- trunk/Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.cpp 2011-12-19 13:35:23 UTC (rev 103231)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.cpp 2011-12-19 14:01:00 UTC (rev 103232)
@@ -20,10 +20,6 @@
#include "config.h"
#include "DeviceOrientationProviderQt.h"
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-QTM_USE_NAMESPACE
-#endif
-
namespace WebCore {
DeviceOrientationProviderQt::DeviceOrientationProviderQt()
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.h (103231 => 103232)
--- trunk/Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.h 2011-12-19 13:35:23 UTC (rev 103231)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DeviceOrientationProviderQt.h 2011-12-19 14:01:00 UTC (rev 103232)
@@ -26,24 +26,21 @@
#include <QRotationFilter>
-namespace WebCore {
-
-class DeviceOrientationProviderQt
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- : public QTM_NAMESPACE::QRotationFilter {
-#else
- : public QRotationFilter {
+using QTM_NAMESPACE::QRotationFilter;
+using QTM_NAMESPACE::QRotationReading;
+using QTM_NAMESPACE::QRotationSensor;
#endif
+
+namespace WebCore {
+
+class DeviceOrientationProviderQt : public QRotationFilter {
public:
DeviceOrientationProviderQt();
void setController(DeviceOrientationController*);
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- bool filter(QTM_NAMESPACE::QRotationReading*);
-#else
bool filter(QRotationReading*);
-#endif
void start();
void stop();
@@ -54,11 +51,7 @@
private:
RefPtr<DeviceOrientation> m_lastOrientation;
DeviceOrientationController* m_controller;
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- QTM_NAMESPACE::QRotationSensor m_sensor;
-#else
QRotationSensor m_sensor;
-#endif
};
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
