anjuta r3926 - in trunk: . plugins/editor plugins/editor/scintilla plugins/file-manager tagmanager

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Tue May 13 12:01:38 2008
New Revision: 3926
URL: http://svn.gnome.org/viewvc/anjuta?rev=3926&view=rev

Log:
	* tagmanager/tm_tag.c:
	* tagmanager/test_tm_buffer.c:
	* plugins/editor/scintilla/LexNsis.cxx:
	* plugins/editor/aneditor.cxx:
	* plugins/file-manager/file-view.c:
	Fixed a bunch of compiler warnings


Modified:
   trunk/ChangeLog
   trunk/plugins/editor/aneditor.cxx
   trunk/plugins/editor/scintilla/LexNsis.cxx
   trunk/plugins/file-manager/file-view.c
   trunk/tagmanager/test_tm_buffer.c
   trunk/tagmanager/tm_tag.c

Modified: trunk/plugins/editor/aneditor.cxx
==============================================================================
--- trunk/plugins/editor/aneditor.cxx	(original)
+++ trunk/plugins/editor/aneditor.cxx	Tue May 13 12:01:38 2008
@@ -2685,8 +2685,8 @@
 		
 		SString value_str;
 		long default_indic_type[] = {INDIC_TT, INDIC_DIAGONAL, INDIC_SQUIGGLE};
-		char *default_indic_color[] = {"0000FF", "#00FF00", "#FF0000"};
-		char *style_name[] = {"normal", "warning", "error"};
+		const char *default_indic_color[] = {"0000FF", "#00FF00", "#FF0000"};
+		const char *style_name[] = {"normal", "warning", "error"};
 		char key[200];
 		sprintf(key, "indicators.style.%s", style_name[i]);
 

Modified: trunk/plugins/editor/scintilla/LexNsis.cxx
==============================================================================
--- trunk/plugins/editor/scintilla/LexNsis.cxx	(original)
+++ trunk/plugins/editor/scintilla/LexNsis.cxx	Tue May 13 12:01:38 2008
@@ -94,7 +94,7 @@
   return false;
 }
 
-static int NsisCmp( char *s1, char *s2, bool bIgnoreCase )
+static int NsisCmp( char *s1, const char *s2, bool bIgnoreCase )
 {
   if( bIgnoreCase )
      return CompareCaseInsensitive( s1, s2);

Modified: trunk/plugins/file-manager/file-view.c
==============================================================================
--- trunk/plugins/file-manager/file-view.c	(original)
+++ trunk/plugins/file-manager/file-view.c	Tue May 13 12:01:38 2008
@@ -375,9 +375,6 @@
 static void
 file_view_finalize (GObject *object)
 {
-	AnjutaFileView* view = ANJUTA_FILE_VIEW (object);
-	AnjutaFileViewPrivate* priv = ANJUTA_FILE_VIEW_GET_PRIVATE (view);
-	
 	G_OBJECT_CLASS (file_view_parent_class)->finalize (object);
 }
 
@@ -385,7 +382,6 @@
 file_view_class_init (AnjutaFileViewClass *klass)
 {
 	GObjectClass* object_class = G_OBJECT_CLASS (klass);
-	GtkTreeViewClass* parent_class = GTK_TREE_VIEW_CLASS (klass);
 	GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (klass);
 	
 	g_type_class_add_private (klass, sizeof (AnjutaFileViewPrivate));

Modified: trunk/tagmanager/test_tm_buffer.c
==============================================================================
--- trunk/tagmanager/test_tm_buffer.c	(original)
+++ trunk/tagmanager/test_tm_buffer.c	Tue May 13 12:01:38 2008
@@ -35,7 +35,7 @@
 }
 
 
-gboolean tm_buffer_parse(TMSourceFile *source_file, unsigned char* buf, int buf_size)
+static gboolean tm_buffer_parse(TMSourceFile *source_file, unsigned char* buf, int buf_size)
 {
 	const char *file_name;
 	gboolean status = TRUE;

Modified: trunk/tagmanager/tm_tag.c
==============================================================================
--- trunk/tagmanager/tm_tag.c	(original)
+++ trunk/tagmanager/tm_tag.c	Tue May 13 12:01:38 2008
@@ -208,14 +208,14 @@
 
 gboolean tm_tag_init_from_file(TMTag *tag, TMSourceFile *file, FILE *fp)
 {
-	guchar buf[BUFSIZ];
+	gchar buf[BUFSIZ];
 	guchar *start, *end;
 	gboolean status;
 	guchar changed_char = TA_NAME;
 
 	if ((NULL == fgets(buf, BUFSIZ, fp)) || ('\0' == *buf))
 		return FALSE;
-	for (start = end = buf, status = TRUE; (TRUE == status); start = end, ++ end)
+	for (start = end = (guchar*)buf, status = TRUE; (TRUE == status); start = end, ++ end)
 	{
 		while ((*end < TA_NAME) && (*end != '\0') && (*end != '\n'))
 			++ end;
@@ -228,35 +228,35 @@
 			if (!isprint(*start))
 				return FALSE;
 			else
-				tag->name = g_strdup(start);
+				tag->name = g_strdup( (gchar*)start );
 		}
 		else
 		{
 			switch (*start)
 			{
 				case TA_LINE:
-					tag->atts.entry.line = atol(start + 1);
+					tag->atts.entry.line = atol( (gchar*)start + 1);
 					break;
 				case TA_LOCAL:
-					tag->atts.entry.local = atoi(start + 1);
+					tag->atts.entry.local = atoi( (gchar*)start + 1);
 					break;
 				case TA_TYPE:
-					tag->type = (TMTagType) atoi(start + 1);
+					tag->type = (TMTagType) atoi( (gchar*)start + 1);
 					break;
 				case TA_ARGLIST:
-					tag->atts.entry.arglist = g_strdup(start + 1);
+					tag->atts.entry.arglist = g_strdup( (gchar*)start + 1);
 					break;
 				case TA_SCOPE:
-					tag->atts.entry.scope = g_strdup(start + 1);
+					tag->atts.entry.scope = g_strdup( (gchar*)start + 1);
 					break;
 				case TA_POINTER:
-					tag->atts.entry.pointerOrder = atoi(start + 1);
+					tag->atts.entry.pointerOrder = atoi( (gchar*)start + 1);
 					break;
 				case TA_VARTYPE:
-					tag->atts.entry.type_ref[1] = g_strdup (start + 1);
+					tag->atts.entry.type_ref[1] = g_strdup ( (gchar*)start + 1);
 					break;
 				case TA_INHERITS:
-					tag->atts.entry.inheritance = g_strdup(start + 1);
+					tag->atts.entry.inheritance = g_strdup( (gchar*)start + 1);
 					break;
 				case TA_TIME:
 					if (tm_tag_file_t != tag->type)
@@ -265,7 +265,7 @@
 						return FALSE;
 					}
 					else
-						tag->atts.file.timestamp = atol(start + 1);
+						tag->atts.file.timestamp = atol( (gchar*)start + 1);
 					break;
 				case TA_LANG:
 					if (tm_tag_file_t != tag->type)
@@ -274,7 +274,7 @@
 						return FALSE;
 					}
 					else
-						tag->atts.file.lang = atoi(start + 1);
+						tag->atts.file.lang = atoi( (gchar*)start + 1);
 					break;
 				case TA_INACTIVE:
 					if (tm_tag_file_t != tag->type)
@@ -283,7 +283,7 @@
 						return FALSE;
 					}
 					else
-						tag->atts.file.inactive = (gboolean) atoi(start + 1);
+						tag->atts.file.inactive = (gboolean) atoi( (gchar*)start + 1);
 					break;
 				case TA_ACCESS:
 					tag->atts.entry.access = *(start + 1);
@@ -385,7 +385,7 @@
 
 int tm_tag_compare(const void *ptr1, const void *ptr2)
 {
-	int *sort_attr;
+	guint *sort_attr;
 	int returnval = 0;
 	TMTag *t1 = *((TMTag **) ptr1);
 	TMTag *t2 = *((TMTag **) ptr2);