← Back to branch summary

~osomon/oxide/override-touchUngrabEvent

« back to all changes in this revision

Viewing changes to qt/core/api/oxideqnavigationrequest.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/oxideqnavigationrequest.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_NAVIGATION_REQUEST
19
 
#define OXIDE_Q_NAVIGATION_REQUEST
20
 
 
21
 
#include <QObject>
22
 
#include <QScopedPointer>
23
 
#include <QtGlobal>
24
 
#include <QUrl>
 
18
#ifndef OXIDE_QTCORE_NAVIGATION_REQUEST
 
19
#define OXIDE_QTCORE_NAVIGATION_REQUEST
 
20
 
 
21
#include <QtCore/QObject>
 
22
#include <QtCore/QScopedPointer>
 
23
#include <QtCore/QtGlobal>
 
24
#include <QtCore/QUrl>
 
25
 
 
26
#include <OxideQtCore/oxideqglobal.h>
 
27
 
 
28
#if defined(OXIDE_QTCORE_IMPLEMENTATION)
 
29
namespace oxide {
 
30
namespace qt {
 
31
class WebView;
 
32
}
 
33
}
 
34
#endif
25
35
 
26
36
class OxideQNavigationRequestPrivate;
27
37
 
28
 
class Q_DECL_EXPORT OxideQNavigationRequest Q_DECL_FINAL : public QObject {
 
38
class OXIDE_QTCORE_EXPORT OxideQNavigationRequest : public QObject {
29
39
  Q_OBJECT
30
40
 
31
41
  Q_PROPERTY(QUrl url READ url CONSTANT)
54
64
    ActionReject = 0xFF
55
65
  };
56
66
 
57
 
  ~OxideQNavigationRequest();
58
 
  Q_DECL_HIDDEN OxideQNavigationRequest(const QUrl& url,
59
 
                                        Disposition disposition,
60
 
                                        bool user_gesture);
 
67
  ~OxideQNavigationRequest() Q_DECL_OVERRIDE;
61
68
 
62
69
  QUrl url() const;
63
70
  Disposition disposition() const;
70
77
  void actionChanged();
71
78
 
72
79
 private:
 
80
#if defined(OXIDE_QTCORE_IMPLEMENTATION)
 
81
  friend class oxide::qt::WebView;
 
82
#endif
 
83
  Q_DECL_HIDDEN OxideQNavigationRequest(const QUrl& url,
 
84
                                        Disposition disposition,
 
85
                                        bool user_gesture);
 
86
 
73
87
  QScopedPointer<OxideQNavigationRequestPrivate> d_ptr;
74
88
};
75
89
 
76
 
#endif // OXIDE_Q_NAVIGATION_REQUEST
 
90
#endif // OXIDE_QTCORE_NAVIGATION_REQUEST