Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use qwebkitplatformplugin.h from webkit trunk #4

Merged
merged 1 commit into from Feb 15, 2012
Merged

Use qwebkitplatformplugin.h from webkit trunk #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 14 additions & 15 deletions qtwebkitplugin/qwebkitplatformplugin.h
View file
Open in desktop
@@ -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
Expand All @@ -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
Expand All @@ -38,7 +37,7 @@

class QWebSelectData {
public:
virtual ~QWebSelectData() { }
virtual ~QWebSelectData() {}

enum ItemType { Option, Group, Separator };

Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;

Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -165,7 +164,7 @@ class QWebSpellChecker : public QObject {

class QWebKitPlatformPlugin {
public:
virtual ~QWebKitPlatformPlugin() { }
virtual ~QWebKitPlatformPlugin() {}

enum Extension {
MultipleSelections,
Expand All @@ -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