From 168effec43932f6b6fca3f9aa186f11240d1604f Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Sat, 4 Sep 2010 12:23:26 +0200 Subject: [PATCH] Change namespace from NDesk.DBus to DBus --- examples/Notifications.cs | 2 +- examples/Test.cs | 2 +- examples/TestExceptions.cs | 2 +- examples/TestExport.cs | 4 ++-- examples/TestExportInterface.cs | 2 +- examples/TestNotifications.cs | 2 +- examples/TestObjects.cs | 2 +- examples/TestRental.cs | 2 +- examples/TestSample.cs | 2 +- examples/TestServer.cs | 2 +- examples/TestServerNative.cs | 4 ++-- examples/TestServerTcp.cs | 4 ++-- src/Address.cs | 2 +- src/Authentication.cs | 4 ++-- src/Bus.cs | 2 +- src/BusObject.cs | 2 +- src/Connection.cs | 2 +- src/DBus.cs | 2 +- src/DProxy.cs | 2 +- src/Daemon.cs | 12 ++++++------ src/DynamicExportObject.cs | 2 +- src/ExportObject.cs | 2 +- src/Introspection.cs | 2 +- src/IntrospectionSchema.cs | 2 +- src/Mapper.cs | 2 +- src/MatchRule.cs | 2 +- src/Message.cs | 2 +- src/MessageFilter.cs | 2 +- src/MessageReader.cs | 2 +- src/MessageWriter.cs | 2 +- src/PendingCall.cs | 2 +- src/PipeTransport.cs | 2 +- src/Protocol.cs | 2 +- src/Server.cs | 10 +++++----- src/ServerBus.cs | 10 +++++----- src/Signature.cs | 2 +- src/SocketTransport.cs | 2 +- src/Transport.cs | 2 +- src/TypeDefiner.cs | 8 ++++---- src/TypeImplementer.cs | 4 ++-- src/TypeRental.cs | 2 +- src/Unix.cs | 2 +- src/UnixMonoTransport.cs | 2 +- src/UnixNativeTransport.cs | 4 ++-- src/UnixTransport.cs | 2 +- src/Wrapper.cs | 2 +- tests/AddressTest.cs | 4 ++-- tests/AuthenticationTest.cs | 6 +++--- tests/MatchRuleTest.cs | 4 ++-- tests/ObjectPathTest.cs | 4 ++-- tests/SignatureTest.cs | 4 ++-- tools/Introspect.cs | 2 +- tools/Monitor.cs | 2 +- 53 files changed, 81 insertions(+), 81 deletions(-) diff --git a/examples/Notifications.cs b/examples/Notifications.cs index fae2c5f..b57bb80 100644 --- a/examples/Notifications.cs +++ b/examples/Notifications.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; // Hand-written interfaces for bootstrapping diff --git a/examples/Test.cs b/examples/Test.cs index 0dd2628..93e5233 100644 --- a/examples/Test.cs +++ b/examples/Test.cs @@ -3,7 +3,7 @@ // See COPYING for details using System; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; public class ManagedDBusTest diff --git a/examples/TestExceptions.cs b/examples/TestExceptions.cs index 9fd6ad4..f5c2572 100644 --- a/examples/TestExceptions.cs +++ b/examples/TestExceptions.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; public class ManagedDBusTestExceptions diff --git a/examples/TestExport.cs b/examples/TestExport.cs index fafb3ef..6b7ff2c 100644 --- a/examples/TestExport.cs +++ b/examples/TestExport.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; //NOTE: MarshalByRefObject use is not recommended in new code @@ -34,7 +34,7 @@ public static void Main () } demo.Say ("Hello world!"); - demo.Say ("Sibérie"); + demo.Say ("SibĂ©rie"); demo.Say (21); demo.SayByteArray (new byte[] {0, 2, 1}, "test string"); demo.SayByteEnumArray (new BEnum[] {BEnum.Zero, BEnum.Two, BEnum.One}, "test string two"); diff --git a/examples/TestExportInterface.cs b/examples/TestExportInterface.cs index b134cad..f46132d 100644 --- a/examples/TestExportInterface.cs +++ b/examples/TestExportInterface.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; public class ManagedDBusTestExport diff --git a/examples/TestNotifications.cs b/examples/TestNotifications.cs index eaf1014..e44681d 100644 --- a/examples/TestNotifications.cs +++ b/examples/TestNotifications.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -using NDesk.DBus; +using DBus; using org.freedesktop; using org.freedesktop.DBus; diff --git a/examples/TestObjects.cs b/examples/TestObjects.cs index 4ff4258..812d8bf 100644 --- a/examples/TestObjects.cs +++ b/examples/TestObjects.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; public class ManagedDBusTestObjects diff --git a/examples/TestRental.cs b/examples/TestRental.cs index 293adb1..494a307 100644 --- a/examples/TestRental.cs +++ b/examples/TestRental.cs @@ -6,7 +6,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Collections.Generic; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; public class ManagedDBusTestRental diff --git a/examples/TestSample.cs b/examples/TestSample.cs index ca62bea..0b6c555 100644 --- a/examples/TestSample.cs +++ b/examples/TestSample.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; public class ManagedDBusTestSample diff --git a/examples/TestServer.cs b/examples/TestServer.cs index 56d570f..9e7f872 100644 --- a/examples/TestServer.cs +++ b/examples/TestServer.cs @@ -3,7 +3,7 @@ // See COPYING for details using System; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; using System.IO; diff --git a/examples/TestServerNative.cs b/examples/TestServerNative.cs index 2f8d41d..0bff745 100644 --- a/examples/TestServerNative.cs +++ b/examples/TestServerNative.cs @@ -3,7 +3,7 @@ // See COPYING for details using System; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; using System.IO; @@ -12,7 +12,7 @@ using System.Threading; using System.Text; -using NDesk.DBus.Transports; +using DBus.Transports; public class TestServerNative { diff --git a/examples/TestServerTcp.cs b/examples/TestServerTcp.cs index 0e72137..6f2035d 100644 --- a/examples/TestServerTcp.cs +++ b/examples/TestServerTcp.cs @@ -3,8 +3,8 @@ // See COPYING for details using System; -using NDesk.DBus; -using NDesk.DBus.Transports; +using DBus; +using DBus.Transports; using org.freedesktop.DBus; using System.IO; diff --git a/src/Address.cs b/src/Address.cs index dbb3d83..a73c1bb 100644 --- a/src/Address.cs +++ b/src/Address.cs @@ -6,7 +6,7 @@ using System.Text; using System.Collections.Generic; -namespace NDesk.DBus +namespace DBus { // Subclass obsolete BadAddressException to avoid ABI break #pragma warning disable 0618 diff --git a/src/Authentication.cs b/src/Authentication.cs index 7b48f94..d43e7b6 100644 --- a/src/Authentication.cs +++ b/src/Authentication.cs @@ -9,7 +9,7 @@ using System.Text.RegularExpressions; using System.Globalization; -namespace NDesk.DBus +namespace DBus { using Authentication; @@ -156,7 +156,7 @@ public DateTime Timestamp } } -namespace NDesk.DBus.Authentication +namespace DBus.Authentication { enum ClientState { diff --git a/src/Bus.cs b/src/Bus.cs index 0db7f90..0b44b10 100644 --- a/src/Bus.cs +++ b/src/Bus.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using org.freedesktop.DBus; -namespace NDesk.DBus +namespace DBus { public sealed class Bus : Connection { diff --git a/src/BusObject.cs b/src/BusObject.cs index e94f0b2..e12207e 100644 --- a/src/BusObject.cs +++ b/src/BusObject.cs @@ -7,7 +7,7 @@ using System.Reflection.Emit; using System.Collections.Generic; -namespace NDesk.DBus +namespace DBus { class BusObject { diff --git a/src/Connection.cs b/src/Connection.cs index b8f2759..c286c41 100644 --- a/src/Connection.cs +++ b/src/Connection.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Reflection; -namespace NDesk.DBus +namespace DBus { using Authentication; using Transports; diff --git a/src/DBus.cs b/src/DBus.cs index c1f47ef..262f299 100644 --- a/src/DBus.cs +++ b/src/DBus.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -using NDesk.DBus; +using DBus; namespace org.freedesktop.DBus { diff --git a/src/DProxy.cs b/src/DProxy.cs index 1a8594f..8b0b7ab 100644 --- a/src/DProxy.cs +++ b/src/DProxy.cs @@ -7,7 +7,7 @@ using System.Runtime.Remoting.Proxies; using System.Runtime.Remoting.Messaging; -namespace NDesk.DBus +namespace DBus { //marked internal because this is really an implementation detail and needs to be replaced internal class DProxy : RealProxy diff --git a/src/Daemon.cs b/src/Daemon.cs index 4acf9db..b3a13a7 100644 --- a/src/Daemon.cs +++ b/src/Daemon.cs @@ -8,8 +8,8 @@ using System.IO; using System.Text; -using NDesk.DBus; -using NDesk.Unix; +using DBus; +using DBus.Unix; public class DBusDaemon { @@ -48,7 +48,7 @@ public static void Main (string[] args) } else if (fd == 2) { tw = Console.Error; } else { - Stream fs = new NDesk.Unix.UnixStream (fd); + Stream fs = new UnixStream (fd); tw = new StreamWriter (fs, Encoding.ASCII); tw.NewLine = "\n"; } @@ -69,8 +69,8 @@ public static void Main (string[] args) switch (arg) { case "--version": - //Console.WriteLine ("NDesk D-Bus Message Bus Daemon " + Introspector.GetProductDescription ()); - Console.WriteLine ("NDesk D-Bus Message Bus Daemon " + "0.1"); + //Console.WriteLine ("D-Bus Message Bus Daemon " + Introspector.GetProductDescription ()); + Console.WriteLine ("D-Bus Message Bus Daemon " + "0.1"); return; case "--system": break; @@ -138,7 +138,7 @@ public static void Main (string[] args) } else if (fd == 2) { tw = Console.Error; } else { - Stream fs = new NDesk.Unix.UnixStream (fd); + Stream fs = new UnixStream (fd); tw = new StreamWriter (fs, Encoding.ASCII); tw.NewLine = "\n"; } diff --git a/src/DynamicExportObject.cs b/src/DynamicExportObject.cs index c0c1d81..d18cf58 100644 --- a/src/DynamicExportObject.cs +++ b/src/DynamicExportObject.cs @@ -17,7 +17,7 @@ using org.freedesktop.DBus; -namespace NDesk.DBus +namespace DBus { internal class DynamicExportObject : ExportObject { diff --git a/src/ExportObject.cs b/src/ExportObject.cs index 719eaa3..f973bc4 100644 --- a/src/ExportObject.cs +++ b/src/ExportObject.cs @@ -9,7 +9,7 @@ using org.freedesktop.DBus; -namespace NDesk.DBus +namespace DBus { //TODO: perhaps ExportObject should not derive from BusObject internal class ExportObject : BusObject, IDisposable //, Peer diff --git a/src/Introspection.cs b/src/Introspection.cs index bb5cc48..acf34b4 100644 --- a/src/Introspection.cs +++ b/src/Introspection.cs @@ -9,7 +9,7 @@ using System.Text; using System.Reflection; -namespace NDesk.DBus +namespace DBus { //TODO: complete this class class Introspector diff --git a/src/IntrospectionSchema.cs b/src/IntrospectionSchema.cs index 83d7b82..fe6a2d0 100644 --- a/src/IntrospectionSchema.cs +++ b/src/IntrospectionSchema.cs @@ -6,7 +6,7 @@ using System.Xml.Serialization; using System.Collections.Generic; -namespace NDesk.DBus.Introspection +namespace DBus.Introspection { [XmlRootAttribute(IsNullable=true)] public class Member { diff --git a/src/Mapper.cs b/src/Mapper.cs index ad6f1c2..4f223bc 100644 --- a/src/Mapper.cs +++ b/src/Mapper.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Reflection; -namespace NDesk.DBus +namespace DBus { static class Mapper { diff --git a/src/MatchRule.cs b/src/MatchRule.cs index 7708f7e..317c171 100644 --- a/src/MatchRule.cs +++ b/src/MatchRule.cs @@ -7,7 +7,7 @@ using System.Text.RegularExpressions; using System.Collections.Generic; -namespace NDesk.DBus +namespace DBus { class MatchRule { diff --git a/src/Message.cs b/src/Message.cs index 3fea8d3..9487e12 100644 --- a/src/Message.cs +++ b/src/Message.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.IO; -namespace NDesk.DBus +namespace DBus { class Message { diff --git a/src/MessageFilter.cs b/src/MessageFilter.cs index b0849c2..9d2a042 100644 --- a/src/MessageFilter.cs +++ b/src/MessageFilter.cs @@ -4,7 +4,7 @@ using System; -namespace NDesk.DBus +namespace DBus { class MessageFilter { diff --git a/src/MessageReader.cs b/src/MessageReader.cs index 1b809cc..758b1ac 100644 --- a/src/MessageReader.cs +++ b/src/MessageReader.cs @@ -8,7 +8,7 @@ using System.IO; using System.Reflection; -namespace NDesk.DBus +namespace DBus { partial class MessageReader { diff --git a/src/MessageWriter.cs b/src/MessageWriter.cs index fb389d7..5287cf2 100644 --- a/src/MessageWriter.cs +++ b/src/MessageWriter.cs @@ -9,7 +9,7 @@ using System.Reflection; using System.Runtime.InteropServices; -namespace NDesk.DBus +namespace DBus { sealed class MessageWriter { diff --git a/src/PendingCall.cs b/src/PendingCall.cs index ee39ce9..f744dc4 100644 --- a/src/PendingCall.cs +++ b/src/PendingCall.cs @@ -5,7 +5,7 @@ using System; using System.Threading; -namespace NDesk.DBus +namespace DBus { class PendingCall : IAsyncResult { diff --git a/src/PipeTransport.cs b/src/PipeTransport.cs index 9bf7023..eb57c10 100644 --- a/src/PipeTransport.cs +++ b/src/PipeTransport.cs @@ -10,7 +10,7 @@ using System.Threading; -namespace NDesk.DBus.Transports +namespace DBus.Transports { class PipeTransport : Transport { diff --git a/src/Protocol.cs b/src/Protocol.cs index 32c55d1..c86436d 100644 --- a/src/Protocol.cs +++ b/src/Protocol.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace NDesk.DBus +namespace DBus { //yyyyuua{yv} //struct Header diff --git a/src/Server.cs b/src/Server.cs index 8e3457b..5e4b5fc 100644 --- a/src/Server.cs +++ b/src/Server.cs @@ -12,7 +12,7 @@ using System.IO.Pipes; #endif -namespace NDesk.DBus +namespace DBus { using Unix; using Transports; @@ -24,7 +24,7 @@ abstract class Server // Was Listen() public static Server ListenAt (string address) { - AddressEntry[] entries = NDesk.DBus.Address.Parse (address); + AddressEntry[] entries = DBus.Address.Parse (address); foreach (AddressEntry entry in entries) { try { @@ -96,7 +96,7 @@ class UnixServer : Server public UnixServer (string address) { - AddressEntry[] entries = NDesk.DBus.Address.Parse (address); + AddressEntry[] entries = DBus.Address.Parse (address); AddressEntry entry = entries[0]; if (entry.Method != "unix") @@ -235,7 +235,7 @@ class TcpServer : Server uint port = 0; public TcpServer (string address) { - AddressEntry[] entries = NDesk.DBus.Address.Parse (address); + AddressEntry[] entries = DBus.Address.Parse (address); AddressEntry entry = entries[0]; if (entry.Method != "tcp") @@ -374,7 +374,7 @@ class WinServer : Server public WinServer (string address) { - AddressEntry[] entries = NDesk.DBus.Address.Parse (address); + AddressEntry[] entries = DBus.Address.Parse (address); AddressEntry entry = entries[0]; if (entry.Method != "win") diff --git a/src/ServerBus.cs b/src/ServerBus.cs index cbebac1..560d213 100644 --- a/src/ServerBus.cs +++ b/src/ServerBus.cs @@ -10,10 +10,10 @@ using System.IO; using System.Threading; -using NDesk.DBus.Transports; +using DBus.Transports; using org.freedesktop.DBus; -namespace NDesk.DBus +namespace DBus { public class ServerBus : org.freedesktop.DBus.IBus { @@ -606,7 +606,7 @@ override internal void HandleMessage (Message msg) if ((string)fieldValue == ServerBus.DBusBusName) { // Workaround for our daemon only listening on a single path - if (msg.Header.MessageType == NDesk.DBus.MessageType.MethodCall) + if (msg.Header.MessageType == DBus.MessageType.MethodCall) msg.Header[FieldCode.Path] = ServerBus.Path; base.HandleMessage (msg); @@ -628,7 +628,7 @@ override internal uint Send (Message msg) return 0; /* - if (msg.Header.MessageType == NDesk.DBus.MessageType.Signal) { + if (msg.Header.MessageType == DBus.MessageType.Signal) { Signal signal = new Signal (msg); if (signal.Member == "NameAcquired" || signal.Member == "NameLost") { string dest = (string)msg.Header[FieldCode.Destination]; @@ -638,7 +638,7 @@ override internal uint Send (Message msg) } */ - if (msg.Header.MessageType != NDesk.DBus.MessageType.MethodReturn) { + if (msg.Header.MessageType != DBus.MessageType.MethodReturn) { msg.Header[FieldCode.Sender] = ServerBus.DBusBusName; } diff --git a/src/Signature.cs b/src/Signature.cs index d93565c..6439fe8 100644 --- a/src/Signature.cs +++ b/src/Signature.cs @@ -9,7 +9,7 @@ //TODO: Reflection should be done at a higher level than this class using System.Reflection; -namespace NDesk.DBus +namespace DBus { //maybe this should be nullable? struct Signature diff --git a/src/SocketTransport.cs b/src/SocketTransport.cs index 5e81007..e6eb6b3 100644 --- a/src/SocketTransport.cs +++ b/src/SocketTransport.cs @@ -7,7 +7,7 @@ using System.Net; using System.Net.Sockets; -namespace NDesk.DBus.Transports +namespace DBus.Transports { class SocketTransport : Transport { diff --git a/src/Transport.cs b/src/Transport.cs index 829ea20..991683d 100644 --- a/src/Transport.cs +++ b/src/Transport.cs @@ -7,7 +7,7 @@ using System.IO; using System.Threading; -namespace NDesk.DBus.Transports +namespace DBus.Transports { abstract class Transport { diff --git a/src/TypeDefiner.cs b/src/TypeDefiner.cs index 61dc395..23f82e9 100644 --- a/src/TypeDefiner.cs +++ b/src/TypeDefiner.cs @@ -10,7 +10,7 @@ using System.IO; using System.Xml.Serialization; -namespace NDesk.DBus +namespace DBus { using Introspection; @@ -97,7 +97,7 @@ public static void Save () const MethodAttributes ifaceMethAttr = MethodAttributes.HideBySig | MethodAttributes.NewSlot | MethodAttributes.Public | MethodAttributes.Abstract | MethodAttributes.Virtual; - public static Type DefineHandler (ModuleBuilder modB, NDesk.DBus.Introspection.Signal declSignal) + public static Type DefineHandler (ModuleBuilder modB, DBus.Introspection.Signal declSignal) { string dlgName = declSignal.Name + "Handler"; TypeBuilder handlerB = modB.DefineType (dlgName, TypeAttributes.Public | TypeAttributes.Class | TypeAttributes.Sealed | TypeAttributes.AnsiClass | TypeAttributes.AutoClass, typeof (System.MulticastDelegate)); @@ -193,7 +193,7 @@ public static void Define (TypeBuilder typeB, Interface iface) DefineMethod (typeB, declMethod.Name, ifaceMethAttr, declMethod.Arguments, false); if (iface.Properties != null) - foreach (NDesk.DBus.Introspection.Property prop in iface.Properties) { + foreach (DBus.Introspection.Property prop in iface.Properties) { Type propType = new Signature (prop.Type).ToType (); PropertyBuilder prop_builder = typeB.DefineProperty (prop.Name, PropertyAttributes.None, propType, Type.EmptyTypes); @@ -206,7 +206,7 @@ public static void Define (TypeBuilder typeB, Interface iface) } if (iface.Signals != null) - foreach (NDesk.DBus.Introspection.Signal signal in iface.Signals) { + foreach (DBus.Introspection.Signal signal in iface.Signals) { Type eventType = DefineHandler (modBdef, signal); EventBuilder event_builder = typeB.DefineEvent (signal.Name, EventAttributes.None, eventType); diff --git a/src/TypeImplementer.cs b/src/TypeImplementer.cs index b4ae730..868b593 100644 --- a/src/TypeImplementer.cs +++ b/src/TypeImplementer.cs @@ -7,11 +7,11 @@ using System.Reflection.Emit; using System.Collections.Generic; -namespace NDesk.DBus +namespace DBus { class TypeImplementer { - public static readonly TypeImplementer Root = new TypeImplementer ("NDesk.DBus.Proxies", false); + public static readonly TypeImplementer Root = new TypeImplementer ("DBus.Proxies", false); AssemblyBuilder asmB; ModuleBuilder modB; static readonly object getImplLock = new Object (); diff --git a/src/TypeRental.cs b/src/TypeRental.cs index 9d8fc9a..9ef2262 100644 --- a/src/TypeRental.cs +++ b/src/TypeRental.cs @@ -7,7 +7,7 @@ using System.Reflection.Emit; using System.Collections.Generic; -namespace NDesk.DBus +namespace DBus { public class ILReader2 { diff --git a/src/Unix.cs b/src/Unix.cs index c624f2f..fab92e8 100644 --- a/src/Unix.cs +++ b/src/Unix.cs @@ -6,7 +6,7 @@ using System.IO; using System.Runtime.InteropServices; -namespace NDesk.Unix +namespace DBus.Unix { // size_t using SizeT = System.UIntPtr; diff --git a/src/UnixMonoTransport.cs b/src/UnixMonoTransport.cs index c9f65e5..47326a7 100644 --- a/src/UnixMonoTransport.cs +++ b/src/UnixMonoTransport.cs @@ -10,7 +10,7 @@ using Mono.Unix; using Mono.Unix.Native; -namespace NDesk.DBus.Transports +namespace DBus.Transports { class UnixMonoTransport : UnixTransport { diff --git a/src/UnixNativeTransport.cs b/src/UnixNativeTransport.cs index 516dd66..14eca60 100644 --- a/src/UnixNativeTransport.cs +++ b/src/UnixNativeTransport.cs @@ -11,9 +11,9 @@ using System.IO; using System.Text; using System.Runtime.InteropServices; -using NDesk.Unix; +using DBus.Unix; -namespace NDesk.DBus.Transports +namespace DBus.Transports { class UnixNativeTransport : UnixTransport { diff --git a/src/UnixTransport.cs b/src/UnixTransport.cs index b96e01b..e433b6d 100644 --- a/src/UnixTransport.cs +++ b/src/UnixTransport.cs @@ -5,7 +5,7 @@ using System; using System.IO; -namespace NDesk.DBus.Transports +namespace DBus.Transports { abstract class UnixTransport : Transport { diff --git a/src/Wrapper.cs b/src/Wrapper.cs index ed68a70..ff13102 100644 --- a/src/Wrapper.cs +++ b/src/Wrapper.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.IO; -namespace NDesk.DBus +namespace DBus { //TODO: complete and use these wrapper classes //not sure exactly what I'm thinking but there seems to be sense here diff --git a/tests/AddressTest.cs b/tests/AddressTest.cs index 5842a74..7c72c44 100644 --- a/tests/AddressTest.cs +++ b/tests/AddressTest.cs @@ -4,10 +4,10 @@ using System; using NUnit.Framework; -using NDesk.DBus; +using DBus; using System.Collections.Generic; -namespace NDesk.DBus.Tests +namespace DBus.Tests { [TestFixture] public class AddressTest diff --git a/tests/AuthenticationTest.cs b/tests/AuthenticationTest.cs index 001e305..b6af81c 100644 --- a/tests/AuthenticationTest.cs +++ b/tests/AuthenticationTest.cs @@ -5,10 +5,10 @@ using System; using System.Collections.Generic; using NUnit.Framework; -using NDesk.DBus; -using NDesk.DBus.Authentication; +using DBus; +using DBus.Authentication; -namespace NDesk.DBus.Tests +namespace DBus.Tests { [TestFixture] public class AuthenticationTest diff --git a/tests/MatchRuleTest.cs b/tests/MatchRuleTest.cs index 9e28a60..9db56f9 100644 --- a/tests/MatchRuleTest.cs +++ b/tests/MatchRuleTest.cs @@ -4,9 +4,9 @@ using System; using NUnit.Framework; -using NDesk.DBus; +using DBus; -namespace NDesk.DBus.Tests +namespace DBus.Tests { [TestFixture] public class MatchRuleTest diff --git a/tests/ObjectPathTest.cs b/tests/ObjectPathTest.cs index 92295bb..bc4065b 100644 --- a/tests/ObjectPathTest.cs +++ b/tests/ObjectPathTest.cs @@ -4,9 +4,9 @@ using System; using NUnit.Framework; -using NDesk.DBus; +using DBus; -namespace NDesk.DBus.Tests +namespace DBus.Tests { [TestFixture] public class ObjectPathTest diff --git a/tests/SignatureTest.cs b/tests/SignatureTest.cs index 6744408..c1e4867 100644 --- a/tests/SignatureTest.cs +++ b/tests/SignatureTest.cs @@ -4,9 +4,9 @@ using System; using NUnit.Framework; -using NDesk.DBus; +using DBus; -namespace NDesk.DBus.Tests +namespace DBus.Tests { [TestFixture] public class SignatureTest diff --git a/tools/Introspect.cs b/tools/Introspect.cs index 6ff7993..d1c6d68 100644 --- a/tools/Introspect.cs +++ b/tools/Introspect.cs @@ -7,7 +7,7 @@ using System.IO; using System.Xml; using System.Xml.Serialization; -using NDesk.DBus; +using DBus; using Schemas; public class test diff --git a/tools/Monitor.cs b/tools/Monitor.cs index b8a14ea..d0a3708 100644 --- a/tools/Monitor.cs +++ b/tools/Monitor.cs @@ -6,7 +6,7 @@ using System.Text; using System.IO; using System.Collections.Generic; -using NDesk.DBus; +using DBus; using org.freedesktop.DBus; class BusMonitor