Use qwebkitplatformplugin.h from webkit trunk #4

Merged
merged 1 commit into from Feb 15, 2012
Jump to file or symbol
Failed to load files and symbols.
+14 −15
Split
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -19,8 +18,8 @@
*
*/
-#ifndef qwebkitplatformplugin_h
-#define qwebkitplatformplugin_h
+#ifndef QWEBKITPLATFORMPLUGIN_H
+#define QWEBKITPLATFORMPLUGIN_H
/*
* Warning: The contents of this file is not part of the public QtWebKit API
@@ -38,7 +37,7 @@
class QWebSelectData {
public:
- virtual ~QWebSelectData() { }
+ virtual ~QWebSelectData() {}
enum ItemType { Option, Group, Separator };
@@ -58,7 +57,7 @@ class QWebSelectData {
class QWebSelectMethod : public QObject {
Q_OBJECT
public:
- virtual ~QWebSelectMethod() { }
+ virtual ~QWebSelectMethod() {}
virtual void show(const QWebSelectData&) = 0;
virtual void hide() = 0;
@@ -72,7 +71,7 @@ class QWebSelectMethod : public QObject {
class QWebNotificationData {
public:
- virtual ~QWebNotificationData() { }
+ virtual ~QWebNotificationData() {}
virtual const QString title() const = 0;
virtual const QString message() const = 0;
@@ -83,8 +82,8 @@ class QWebNotificationData {
class QWebNotificationPresenter : public QObject {
Q_OBJECT
public:
- QWebNotificationPresenter() { }
- virtual ~QWebNotificationPresenter() { }
+ QWebNotificationPresenter() {}
+ virtual ~QWebNotificationPresenter() {}
virtual void showNotification(const QWebNotificationData*) = 0;
@@ -96,8 +95,8 @@ class QWebNotificationPresenter : public QObject {
class QWebHapticFeedbackPlayer: public QObject {
Q_OBJECT
public:
- QWebHapticFeedbackPlayer() { }
- virtual ~QWebHapticFeedbackPlayer() { }
+ QWebHapticFeedbackPlayer() {}
+ virtual ~QWebHapticFeedbackPlayer() {}
enum HapticStrength {
None, Weak, Medium, Strong
@@ -113,7 +112,7 @@ class QWebHapticFeedbackPlayer: public QObject {
class QWebTouchModifier : public QObject {
Q_OBJECT
public:
- virtual ~QWebTouchModifier() { }
+ virtual ~QWebTouchModifier() {}
enum PaddingDirection {
Up, Right, Down, Left
@@ -126,8 +125,8 @@ class QWebTouchModifier : public QObject {
class QWebFullScreenVideoHandler : public QObject {
Q_OBJECT
public:
- QWebFullScreenVideoHandler() { }
- virtual ~QWebFullScreenVideoHandler() { }
+ QWebFullScreenVideoHandler() {}
+ virtual ~QWebFullScreenVideoHandler() {}
virtual bool requiresFullScreenForVideoPlayback() const = 0;
Q_SIGNALS:
@@ -165,7 +164,7 @@ class QWebSpellChecker : public QObject {
class QWebKitPlatformPlugin {
public:
- virtual ~QWebKitPlatformPlugin() { }
+ virtual ~QWebKitPlatformPlugin() {}
enum Extension {
MultipleSelections,
@@ -184,4 +183,4 @@ QT_BEGIN_NAMESPACE
Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.8");
QT_END_NAMESPACE
-#endif // qwebkitplatformplugin_h
+#endif // QWEBKITPLATFORMPLUGIN_H