commit a neatness ordering the class headers

6 files changed, 68 insertions, 43 deletions

diff --git a/frontends/qt/scaffolding.cls.h b/frontends/qt/scaffolding.cls.h
index bbcf41f77..3ddf45432 100644
--- a/frontends/qt/scaffolding.cls.h
+++ b/frontends/qt/scaffolding.cls.h
@@ -31,13 +31,6 @@ class NS_Scaffold : public QTabWidget
 {
 	Q_OBJECT
 
-private slots:
-	void destroyTab(int index);
-	void changeTab(int index);
-
-protected:
-	void closeEvent(QCloseEvent *event);
-
 public:
 	NS_Scaffold(QWidget *parent);
 
@@ -46,4 +39,12 @@ public:
 
 public slots:
 	void changeTabTitle(const char *title);
+
+protected:
+	void closeEvent(QCloseEvent *event);
+
+private slots:
+	void destroyTab(int index);
+	void changeTab(int index);
+
 };
diff --git a/frontends/qt/urlbar.cls.h b/frontends/qt/urlbar.cls.h
index ba5b535ad..c2b0993f9 100644
--- a/frontends/qt/urlbar.cls.h
+++ b/frontends/qt/urlbar.cls.h
@@ -23,19 +23,24 @@
 
 #include <QToolBar>
 #include <QLineEdit>
+
 extern "C" {
+
 #include "netsurf/types.h"
 #include "netsurf/content_type.h"
 #include "netsurf/browser_window.h"
+
 }
 
 class NS_URLBar :public QToolBar
 {
 	Q_OBJECT
-private:
-	struct browser_window *m_bw;
-	QLineEdit *m_input;
+
 public:
 	NS_URLBar(QWidget* parent, struct browser_window *bw);
 	nserror set_url(struct nsurl *url);
+
+private:
+	struct browser_window *m_bw;
+	QLineEdit *m_input;
 };
diff --git a/frontends/qt/widget.cls.h b/frontends/qt/widget.cls.h
index c73e23c24..0dc195558 100644
--- a/frontends/qt/widget.cls.h
+++ b/frontends/qt/widget.cls.h
@@ -23,37 +23,39 @@
 
 #include <QWidget>
 extern "C" {
+
 #include "netsurf/types.h"
 #include "netsurf/content_type.h"
 #include "netsurf/browser_window.h"
+
 }
 
 class NS_Widget : public QWidget
 {
 	Q_OBJECT
-private:
-	struct browser_window *m_bw;
-	int m_xoffset;
-	int m_yoffset;
-	uint32_t qkeyevent_to_nskey(QKeyEvent *event);
-
-protected:
-	void paintEvent(QPaintEvent *event);
-	void resizeEvent(QResizeEvent *event);
-	void mousePressEvent(QMouseEvent *event);
-	void mouseReleaseEvent(QMouseEvent *event);
-	void keyPressEvent(QKeyEvent *event);
 
 public:
-	NS_Widget(QWidget *parent, struct browser_window *bw)
-		: QWidget(parent, Qt::Widget), m_bw(bw), m_xoffset(0), m_yoffset(0) {setFocusPolicy(Qt::StrongFocus);}
+	NS_Widget(QWidget *parent, struct browser_window *bw);
+
 	QSize sizeHint() const override;
 	bool get_scroll(int *sx, int *sy);
 	nserror get_dimensions(int *width, int *height);
-
 	nserror invalidate(const struct rect *rect);
+
 public slots:
 	void setHorizontalScroll(int value);
 	void setVerticalScroll(int value);
 
+protected:
+	void paintEvent(QPaintEvent *event);
+	void resizeEvent(QResizeEvent *event);
+	void mousePressEvent(QMouseEvent *event);
+	void mouseReleaseEvent(QMouseEvent *event);
+	void keyPressEvent(QKeyEvent *event);
+
+private:
+	struct browser_window *m_bw;
+	int m_xoffset;
+	int m_yoffset;
+	uint32_t qkeyevent_to_nskey(QKeyEvent *event);
 };
diff --git a/frontends/qt/widget.cpp b/frontends/qt/widget.cpp
index 81072c9d1..4f5e9ab93 100644
--- a/frontends/qt/widget.cpp
+++ b/frontends/qt/widget.cpp
@@ -36,6 +36,19 @@ extern "C" {
 #include "qt/plotters.h"
 
 /**
+ * netsurf widget class constructor
+ */
+NS_Widget::NS_Widget(QWidget *parent, struct browser_window *bw)
+	: QWidget(parent, Qt::Widget),
+	  m_bw(bw),
+	  m_xoffset(0),
+	  m_yoffset(0)
+{
+	setFocusPolicy(Qt::StrongFocus);
+}
+
+
+/**
  * widget has been resized
  */
 void NS_Widget::resizeEvent(QResizeEvent *event)
diff --git a/frontends/qt/window.cls.h b/frontends/qt/window.cls.h
index 210e2e980..33ea87f51 100644
--- a/frontends/qt/window.cls.h
+++ b/frontends/qt/window.cls.h
@@ -40,24 +40,6 @@ extern "C" {
 class NS_Window : public QWidget
 {
 	Q_OBJECT
-private:
-	struct browser_window *m_bw;
-
-	NS_URLBar *m_nsurlbar;
-	NS_Widget *m_nswidget;
-	QScrollBar *m_vscrollbar;
-	QScrollBar *m_hscrollbar;
-	QLabel *m_status;
-
-	nserror set_scroll(const struct rect *rect);
-	void set_status(const char *text);
-	nserror set_extent(int w, int h);
-
-protected:
-	void closeEvent(QCloseEvent *event);
-
-signals:
-	void titleChanged(const char *title);
 
 public:
 	NS_Window(QWidget* parent, struct browser_window *bw);
@@ -77,4 +59,23 @@ public:
 	static nserror static_get_dimensions(struct gui_window *gw, int *width, int *height);
 	static struct gui_window *static_create(struct browser_window *bw, struct gui_window *existing, gui_window_create_flags flags);
 	static void static_destroy(struct gui_window *gw);
+
+signals:
+	void titleChanged(const char *title);
+
+protected:
+	void closeEvent(QCloseEvent *event);
+
+private:
+	struct browser_window *m_bw;
+
+	NS_URLBar *m_nsurlbar;
+	NS_Widget *m_nswidget;
+	QScrollBar *m_vscrollbar;
+	QScrollBar *m_hscrollbar;
+	QLabel *m_status;
+
+	nserror set_scroll(const struct rect *rect);
+	void set_status(const char *text);
+	nserror set_extent(int w, int h);
 };
diff --git a/frontends/qt/window.cpp b/frontends/qt/window.cpp
index 9ef83f72d..db0ba675f 100644
--- a/frontends/qt/window.cpp
+++ b/frontends/qt/window.cpp
@@ -113,6 +113,7 @@ void NS_Window::closeEvent(QCloseEvent *event)
 	browser_window_destroy(m_bw);
 }
 
+
 /**
  * destroy a tab
  */
@@ -121,6 +122,7 @@ void NS_Window::destroy(void)
 	browser_window_destroy(m_bw);
 }
 
+
 /**
  * set the status text
  */
@@ -374,6 +376,7 @@ NS_Window::static_create(struct browser_window *bw,
 	return gw;
 }
 
+
 /**
  * Destroy previously created gui window
  *