[rygel] db,media-export: Move more functions

[Jens Georg <jensgeorg src gnome org>]

commit 446e3a5b29a812841926e1e530c94fcf5cbfcac4
Author: Jens Georg <mail jensge org>
Date:   Fri Apr 17 01:22:17 2015 +0200

    db,media-export: Move more functions
    
    Signed-off-by: Jens Georg <mail jensge org>

 src/librygel-db/filelist.am                        |    4 +++-
 .../sql-function.vala}                             |    2 +-
 .../sql-operator.vala}                             |    4 +---
 src/plugins/media-export/Makefile.am               |    2 --
 4 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/librygel-db/filelist.am b/src/librygel-db/filelist.am
index 3feb576..b0dd254 100644
--- a/src/librygel-db/filelist.am
+++ b/src/librygel-db/filelist.am
@@ -2,7 +2,9 @@
 LIBRYGEL_DB_VAPI_SOURCE_FILES = \
        database-cursor.vala \
        database.vala \
-       sqlite-wrapper.vala
+       sql-function.vala \
+       sqlite-wrapper.vala \
+       sql-operator.vala
 
 LIBRYGEL_DB_NONVAPI_SOURCE_FILES = \
        collate.c
diff --git a/src/plugins/media-export/rygel-media-export-sql-function.vala b/src/librygel-db/sql-function.vala
similarity index 94%
rename from src/plugins/media-export/rygel-media-export-sql-function.vala
rename to src/librygel-db/sql-function.vala
index 0ff0a80..499a22b 100644
--- a/src/plugins/media-export/rygel-media-export-sql-function.vala
+++ b/src/librygel-db/sql-function.vala
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-internal class Rygel.MediaExport.SqlFunction : SqlOperator {
+public class Rygel.Database.SqlFunction : SqlOperator {
     public SqlFunction (string name, string arg) {
         base (name, arg);
     }
diff --git a/src/plugins/media-export/rygel-media-export-sql-operator.vala b/src/librygel-db/sql-operator.vala
similarity index 97%
rename from src/plugins/media-export/rygel-media-export-sql-operator.vala
rename to src/librygel-db/sql-operator.vala
index 3620091..127482c 100644
--- a/src/plugins/media-export/rygel-media-export-sql-operator.vala
+++ b/src/librygel-db/sql-operator.vala
@@ -22,7 +22,7 @@
 
 using GUPnP;
 
-internal class Rygel.MediaExport.SqlOperator : GLib.Object {
+public class Rygel.Database.SqlOperator : GLib.Object {
     protected string name;
     protected string arg;
     protected string collate;
@@ -69,5 +69,3 @@ internal class Rygel.MediaExport.SqlOperator : GLib.Object {
         return "(%s %s ? %s)".printf (arg, name, collate);
     }
 }
-
-
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 2bbf458..978cb9c 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -36,8 +36,6 @@ librygel_media_export_la_SOURCES = \
        rygel-media-export-db-container.vala \
        rygel-media-export-sql-factory.vala \
        rygel-media-export-media-cache.vala \
-       rygel-media-export-sql-operator.vala \
-       rygel-media-export-sql-function.vala \
        rygel-media-export-media-cache-upgrader.vala \
        rygel-media-export-metadata-extractor.vala \
        rygel-media-export-null-container.vala \