Author: abrander
Date: 2010-01-27 16:43:09 +0100 (Wed, 27 Jan 2010)
New Revision: 3094
Modified:
branches/rawstudio-ng-color/librawstudio/rs-profile-factory-model.h
branches/rawstudio-ng-color/librawstudio/rs-profile-factory.c
Log:
Prefixing column names for RSProfileFactory.
Modified: branches/rawstudio-ng-color/librawstudio/rs-profile-factory-model.h
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-profile-factory-model.h
2010-01-27 14:58:47 UTC (rev 3093)
+++ branches/rawstudio-ng-color/librawstudio/rs-profile-factory-model.h
2010-01-27 15:43:09 UTC (rev 3094)
@@ -1,6 +1,6 @@
enum {
- COLUMN_PROFILE,
- COLUMN_MODEL,
- COLUMN_ID,
- NUM_COLUMNS
+ FACTORY_MODEL_COLUMN_PROFILE,
+ FACTORY_MODEL_COLUMN_MODEL,
+ FACTORY_MODEL_COLUMN_ID,
+ FACTORY_MODEL_NUM_COLUMNS
};
Modified: branches/rawstudio-ng-color/librawstudio/rs-profile-factory.c
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-profile-factory.c
2010-01-27 14:58:47 UTC (rev 3093)
+++ branches/rawstudio-ng-color/librawstudio/rs-profile-factory.c
2010-01-27 15:43:09 UTC (rev 3094)
@@ -24,7 +24,7 @@
{
/* We use G_TYPE_POINTER to store some strings because they should live
forever - and we avoid unneeded strdup/free */
- factory->profiles = gtk_list_store_new(NUM_COLUMNS, RS_TYPE_DCP_FILE,
G_TYPE_POINTER, G_TYPE_POINTER);
+ factory->profiles = gtk_list_store_new(FACTORY_MODEL_NUM_COLUMNS,
RS_TYPE_DCP_FILE, G_TYPE_POINTER, G_TYPE_POINTER);
}
static void
@@ -55,9 +55,9 @@
gtk_list_store_prepend(factory->profiles,
&iter);
gtk_list_store_set(factory->profiles, &iter,
- COLUMN_PROFILE, profile,
- COLUMN_MODEL, model,
- COLUMN_ID, rs_dcp_get_id(profile),
+ FACTORY_MODEL_COLUMN_PROFILE, profile,
+ FACTORY_MODEL_COLUMN_MODEL, model,
+ FACTORY_MODEL_COLUMN_ID,
rs_dcp_get_id(profile),
-1);
}
}
@@ -115,8 +115,8 @@
if (gtk_tree_model_get_iter_first(treemodel, &iter))
do {
gtk_tree_model_get(treemodel, &iter,
- COLUMN_MODEL, &dcp_model,
- COLUMN_PROFILE, &dcp,
+ FACTORY_MODEL_COLUMN_MODEL, &dcp_model,
+ FACTORY_MODEL_COLUMN_PROFILE, &dcp,
-1);
if (model && g_str_equal(model, dcp_model))
matches = g_list_prepend(matches, dcp);
@@ -138,13 +138,13 @@
if (gtk_tree_model_get_iter_first(treemodel, &iter))
do {
gtk_tree_model_get(treemodel, &iter,
- COLUMN_ID, &model_id,
+ FACTORY_MODEL_COLUMN_ID, &model_id,
-1);
if (id && g_str_equal(id, model_id))
{
gtk_tree_model_get(treemodel, &iter,
- COLUMN_PROFILE, &dcp,
+ FACTORY_MODEL_COLUMN_PROFILE, &dcp,
-1);
if (ret)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
