Don't use "using" in *.vapi.

Fixes bug 593195.

diff --git a/vapi/curses.vapi b/vapi/curses.vapi
index 1a2ba36409da2f84668bc98a550ffb9741b9a50e..5b9957a5051036922ee759e0e23e28d2d541e738 100644 (file)
--- a/vapi/curses.vapi
+++ b/vapi/curses.vapi
@@ -25,8 +25,6 @@
  * SUCH DAMAGE.
  */
 
-using GLib;
-
 [CCode (lower_case_cprefix = "", cheader_filename = "curses.h")]
 namespace Curses {
        public const int COLORS;
@@ -65,7 +63,7 @@ namespace Curses {
                [CCode (cname = "dupwin")]
                public Window copy();
                public ulong getbkgd();
-               public static Window getwin(FileStream filep);
+               public static Window getwin(GLib.FileStream filep);
                public void idcok(bool bf);
                public int idlok(bool bf);
                public void immedok(bool bf);
@@ -129,7 +127,7 @@ namespace Curses {
                public int notimeout(bool bf);
                public int overlay(Window win);
                public int overwrite(Window win);
-               public int putwin(FileStream filep);
+               public int putwin(GLib.FileStream filep);
                public int redrawwin();
                public int scroll();
                public int scrollok(bool bf);
@@ -265,7 +263,7 @@ namespace Curses {
        [CCode (free_function = "delscreen", cname = "SCREEN", cprefix = "")]
        public class Screen {
                [CCode (cname = "newterm")]
-               public Screen(string str, FileStream outfd, FileStream infd);
+               public Screen(string str, GLib.FileStream outfd, GLib.FileStream infd);
                public weak Screen set_term();
        }
 

diff --git a/vapi/fuse.vapi b/vapi/fuse.vapi
index 054bcd60e1a5cd8fdabcc1d839e70a111b1d105c..d00a021f3548c32cc0a12195680da09e0a4efe22 100644 (file)
--- a/vapi/fuse.vapi
+++ b/vapi/fuse.vapi
@@ -20,8 +20,6 @@
  *     John Carr <john.carr@unrouted.co.uk>
  */
 
-using Posix;
-
 [CCode (cprefix = "fuse_", cheader_filename = "fuse/fuse.h")]
 namespace Fuse {
        [CCode (cname = "struct fuse_file_info")]
@@ -44,34 +42,34 @@ namespace Fuse {
        [CCode (cname = "struct fuse_context")]
        public struct Context {
                Fuse fuse;
-               uid_t uid;
-               gid_t gid;
-               /*pid_t pid;*/
+               Posix.uid_t uid;
+               Posix.gid_t gid;
+               /*Posix.pid_t pid;*/
                void *private_data;
        }
 
        [CCode (cname = "fuse_fill_dir_t")]
-       public static delegate int FillDir (void* buf, string name, Stat? st, off_t offset);
+       public static delegate int FillDir (void* buf, string name, Posix.Stat? st, Posix.off_t offset);
 
-       public static delegate int GetAttr (string path, Stat* st);
+       public static delegate int GetAttr (string path, Posix.Stat* st);
        public static delegate int Access (string path, int mask);
        public static delegate int ReadLink (string path, char* buf, size_t size);
-       public static delegate int ReadDir (string path, void* buf, FillDir filler, off_t offset, FileInfo fi);
-       public static delegate int MkNod (string path, mode_t mode, dev_t rdev);
-       public static delegate int MkDir (string path, mode_t mode);
+       public static delegate int ReadDir (string path, void* buf, FillDir filler, Posix.off_t offset, FileInfo fi);
+       public static delegate int MkNod (string path, Posix.mode_t mode, Posix.dev_t rdev);
+       public static delegate int MkDir (string path, Posix.mode_t mode);
        public static delegate int Unlink (string path);
        public static delegate int RmDir (string path);
        public static delegate int Symlink (string from, string to);
        public static delegate int Rename (string from, string to);
        public static delegate int Link (string from, string to);
-       public static delegate int Chmod (string path, mode_t mode);
-       public static delegate int Chown (string path, uid_t uid, gid_t gid);
-       public static delegate int Truncate (string path, off_t size);
-       public static delegate int Utimens (string path, timespec[] ts);
+       public static delegate int Chmod (string path, Posix.mode_t mode);
+       public static delegate int Chown (string path, Posix.uid_t uid, Posix.gid_t gid);
+       public static delegate int Truncate (string path, Posix.off_t size);
+       public static delegate int Utimens (string path, Posix.timespec[] ts);
        public static delegate int Open (string path, FileInfo fi);
-       public static delegate int Read (string path, char* buf, size_t size, off_t offset, FileInfo fi);
-       public static delegate int Write (string path, char* buf, size_t size, off_t offset, FileInfo fi);
-       public static delegate int StatFs (string path, statvfs *stbuf);
+       public static delegate int Read (string path, char* buf, size_t size, Posix.off_t offset, FileInfo fi);
+       public static delegate int Write (string path, char* buf, size_t size, Posix.off_t offset, FileInfo fi);
+       public static delegate int StatFs (string path, Posix.statvfs *stbuf);
        public static delegate int Release (string path, FileInfo fi);
        public static delegate int Fsync (string path, int isdatasync, FileInfo fi);
 

diff --git a/vapi/libpq.vapi b/vapi/libpq.vapi
index ec26ac40cf865b57098dbf82e127a93d09b7b9d2..dbdc96f36ee17f629d4550603739f907117e7eaa 100644 (file)
--- a/vapi/libpq.vapi
+++ b/vapi/libpq.vapi
@@ -20,8 +20,6 @@
  *     Jukka-Pekka Iivonen <jp0409@jippii.fi>
  */
 
-using GLib;
-
 [CCode (cprefix = "PQ", cheader_filename = "postgresql/libpq-fe.h")]
 namespace Postgres {
 

diff --git a/vapi/sdl-gfx.vapi b/vapi/sdl-gfx.vapi
index 90f2f77101afba1f6debbaf53dba145a88ede6b7..c8ba2ad7b1e1ff5757e2592d9504eb3e88469baa 100644 (file)
--- a/vapi/sdl-gfx.vapi
+++ b/vapi/sdl-gfx.vapi
@@ -1,15 +1,12 @@
-using GLib;
-using SDL;
-
 namespace SDLGraphics {
        [CCode (cheader_filename="SDL_gfxPrimitives.h")]
        [Compact]
        public class Pixel {
                [CCode (cname="pixelColor")]
-               public static int color(Surface dst, int16 x, int16 y, uint32 color);
+               public static int color(SDL.Surface dst, int16 x, int16 y, uint32 color);
 
                [CCode (cname="pixelRGBA")]
-               public static int rgba(Surface dst, int16 x, int16 y, 
+               public static int rgba(SDL.Surface dst, int16 x, int16 y,
                        uchar r, uchar g, uchar b, uchar a);
        }// Pixel
 
@@ -17,35 +14,35 @@ namespace SDLGraphics {
        [Compact]
        public class Line {
                [CCode (cname="hlineColor")]
-               public static int color_h(Surface dst, int16 x1, int16 x2, 
+               public static int color_h(SDL.Surface dst, int16 x1, int16 x2,
                        int16 y, uint32 color);
 
                [CCode (cname="hlineRGBA")]
-               public static int rgba_h(Surface dst, int16 x1, int16 x2, 
+               public static int rgba_h(SDL.Surface dst, int16 x1, int16 x2,
                        int16 y, uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="vlineColor")]
-               public static int color_v(Surface dst, int16 x, int16 y1, 
+               public static int color_v(SDL.Surface dst, int16 x, int16 y1,
                        int16 y2, uint32 color);
 
                [CCode (cname="vlineRGBA")]
-               public static int rgba_v(Surface dst, int16 x, int16 y1, 
+               public static int rgba_v(SDL.Surface dst, int16 x, int16 y1,
                        int16 y2, uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="lineColor")]
-               public static int color(Surface dst, int16 x1, int16 y1, 
+               public static int color(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, uint32 color);
 
                [CCode (cname="lineRGBA")]
-               public static int rgba(Surface dst, int16 x1, int16 y1, 
+               public static int rgba(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="aalineColor")]
-               public static int color_aa(Surface dst, int16 x1, int16 y1, 
+               public static int color_aa(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, uint32 color);
 
                [CCode (cname="aalineRGBA")]
-               public static int rgba_aa(Surface dst, int16 x1, int16 y1, 
+               public static int rgba_aa(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, uchar r, uchar g, uchar b, uchar a);
        }// Line
 
@@ -53,19 +50,19 @@ namespace SDLGraphics {
        [Compact]
        public class Rectangle {
                [CCode (cname="rectangleColor")]
-               public static int outline_color(Surface dst, int16 x1, int16 y1, 
+               public static int outline_color(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, uint32 color);
 
                [CCode (cname="rectangleRGBA")]
-               public static int outline_rgba(Surface dst, int16 x1, int16 y1, 
+               public static int outline_rgba(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="boxColor")]
-               public static int fill_color(Surface dst, int16 x1, int16 y1, 
+               public static int fill_color(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, uint32 color);
 
                [CCode (cname="boxRGBA")]
-               public static int fill_rgba(Surface dst, int16 x1, int16 y1, 
+               public static int fill_rgba(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, uchar r, uchar g, uchar b, uchar a);
        }// Rectangle
 
@@ -73,27 +70,27 @@ namespace SDLGraphics {
        [Compact]
        public class Circle {
                [CCode (cname="circleColor")]
-               public static int outline_color(Surface dst, int16 x, int16 y, 
+               public static int outline_color(SDL.Surface dst, int16 x, int16 y,
                        int16 radius, uint32 color);
 
                [CCode (cname="circleRGBA")]
-               public static int outline_rgba(Surface dst, int16 x, int16 y, int16 radius, 
+               public static int outline_rgba(SDL.Surface dst, int16 x, int16 y, int16 radius,
                        uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="aacircleColor")]
-               public static int outline_color_aa(Surface dst, int16 x, int16 y, 
+               public static int outline_color_aa(SDL.Surface dst, int16 x, int16 y,
                        int16 radius, uint32 color);
 
                [CCode (cname="aacircleRGBA")]
-               public static int outline_rgba_aa(Surface dst, int16 x, int16 y, int16 radius, 
+               public static int outline_rgba_aa(SDL.Surface dst, int16 x, int16 y, int16 radius,
                        uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="filledCircleColor")]
-               public static int fill_color(Surface dst, int16 x, int16 y, 
+               public static int fill_color(SDL.Surface dst, int16 x, int16 y,
                        int16 radius, uint32 color);
 
                [CCode (cname="filledCircleRGBA")]
-               public static int fill_rgba(Surface dst, int16 x, int16 y, int16 radius, 
+               public static int fill_rgba(SDL.Surface dst, int16 x, int16 y, int16 radius,
                        uchar r, uchar g, uchar b, uchar a);
        }// Circle
 
@@ -101,27 +98,27 @@ namespace SDLGraphics {
        [Compact]
        public class Ellipse {
                [CCode (cname="ellipseColor")]
-               public static int outline_color(Surface dst, int16 xc, int16 yc, 
+               public static int outline_color(SDL.Surface dst, int16 xc, int16 yc,
                        int16 rx, int16 ry, uint32 color);
 
                [CCode (cname="ellipseRGBA")]
-               public static int outline_rgba(Surface dst, int16 xc, int16 yc, 
+               public static int outline_rgba(SDL.Surface dst, int16 xc, int16 yc,
                        int16 rx, int16 ry, uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="aaellipseColor")]
-               public static int outline_color_aa(Surface dst, int16 xc, int16 yc, 
+               public static int outline_color_aa(SDL.Surface dst, int16 xc, int16 yc,
                        int16 rx, int16 ry, uint32 color);
 
                [CCode (cname="aaellipseRGBA")]
-               public static int outline_rgba_aa(Surface dst, int16 xc, int16 yc, 
+               public static int outline_rgba_aa(SDL.Surface dst, int16 xc, int16 yc,
                        int16 rx, int16 ry, uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="filledEllipseColor")]
-               public static int fill_color(Surface dst, int16 xc, int16 yc, 
+               public static int fill_color(SDL.Surface dst, int16 xc, int16 yc,
                        int16 rx, int16 ry, uint32 color);
 
                [CCode (cname="filledEllipseRGBA")]
-               public static int fill_rgba(Surface dst, int16 xc, int16 yc, 
+               public static int fill_rgba(SDL.Surface dst, int16 xc, int16 yc,
                        int16 rx, int16 ry, uchar r, uchar g, uchar b, uchar a);
        }// Ellipse
 
@@ -129,19 +126,19 @@ namespace SDLGraphics {
        [Compact]
        public class Arc {
                [CCode (cname="pieColor")]
-               public static int outline_color(Surface dst, int16 x, int16 y, int16 radius, 
+               public static int outline_color(SDL.Surface dst, int16 x, int16 y, int16 radius,
                        int16 start, int16 end, uint32 color);
 
                [CCode (cname="pieRGBA")]
-               public static int outline_rgba(Surface dst, int16 x, int16 y, int16 radius, 
+               public static int outline_rgba(SDL.Surface dst, int16 x, int16 y, int16 radius,
                        int16 start, int16 end, uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="filledPieColor")]
-               public static int fill_color(Surface dst, int16 x, int16 y, int16 radius, 
+               public static int fill_color(SDL.Surface dst, int16 x, int16 y, int16 radius,
                        int16 start, int16 end, uint32 color);
 
                [CCode (cname="filledPieRGBA")]
-               public static int fill_rgba(Surface dst, int16 x, int16 y, int16 radius, 
+               public static int fill_rgba(SDL.Surface dst, int16 x, int16 y, int16 radius,
                        int16 start, int16 end, uchar r, uchar g, uchar b, uchar a);
        }// Arc
 
@@ -149,29 +146,29 @@ namespace SDLGraphics {
        [Compact]
        public class Trigon {
                [CCode (cname="trigonColor")]
-               public static int outline_color(Surface dst, int16 x1, int16 y1, 
+               public static int outline_color(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, int16 x3, int16 y3, uint32 color);
 
                [CCode (cname="trigonRGBA")]
-               public static int outline_rgba(Surface dst, int16 x1, int16 y1, 
+               public static int outline_rgba(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, int16 x3, int16 y3, 
                        uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="aatrigonColor")]
-               public static int outline_color_aa(Surface dst, int16 x1, int16 y1, 
+               public static int outline_color_aa(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, int16 x3, int16 y3, uint32 color);
 
                [CCode (cname="aatrigonRGBA")]
-               public static int outline_rgba_aa(Surface dst, int16 x1, int16 y1, 
+               public static int outline_rgba_aa(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, int16 x3, int16 y3, 
                        uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="filledTrigonColor")]
-               public static int fill_color(Surface dst, int16 x1, int16 y1, 
+               public static int fill_color(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, int16 x3, int16 y3, uint32 color);
 
                [CCode (cname="filledTrigonRGBA")]
-               public static int fill_rgba(Surface dst, int16 x1, int16 y1, 
+               public static int fill_rgba(SDL.Surface dst, int16 x1, int16 y1,
                        int16 x2, int16 y2, int16 x3, int16 y3, 
                        uchar r, uchar g, uchar b, uchar a);
        }// Trigon
@@ -180,27 +177,27 @@ namespace SDLGraphics {
        [Compact]
        public class Polygon {
                [CCode (cname="polygonColor")]
-               public static int outline_color(Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy, 
+               public static int outline_color(SDL.Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy,
                        int n, uint32 color);
 
                [CCode (cname="polygonRGBA")]
-               public static int outline_rgba(Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy, 
+               public static int outline_rgba(SDL.Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy,
                        int n, uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="aapolygonColor")]
-               public static int outline_color_aa(Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy, 
+               public static int outline_color_aa(SDL.Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy,
                        int n, uint32 color);
 
                [CCode (cname="aapolygonRGBA")]
-               public static int outline_rgba_aa(Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy, 
+               public static int outline_rgba_aa(SDL.Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy,
                        int n, uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="filledPolygonColor")]
-               public static int fill_color(Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy, 
+               public static int fill_color(SDL.Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy,
                        int n, uint32 color);
 
                [CCode (cname="filledPolygonRGBA")]
-               public static int fill_rgba(Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy, 
+               public static int fill_rgba(SDL.Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy,
                        int n, uchar r, uchar g, uchar b, uchar a);
        }// Polygon
 
@@ -208,11 +205,11 @@ namespace SDLGraphics {
        [Compact]
        public class BezierCurve {
                [CCode (cname="bezierColor")]
-               public static int color(Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy, 
+               public static int color(SDL.Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy,
                        int vertices, int steps, uint32 color);
 
                [CCode (cname="bezierRGBA")]
-               public static int rgba(Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy, 
+               public static int rgba(SDL.Surface dst, [CCode (array_length = false)] int16[] vx, [CCode (array_length = false)] int16[] vy,
                        int vertices, int steps, uchar r, uchar g, uchar b, uchar a);
        }// BezierCurve
 
@@ -220,10 +217,10 @@ namespace SDLGraphics {
        [Compact]
        public class Text {
                [CCode (cname="stringColor")]
-               public static int color(Surface dst, int16 x, int16 y, string s, uint32 color);
+               public static int color(SDL.Surface dst, int16 x, int16 y, string s, uint32 color);
 
                [CCode (cname="stringRGBA")]
-               public static int rgba(Surface dst, int16 x, int16 y, string s, 
+               public static int rgba(SDL.Surface dst, int16 x, int16 y, string s,
                        uchar r, uchar g, uchar b, uchar a);
 
                [CCode (cname="gfxPrimitivesSetFont")]
@@ -234,11 +231,11 @@ namespace SDLGraphics {
        [Compact]
        public class RotoZoom {
                [CCode (cname="rotozoomSurface")]
-               public static Surface rotozoom(Surface src, double degrees, 
+               public static SDL.Surface rotozoom(SDL.Surface src, double degrees,
                        double zoom, int smooth);
 
                [CCode (cname="rotozoomSurfaceXY")]
-               public static Surface rotozoom_xy(Surface src, double degrees, 
+               public static SDL.Surface rotozoom_xy(SDL.Surface src, double degrees,
                        double zoomx, double zoomy, int smooth);
 
                [CCode (cname="rotozoomSurfaceSize")]
@@ -250,7 +247,7 @@ namespace SDLGraphics {
                        double zoomx, double zoomy, ref int dstwidth, ref int dstheight);
 
                [CCode (cname="zoomSurface")]
-               public static Surface zoom(Surface src, double zoomx, 
+               public static SDL.Surface zoom(SDL.Surface src, double zoomx,
                        double zoomy, int smooth);
 
                [CCode (cname="zoomSurfaceSize")]

diff --git a/vapi/sdl-image.vapi b/vapi/sdl-image.vapi
index 17dc96733234e68ca9f25954b41877b3ea46e979..954d7dafa4459a0d679f919391d5fdeba167a560 100644 (file)
--- a/vapi/sdl-image.vapi
+++ b/vapi/sdl-image.vapi
@@ -1,87 +1,84 @@
-using GLib;
-using SDL;
-
 [CCode (cheader_filename="SDL_image.h")]
 namespace SDLImage {
        [CCode (cname="IMG_Linked_Version")]
-       public static weak Version linked();
+       public static weak SDL.Version linked();
 
        [CCode (cname="IMG_LoadTyped_RW")]
-       public static Surface load_rw_typed(RWops src, int freesrc=0, string type);
+       public static SDL.Surface load_rw_typed(SDL.RWops src, int freesrc=0, string type);
 
        [CCode (cname="IMG_Load_RW")]
-       public static Surface load_rw(RWops src, int freesrc=0);
+       public static SDL.Surface load_rw(SDL.RWops src, int freesrc=0);
 
        [CCode (cname="IMG_Load")]
-       public static Surface load(string file);
+       public static SDL.Surface load(string file);
 
        [CCode (cname="IMG_isBMP")]
-       public static int is_bmp(RWops src);
+       public static int is_bmp(SDL.RWops src);
 
        [CCode (cname="IMG_isGIF")]
-       public static int is_gif(RWops src);
+       public static int is_gif(SDL.RWops src);
 
        [CCode (cname="IMG_isJPG")]
-       public static int is_jpg(RWops src);
+       public static int is_jpg(SDL.RWops src);
 
        [CCode (cname="IMG_isLBM")]
-       public static int is_lbm(RWops src);
+       public static int is_lbm(SDL.RWops src);
 
        [CCode (cname="IMG_isPCX")]
-       public static int is_pcx(RWops src);
+       public static int is_pcx(SDL.RWops src);
 
        [CCode (cname="IMG_isPNG")]
-       public static int is_png(RWops src);
+       public static int is_png(SDL.RWops src);
 
        [CCode (cname="IMG_isPNM")]
-       public static int is_pnm(RWops src);
+       public static int is_pnm(SDL.RWops src);
 
        [CCode (cname="IMG_isTIF")]
-       public static int is_tif(RWops src);
+       public static int is_tif(SDL.RWops src);
 
        [CCode (cname="IMG_isXCF")]
-       public static int is_xcf(RWops src);
+       public static int is_xcf(SDL.RWops src);
 
        [CCode (cname="IMG_isXPM")]
-       public static int is_xpm(RWops src);
+       public static int is_xpm(SDL.RWops src);
 
        [CCode (cname="IMG_isXV")]
-       public static int is_xv(RWops src);
+       public static int is_xv(SDL.RWops src);
 
 
        [CCode (cname="IMG_LoadBMP_RW")]
-       public static Surface load_bmp(RWops src);
+       public static SDL.Surface load_bmp(SDL.RWops src);
 
        [CCode (cname="IMG_LoadGIF_RW")]
-       public static Surface load_gif(RWops src);
+       public static SDL.Surface load_gif(SDL.RWops src);
 
        [CCode (cname="IMG_LoadJPG_RW")]
-       public static Surface load_jpg(RWops src);
+       public static SDL.Surface load_jpg(SDL.RWops src);
 
        [CCode (cname="IMG_LoadLBM_RW")]
-       public static Surface load_lbm(RWops src);
+       public static SDL.Surface load_lbm(SDL.RWops src);
 
        [CCode (cname="IMG_LoadPCX_RW")]
-       public static Surface load_pcx(RWops src);
+       public static SDL.Surface load_pcx(SDL.RWops src);
 
        [CCode (cname="IMG_LoadPNG_RW")]
-       public static Surface load_png(RWops src);
+       public static SDL.Surface load_png(SDL.RWops src);
 
        [CCode (cname="IMG_LoadPNM_RW")]
-       public static Surface load_pnm(RWops src);
+       public static SDL.Surface load_pnm(SDL.RWops src);
 
        [CCode (cname="IMG_LoadTIF_RW")]
-       public static Surface load_tif(RWops src);
+       public static SDL.Surface load_tif(SDL.RWops src);
 
        [CCode (cname="IMG_LoadXCF_RW")]
-       public static Surface load_xcf(RWops src);
+       public static SDL.Surface load_xcf(SDL.RWops src);
 
        [CCode (cname="IMG_LoadXPM_RW")]
-       public static Surface load_xpm(RWops src);
+       public static SDL.Surface load_xpm(SDL.RWops src);
 
        [CCode (cname="IMG_ReadXPMFromArray")]
-       public static Surface read_xpm(char** xpmdata);
+       public static SDL.Surface read_xpm(char** xpmdata);
 
        [CCode (cname="IMG_LoadXV_RW")]
-       public static Surface load_xv(RWops src);
+       public static SDL.Surface load_xv(SDL.RWops src);
 }// SDLImage

diff --git a/vapi/sdl-mixer.vapi b/vapi/sdl-mixer.vapi
index 8b788d4cef231edd1cdaf9d31897453673bd67ff..dcb600bfa9b8ab4f5536bca6dfa1d5a5c30fdaeb 100644 (file)
--- a/vapi/sdl-mixer.vapi
+++ b/vapi/sdl-mixer.vapi
@@ -1,10 +1,7 @@
-using GLib;
-using SDL;
-
 [CCode (cheader_filename="SDL_mixer.h")]
 namespace SDLMixer {
        [CCode (cname="Mix_Linked_Version")]
-       public static weak Version linked();
+       public static weak SDL.Version linked();
 
        [CCode (cname="Mix_OpenAudio")]
        public static int open(int frequency, uint16 format, int channels, int chunksize);
@@ -44,7 +41,7 @@ namespace SDLMixer {
        [Compact]
        public class Chunk {
                [CCode (cname="Mix_LoadWAV_RW")]
-               public Chunk.WAV(RWops src, int freesrc=0);
+               public Chunk.WAV(SDL.RWops src, int freesrc=0);
 
                [CCode (cname="Mix_QuickLoad_WAV")]
                public Chunk.QuickWAV([CCode (array_length = false)] uchar[] mem);
@@ -105,7 +102,7 @@ namespace SDLMixer {
                public Music(string file);
 
                [CCode (cname="Mix_LoadMUS_RW")]
-               public Music.RW(RWops rw);
+               public Music.RW(SDL.RWops rw);
 
                [CCode (cname="Mix_GetMusicType")]
                public MusicType type();

diff --git a/vapi/sdl-net.vapi b/vapi/sdl-net.vapi
index 0ec440d94e2256db68dd8e29af32463bf107033d..c7a83ef9392e2702655da122def3ff2369877c38 100644 (file)
--- a/vapi/sdl-net.vapi
+++ b/vapi/sdl-net.vapi
@@ -1,10 +1,7 @@
-using GLib;
-using SDL;
-
 [CCode (cprefix="SDLNet_", cheader_filename="SDL_net.h")]
 namespace SDLNet {
        [CCode (cname="SDLNet_Linked_Version")]
-       public static Version linked();
+       public static SDL.Version linked();
 
        /**
         * Initialize the network API 

diff --git a/vapi/sdl-ttf.vapi b/vapi/sdl-ttf.vapi
index 39c8cdaaf0c842343d2ef5666e35e5504a639efb..6313a23dcbbf6d4f69639e082d6d1d6b68e4f6b3 100644 (file)
--- a/vapi/sdl-ttf.vapi
+++ b/vapi/sdl-ttf.vapi
@@ -1,10 +1,7 @@
-using GLib;
-using SDL;
-
 [CCode (cheader_filename="SDL_ttf.h")]
 namespace SDLTTF {
        [CCode (cname="TTF_Linked_Version")]
-       public static weak Version linked();
+       public static weak SDL.Version linked();
 
        [CCode (cname="TTF_ByteSwappedUNICODE")]
        public static void byteswap_unicode(int swapped);
@@ -82,30 +79,30 @@ namespace SDLTTF {
                public int size_unicode([CCode (array_length = false)] uint16[] text, ref int w, ref int h);
 
                [CCode (cname="TTF_RenderText_Solid")]
-               public Surface? render(string text, Color fg);
+               public SDL.Surface? render(string text, SDL.Color fg);
 
                [CCode (cname="TTF_RenderUTF8_Solid")]
-               public Surface? render_utf8(string text, Color fg);
+               public SDL.Surface? render_utf8(string text, SDL.Color fg);
 
                [CCode (cname="TTF_RenderUNICODE_Solid")]
-               public Surface? render_unicode([CCode (array_length = false)] uint16[] text, Color fg);
+               public SDL.Surface? render_unicode([CCode (array_length = false)] uint16[] text, SDL.Color fg);
 
                [CCode (cname="TTF_RenderText_Shaded")]
-               public Surface? render_shaded(string text, Color fg, Color bg);
+               public SDL.Surface? render_shaded(string text, SDL.Color fg, SDL.Color bg);
 
                [CCode (cname="TTF_RenderUTF8_Shaded")]
-               public Surface? render_shaded_utf8(string text, Color fg, Color bg);
+               public SDL.Surface? render_shaded_utf8(string text, SDL.Color fg, SDL.Color bg);
 
                [CCode (cname="TTF_RenderUNICODE_Shaded")]
-               public Surface? render_shaded_unicode([CCode (array_length = false)] uint16[] text, Color fg, Color bg);
+               public SDL.Surface? render_shaded_unicode([CCode (array_length = false)] uint16[] text, SDL.Color fg, SDL.Color bg);
 
                [CCode (cname="TTF_RenderText_Blended")]
-               public Surface? render_blended(string text, Color fg);
+               public SDL.Surface? render_blended(string text, SDL.Color fg);
 
                [CCode (cname="TTF_RenderUTF8_Blended")]
-               public Surface? render_blended_utf8(string text, Color fg);
+               public SDL.Surface? render_blended_utf8(string text, SDL.Color fg);
 
                [CCode (cname="TTF_RenderUNICODE_Blended")]
-               public Surface? render_blended_unicode([CCode (array_length = false)] uint16[] text, Color fg);
+               public SDL.Surface? render_blended_unicode([CCode (array_length = false)] uint16[] text, SDL.Color fg);
        }// Font
 }// SDLTTF

diff --git a/vapi/sdl.vapi b/vapi/sdl.vapi
index acb8eccc91f936d63fff701d42174bad8847c142..251cfd9ac2ddb321485fc39a2b97fd42b5f8669b 100644 (file)
--- a/vapi/sdl.vapi
+++ b/vapi/sdl.vapi
@@ -1,5 +1,3 @@
-using GLib;
-
 [CCode (cprefix="SDL_", cheader_filename="SDL.h")]
 namespace SDL {
        ///