Merge branch 'Qt'

After the 3.1 release it is time to shift the focus on the Qt effort - and
the best way to do this is to merge the changes in the Qt branch into
master.

Linus was extremely nice and did a merge for me. I decided to do my own
merge instead (which by accident actually based on a different version of
the Qt branch) and then used his merge to double check what I was doing.

I resolved a few things differently but overall what we did was very much
the same (and I say this with pride since Linus is a professional git
merger)

Here's his merge commit message:

    This is a rough and tumble merge of the Qt branch into 'master',
    trying to sort out the conflicts as best as I could.

    There were two major kinds of conflicts:

     - the Makefile changes, in particular the split of the single
       Makefile into Rules.mk and Configure.mk, along with the obvious Qt
       build changes themselves.

       Those changes conflicted with some of the updates done in mainline
       wrt "release" targets and some helper macros ($(NAME) etc).

       Resolved by largely taking the Qt branch versions, and then editing
       in the most obvious parts of the Makefile updates from mainline.

       NOTE! The script/get_version shell script was made to just fail
       silently on not finding a git repository, which avoided having to
       take some particularly ugly Makefile changes.

     - Various random updates in mainline to support things like dive tags.

       The conflicts were mainly to the gtk GUI parts, which obviously
       looked different afterwards.  I fixed things up to look like the
       newer code, but since the gtk files themselves are actually dead in
       the Qt branch, this is largely irrelevant.

       NOTE! This does *NOT* introduce the equivalent Qt functionality.
       The fields are there in the code now, but there's no Qt UI for the
       whole dive tag stuff etc.

    This seems to compile for me (although I have to force
    "QMAKE=qmake-qt4" on f19), and results in a Linux binary that seems to
    work, but it is otherwise largely untested.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 38 insertions, 8 deletions

diff --git a/equipment.c b/equipment.c
index 97388e79b..189cc617f 100644
--- a/equipment.c
+++ b/equipment.c
@@ -16,9 +16,14 @@
 
 #include "dive.h"
 #include "display.h"
+#if USE_GTK_UI
 #include "display-gtk.h"
+#endif
 #include "divelist.h"
+#include "conversions.h"
 
+#if USE_GTK_UI
+#include "display-gtk.h"
 static GtkListStore *cylinder_model, *weightsystem_model;
 
 enum {
@@ -68,9 +73,10 @@ struct ws_widget {
 	GtkSpinButton *weight;
 	int w_idx;
 };
+#endif /* USE_GTK_UI */
 
 /* we want bar - so let's not use our unit functions */
-static int convert_pressure(int mbar, double *p)
+int convert_pressure(int mbar, double *p)
 {
 	int decimals = 1;
 	double pressure;
@@ -86,7 +92,7 @@ static int convert_pressure(int mbar, double *p)
 	return decimals;
 }
 
-static void convert_volume_pressure(int ml, int mbar, double *v, double *p)
+void convert_volume_pressure(int ml, int mbar, double *v, double *p)
 {
 	double volume, pressure;
 
@@ -108,7 +114,7 @@ static void convert_volume_pressure(int ml, int mbar, double *v, double *p)
 	*v = volume;
 }
 
-static int convert_weight(int grams, double *m)
+int convert_weight(int grams, double *m)
 {
 	int decimals = 1; /* not sure - do people do less than whole lbs/kg ? */
 	double weight;
@@ -121,6 +127,7 @@ static int convert_weight(int grams, double *m)
 	return decimals;
 }
 
+#if USE_GTK_UI
 static void set_cylinder_description(struct cylinder_widget *cylinder, const char *desc)
 {
 	set_active_text(cylinder->description, desc);
@@ -452,6 +459,28 @@ static void show_weightsystem(weightsystem_t *ws, struct ws_widget *weightsystem
 	set_weight_description(weightsystem_widget, desc);
 	set_weight_weight_spinbutton(weightsystem_widget, ws->weight.grams);
 }
+#else
+/* placeholders for a few functions that we need to redesign for the Qt UI */
+void add_cylinder_description(cylinder_type_t *type)
+{
+	const char *desc;
+
+	desc = type->description;
+	if (!desc)
+		return;
+	/* now do something with it... */
+}
+void add_weightsystem_description(weightsystem_t *weightsystem)
+{
+	const char *desc;
+
+	desc = weightsystem->description;
+	if (!desc)
+		return;
+	/* now do something with it... */
+}
+
+#endif /* USE_GTK_UI */
 
 gboolean cylinder_nodata(cylinder_t *cyl)
 {
@@ -516,6 +545,7 @@ gboolean weightsystems_equal(weightsystem_t *ws1, weightsystem_t *ws2)
 	return TRUE;
 }
 
+#if USE_GTK_UI
 static void set_one_cylinder(void *_data, GtkListStore *model, GtkTreeIter *iter)
 {
 	cylinder_t *cyl = _data;
@@ -726,6 +756,7 @@ static void fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl
 	/*
 	 * Also, insert it into the model if it doesn't already exist
 	 */
+	// WARNING: GTK-Specific Code.
 	add_cylinder(cylinder, desc, ml, mbar);
 }
 
@@ -784,16 +815,13 @@ static void record_weightsystem_changes(weightsystem_t *ws, struct ws_widget *we
 	ws->description = desc;
 	add_weightsystem_type(desc, grams, &iter);
 }
-
+#endif /* USE_GTK_UI */
 /*
  * We hardcode the most common standard cylinders,
  * we should pick up any other names from the dive
  * logs directly.
  */
-static struct tank_info {
-	const char *name;
-	int cuft, ml, psi, bar;
-} tank_info[100] = {
+struct tank_info tank_info[100] = {
 	/* Need an empty entry for the no-cylinder case */
 	{ "", },
 
@@ -836,6 +864,7 @@ static struct tank_info {
 	{ NULL, }
 };
 
+#if USE_GTK_UI
 static void fill_tank_list(GtkListStore *store)
 {
 	GtkTreeIter iter;
@@ -1682,3 +1711,4 @@ void clear_equipment_widgets()
 	gtk_list_store_clear(cylinder_list[W_IDX_PRIMARY].model);
 	gtk_list_store_clear(weightsystem_list[W_IDX_PRIMARY].model);
 }
+#endif /* USE_GTK_UI */