Remove redundant qualifiers

dahlbyk · nulltoken · commit e3fca98cd527 · 2013-02-14T07:47:36.000+01:00
diff --git a/LibGit2Sharp.Tests/OdbBackendFixture.cs b/LibGit2Sharp.Tests/OdbBackendFixture.cs
@@ -184,7 +184,7 @@ public override int ReadStream(byte[] oid, out OdbBackendStream stream)
                 throw new NotImplementedException();
             }
 
-            public override int ForEach(OdbBackend.ForEachCallback callback)
+            public override int ForEach(ForEachCallback callback)
             {
                 throw new NotImplementedException();
             }
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -26,8 +26,8 @@ private sealed class LibraryLifetimeObject : CriticalFinalizerObject
             // Ensure mono can JIT the .cctor and adjust the PATH before trying to load the native library.
             // See https://github.com/libgit2/libgit2sharp/pull/190
             [MethodImpl(MethodImplOptions.NoInlining)]
-            public LibraryLifetimeObject() { Ensure.ZeroResult(NativeMethods.git_threads_init()); }
-            ~LibraryLifetimeObject() { NativeMethods.git_threads_shutdown(); }
+            public LibraryLifetimeObject() { Ensure.ZeroResult(git_threads_init()); }
+            ~LibraryLifetimeObject() { git_threads_shutdown(); }
         }
 
         static NativeMethods()
diff --git a/LibGit2Sharp/Core/Utf8Marshaler.cs b/LibGit2Sharp/Core/Utf8Marshaler.cs
@@ -87,12 +87,12 @@ public IntPtr MarshalManagedToNative(Object managedObj)
                 throw new MarshalDirectiveException("Utf8Marshaler must be used on a string.");
             }
 
-            return Utf8Marshaler.FromManaged(str);
+            return FromManaged(str);
         }
 
         public Object MarshalNativeToManaged(IntPtr pNativeData)
         {
-            return Utf8Marshaler.FromNative(pNativeData);
+            return FromNative(pNativeData);
         }
 
         #endregion
diff --git a/LibGit2Sharp/TagAnnotation.cs b/LibGit2Sharp/TagAnnotation.cs
@@ -24,7 +24,7 @@ internal TagAnnotation(Repository repo, ObjectId id)
         {
             lazyName = GitObjectLazyGroup.Singleton(repo, id, Proxy.git_tag_name);
             lazyTarget = GitObjectLazyGroup.Singleton(repo, id,
-                obj => GitObject.BuildFrom(repo, Proxy.git_tag_target_oid(obj), Proxy.git_tag_target_type(obj), null));
+                obj => BuildFrom(repo, Proxy.git_tag_target_oid(obj), Proxy.git_tag_target_type(obj), null));
 
             group = new GitObjectLazyGroup(repo, id);
             lazyTagger = group.AddLazy(Proxy.git_tag_tagger);

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public override int ReadStream(byte[] oid, out OdbBackendStream stream)`
`184`	`184`	`throw new NotImplementedException();`
`185`	`185`	`}`
`186`	`186`
`187`		`- public override int ForEach(OdbBackend.ForEachCallback callback)`
	`187`	`+ public override int ForEach(ForEachCallback callback)`
`188`	`188`	`{`
`189`	`189`	`throw new NotImplementedException();`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,12 +87,12 @@ public IntPtr MarshalManagedToNative(Object managedObj)`
`87`	`87`	`throw new MarshalDirectiveException("Utf8Marshaler must be used on a string.");`
`88`	`88`	`}`
`89`	`89`
`90`		`- return Utf8Marshaler.FromManaged(str);`
	`90`	`+ return FromManaged(str);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public Object MarshalNativeToManaged(IntPtr pNativeData)`
`94`	`94`	`{`
`95`		`- return Utf8Marshaler.FromNative(pNativeData);`
	`95`	`+ return FromNative(pNativeData);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ internal TagAnnotation(Repository repo, ObjectId id)`
`24`	`24`	`{`
`25`	`25`	`lazyName = GitObjectLazyGroup.Singleton(repo, id, Proxy.git_tag_name);`
`26`	`26`	`lazyTarget = GitObjectLazyGroup.Singleton(repo, id,`
`27`		`- obj => GitObject.BuildFrom(repo, Proxy.git_tag_target_oid(obj), Proxy.git_tag_target_type(obj), null));`
	`27`	`+ obj => BuildFrom(repo, Proxy.git_tag_target_oid(obj), Proxy.git_tag_target_type(obj), null));`
`28`	`28`
`29`	`29`	`group = new GitObjectLazyGroup(repo, id);`
`30`	`30`	`lazyTagger = group.AddLazy(Proxy.git_tag_tagger);`