Explorar el Código

Remove dependency on LibGee

Billy Barrow hace 6 días
padre
commit
c41a62925d

+ 0 - 6
src/lib/Enumerable.vala

@@ -40,12 +40,6 @@ namespace Invercargill {
             return series;
         }
 
-        public virtual Gee.Collection<T> to_gee_collection() {
-            var collection = new Gee.LinkedList<T>();
-            iterate(i => collection.add(i));
-            return collection;
-        }
-
         public virtual Tracker<T> iterator() {
             return get_tracker();
         }

+ 0 - 6
src/lib/Promotions/Attempts.vala

@@ -51,12 +51,6 @@ namespace Invercargill {
             return series;
         }
 
-        public new Gee.Collection<T> to_gee_collection() throws Error {
-            var collection = new Gee.LinkedList<T>();
-            iterate(i => collection.add(i));
-            return collection;
-        }
-
         public new T[] to_array() throws Error {
             var array = new T[1024];
             var index = 0;

+ 0 - 4
src/lib/Proxy.vala

@@ -31,10 +31,6 @@ namespace Invercargill {
             return inner.to_series();
         }
     
-        public override Gee.Collection<T> to_gee_collection() {
-            return inner.to_gee_collection();
-        }
-    
         public override Tracker<T> iterator() {
             return inner.iterator();
         }

+ 0 - 19
src/lib/Tracker.vala

@@ -120,23 +120,4 @@ namespace Invercargill {
 
     }
 
-    internal class GeeTracker<T> : Tracker<T> {
-        private Gee.Iterable<T> source;
-        private Gee.Iterator<T> iterator;
-
-        public GeeTracker(Gee.Iterable<T> source, Gee.Iterator<T> iterator) {
-            this.source = source;
-            this.iterator = iterator;
-        }
-
-        public override bool has_next () {
-            return iterator.has_next();
-        }
-        public override T get_next () {
-            iterator.next();
-            var item = iterator.get();
-            return item;
-        }
-    }
-
 }

+ 0 - 2
src/lib/meson.build

@@ -3,7 +3,6 @@ add_project_arguments('-DFUSE_USE_VERSION=26', language: 'c')
 dependencies = [
     dependency('glib-2.0'),
     dependency('gobject-2.0'),
-    dependency('gee-0.8')
 ]
 
 sources = files('Invercargill.vala')
@@ -67,7 +66,6 @@ sources += files('Modifiers/Scanner.vala')
 sources += files('Modifiers/Window.vala')
 
 sources += files('Wrappers/Array.vala')
-sources += files('Wrappers/GeeIterable.vala')
 sources += files('Wrappers/GenericArray.vala')
 
 sources += files('Generators/Range.vala')

+ 0 - 16
src/tests/Integration/Gee.vala

@@ -1,16 +0,0 @@
-using Invercargill;
-
-void gee_tests() {
-
-    Test.add_func("/invercargill/conversion/gee/collection", () => {
-        var items = Wrap.array(new int[] { 1, 2, 3, 4, 5, 6});
-        var result = items.to_gee_collection();
-
-        var i = 1;
-        foreach (var item in result) {
-            assert_true(item == i);
-            i++;
-        }
-    });
-
-}

+ 0 - 1
src/tests/TestRunner.vala

@@ -6,7 +6,6 @@ public static int main(string[] args) {
     where_tests();
     select_tests();
     select_many_tests();
-    gee_tests();
     tracker_tests();
     parallel_tests();
     first_tests();

+ 0 - 1
src/tests/meson.build

@@ -6,7 +6,6 @@ sources += files('Integration/SelectMany.vala')
 sources += files('Integration/Skip.vala')
 sources += files('Integration/Take.vala')
 sources += files('Integration/Sort.vala')
-sources += files('Integration/Gee.vala')
 sources += files('Integration/Tracker.vala')
 sources += files('Integration/Parallel.vala')
 sources += files('Integration/Firsts.vala')