GNOME.org
 

[planner] Various indentation fixes

commit c45ee9d5405cef6e0ec6ff8ee2d42525845895cb
Author: Maurice van der Pot <griffon26 kfk4ever com>
Date:   Sun Jun 14 11:47:22 2009 +0200

    Various indentation fixes
    
    Most of Planner's code uses tabs at the beginning of lines and spaces in all
    other places, such as between a function name and its list of parameters.
    Spaces are also used after tabs on lines that need to align with previous
    lines, such as function prototypes that are split over multiple lines.
    This patch fixes some code where this style was not used.

 libplanner/mrp-task-manager.c |    2 +-
 libplanner/mrp-task.c         |   22 +++++++++---------
 libplanner/mrp-task.h         |   12 +++++-----
 src/planner-gantt-chart.c     |    4 +-
 src/planner-gantt-chart.h     |   18 +++++++-------
 src/planner-gantt-model.c     |    2 +-
 src/planner-gantt-model.h     |   10 ++++----
 src/planner-gantt-view.c      |   14 +++++-----
 src/planner-task-tree.c       |   50 ++++++++++++++++++++--------------------
 src/planner-task-view.c       |    2 +-
 src/planner-window.c          |    2 +-
 11 files changed, 69 insertions(+), 69 deletions(-)
---
diff --git a/libplanner/mrp-task-manager.c b/libplanner/mrp-task-manager.c
index 60f3ee5..2388959 100644
--- a/libplanner/mrp-task-manager.c
+++ b/libplanner/mrp-task-manager.c
@@ -123,7 +123,7 @@ static GObjectClass *parent_class;
 
 static mrptime
 task_manager_calculate_task_start_from_finish (MrpTaskManager *manager,
-				    		MrpTask        *task,
+						MrpTask        *task,
 						mrptime         finish,
 						gint           *duration);
 
diff --git a/libplanner/mrp-task.c b/libplanner/mrp-task.c
index 7a7ceca..92a95b8 100644
--- a/libplanner/mrp-task.c
+++ b/libplanner/mrp-task.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2004-2005 Imendio AB
  * Copyright (C) 2001-2002 CodeFactory AB
@@ -197,7 +197,7 @@ task_init (MrpTask *task)
 	priv->note = g_strdup ("");
 
 	priv->cost = 0.0;
- 	priv->cost_cached = FALSE;
+	priv->cost_cached = FALSE;
 	priv->unit_ivals = NULL;
 }
 
@@ -473,7 +473,7 @@ task_set_property (GObject      *object,
 
 		break;
 
- 	case PROP_START:
+	case PROP_START:
 		priv->start = g_value_get_long (value);
 		break;
 
@@ -553,7 +553,7 @@ task_set_property (GObject      *object,
 		changed = TRUE;
 		break;
 
- 	case PROP_CONSTRAINT:
+	case PROP_CONSTRAINT:
 		/* FIXME: compare */
 		priv->constraint = *(MrpConstraint *) g_value_get_boxed (value);
 		changed = TRUE;
@@ -1051,13 +1051,13 @@ mrp_task_add_predecessor (MrpTask          *task,
 			  glong             lag,
 			  GError          **error)
 {
-	MrpRelation		*relation;
-	MrpProject		*project;
-	MrpTaskManager		*manager;
-	GList			*relations;
-	gchar			*tmp;
-	MrpConstraint		 constraint;
-	mrptime			 pred_start;
+	MrpRelation             *relation;
+	MrpProject              *project;
+	MrpTaskManager          *manager;
+	GList                   *relations;
+	gchar                   *tmp;
+	MrpConstraint            constraint;
+	mrptime                  pred_start;
 
 	g_return_val_if_fail (MRP_IS_TASK (task), NULL);
 	g_return_val_if_fail (MRP_IS_TASK (predecessor), NULL);
diff --git a/libplanner/mrp-task.h b/libplanner/mrp-task.h
index 4efa9e2..b9f6a83 100644
--- a/libplanner/mrp-task.h
+++ b/libplanner/mrp-task.h
@@ -29,12 +29,12 @@
 #include <libplanner/mrp-time.h>
 #include <libplanner/mrp-assignment.h>
 
-#define MRP_TYPE_TASK			(mrp_task_get_type ())
-#define MRP_TASK(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), MRP_TYPE_TASK, MrpTask))
-#define MRP_TASK_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), MRP_TYPE_TASK, MrpTaskClass))
-#define MRP_IS_TASK(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), MRP_TYPE_TASK))
-#define MRP_IS_TASK_CLASS(klass)	(G_TYPE_CHECK_TYPE ((obj), MRP_TYPE_TASK))
-#define MRP_TASK_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), MRP_TYPE_TASK, MrpTaskClass))
+#define MRP_TYPE_TASK                   (mrp_task_get_type ())
+#define MRP_TASK(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), MRP_TYPE_TASK, MrpTask))
+#define MRP_TASK_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), MRP_TYPE_TASK, MrpTaskClass))
+#define MRP_IS_TASK(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MRP_TYPE_TASK))
+#define MRP_IS_TASK_CLASS(klass)        (G_TYPE_CHECK_TYPE ((obj), MRP_TYPE_TASK))
+#define MRP_TASK_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), MRP_TYPE_TASK, MrpTaskClass))
 
 #define MRP_TYPE_CONSTRAINT             (mrp_constraint_get_type ())
 #define MRP_TYPE_RELATION               (mrp_relation_get_type ())
diff --git a/src/planner-gantt-chart.c b/src/planner-gantt-chart.c
index 27db952..a050ce8 100644
--- a/src/planner-gantt-chart.c
+++ b/src/planner-gantt-chart.c
@@ -110,7 +110,7 @@ struct _PlannerGanttChartPriv {
 	gboolean         nonstandard_days;
 
 	/* GuideLines . */
-	gboolean 		 guidelines;
+	gboolean         guidelines;
 
 	/* Keep a list of signal connection ids, so we can remove them
 	 * easily.
@@ -1107,7 +1107,7 @@ gantt_chart_insert_task (PlannerGanttChart *chart,
 static PlannerRelationArrow *
 gantt_chart_add_relation (PlannerGanttChart *chart,
 			  TreeNode          *task,
-			  TreeNode     	    *predecessor,
+			  TreeNode          *predecessor,
 			  MrpRelationType    type)
 {
 	return planner_relation_arrow_new (PLANNER_GANTT_ROW (task->item),
diff --git a/src/planner-gantt-chart.h b/src/planner-gantt-chart.h
index 4886e86..93244e5 100644
--- a/src/planner-gantt-chart.h
+++ b/src/planner-gantt-chart.h
@@ -29,12 +29,12 @@
 #include <libgnomecanvas/gnome-canvas.h>
 #include "planner-task-tree.h"
 
-#define PLANNER_TYPE_GANTT_CHART		(planner_gantt_chart_get_type ())
-#define PLANNER_GANTT_CHART(obj)		(GTK_CHECK_CAST ((obj), PLANNER_TYPE_GANTT_CHART, PlannerGanttChart))
-#define PLANNER_GANTT_CHART_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), PLANNER_TYPE_GANTT_CHART, PlannerGanttChartClass))
-#define PLANNER_IS_GANTT_CHART(obj)		(GTK_CHECK_TYPE ((obj), PLANNER_TYPE_GANTT_CHART))
-#define PLANNER_IS_GANTT_CHART_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), PLANNER_TYPE_GANTT_CHART))
-#define PLANNER_GANTT_CHART_GET_CLASS(obj)	(GTK_CHECK_GET_CLASS ((obj), PLANNER_TYPE_GANTT_CHART, PlannerGanttChartClass))
+#define PLANNER_TYPE_GANTT_CHART                (planner_gantt_chart_get_type ())
+#define PLANNER_GANTT_CHART(obj)                (GTK_CHECK_CAST ((obj), PLANNER_TYPE_GANTT_CHART, PlannerGanttChart))
+#define PLANNER_GANTT_CHART_CLASS(klass)        (GTK_CHECK_CLASS_CAST ((klass), PLANNER_TYPE_GANTT_CHART, PlannerGanttChartClass))
+#define PLANNER_IS_GANTT_CHART(obj)             (GTK_CHECK_TYPE ((obj), PLANNER_TYPE_GANTT_CHART))
+#define PLANNER_IS_GANTT_CHART_CLASS(klass)     (GTK_CHECK_CLASS_TYPE ((obj), PLANNER_TYPE_GANTT_CHART))
+#define PLANNER_GANTT_CHART_GET_CLASS(obj)      (GTK_CHECK_GET_CLASS ((obj), PLANNER_TYPE_GANTT_CHART, PlannerGanttChartClass))
 
 typedef struct _PlannerGanttChart           PlannerGanttChart;
 typedef struct _PlannerGanttChartClass      PlannerGanttChartClass;
@@ -92,11 +92,11 @@ gboolean
 planner_gantt_chart_get_highlight_critical_tasks      (PlannerGanttChart  *chart);
 
 void
-planner_gantt_chart_set_show_guidelines			(PlannerGanttChart  *chart,
-							 gboolean       state);
+planner_gantt_chart_set_show_guidelines               (PlannerGanttChart  *chart,
+						       gboolean            state);
 
 gboolean
-planner_gantt_chart_get_show_guidelines 		(PlannerGanttChart *chart);
+planner_gantt_chart_get_show_guidelines              (PlannerGanttChart *chart);
 
 void
 planner_gantt_chart_set_nonstandard_days             (PlannerGanttChart *chart,
diff --git a/src/planner-gantt-model.c b/src/planner-gantt-model.c
index 7e22788..42ed928 100644
--- a/src/planner-gantt-model.c
+++ b/src/planner-gantt-model.c
@@ -117,7 +117,7 @@ planner_gantt_model_get_type (void)
 		g_type_add_interface_static (type,
 					     GTK_TYPE_TREE_MODEL,
 					     &tree_model_info);
-   	}
+	}
 
 	return type;
 }
diff --git a/src/planner-gantt-model.h b/src/planner-gantt-model.h
index 909fa06..b381959 100644
--- a/src/planner-gantt-model.h
+++ b/src/planner-gantt-model.h
@@ -27,11 +27,11 @@
 #include <libplanner/mrp-task.h>
 #include <gtk/gtktreemodel.h>
 
-#define PLANNER_TYPE_GANTT_MODEL	(planner_gantt_model_get_type ())
-#define PLANNER_GANTT_MODEL(obj)	(GTK_CHECK_CAST ((obj), PLANNER_TYPE_GANTT_MODEL, PlannerGanttModel))
-#define PLANNER_GANTT_MODEL_CLASS(klass)(GTK_CHECK_CLASS_CAST ((klass), PLANNER_TYPE_GANTT_MODEL, PlannerGanttModelClass))
-#define PLANNER_IS_GANTT_MODEL(obj)	(GTK_CHECK_TYPE ((obj), PLANNER_TYPE_GANTT_MODEL))
-#define PLANNER_IS_GANTT_MODEL_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((obj), PLANNER_TYPE_GANTT_MODEL))
+#define PLANNER_TYPE_GANTT_MODEL            (planner_gantt_model_get_type ())
+#define PLANNER_GANTT_MODEL(obj)            (GTK_CHECK_CAST ((obj), PLANNER_TYPE_GANTT_MODEL, PlannerGanttModel))
+#define PLANNER_GANTT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), PLANNER_TYPE_GANTT_MODEL, PlannerGanttModelClass))
+#define PLANNER_IS_GANTT_MODEL(obj)         (GTK_CHECK_TYPE ((obj), PLANNER_TYPE_GANTT_MODEL))
+#define PLANNER_IS_GANTT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), PLANNER_TYPE_GANTT_MODEL))
 
 typedef struct _PlannerGanttModel      PlannerGanttModel;
 typedef struct _PlannerGanttModelClass PlannerGanttModelClass;
diff --git a/src/planner-gantt-view.c b/src/planner-gantt-view.c
index 813f379..b1e08f0 100644
--- a/src/planner-gantt-view.c
+++ b/src/planner-gantt-view.c
@@ -208,19 +208,19 @@ gantt_view_chart_scroll_event (GtkWidget * gki, GdkEventScroll * event, PlannerG
 		priv = view->priv;
 		planner_gantt_chart_can_zoom (PLANNER_GANTT_CHART (priv->gantt), &can_in, &can_out);
 		switch (event->direction) {
-      			case GDK_SCROLL_UP: {
+			case GDK_SCROLL_UP: {
 				if (can_in)
 					gantt_view_zoom_in_cb  (NULL, view);
-	        		break;
+				break;
 			}
 			case GDK_SCROLL_DOWN:
 				if (can_out)
 					gantt_view_zoom_out_cb  (NULL, view);
 			        break;
-		      default:
-        		break;
+			default:
+				break;
 		}
-    	}
+	}
 
 	return TRUE;
 }
@@ -376,7 +376,7 @@ gantt_view_get_widget (PlannerView *view)
 
 	priv = PLANNER_GANTT_VIEW (view)->priv;
 
- 	if (priv->paned == NULL) {
+	if (priv->paned == NULL) {
 		priv->paned = gantt_view_create_widget (PLANNER_GANTT_VIEW (view));
 		gtk_widget_show_all (priv->paned);
 	}
@@ -1166,7 +1166,7 @@ gantt_view_show_guidelines_cb (GtkAction *action,
 
 	planner_gantt_chart_set_show_guidelines (
 		PLANNER_GANTT_CHART (priv->gantt),
- 		state);
+		state);
 }
 
 static void
diff --git a/src/planner-task-tree.c b/src/planner-task-tree.c
index 3e3c165..8907c08 100644
--- a/src/planner-task-tree.c
+++ b/src/planner-task-tree.c
@@ -507,7 +507,7 @@ task_cmd_remove_undo (PlannerCmd *cmd_base)
 	depth = gtk_tree_path_get_depth (path);
 	position = gtk_tree_path_get_indices (path)[depth - 1];
 
- 	if (depth > 1) {
+	if (depth > 1) {
 		gtk_tree_path_up (path);
 		parent = task_tree_get_task_from_path (cmd->tree, path);
 	} else {
@@ -3285,10 +3285,10 @@ planner_task_tree_move_task_up (PlannerTaskTree *tree)
 	GtkTreeSelection    *selection;
 	PlannerGanttModel   *model;
 	GtkTreePath	    *path;
-	MrpProject  	    *project;
-	MrpTask	    	    *task, *parent, *sibling;
-	GList	    	    *list, *l, *m;
-	guint	    	     position;
+	MrpProject          *project;
+	MrpTask	            *task, *parent, *sibling;
+	GList	            *list, *l, *m;
+	guint	             position;
 	gboolean	     proceed, skip;
 	gint		     count;
 	MrpTask             *anchor_task;
@@ -3314,8 +3314,8 @@ planner_task_tree_move_task_up (PlannerTaskTree *tree)
 		anchor_task = NULL;
 	}
 
- 	proceed = TRUE;
- 	count = 0 ;
+	proceed = TRUE;
+	count = 0 ;
 
 	/* Note: This will not be 100% accurate since even if we select 10
 	 * tasks, only one of them may end up moved. It's not a big deal
@@ -3334,11 +3334,11 @@ planner_task_tree_move_task_up (PlannerTaskTree *tree)
 	}
 
 	for (l = list; l; l = l->next) {
- 		count++;
+		count++;
 
- 		task = l->data;
- 		position = mrp_task_get_position (task);
- 		parent = mrp_task_get_parent (task);
+		task = l->data;
+		position = mrp_task_get_position (task);
+		parent = mrp_task_get_parent (task);
 
 		/* We now check if the parent is selected as well me. If it is
 		 * then we skip checks on our position and skip moving because
@@ -3351,27 +3351,27 @@ planner_task_tree_move_task_up (PlannerTaskTree *tree)
 		 * do that we need to recurse this selection list.
 		 */
 
- 		skip = FALSE;
- 		for (m = list; m; m = m->next) {
- 			if (m->data == parent ) {
- 				skip = TRUE;
+		skip = FALSE;
+		for (m = list; m; m = m->next) {
+			if (m->data == parent ) {
+				skip = TRUE;
 				break;
- 			}
- 		}
+			}
+		}
 
- 		if (position == 0 && count == 1) {
+		if (position == 0 && count == 1) {
 			/* We stop everything if at top of list and first task
 			 * else just stop moving this one task.
 			 */
- 			proceed = FALSE;
- 		}
- 		if (!skip && position != 0 && proceed) {
+			proceed = FALSE;
+		}
+		if (!skip && position != 0 && proceed) {
 			/* Move task from position to position - 1. */
- 			sibling = mrp_task_get_nth_child (parent, position - 1);
+			sibling = mrp_task_get_nth_child (parent, position - 1);
 			task_cmd_move (tree, _("Move task up"),
 				       task, sibling, parent,
 				       TRUE, NULL);
- 		}
+		}
 	}
 
 	/* Reselect all the previous selected tasks. */
@@ -3406,8 +3406,8 @@ planner_task_tree_move_task_down (PlannerTaskTree *tree)
 	GtkTreeSelection    *selection;
 	PlannerGanttModel   *model;
 	GtkTreePath	    *path;
-	MrpProject 	    *project;
-	MrpTask	   	    *task, *parent, *sibling;
+	MrpProject          *project;
+	MrpTask	            *task, *parent, *sibling;
 	GList		    *list, *l, *m;
 	guint		     position;
 	gboolean	     proceed, skip;
diff --git a/src/planner-task-view.c b/src/planner-task-view.c
index 58e012a..cdcfcd4 100644
--- a/src/planner-task-view.c
+++ b/src/planner-task-view.c
@@ -415,7 +415,7 @@ task_view_project_loaded_cb (MrpProject  *project,
 	PlannerTaskViewPriv *priv;
 	GtkTreeModel        *model;
 
- 	priv = PLANNER_TASK_VIEW (view)->priv;
+	priv = PLANNER_TASK_VIEW (view)->priv;
 
 	model = GTK_TREE_MODEL (planner_gantt_model_new (project));
 
diff --git a/src/planner-window.c b/src/planner-window.c
index 9af4bad..e178602 100644
--- a/src/planner-window.c
+++ b/src/planner-window.c
@@ -1862,7 +1862,7 @@ window_get_name (PlannerWindow *window)
 static void
 window_update_title (PlannerWindow *window)
 {
- 	PlannerWindowPriv *priv;
+	PlannerWindowPriv *priv;
 	gchar             *name;
 	gchar             *title;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]