← Back to branch summary

~osomon/oxide/override-touchUngrabEvent

« back to all changes in this revision

Viewing changes to qt/core/api/oxideqpermissionrequest.h

  • Committer: Chris Coulson
  • Date: 2016-01-13 18:16:11 UTC
  • Revision ID: chris.coulson@canonical.com-20160113181611-vo55lgwngvcj9u1h
https://launchpad.net/bugs/1533710
https://launchpad.net/bugs/1432059
Various clean-ups in soon-to-be-public headers. Also, we rename header files based on whether they're going to be public or not

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/core/api/oxideqpermissionrequest.h
15
15
// License along with this library; if not, write to the Free Software
16
16
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
17
17
 
18
 
#ifndef OXIDE_Q_PERMISSION_REQUEST
19
 
#define OXIDE_Q_PERMISSION_REQUEST
20
 
 
21
 
#include <QObject>
22
 
#include <QScopedPointer>
23
 
#include <QtGlobal>
24
 
#include <QUrl>
 
18
#ifndef OXIDE_QTCORE_PERMISSION_REQUEST
 
19
#define OXIDE_QTCORE_PERMISSION_REQUEST
 
20
 
 
21
#include <QtCore/QObject>
 
22
#include <QtCore/QScopedPointer>
 
23
#include <QtCore/QtGlobal>
 
24
#include <QtCore/QUrl>
 
25
 
 
26
#include <OxideQtCore/oxideqglobal.h>
25
27
 
26
28
class OxideQGeolocationPermissionRequestPrivate;
27
29
class OxideQMediaAccessPermissionRequestPrivate;
28
30
class OxideQPermissionRequestPrivate;
29
31
class OxideQSimplePermissionRequestPrivate;
30
32
 
31
 
class Q_DECL_EXPORT OxideQPermissionRequest : public QObject {
 
33
class OXIDE_QTCORE_EXPORT OxideQPermissionRequest : public QObject {
32
34
  Q_OBJECT
33
35
 
34
36
  Q_PROPERTY(QUrl origin READ origin CONSTANT)
60
62
  QScopedPointer<OxideQPermissionRequestPrivate> d_ptr;
61
63
};
62
64
 
63
 
class Q_DECL_EXPORT OxideQSimplePermissionRequest :
64
 
    public OxideQPermissionRequest {
 
65
class OXIDE_QTCORE_EXPORT OxideQSimplePermissionRequest
 
66
    : public OxideQPermissionRequest {
65
67
  Q_OBJECT
66
68
 
67
69
  Q_DECLARE_PRIVATE(OxideQSimplePermissionRequest)
78
80
  OxideQSimplePermissionRequest(OxideQSimplePermissionRequestPrivate& dd);
79
81
};
80
82
 
81
 
class Q_DECL_EXPORT OxideQGeolocationPermissionRequest Q_DECL_FINAL :
82
 
    public OxideQSimplePermissionRequest {
 
83
class OXIDE_QTCORE_EXPORT OxideQGeolocationPermissionRequest
 
84
    : public OxideQSimplePermissionRequest {
83
85
  Q_OBJECT
84
86
 
85
87
  // This has been replaced by url. origin made sense for geolocation
91
93
  Q_DISABLE_COPY(OxideQGeolocationPermissionRequest)
92
94
 
93
95
 public:
94
 
  ~OxideQGeolocationPermissionRequest() Q_DECL_FINAL;
 
96
  ~OxideQGeolocationPermissionRequest() Q_DECL_OVERRIDE;
95
97
 
96
98
  QUrl origin() const;
97
99
 
105
107
      OxideQGeolocationPermissionRequestPrivate& dd);
106
108
};
107
109
 
108
 
class Q_DECL_EXPORT OxideQMediaAccessPermissionRequest Q_DECL_FINAL
 
110
class OXIDE_QTCORE_EXPORT OxideQMediaAccessPermissionRequest
109
111
    : public OxideQPermissionRequest {
110
112
  Q_OBJECT
111
113
 
116
118
  Q_DISABLE_COPY(OxideQMediaAccessPermissionRequest)
117
119
 
118
120
 public:
119
 
  ~OxideQMediaAccessPermissionRequest() Q_DECL_FINAL;
 
121
  ~OxideQMediaAccessPermissionRequest() Q_DECL_OVERRIDE;
120
122
 
121
123
  bool isForAudio() const;
122
124
  bool isForVideo() const;
130
132
      OxideQMediaAccessPermissionRequestPrivate& dd);
131
133
};
132
134
 
133
 
#endif // OXIDE_Q_PERMISSION_REQUEST
 
135
#endif // OXIDE_QTCORE_PERMISSION_REQUEST