From 99e4257a9ff110c865e9b7a61b6b37299793a6b7 Mon Sep 17 00:00:00 2001 From: "Andres G. Aragoneses" Date: Mon, 1 Apr 2013 23:55:17 +0100 Subject: [PATCH] samples: Track API changes (I- interface prefixes) This includes changes to fix the build. --- sample/CustomScrollableWidget.cs | 3 ++- sample/GtkDemo/DemoEditableCells.cs | 2 +- sample/GtkDemo/DemoEntryCompletion.cs | 2 +- sample/GtkDemo/DemoMain.cs | 2 +- sample/GtkDemo/DemoStockBrowser.cs | 2 +- sample/ManagedTreeViewDemo.cs | 4 ++-- sample/TreeModelDemo.cs | 2 +- sample/gio/AppInfo.cs | 8 ++++---- sample/gio/Volume.cs | 10 +++++----- sample/gtk-gio/MountOperation.cs | 4 ++-- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/sample/CustomScrollableWidget.cs b/sample/CustomScrollableWidget.cs index 4c28161dc..2535c9286 100644 --- a/sample/CustomScrollableWidget.cs +++ b/sample/CustomScrollableWidget.cs @@ -3,6 +3,7 @@ using Gtk; using System; class CustomScrollableWidgetTest { + public static int Main (string[] args) { Gtk.Application.Init (); @@ -53,7 +54,7 @@ class DerivedScrollableWidget : CustomScrollableWidget { } } -class CustomScrollableWidget : CustomBase, ScrollableImplementor { +class CustomScrollableWidget : CustomBase, IScrollableImplementor { private int num_rows = 20; private string label; private Pango.Layout layout; diff --git a/sample/GtkDemo/DemoEditableCells.cs b/sample/GtkDemo/DemoEditableCells.cs index 56848af13..35173da7b 100644 --- a/sample/GtkDemo/DemoEditableCells.cs +++ b/sample/GtkDemo/DemoEditableCells.cs @@ -162,7 +162,7 @@ namespace GtkDemo private void RemoveItem (object o, EventArgs args) { TreeIter iter; - TreeModel model; + ITreeModel model; if (treeView.Selection.GetSelected (out model, out iter)) { int position = store.GetPath (iter).Indices[0]; diff --git a/sample/GtkDemo/DemoEntryCompletion.cs b/sample/GtkDemo/DemoEntryCompletion.cs index 2f4dab7a0..b44d4235e 100644 --- a/sample/GtkDemo/DemoEntryCompletion.cs +++ b/sample/GtkDemo/DemoEntryCompletion.cs @@ -38,7 +38,7 @@ namespace GtkDemo Destroy (); } - TreeModel CreateCompletionModel () + ITreeModel CreateCompletionModel () { ListStore store = new ListStore (typeof (string)); diff --git a/sample/GtkDemo/DemoMain.cs b/sample/GtkDemo/DemoMain.cs index 961be1d69..82fb4a3e8 100644 --- a/sample/GtkDemo/DemoMain.cs +++ b/sample/GtkDemo/DemoMain.cs @@ -222,7 +222,7 @@ namespace GtkDemo private void TreeChanged (object o, EventArgs args) { TreeIter iter; - TreeModel model; + ITreeModel model; if (treeView.Selection.GetSelected (out model, out iter)) { Type type = (Type) model.GetValue (iter, 1); diff --git a/sample/GtkDemo/DemoStockBrowser.cs b/sample/GtkDemo/DemoStockBrowser.cs index 9316fde19..c857dac66 100644 --- a/sample/GtkDemo/DemoStockBrowser.cs +++ b/sample/GtkDemo/DemoStockBrowser.cs @@ -118,7 +118,7 @@ namespace GtkDemo { TreeSelection selection = (TreeSelection)o; TreeIter iter; - TreeModel model; + ITreeModel model; if (selection.GetSelected (out model, out iter)) { string id = (string) model.GetValue (iter, (int)Column.Id); diff --git a/sample/ManagedTreeViewDemo.cs b/sample/ManagedTreeViewDemo.cs index ef06e4061..08b4f656a 100644 --- a/sample/ManagedTreeViewDemo.cs +++ b/sample/ManagedTreeViewDemo.cs @@ -32,13 +32,13 @@ namespace GtkSamples { } } - private static void CellDataA (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter) + private static void CellDataA (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel tree_model, Gtk.TreeIter iter) { Pair val = (Pair) store.GetValue (iter, 0); ((CellRendererText) cell).Text = val.a; } - private static void CellDataB (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, Gtk.TreeIter iter) + private static void CellDataB (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.ITreeModel tree_model, Gtk.TreeIter iter) { Pair val = (Pair) store.GetValue (iter, 0); ((CellRendererText) cell).Text = val.b; diff --git a/sample/TreeModelDemo.cs b/sample/TreeModelDemo.cs index 44b7c1053..419ec9add 100644 --- a/sample/TreeModelDemo.cs +++ b/sample/TreeModelDemo.cs @@ -57,7 +57,7 @@ namespace GtkSamples { } - public class MyTreeModel : GLib.Object, TreeModelImplementor { + public class MyTreeModel : GLib.Object, ITreeModelImplementor { Assembly[] assemblies; diff --git a/sample/gio/AppInfo.cs b/sample/gio/AppInfo.cs index 25a385bef..2da8b41d7 100644 --- a/sample/gio/AppInfo.cs +++ b/sample/gio/AppInfo.cs @@ -16,14 +16,14 @@ namespace TestGio Console.WriteLine ("Default Handler for {0}: {1}", args[0], AppInfoAdapter.GetDefaultForType (args[0], false).Name); Console.WriteLine(); Console.WriteLine("List of all {0} handlers", args[0]); - foreach (AppInfo appinfo in AppInfoAdapter.GetAllForType (args[0])) + foreach (IAppInfo appinfo in AppInfoAdapter.GetAllForType (args[0])) Console.WriteLine ("\t{0}: {1} {2}", appinfo.Name, appinfo.Executable, appinfo.Description); - AppInfo app_info = AppInfoAdapter.GetDefaultForType ("image/jpeg", false); + IAppInfo app_info = AppInfoAdapter.GetDefaultForType ("image/jpeg", false); Console.WriteLine ("{0}:\t{1}", app_info.Name, app_info.Description); - Console.WriteLine ("All installed AppInfos:"); - foreach (AppInfo appinfo in AppInfoAdapter.GetAll ()) + Console.WriteLine ("All installed IAppInfos:"); + foreach (IAppInfo appinfo in AppInfoAdapter.GetAll ()) Console.WriteLine ("\t{0}: {1} ", appinfo.Name, appinfo.Executable); } } diff --git a/sample/gio/Volume.cs b/sample/gio/Volume.cs index b47424515..315bfdec2 100644 --- a/sample/gio/Volume.cs +++ b/sample/gio/Volume.cs @@ -10,20 +10,20 @@ namespace TestGio GLib.GType.Init (); VolumeMonitor monitor = VolumeMonitor.Default; Console.WriteLine ("Volumes:"); - foreach (Volume v in monitor.Volumes) + foreach (IVolume v in monitor.Volumes) Console.WriteLine ("\t{0}", v.Name); Console.WriteLine ("\nMounts:"); - foreach (Mount m in monitor.Mounts) { + foreach (IMount m in monitor.Mounts) { Console.WriteLine ("\tName:{0}, UUID:{1}, root:{2}, CanUnmount: {3}", m.Name, m.Uuid, m.Root, m.CanUnmount); - Volume v = m.Volume; + IVolume v = m.Volume; if (v != null) Console.WriteLine ("\t\tVolume:{0}", v.Name); - Drive d = m.Drive; + IDrive d = m.Drive; if (d != null) Console.WriteLine ("\t\tDrive:{0}", d.Name); } Console.WriteLine ("\nConnectedDrives:"); - foreach (Drive d in monitor.ConnectedDrives) + foreach (IDrive d in monitor.ConnectedDrives) Console.WriteLine ("\t{0}, HasVolumes:{1}", d.Name, d.HasVolumes); } } diff --git a/sample/gtk-gio/MountOperation.cs b/sample/gtk-gio/MountOperation.cs index 2f41bb0fd..f21416ee9 100644 --- a/sample/gtk-gio/MountOperation.cs +++ b/sample/gtk-gio/MountOperation.cs @@ -35,7 +35,7 @@ using GLib; public class TestMount { - static GLib.File file; + static GLib.IFile file; static Gtk.MountOperation operation; static void Main () @@ -59,7 +59,7 @@ public class TestMount file.MountEnclosingVolume (0, operation, null, new GLib.AsyncReadyCallback (HandleMountFinished)); } - static void HandleMountFinished (GLib.Object sender, GLib.AsyncResult result) + static void HandleMountFinished (GLib.Object sender, GLib.IAsyncResult result) { System.Console.WriteLine ("handle mount finished"); if (file.MountEnclosingVolumeFinish (result))