← Back to branch summary

~osomon/oxide/override-touchUngrabEvent

« back to all changes in this revision

Viewing changes to qt/quick/api/oxideqquicklocationbarcontroller.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/quick/api/oxideqquicklocationbarcontroller.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_QT_QUICK_API_LOCATION_BAR_CONTROLLER_H_
19
 
#define _OXIDE_QT_QUICK_API_LOCATION_BAR_CONTROLLER_H_
20
 
 
21
 
#include <QObject>
22
 
#include <QtGlobal>
 
18
#ifndef OXIDE_QTQUICK_LOCATION_BAR_CONTROLLER
 
19
#define OXIDE_QTQUICK_LOCATION_BAR_CONTROLLER
 
20
 
 
21
#include <QtCore/QObject>
 
22
#include <QtCore/QtGlobal>
 
23
 
 
24
#include <OxideQtQuick/oxideqquickglobal.h>
23
25
 
24
26
class OxideQQuickLocationBarControllerPrivate;
25
27
class OxideQQuickWebView;
26
28
 
27
 
class Q_DECL_EXPORT OxideQQuickLocationBarController : public QObject {
 
29
class OXIDE_QTQUICK_EXPORT OxideQQuickLocationBarController : public QObject {
28
30
  Q_OBJECT
29
31
 
30
32
  Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY heightChanged)
47
49
    ModeHidden
48
50
  };
49
51
 
50
 
  Q_DECL_HIDDEN OxideQQuickLocationBarController(OxideQQuickWebView* view);
51
 
  virtual ~OxideQQuickLocationBarController();
 
52
  ~OxideQQuickLocationBarController() Q_DECL_OVERRIDE;
52
53
 
53
54
  qreal height() const;
54
55
  void setHeight(qreal height);
74
75
  void contentOffsetChanged();
75
76
 
76
77
 private:
 
78
  friend class OxideQQuickWebView;
 
79
  Q_DECL_HIDDEN OxideQQuickLocationBarController(OxideQQuickWebView* view);
 
80
 
77
81
  QScopedPointer<OxideQQuickLocationBarControllerPrivate> d_ptr;
78
82
};
79
83
 
80
 
#endif // _OXIDE_QT_QUICK_API_LOCATION_BAR_CONTROLLER_H_
 
84
#endif // OXIDE_QTQUICK_LOCATION_BAR_CONTROLLER