[ease] [general] Start internal-izing things.
- From: Nate Stedman <natesm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease] [general] Start internal-izing things.
- Date: Tue, 27 Jul 2010 07:07:16 +0000 (UTC)
commit 989778034e3c60ef79622d235c4917878bdc7438
Author: Nate Stedman <natesm gmail com>
Date: Tue Jul 27 02:22:30 2010 -0400
[general] Start internal-izing things.
ease-core/ease-document.vala | 10 +++++-----
ease-core/ease-element.vala | 4 ++--
ease-core/ease-image-element.vala | 4 ++--
ease-core/ease-iterables.vala | 4 ++--
ease-core/ease-media-element.vala | 4 ++--
ease-core/ease-text-element.vala | 4 ++--
flutter/Makefile.am | 5 +++--
7 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/ease-core/ease-document.vala b/ease-core/ease-document.vala
index 2384bdd..6f206c2 100644
--- a/ease-core/ease-document.vala
+++ b/ease-core/ease-document.vala
@@ -94,7 +94,7 @@ public class Ease.Document : GLib.Object, UndoSource
/**
* All { link Slide}s in this Document.
*/
- public Iterable.ListStore slides = new Iterable.ListStore(
+ internal Iterable.ListStore slides = new Iterable.ListStore(
{ typeof(Slide),
typeof(Gdk.Pixbuf) });
@@ -120,7 +120,7 @@ public class Ease.Document : GLib.Object, UndoSource
*/
public Document() { }
- public Document.from_saved(string file_path) throws GLib.Error
+ internal Document.from_saved(string file_path) throws GLib.Error
{
this();
@@ -166,8 +166,8 @@ public class Ease.Document : GLib.Object, UndoSource
* @param w The width of the new Document.
* @param h The height of the new Document.
*/
- public Document.from_theme(Theme doc_theme,
- int w, int h) throws GLib.Error
+ internal Document.from_theme(Theme doc_theme,
+ int w, int h) throws GLib.Error
{
assert(doc_theme != null);
@@ -190,7 +190,7 @@ public class Ease.Document : GLib.Object, UndoSource
append_slide(slide);
}
- public void to_json() throws GLib.Error
+ internal void to_json() throws GLib.Error
{
var root = new Json.Node(Json.NodeType.OBJECT);
var obj = new Json.Object();
diff --git a/ease-core/ease-element.vala b/ease-core/ease-element.vala
index 9c7dc0a..29edac6 100644
--- a/ease-core/ease-element.vala
+++ b/ease-core/ease-element.vala
@@ -47,7 +47,7 @@ public abstract class Ease.Element : GLib.Object, UndoSource
/**
* Creates an Element from a JsonObject
*/
- public Element.from_json(Json.Object obj)
+ internal Element.from_json(Json.Object obj)
{
identifier = obj.get_string_member(Theme.E_IDENTIFIER);
x = (float)obj.get_string_member(Theme.X).to_double();
@@ -61,7 +61,7 @@ public abstract class Ease.Element : GLib.Object, UndoSource
/**
* Writes an Element to a JsonObject
*/
- public virtual Json.Object to_json()
+ internal virtual Json.Object to_json()
{
var obj = new Json.Object();
diff --git a/ease-core/ease-image-element.vala b/ease-core/ease-image-element.vala
index edacf44..b277cdf 100644
--- a/ease-core/ease-image-element.vala
+++ b/ease-core/ease-image-element.vala
@@ -31,12 +31,12 @@ public class Ease.ImageElement : MediaElement
{
}
- public ImageElement.from_json(Json.Object obj)
+ internal ImageElement.from_json(Json.Object obj)
{
base.from_json(obj);
}
- public override Actor actor(ActorContext c)
+ internal override Actor actor(ActorContext c)
{
return new ImageActor(this, c);
}
diff --git a/ease-core/ease-iterables.vala b/ease-core/ease-iterables.vala
index d4a065f..c47a985 100644
--- a/ease-core/ease-iterables.vala
+++ b/ease-core/ease-iterables.vala
@@ -21,7 +21,7 @@
* The foreach loop returns a Gtk.TreeIter. The Gtk.TreePath provided by the
* built in TreeModel foreach function is not (immediately) available.
*/
-public interface Ease.Iterable.TreeModel : Gtk.TreeModel
+internal interface Ease.Iterable.TreeModel : Gtk.TreeModel
{
public Iterator iterator()
{
@@ -57,7 +57,7 @@ public interface Ease.Iterable.TreeModel : Gtk.TreeModel
/**
* ListStore with the { link Iterable.TreeModel} mixin.
*/
-public class Ease.Iterable.ListStore : Gtk.ListStore, TreeModel
+internal class Ease.Iterable.ListStore : Gtk.ListStore, TreeModel
{
/**
* Creates an iterable ListStore with the specified types.
diff --git a/ease-core/ease-media-element.vala b/ease-core/ease-media-element.vala
index 51f0b98..aad95a7 100644
--- a/ease-core/ease-media-element.vala
+++ b/ease-core/ease-media-element.vala
@@ -23,14 +23,14 @@ public abstract class Ease.MediaElement : Element
/**
* Creates a MediaElement from a JsonObject
*/
- public MediaElement.from_json(Json.Object obj)
+ internal MediaElement.from_json(Json.Object obj)
{
base.from_json(obj);
filename = obj.get_string_member(Theme.MEDIA_FILENAME);
source_filename = obj.get_string_member(Theme.MEDIA_SOURCE_FILENAME);
}
- public override Json.Object to_json()
+ internal override Json.Object to_json()
{
var obj = base.to_json();
diff --git a/ease-core/ease-text-element.vala b/ease-core/ease-text-element.vala
index 83b5ce4..2306e92 100644
--- a/ease-core/ease-text-element.vala
+++ b/ease-core/ease-text-element.vala
@@ -32,7 +32,7 @@ public class Ease.TextElement : Element
/**
* Create a TextElement from a JsonObject
*/
- public TextElement.from_json(Json.Object obj)
+ internal TextElement.from_json(Json.Object obj)
{
base.from_json(obj);
@@ -46,7 +46,7 @@ public class Ease.TextElement : Element
text_size_from_string(obj.get_string_member(Theme.TEXT_SIZE));
}
- public override Json.Object to_json()
+ internal override Json.Object to_json()
{
var obj = base.to_json();
diff --git a/flutter/Makefile.am b/flutter/Makefile.am
index 19c6ea1..353a7d5 100644
--- a/flutter/Makefile.am
+++ b/flutter/Makefile.am
@@ -44,8 +44,9 @@ EXTRA_DIST = Flutter-0.3.gir
# remove generated files on `make clean`
CLEANFILES = \
- $(subst .vala,.c,$(flutter_0_3_la_SOURCES)) \
+ flutter.c \
../vapi/flutter-0.3.vapi \
Flutter-0.3.gir \
- flutter.h
+ flutter.h \
+ libflutter_0_3_la-flutter.lo
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]