[gnome-contacts/nielsdg/core-should-stay-core: 4/11] Move TypeDescriptor related items to core

[Niels De Graef <nielsdg src gnome org>]

commit 1a16aafe01704ee4a5d5f9099e392983b2566f3a
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Wed Sep 7 09:08:07 2022 +0200

    Move TypeDescriptor related items to core
    
    And remove an unused reference to `Gtk.TreeIter` in `TypeDescriptor`

 po/POTFILES.in                                             | 4 ++--
 po/POTFILES.skip                                           | 4 ++--
 src/{ => core}/contacts-type-descriptor.vala               | 1 -
 src/{contacts-typeset.vala => core/contacts-type-set.vala} | 0
 src/{ => core}/contacts-vcard-type-mapping.vala            | 0
 src/meson.build                                            | 6 +++---
 6 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1790c0f1..ab97aef8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,8 +34,6 @@ src/contacts-preferences-window.vala
 src/contacts-settings.vala
 src/contacts-setup-window.vala
 src/contacts-type-combo.vala
-src/contacts-type-descriptor.vala
-src/contacts-typeset.vala
 src/contacts-unlink-operation.vala
 src/contacts-utils.vala
 src/core/contacts-addresses-chunk.vala
@@ -53,6 +51,8 @@ src/core/contacts-notes-chunk.vala
 src/core/contacts-phones-chunk.vala
 src/core/contacts-roles-chunk.vala
 src/core/contacts-structured-name-chunk.vala
+src/core/contacts-type-descriptor.vala
+src/core/contacts-type-set.vala
 src/core/contacts-urls-chunk.vala
 src/io/contacts-io-parse-operation.vala
 src/main.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 364046ec..0e580c01 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -24,8 +24,6 @@ src/contacts-preferences-window.c
 src/contacts-settings.c
 src/contacts-setup-window.c
 src/contacts-type-combo.c
-src/contacts-type-descriptor.c
-src/contacts-typeset.c
 src/contacts-unlink-operation.c
 src/contacts-utils.c
 src/core/contacts-addresses-chunk.c
@@ -43,6 +41,8 @@ src/core/contacts-notes-chunk.c
 src/core/contacts-phones-chunk.c
 src/core/contacts-roles-chunk.c
 src/core/contacts-structured-name-chunk.c
+src/core/contacts-type-descriptor.c
+src/core/contacts-type-set.c
 src/core/contacts-urls-chunk.c
 src/io/contacts-io-parse-operation.c
 src/main.c
diff --git a/src/contacts-type-descriptor.vala b/src/core/contacts-type-descriptor.vala
similarity index 99%
rename from src/contacts-type-descriptor.vala
rename to src/core/contacts-type-descriptor.vala
index c4e4dc07..f37a960d 100644
--- a/src/contacts-type-descriptor.vala
+++ b/src/core/contacts-type-descriptor.vala
@@ -45,7 +45,6 @@ public class Contacts.TypeDescriptor : Object {
   private Source source;
   public string? name = null;
   public string[]? vcard_types = null;
-  public Gtk.TreeIter iter;
 
   /**
    * Returns the translated name for this property.
diff --git a/src/contacts-typeset.vala b/src/core/contacts-type-set.vala
similarity index 100%
rename from src/contacts-typeset.vala
rename to src/core/contacts-type-set.vala
diff --git a/src/contacts-vcard-type-mapping.vala b/src/core/contacts-vcard-type-mapping.vala
similarity index 100%
rename from src/contacts-vcard-type-mapping.vala
rename to src/core/contacts-vcard-type-mapping.vala
diff --git a/src/meson.build b/src/meson.build
index 3d97c53b..5c2ef5dd 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -23,7 +23,10 @@ libcontacts_sources = files(
   'core/contacts-phones-chunk.vala',
   'core/contacts-roles-chunk.vala',
   'core/contacts-structured-name-chunk.vala',
+  'core/contacts-type-descriptor.vala',
+  'core/contacts-type-set.vala',
   'core/contacts-urls-chunk.vala',
+  'core/contacts-vcard-type-mapping.vala',
 
   'contacts-abstract-field-details-sorter.vala',
   'contacts-chunk-filter.vala',
@@ -42,11 +45,8 @@ libcontacts_sources = files(
   'contacts-persona-sorter.vala',
   'contacts-query-filter.vala',
   'contacts-store.vala',
-  'contacts-typeset.vala',
-  'contacts-type-descriptor.vala',
   'contacts-unlink-operation.vala',
   'contacts-utils.vala',
-  'contacts-vcard-type-mapping.vala',
 
   'io/contacts-io-export-operation.vala',
   'io/contacts-io-vcard-export-operation.vala',