GNOME.org
 

[gnome-todo] project: Rename contrib/ to models/

commit 20e774da6c7b9d8015c4245010fc53bf068188bb
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Sep 12 15:50:19 2018 -0300

    project: Rename contrib/ to models/
    
    To better reflect what this folder is about now.

 meson.build                                      |  2 +-
 src/engine/gtd-manager.c                         |  4 ++--
 src/meson.build                                  | 20 ++++++++++----------
 src/{contrib => models}/gtd-list-model-filter.c  |  0
 src/{contrib => models}/gtd-list-model-filter.h  |  0
 src/{contrib => models}/gtd-list-model-sort.c    |  0
 src/{contrib => models}/gtd-list-model-sort.h    |  0
 src/{contrib => models}/gtd-list-store.c         |  0
 src/{contrib => models}/gtd-list-store.h         |  0
 src/{contrib => models}/gtd-task-model-private.h |  0
 src/{contrib => models}/gtd-task-model.c         |  0
 src/{contrib => models}/gtd-task-model.h         |  0
 src/task-list-view/gtd-task-list-popover.c       |  2 +-
 tests/interactive/test-filter-sort.c             |  8 ++++----
 tests/interactive/test-task-model.c              |  4 ++--
 tests/test-model-filter.c                        |  6 +++---
 tests/test-model-sort.c                          |  4 ++--
 tests/test-task-model.c                          |  6 +++---
 18 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/meson.build b/meson.build
index b35a7b2..01ec4f6 100644
--- a/meson.build
+++ b/meson.build
@@ -163,9 +163,9 @@ pkg = import('pkgconfig')
 top_inc = include_directories('.')
 src_inc = include_directories(
   'src',
-  'src/contrib',
   'src/engine',
   'src/interfaces',
+  'src/models',
   'src/notification',
   'src/task-list-view',
   'src/widgets',
diff --git a/src/engine/gtd-manager.c b/src/engine/gtd-manager.c
index bd628d3..4ebc380 100644
--- a/src/engine/gtd-manager.c
+++ b/src/engine/gtd-manager.c
@@ -18,8 +18,8 @@
 
 #define G_LOG_DOMAIN "GtdManager"
 
-#include "contrib/gtd-list-store.h"
-#include "contrib/gtd-task-model-private.h"
+#include "models/gtd-list-store.h"
+#include "models/gtd-task-model-private.h"
 #include "interfaces/gtd-provider.h"
 #include "interfaces/gtd-panel.h"
 #include "notification/gtd-notification.h"
diff --git a/src/meson.build b/src/meson.build
index 6948cec..206fba5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,12 +6,12 @@
 enum_headers = files('gtd-enums.h')
 
 headers = enum_headers + files(
-  'contrib/gtd-list-model-filter.h',
-  'contrib/gtd-list-store.h',
   'engine/gtd-manager.h',
   'interfaces/gtd-activatable.h',
   'interfaces/gtd-panel.h',
   'interfaces/gtd-provider.h',
+  'models/gtd-list-model-filter.h',
+  'models/gtd-list-store.h',
   'notification/gtd-notification.h',
   'task-list-view/gtd-task-list-view.h',
   'gtd-object.h',
@@ -32,16 +32,16 @@ install_headers(headers, subdir: meson.project_name())
 ################
 
 sources = files(
-  'contrib/gtd-list-model-filter.c',
-  'contrib/gtd-list-model-sort.c',
-  'contrib/gtd-list-store.c',
-  'contrib/gtd-task-model.c',
   'engine/gtd-manager.c',
   'engine/gtd-plugin-manager.c',
   'interfaces/gtd-activatable.c',
   'interfaces/gtd-panel.c',
   'interfaces/gtd-provider.c',
   'logging/gtd-log.c',
+  'models/gtd-list-model-filter.c',
+  'models/gtd-list-model-sort.c',
+  'models/gtd-list-store.c',
+  'models/gtd-task-model.c',
   'notification/gtd-notification.c',
   'notification/gtd-notification-widget.c',
   'provider/gtd-provider-popover.c',
@@ -198,10 +198,6 @@ pkg.generate(
 
 if get_option('introspection')
   gir_sources = files(
-    'contrib/gtd-list-model-filter.c',
-    'contrib/gtd-list-model-filter.h',
-    'contrib/gtd-list-store.c',
-    'contrib/gtd-list-store.h',
     'engine/gtd-manager.c',
     'engine/gtd-manager.h',
     'interfaces/gtd-activatable.c',
@@ -210,6 +206,10 @@ if get_option('introspection')
     'interfaces/gtd-panel.h',
     'interfaces/gtd-provider.c',
     'interfaces/gtd-provider.h',
+    'models/gtd-list-model-filter.c',
+    'models/gtd-list-model-filter.h',
+    'models/gtd-list-store.c',
+    'models/gtd-list-store.h',
     'notification/gtd-notification.c',
     'notification/gtd-notification.h',
     'task-list-view/gtd-task-list-view.c',
diff --git a/src/contrib/gtd-list-model-filter.c b/src/models/gtd-list-model-filter.c
similarity index 100%
rename from src/contrib/gtd-list-model-filter.c
rename to src/models/gtd-list-model-filter.c
diff --git a/src/contrib/gtd-list-model-filter.h b/src/models/gtd-list-model-filter.h
similarity index 100%
rename from src/contrib/gtd-list-model-filter.h
rename to src/models/gtd-list-model-filter.h
diff --git a/src/contrib/gtd-list-model-sort.c b/src/models/gtd-list-model-sort.c
similarity index 100%
rename from src/contrib/gtd-list-model-sort.c
rename to src/models/gtd-list-model-sort.c
diff --git a/src/contrib/gtd-list-model-sort.h b/src/models/gtd-list-model-sort.h
similarity index 100%
rename from src/contrib/gtd-list-model-sort.h
rename to src/models/gtd-list-model-sort.h
diff --git a/src/contrib/gtd-list-store.c b/src/models/gtd-list-store.c
similarity index 100%
rename from src/contrib/gtd-list-store.c
rename to src/models/gtd-list-store.c
diff --git a/src/contrib/gtd-list-store.h b/src/models/gtd-list-store.h
similarity index 100%
rename from src/contrib/gtd-list-store.h
rename to src/models/gtd-list-store.h
diff --git a/src/contrib/gtd-task-model-private.h b/src/models/gtd-task-model-private.h
similarity index 100%
rename from src/contrib/gtd-task-model-private.h
rename to src/models/gtd-task-model-private.h
diff --git a/src/contrib/gtd-task-model.c b/src/models/gtd-task-model.c
similarity index 100%
rename from src/contrib/gtd-task-model.c
rename to src/models/gtd-task-model.c
diff --git a/src/contrib/gtd-task-model.h b/src/models/gtd-task-model.h
similarity index 100%
rename from src/contrib/gtd-task-model.h
rename to src/models/gtd-task-model.h
diff --git a/src/task-list-view/gtd-task-list-popover.c b/src/task-list-view/gtd-task-list-popover.c
index 0bf4d82..d61e597 100644
--- a/src/task-list-view/gtd-task-list-popover.c
+++ b/src/task-list-view/gtd-task-list-popover.c
@@ -20,7 +20,7 @@
 
 #define G_LOG_DOMAIN "GtdTaskListPopover"
 
-#include "contrib/gtd-list-model-filter.h"
+#include "models/gtd-list-model-filter.h"
 #include "gtd-debug.h"
 #include "gtd-manager.h"
 #include "gtd-provider.h"
diff --git a/tests/interactive/test-filter-sort.c b/tests/interactive/test-filter-sort.c
index 355dfee..dcb0fb7 100644
--- a/tests/interactive/test-filter-sort.c
+++ b/tests/interactive/test-filter-sort.c
@@ -21,10 +21,10 @@
 
 #include <gtk/gtk.h>
 
-#include "contrib/gtd-list-model-filter.h"
-#include "contrib/gtd-list-model-sort.h"
-#include "contrib/gtd-task-model.h"
-#include "contrib/gtd-task-model-private.h"
+#include "models/gtd-list-model-filter.h"
+#include "models/gtd-list-model-sort.h"
+#include "models/gtd-task-model.h"
+#include "models/gtd-task-model-private.h"
 #include "logging/gtd-log.h"
 #include "dummy-provider.h"
 #include "gtd-manager.h"
diff --git a/tests/interactive/test-task-model.c b/tests/interactive/test-task-model.c
index e79847d..f68fefc 100644
--- a/tests/interactive/test-task-model.c
+++ b/tests/interactive/test-task-model.c
@@ -20,8 +20,8 @@
 
 #include <gtk/gtk.h>
 
-#include "contrib/gtd-task-model.h"
-#include "contrib/gtd-task-model-private.h"
+#include "models/gtd-task-model.h"
+#include "models/gtd-task-model-private.h"
 #include "logging/gtd-log.h"
 #include "dummy-provider.h"
 #include "gtd-manager.h"
diff --git a/tests/test-model-filter.c b/tests/test-model-filter.c
index 64889cf..025b9e3 100644
--- a/tests/test-model-filter.c
+++ b/tests/test-model-filter.c
@@ -1,4 +1,4 @@
-#include "contrib/gtd-list-model-filter.h"
+#include "models/gtd-list-model-filter.h"
 #include <math.h>
 #include <string.h>
 
@@ -202,7 +202,7 @@ main (gint argc,
       gchar *argv[])
 {
   g_test_init (&argc, &argv, NULL);
-  g_test_add_func ("/contrib/model-filter/basic", test_basic);
-  g_test_add_func ("/contrib/model-filter/items-changed", test_items_changed);
+  g_test_add_func ("/models/model-filter/basic", test_basic);
+  g_test_add_func ("/models/model-filter/items-changed", test_items_changed);
   return g_test_run ();
 }
diff --git a/tests/test-model-sort.c b/tests/test-model-sort.c
index e4426fc..b54b29f 100644
--- a/tests/test-model-sort.c
+++ b/tests/test-model-sort.c
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#include "contrib/gtd-list-model-sort.h"
+#include "models/gtd-list-model-sort.h"
 
 #include <math.h>
 #include <string.h>
@@ -137,7 +137,7 @@ main (gint argc,
 {
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add_func ("/contrib/model-sort/basic", test_basic);
+  g_test_add_func ("/models/model-sort/basic", test_basic);
 
   return g_test_run ();
 }
diff --git a/tests/test-task-model.c b/tests/test-task-model.c
index dae8b40..0a18153 100644
--- a/tests/test-task-model.c
+++ b/tests/test-task-model.c
@@ -20,8 +20,8 @@
 
 #include "gnome-todo.h"
 
-#include "contrib/gtd-task-model.h"
-#include "contrib/gtd-task-model-private.h"
+#include "models/gtd-task-model.h"
+#include "models/gtd-task-model-private.h"
 #include "logging/gtd-log.h"
 #include "gtd-manager-protected.h"
 #include "dummy-provider.h"
@@ -61,7 +61,7 @@ main (gint argc,
   if (g_getenv ("G_MESSAGES_DEBUG"))
     gtd_log_init ();
 
-  g_test_add_func ("/contrib/task-model/basic", test_basic);
+  g_test_add_func ("/models/task-model/basic", test_basic);
 
   return g_test_run ();
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]