src/*.h, src/*/*.h, src/*/*/*.h: Move typedefs within include guards

13 files changed, 37 insertions, 37 deletions

diff --git a/src/application.h b/src/application.h
index bf68cd3..0a9939d 100644
--- a/src/application.h
+++ b/src/application.h
@@ -19,11 +19,11 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct MqApplication MqApplication;
-
 #ifndef MQ_APPLICATION_H
 #define MQ_APPLICATION_H
 
+typedef struct MqApplication MqApplication;
+
 #include <glib.h>
 #include <webkit2/webkit2.h>
 
diff --git a/src/config.h b/src/config.h
index c0ef323..93af5f8 100644
--- a/src/config.h
+++ b/src/config.h
@@ -19,11 +19,11 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct MqConfig MqConfig;
-
 #ifndef MQ_CONFIG_H
 #define MQ_CONFIG_H
 
+typedef struct MqConfig MqConfig;
+
 #include <glib.h>
 
 typedef void (*MqConfigBooleanCallback)(MqConfig *,
diff --git a/src/tab-label.h b/src/tab-label.h
index d7545b2..df760b5 100644
--- a/src/tab-label.h
+++ b/src/tab-label.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqTabLabel      MqTabLabel;
-typedef struct _MqTabLabelClass MqTabLabelClass;
-
 #ifndef MQ_TAB_LABEL_H
 #define MQ_TAB_LABEL_H
 
+typedef struct _MqTabLabel      MqTabLabel;
+typedef struct _MqTabLabelClass MqTabLabelClass;
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
diff --git a/src/tab-page.h b/src/tab-page.h
index 0078fc9..85e332d 100644
--- a/src/tab-page.h
+++ b/src/tab-page.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqTabPage      MqTabPage;
-typedef struct _MqTabPageClass MqTabPageClass;
-
 #ifndef MQ_TAB_PAGE_H
 #define MQ_TAB_PAGE_H
 
+typedef struct _MqTabPage      MqTabPage;
+typedef struct _MqTabPageClass MqTabPageClass;
+
 #include <stdarg.h>
 
 #include <glib.h>
diff --git a/src/toolbars/find-toolbar.h b/src/toolbars/find-toolbar.h
index 386cab4..d9e2216 100644
--- a/src/toolbars/find-toolbar.h
+++ b/src/toolbars/find-toolbar.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqFindToolbar      MqFindToolbar;
-typedef struct _MqFindToolbarClass MqFindToolbarClass;
-
 #ifndef MQ_TOOLBARS_FIND_TOOLBAR_H
 #define MQ_TOOLBARS_FIND_TOOLBAR_H
 
+typedef struct _MqFindToolbar      MqFindToolbar;
+typedef struct _MqFindToolbarClass MqFindToolbarClass;
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
diff --git a/src/toolbars/navigation-toolbar.h b/src/toolbars/navigation-toolbar.h
index 65253f4..3dd9959 100644
--- a/src/toolbars/navigation-toolbar.h
+++ b/src/toolbars/navigation-toolbar.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqNavigationToolbar      MqNavigationToolbar;
-typedef struct _MqNavigationToolbarClass MqNavigationToolbarClass;
-
 #ifndef MQ_TOOLBARS_NAVIGATION_TOOLBAR_H
 #define MQ_TOOLBARS_NAVIGATION_TOOLBAR_H
 
+typedef struct _MqNavigationToolbar      MqNavigationToolbar;
+typedef struct _MqNavigationToolbarClass MqNavigationToolbarClass;
+
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/src/toolbars/navigation/back-forward-button-box.h b/src/toolbars/navigation/back-forward-button-box.h
index a11c4de..b00c079 100644
--- a/src/toolbars/navigation/back-forward-button-box.h
+++ b/src/toolbars/navigation/back-forward-button-box.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqBackForwardButtonBox      MqBackForwardButtonBox;
-typedef struct _MqBackForwardButtonBoxClass MqBackForwardButtonBoxClass;
-
 #ifndef MQ_TOOLBARS_NAVIGATION_BACK_FORWARD_BUTTON_BOX_H
 #define MQ_TOOLBARS_NAVIGATION_BACK_FORWARD_BUTTON_BOX_H
 
+typedef struct _MqBackForwardButtonBox      MqBackForwardButtonBox;
+typedef struct _MqBackForwardButtonBoxClass MqBackForwardButtonBoxClass;
+
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/src/toolbars/navigation/home-button.h b/src/toolbars/navigation/home-button.h
index 0eae927..af1d448 100644
--- a/src/toolbars/navigation/home-button.h
+++ b/src/toolbars/navigation/home-button.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqHomeButton      MqHomeButton;
-typedef struct _MqHomeButtonClass MqHomeButtonClass;
-
 #ifndef MQ_TOOLBARS_NAVIGATION_HOME_BUTTON_H
 #define MQ_TOOLBARS_NAVIGATION_HOME_BUTTON_H
 
+typedef struct _MqHomeButton      MqHomeButton;
+typedef struct _MqHomeButtonClass MqHomeButtonClass;
+
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/src/toolbars/navigation/main-menu.h b/src/toolbars/navigation/main-menu.h
index dbe00ce..13a6c33 100644
--- a/src/toolbars/navigation/main-menu.h
+++ b/src/toolbars/navigation/main-menu.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqMainMenu      MqMainMenu;
-typedef struct _MqMainMenuClass MqMainMenuClass;
-
 #ifndef MQ_TOOLBARS_NAVIGATION_MAIN_MENU_H
 #define MQ_TOOLBARS_NAVIGATION_MAIN_MENU_H
 
+typedef struct _MqMainMenu      MqMainMenu;
+typedef struct _MqMainMenuClass MqMainMenuClass;
+
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/src/toolbars/navigation/stop-reload-button.h b/src/toolbars/navigation/stop-reload-button.h
index 2b85109..82fd8a5 100644
--- a/src/toolbars/navigation/stop-reload-button.h
+++ b/src/toolbars/navigation/stop-reload-button.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqStopReloadButton      MqStopReloadButton;
-typedef struct _MqStopReloadButtonClass MqStopReloadButtonClass;
-
 #ifndef MQ_TOOLBARS_NAVIGATION_STOP_RELOAD_BUTTON_H
 #define MQ_TOOLBARS_NAVIGATION_STOP_RELOAD_BUTTON_H
 
+typedef struct _MqStopReloadButton      MqStopReloadButton;
+typedef struct _MqStopReloadButtonClass MqStopReloadButtonClass;
+
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/src/toolbars/navigation/uri-entry.h b/src/toolbars/navigation/uri-entry.h
index 248ba22..046d243 100644
--- a/src/toolbars/navigation/uri-entry.h
+++ b/src/toolbars/navigation/uri-entry.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqUriEntry      MqUriEntry;
-typedef struct _MqUriEntryClass MqUriEntryClass;
-
 #ifndef MQ_TOOLBARS_NAVIGATION_URI_ENTRY_H
 #define MQ_TOOLBARS_NAVIGATION_URI_ENTRY_H
 
+typedef struct _MqUriEntry      MqUriEntry;
+typedef struct _MqUriEntryClass MqUriEntryClass;
+
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/src/web-view.h b/src/web-view.h
index 3cd9814..fa209c1 100644
--- a/src/web-view.h
+++ b/src/web-view.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqWebView      MqWebView;
-typedef struct _MqWebViewClass MqWebViewClass;
-
 #ifndef MQ_WEB_VIEW_H
 #define MQ_WEB_VIEW_H
 
+typedef struct _MqWebView      MqWebView;
+typedef struct _MqWebViewClass MqWebViewClass;
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
diff --git a/src/window.h b/src/window.h
index 0dcb25c..3e82263 100644
--- a/src/window.h
+++ b/src/window.h
@@ -19,12 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-typedef struct _MqWindow      MqWindow;
-typedef struct _MqWindowClass MqWindowClass;
-
 #ifndef MQ_WINDOW_H
 #define MQ_WINDOW_H
 
+typedef struct _MqWindow      MqWindow;
+typedef struct _MqWindowClass MqWindowClass;
+
 #include <glib.h>
 #include <gtk/gtk.h>