Rename ScopedComPtr::QueryInterface to ScopedComPtr::CopyTo

base/win/scoped_comptr.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_WIN_SCOPED_COMPTR_H_
 #define BASE_WIN_SCOPED_COMPTR_H_
 
 #include <objbase.h>
 #include <unknwn.h>
 
@@ skipping 82 matching lines @@
   // Retrieves the pointer address.
   // Used to receive object pointers as out arguments (and take ownership).
   // The function DCHECKs on the current value being NULL.
   // Usage: Foo(p.Receive());
   Interface** Receive() {
     DCHECK(!ptr_) << "Object leak. Pointer must be NULL";
     return &ptr_;
   }
 
   template <class Query>
-  HRESULT QueryInterface(Query** p) {
+  HRESULT CopyTo(Query** p) {
     DCHECK(p);
     DCHECK(ptr_);
     // IUnknown already has a template version of QueryInterface
     // so the iid parameter is implicit here. The only thing this
     // function adds are the DCHECKs.
     return ptr_->QueryInterface(IID_PPV_ARGS(p));
   }
 
   // QI for times when the IID is not associated with the type.
-  HRESULT QueryInterface(const IID& iid, void** obj) {
+  HRESULT CopyTo(const IID& iid, void** obj) {
     DCHECK(obj);
     DCHECK(ptr_);
     return ptr_->QueryInterface(iid, obj);
   }
 
   // Queries |other| for the interface this object wraps and returns the
   // error code from the other->QueryInterface operation.
   HRESULT QueryFrom(IUnknown* object) {
     DCHECK(object);
     return object->QueryInterface(IID_PPV_ARGS(Receive()));
@@ skipping 11 matching lines @@
 
   // Checks if the identity of |other| and this object is the same.
   bool IsSameObject(IUnknown* other) {
     if (!other && !ptr_)
       return true;
 
     if (!other || !ptr_)
       return false;
 
     ScopedComPtr<IUnknown> my_identity;
-    QueryInterface(IID_PPV_ARGS(my_identity.Receive()));
+    CopyTo(IID_PPV_ARGS(my_identity.Receive()));
 
     ScopedComPtr<IUnknown> other_identity;
     other->QueryInterface(IID_PPV_ARGS(other_identity.Receive()));
 
     return my_identity == other_identity;
   }
 
   // Provides direct access to the interface.
   // Here we use a well known trick to make sure we block access to
   // IUnknown methods so that something bad like this doesn't happen:
@@ skipping 138 matching lines @@
 // Helper to make IID_PPV_ARGS work with ScopedComPtr.
 template <typename T>
 void** IID_PPV_ARGS_Helper(base::win::details::ScopedComPtrRef<T> pp) throw() {
   return pp;
 }
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_WIN_SCOPED_COMPTR_H_