SF.net SVN: geany: [1800] trunk - Commits

15 Aug 2007

Revision: 1800
          http://geany.svn.sourceforge.net/geany/?rev=1800&view=rev
Author:   ntrel
Date:     2007-08-15 08:37:21 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
Move #define PLAT_GTK to geany.h.
Move filetype typedef to geany.h.
Don't #include any src/*.h files from headers.
Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/build.c
    trunk/src/callbacks.c
    trunk/src/dialogs.c
    trunk/src/document.c
    trunk/src/document.h
    trunk/src/editor.c
    trunk/src/editor.h
    trunk/src/filetypes.h
    trunk/src/geany.h
    trunk/src/highlighting.h
    trunk/src/keybindings.c
    trunk/src/keyfile.c
    trunk/src/main.c
    trunk/src/msgwindow.c
    trunk/src/plugins.c
    trunk/src/sciwrappers.h
    trunk/src/symbols.c
    trunk/src/symbols.h
    trunk/src/templates.c
    trunk/src/treeviews.c
    trunk/src/ui_utils.c
    trunk/src/utils.c
Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/ChangeLog	2007-08-15 15:37:21 UTC (rev 1800)
@@ -7,6 +7,15 @@
  * src/plugins.c:
    Disconnect plugin callback signals when unloading plugins, to prevent
    a segfault when emitting signals.
+ * src/templates.c, src/build.c, src/utils.c,
+   src/keybindings.c, src/highlighting.h, src/sciwrappers.h,
+   src/dialogs.c, src/geany.h, src/treeviews.c, src/msgwindow.c,
+   src/callbacks.c, src/keyfile.c, src/filetypes.h, src/document.c,
+   src/plugins.c, src/document.h, src/main.c, src/editor.c,
+   src/symbols.c, src/editor.h, src/symbols.h, src/ui_utils.c
+   Move #define PLAT_GTK to geany.h.
+   Move filetype typedef to geany.h.
+   Don't #include any src/*.h files from headers.
2007-08-14  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/build.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -47,6 +47,7 @@
 #include "dialogs.h"
 #include "msgwindow.h"
 #include "document.h"
+#include "filetypes.h"
 #include "keybindings.h"
 #include "vte.h"
 #include "project.h"
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/callbacks.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -41,6 +41,7 @@
#include "keyfile.h"
 #include "document.h"
+#include "filetypes.h"
 #include "sciwrappers.h"
 #include "editor.h"
 #include "ui_utils.h"
Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/dialogs.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -45,6 +45,7 @@
#include "callbacks.h"
 #include "document.h"
+#include "filetypes.h"
 #include "win32.h"
 #include "sciwrappers.h"
 #include "support.h"
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/document.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -51,6 +51,7 @@
 #include <glib/gstdio.h>
#include "document.h"
+#include "filetypes.h"
 #include "support.h"
 #include "sciwrappers.h"
 #include "editor.h"
Modified: trunk/src/document.h
===================================================================
--- trunk/src/document.h	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/document.h	2007-08-15 15:37:21 UTC (rev 1800)
@@ -25,17 +25,10 @@
 #ifndef GEANY_DOCUMENT_H
 #define GEANY_DOCUMENT_H 1
-#ifndef PLAT_GTK
-#   define PLAT_GTK 1	// needed for ScintillaWidget.h
-#endif
-
 #include "Scintilla.h"
 #include "ScintillaWidget.h"
-#include "geany.h"
-#include "filetypes.h"
-
 typedef struct FileEncoding
 {
    gchar 			*encoding;
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/editor.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -36,6 +36,7 @@
#include "editor.h"
 #include "document.h"
+#include "filetypes.h"
 #include "sciwrappers.h"
 #include "ui_utils.h"
 #include "utils.h"
Modified: trunk/src/editor.h
===================================================================
--- trunk/src/editor.h	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/editor.h	2007-08-15 15:37:21 UTC (rev 1800)
@@ -24,10 +24,6 @@
 #ifndef GEANY_SCI_CB_H
 #define GEANY_SCI_CB_H 1
-#ifndef PLAT_GTK
-#   define PLAT_GTK 1	// needed for ScintillaWidget.h
-#endif
-
 #include "Scintilla.h"
 #include "ScintillaWidget.h"
Modified: trunk/src/filetypes.h
===================================================================
--- trunk/src/filetypes.h	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/filetypes.h	2007-08-15 15:37:21 UTC (rev 1800)
@@ -25,10 +25,6 @@
 #ifndef GEANY_FILETYPES_H
 #define GEANY_FILETYPES_H 1
-#ifndef PLAT_GTK
-#   define PLAT_GTK 1	// needed for ScintillaWidget.h
-#endif
-
 #include "Scintilla.h"
 #include "ScintillaWidget.h"
@@ -106,7 +102,7 @@
    gboolean modified;
 };
-typedef struct filetype
+struct filetype
 {
    filetype_id		  id;
    guint	 		  uid;				// unique id as reference for saved filetype in config file
@@ -124,7 +120,7 @@
    struct build_programs	*programs;
    struct build_actions	*actions;
    void (*style_func_ptr) (ScintillaObject*);
-} filetype;
+};
extern filetype *filetypes[GEANY_MAX_FILE_TYPES];
Modified: trunk/src/geany.h
===================================================================
--- trunk/src/geany.h	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/geany.h	2007-08-15 15:37:21 UTC (rev 1800)
@@ -32,7 +32,11 @@
#include "tm_tagmanager.h"
+#ifndef PLAT_GTK
+#   define PLAT_GTK 1	// needed when including ScintillaWidget.h
+#endif
+
 // for detailed description look in the documentation, things are not
 // listed in the documentation should not be changed ;-)
 #define GEANY_HOME_DIR					g_get_home_dir()
@@ -71,7 +75,8 @@
-// simple forward declaration to avoid unnecessary inclusion of project.h
+// useful forward declarations
+typedef struct filetype filetype;
 typedef struct _GeanyProject GeanyProject;
Modified: trunk/src/highlighting.h
===================================================================
--- trunk/src/highlighting.h	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/highlighting.h	2007-08-15 15:37:21 UTC (rev 1800)
@@ -25,10 +25,6 @@
 #ifndef GEANY_HIGHLIGHTING_H
 #define GEANY_HIGHLIGHTING_H 1
-#ifndef PLAT_GTK
-#   define PLAT_GTK 1	// needed for ScintillaWidget.h
-#endif
-
 #include "Scintilla.h"
 #include "ScintillaWidget.h"
Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/keybindings.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -33,6 +33,7 @@
 #include "utils.h"
 #include "ui_utils.h"
 #include "document.h"
+#include "filetypes.h"
 #include "callbacks.h"
 #include "prefs.h"
 #include "msgwindow.h"
Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/keyfile.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -41,6 +41,7 @@
 #include "ui_utils.h"
 #include "utils.h"
 #include "document.h"
+#include "filetypes.h"
 #include "sciwrappers.h"
 #include "encodings.h"
 #include "vte.h"
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/main.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -47,6 +47,7 @@
 #include "ui_utils.h"
 #include "utils.h"
 #include "document.h"
+#include "filetypes.h"
 #include "keyfile.h"
 #include "win32.h"
 #include "msgwindow.h"
Modified: trunk/src/msgwindow.c
===================================================================
--- trunk/src/msgwindow.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/msgwindow.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -36,6 +36,7 @@
 #include "ui_utils.h"
 #include "utils.h"
 #include "document.h"
+#include "filetypes.h"
 #include "build.h"
#include <string.h>
Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/plugins.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -30,10 +30,6 @@
#include <string.h>
-#ifndef PLAT_GTK
-#   define PLAT_GTK 1   // needed for ScintillaWidget.h
-#endif
-
 #include "Scintilla.h"
 #include "ScintillaWidget.h"
@@ -42,6 +38,7 @@
 #include "support.h"
 #include "utils.h"
 #include "document.h"
+#include "filetypes.h"
 #include "templates.h"
 #include "sciwrappers.h"
 #include "ui_utils.h"
Modified: trunk/src/sciwrappers.h
===================================================================
--- trunk/src/sciwrappers.h	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/sciwrappers.h	2007-08-15 15:37:21 UTC (rev 1800)
@@ -25,9 +25,6 @@
 #define GEANY_SCIWRAPPERS_H 1
#include "Scintilla.h"
-#ifndef PLAT_GTK
-#   define PLAT_GTK 1
-#endif
 #include "ScintillaWidget.h"
Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/symbols.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -179,7 +179,7 @@
 }
-const gchar *symbols_get_context_separator(filetype_id ft_id)
+const gchar *symbols_get_context_separator(gint ft_id)
 {
    gchar *cosep;
Modified: trunk/src/symbols.h
===================================================================
--- trunk/src/symbols.h	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/symbols.h	2007-08-15 15:37:21 UTC (rev 1800)
@@ -25,8 +25,6 @@
 #ifndef GEANY_SYMBOLS_H
 #define GEANY_SYMBOLS_H 1
-#include "filetypes.h"
-
 extern const guint TM_GLOBAL_TYPE_MASK;
@@ -34,7 +32,7 @@
GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types);
-const gchar *symbols_get_context_separator(filetype_id ft_id);
+const gchar *symbols_get_context_separator(gint ft_id);
const GList *symbols_get_tag_list(gint idx, guint tag_types);
Modified: trunk/src/templates.c
===================================================================
--- trunk/src/templates.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/templates.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -35,6 +35,7 @@
 #include "support.h"
 #include "utils.h"
 #include "document.h"
+#include "filetypes.h"
// default templates, only for initial tempate file creation on first start of Geany
Modified: trunk/src/treeviews.c
===================================================================
--- trunk/src/treeviews.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/treeviews.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -32,6 +32,7 @@
 #include "callbacks.h"
 #include "treeviews.h"
 #include "document.h"
+#include "filetypes.h"
 #include "utils.h"
 #include "ui_utils.h"
 #include "symbols.h"
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/ui_utils.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -32,6 +32,7 @@
 #include "ui_utils.h"
 #include "sciwrappers.h"
 #include "document.h"
+#include "filetypes.h"
 #include "support.h"
 #include "msgwindow.h"
 #include "utils.h"
Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2007-08-15 12:29:57 UTC (rev 1799)
+++ trunk/src/utils.c	2007-08-15 15:37:21 UTC (rev 1800)
@@ -47,6 +47,7 @@
#include "support.h"
 #include "document.h"
+#include "filetypes.h"
 #include "sciwrappers.h"
 #include "dialogs.h"
 #include "win32.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    