Skip to content

Commit

Permalink
Bug 900908 - Part 3: Change uses of numbered macros in nsIClassInfoIm…
Browse files Browse the repository at this point in the history 
…pl.h/nsISupportsImpl.h to the variadic variants. r=froydnj
  • Loading branch information
@poiru
poiru committed Apr 27, 2014
1 parent 5c3bda3 commit 5f1fde8
Show file tree
Hide file tree
Showing 1,104 changed files with 2,667 additions and 2,673 deletions.
8 changes: 4 additions & 4 deletions accessible/src/base/DocManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ DocManager::Shutdown()
////////////////////////////////////////////////////////////////////////////////
// nsISupports

NS_IMPL_ISUPPORTS3(DocManager,
nsIWebProgressListener,
nsIDOMEventListener,
nsISupportsWeakReference)
NS_IMPL_ISUPPORTS(DocManager,
nsIWebProgressListener,
nsIDOMEventListener,
nsISupportsWeakReference)

////////////////////////////////////////////////////////////////////////////////
// nsIWebProgressListener
Expand Down
14 changes: 7 additions & 7 deletions accessible/src/base/nsAccessibilityService.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ nsAccessibilityService::~nsAccessibilityService()
////////////////////////////////////////////////////////////////////////////////
// nsISupports

NS_IMPL_ISUPPORTS_INHERITED4(nsAccessibilityService,
DocManager,
nsIAccessibilityService,
nsIAccessibleRetrieval,
nsIObserver,
nsISelectionListener) // from SelectionManager
NS_IMPL_ISUPPORTS_INHERITED(nsAccessibilityService,
DocManager,
nsIAccessibilityService,
nsIAccessibleRetrieval,
nsIObserver,
nsISelectionListener) // from SelectionManager

////////////////////////////////////////////////////////////////////////////////
// nsIObserver
Expand Down Expand Up @@ -256,7 +256,7 @@ class PluginTimerCallBack MOZ_FINAL : public nsITimerCallback
nsCOMPtr<nsIContent> mContent;
};

NS_IMPL_ISUPPORTS1(PluginTimerCallBack, nsITimerCallback)
NS_IMPL_ISUPPORTS(PluginTimerCallBack, nsITimerCallback)
#endif

already_AddRefed<Accessible>
Expand Down
12 changes: 6 additions & 6 deletions accessible/src/generic/ARIAGridAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ ARIAGridAccessible::
////////////////////////////////////////////////////////////////////////////////
// nsISupports

NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridAccessible,
Accessible,
nsIAccessibleTable)
NS_IMPL_ISUPPORTS_INHERITED(ARIAGridAccessible,
Accessible,
nsIAccessibleTable)

////////////////////////////////////////////////////////////////////////////////
// Accessible
Expand Down Expand Up @@ -540,9 +540,9 @@ ARIAGridCellAccessible::
////////////////////////////////////////////////////////////////////////////////
// nsISupports

NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridCellAccessible,
HyperTextAccessible,
nsIAccessibleTableCell)
NS_IMPL_ISUPPORTS_INHERITED(ARIAGridCellAccessible,
HyperTextAccessible,
nsIAccessibleTableCell)

////////////////////////////////////////////////////////////////////////////////
// nsIAccessibleTableCell
Expand Down
4 changes: 2 additions & 2 deletions accessible/src/generic/ApplicationAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ ApplicationAccessible::ApplicationAccessible() :
////////////////////////////////////////////////////////////////////////////////
// nsISupports

NS_IMPL_ISUPPORTS_INHERITED1(ApplicationAccessible, Accessible,
nsIAccessibleApplication)
NS_IMPL_ISUPPORTS_INHERITED(ApplicationAccessible, Accessible,
nsIAccessibleApplication)

////////////////////////////////////////////////////////////////////////////////
// nsIAccessible
Expand Down
6 changes: 3 additions & 3 deletions accessible/src/generic/FormControlAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ template<int Max>
NS_IMPL_RELEASE_INHERITED(ProgressMeterAccessible<Max>, LeafAccessible)

template<int Max>
NS_IMPL_QUERY_INTERFACE_INHERITED1(ProgressMeterAccessible<Max>,
LeafAccessible,
nsIAccessibleValue)
NS_IMPL_QUERY_INTERFACE_INHERITED(ProgressMeterAccessible<Max>,
LeafAccessible,
nsIAccessibleValue)

////////////////////////////////////////////////////////////////////////////////
// Accessible
Expand Down
4 changes: 2 additions & 2 deletions accessible/src/generic/ImageAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ ImageAccessible::
mType = eImageType;
}

NS_IMPL_ISUPPORTS_INHERITED1(ImageAccessible, Accessible,
nsIAccessibleImage)
NS_IMPL_ISUPPORTS_INHERITED(ImageAccessible, Accessible,
nsIAccessibleImage)

////////////////////////////////////////////////////////////////////////////////
// Accessible public
Expand Down
2 changes: 1 addition & 1 deletion accessible/src/generic/RootAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ using namespace mozilla::dom;
////////////////////////////////////////////////////////////////////////////////
// nsISupports

NS_IMPL_ISUPPORTS_INHERITED1(RootAccessible, DocAccessible, nsIAccessibleDocument)
NS_IMPL_ISUPPORTS_INHERITED(RootAccessible, DocAccessible, nsIAccessibleDocument)

////////////////////////////////////////////////////////////////////////////////
// Constructor/destructor
Expand Down
8 changes: 4 additions & 4 deletions accessible/src/html/HTMLFormControlAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,10 @@ HTMLTextFieldAccessible::
mType = eHTMLTextFieldType;
}

NS_IMPL_ISUPPORTS_INHERITED2(HTMLTextFieldAccessible,
Accessible,
nsIAccessibleText,
nsIAccessibleEditableText)
NS_IMPL_ISUPPORTS_INHERITED(HTMLTextFieldAccessible,
Accessible,
nsIAccessibleText,
nsIAccessibleEditableText)

role
HTMLTextFieldAccessible::NativeRole()
Expand Down
4 changes: 2 additions & 2 deletions accessible/src/html/HTMLLinkAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ HTMLLinkAccessible::
}

// Expose nsIAccessibleHyperLink unconditionally
NS_IMPL_ISUPPORTS_INHERITED1(HTMLLinkAccessible, HyperTextAccessibleWrap,
nsIAccessibleHyperLink)
NS_IMPL_ISUPPORTS_INHERITED(HTMLLinkAccessible, HyperTextAccessibleWrap,
nsIAccessibleHyperLink)

////////////////////////////////////////////////////////////////////////////////
// nsIAccessible
Expand Down
10 changes: 5 additions & 5 deletions accessible/src/html/HTMLTableAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ HTMLTableCellAccessible::
////////////////////////////////////////////////////////////////////////////////
// HTMLTableCellAccessible: nsISupports implementation

NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableCellAccessible,
HyperTextAccessible,
nsIAccessibleTableCell)
NS_IMPL_ISUPPORTS_INHERITED(HTMLTableCellAccessible,
HyperTextAccessible,
nsIAccessibleTableCell)

////////////////////////////////////////////////////////////////////////////////
// HTMLTableCellAccessible: Accessible implementation
Expand Down Expand Up @@ -360,8 +360,8 @@ HTMLTableRowAccessible::NativeRole()
// HTMLTableAccessible
////////////////////////////////////////////////////////////////////////////////

NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableAccessible, Accessible,
nsIAccessibleTable)
NS_IMPL_ISUPPORTS_INHERITED(HTMLTableAccessible, Accessible,
nsIAccessibleTable)

////////////////////////////////////////////////////////////////////////////////
// HTMLTableAccessible: Accessible
Expand Down
2 changes: 1 addition & 1 deletion accessible/src/xpcom/nsAccessibleRelation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ nsAccessibleRelation::nsAccessibleRelation(uint32_t aType,
}

// nsISupports
NS_IMPL_ISUPPORTS1(nsAccessibleRelation, nsIAccessibleRelation)
NS_IMPL_ISUPPORTS(nsAccessibleRelation, nsIAccessibleRelation)

// nsIAccessibleRelation
NS_IMETHODIMP
Expand Down
4 changes: 2 additions & 2 deletions accessible/src/xul/XULElementAccessibles.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ XULLinkAccessible::
}

// Expose nsIAccessibleHyperLink unconditionally
NS_IMPL_ISUPPORTS_INHERITED1(XULLinkAccessible, XULLabelAccessible,
nsIAccessibleHyperLink)
NS_IMPL_ISUPPORTS_INHERITED(XULLinkAccessible, XULLabelAccessible,
nsIAccessibleHyperLink)

////////////////////////////////////////////////////////////////////////////////
// XULLinkAccessible. nsIAccessible
Expand Down
6 changes: 3 additions & 3 deletions accessible/src/xul/XULListboxAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,9 +739,9 @@ XULListCellAccessible::
////////////////////////////////////////////////////////////////////////////////
// nsISupports

NS_IMPL_ISUPPORTS_INHERITED1(XULListCellAccessible,
HyperTextAccessible,
nsIAccessibleTableCell)
NS_IMPL_ISUPPORTS_INHERITED(XULListCellAccessible,
HyperTextAccessible,
nsIAccessibleTableCell)

////////////////////////////////////////////////////////////////////////////////
// XULListCellAccessible: nsIAccessibleTableCell implementation
Expand Down
4 changes: 2 additions & 2 deletions accessible/src/xul/XULTreeAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,8 +710,8 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase, Accessible,
mTree)

NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeItemAccessibleBase)
NS_INTERFACE_TABLE_INHERITED1(XULTreeItemAccessibleBase,
XULTreeItemAccessibleBase)
NS_INTERFACE_TABLE_INHERITED(XULTreeItemAccessibleBase,
XULTreeItemAccessibleBase)
NS_INTERFACE_TABLE_TAIL_INHERITING(Accessible)
NS_IMPL_ADDREF_INHERITED(XULTreeItemAccessibleBase, Accessible)
NS_IMPL_RELEASE_INHERITED(XULTreeItemAccessibleBase, Accessible)
Expand Down
12 changes: 6 additions & 6 deletions accessible/src/xul/XULTreeGridAccessible.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ using namespace mozilla::a11y;
////////////////////////////////////////////////////////////////////////////////
// XULTreeGridAccessible: nsISupports implementation

NS_IMPL_ISUPPORTS_INHERITED1(XULTreeGridAccessible,
XULTreeAccessible,
nsIAccessibleTable)
NS_IMPL_ISUPPORTS_INHERITED(XULTreeGridAccessible,
XULTreeAccessible,
nsIAccessibleTable)

////////////////////////////////////////////////////////////////////////////////
// XULTreeGridAccessible: nsIAccessibleTable implementation
Expand Down Expand Up @@ -457,9 +457,9 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible, LeafAccessible,
mTree, mColumn)

NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(XULTreeGridCellAccessible)
NS_INTERFACE_TABLE_INHERITED2(XULTreeGridCellAccessible,
nsIAccessibleTableCell,
XULTreeGridCellAccessible)
NS_INTERFACE_TABLE_INHERITED(XULTreeGridCellAccessible,
nsIAccessibleTableCell,
XULTreeGridCellAccessible)
NS_INTERFACE_TABLE_TAIL_INHERITING(LeafAccessible)
NS_IMPL_ADDREF_INHERITED(XULTreeGridCellAccessible, LeafAccessible)
NS_IMPL_RELEASE_INHERITED(XULTreeGridCellAccessible, LeafAccessible)
Expand Down
2 changes: 1 addition & 1 deletion browser/components/about/AboutRedirector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace mozilla {
namespace browser {

NS_IMPL_ISUPPORTS1(AboutRedirector, nsIAboutModule)
NS_IMPL_ISUPPORTS(AboutRedirector, nsIAboutModule)

struct RedirEntry {
const char* id;
Expand Down
8 changes: 4 additions & 4 deletions browser/components/dirprovider/DirectoryProvider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
namespace mozilla {
namespace browser {

NS_IMPL_ISUPPORTS2(DirectoryProvider,
nsIDirectoryServiceProvider,
nsIDirectoryServiceProvider2)
NS_IMPL_ISUPPORTS(DirectoryProvider,
nsIDirectoryServiceProvider,
nsIDirectoryServiceProvider2)

NS_IMETHODIMP
DirectoryProvider::GetFile(const char *aKey, bool *aPersist, nsIFile* *aResult)
Expand Down Expand Up @@ -254,7 +254,7 @@ DirectoryProvider::GetFiles(const char *aKey, nsISimpleEnumerator* *aResult)
return NS_ERROR_FAILURE;
}

NS_IMPL_ISUPPORTS1(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator)
NS_IMPL_ISUPPORTS(DirectoryProvider::AppendingEnumerator, nsISimpleEnumerator)

NS_IMETHODIMP
DirectoryProvider::AppendingEnumerator::HasMoreElements(bool *aResult)
Expand Down
8 changes: 4 additions & 4 deletions browser/components/feeds/src/nsFeedSniffer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@

#define MAX_BYTES 512u

NS_IMPL_ISUPPORTS3(nsFeedSniffer,
nsIContentSniffer,
nsIStreamListener,
nsIRequestObserver)
NS_IMPL_ISUPPORTS(nsFeedSniffer,
nsIContentSniffer,
nsIStreamListener,
nsIRequestObserver)

nsresult
nsFeedSniffer::ConvertEncodedData(nsIRequest* request,
Expand Down
2 changes: 1 addition & 1 deletion browser/components/migration/src/nsIEHistoryEnumerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace {
////////////////////////////////////////////////////////////////////////////////
//// nsIEHistoryEnumerator

NS_IMPL_ISUPPORTS1(nsIEHistoryEnumerator, nsISimpleEnumerator)
NS_IMPL_ISUPPORTS(nsIEHistoryEnumerator, nsISimpleEnumerator)

nsIEHistoryEnumerator::nsIEHistoryEnumerator()
{
Expand Down
2 changes: 1 addition & 1 deletion browser/components/shell/src/nsGNOMEShellService.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ nsGNOMEShellService::Init()
return appPath->GetNativePath(mAppPath);
}

NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)
NS_IMPL_ISUPPORTS(nsGNOMEShellService, nsIShellService)

bool
nsGNOMEShellService::GetAppPathFromLauncher()
Expand Down
2 changes: 1 addition & 1 deletion browser/components/shell/src/nsMacShellService.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#define SAFARI_BUNDLE_IDENTIFIER "com.apple.Safari"

NS_IMPL_ISUPPORTS3(nsMacShellService, nsIMacShellService, nsIShellService, nsIWebProgressListener)
NS_IMPL_ISUPPORTS(nsMacShellService, nsIMacShellService, nsIShellService, nsIWebProgressListener)

NS_IMETHODIMP
nsMacShellService::IsDefaultBrowser(bool aStartupCheck,
Expand Down
2 changes: 1 addition & 1 deletion browser/components/shell/src/nsWindowsShellService.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ using mozilla::IsWin8OrLater;
using namespace mozilla;
using namespace mozilla::gfx;

NS_IMPL_ISUPPORTS2(nsWindowsShellService, nsIWindowsShellService, nsIShellService)
NS_IMPL_ISUPPORTS(nsWindowsShellService, nsIWindowsShellService, nsIShellService)

static nsresult
OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
Expand Down
4 changes: 2 additions & 2 deletions caps/src/DomainPolicy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace mozilla {

NS_IMPL_ISUPPORTS1(DomainPolicy, nsIDomainPolicy)
NS_IMPL_ISUPPORTS(DomainPolicy, nsIDomainPolicy)

DomainPolicy::DomainPolicy() : mBlacklist(new DomainSet())
, mSuperBlacklist(new DomainSet())
Expand Down Expand Up @@ -92,7 +92,7 @@ GetCanonicalClone(nsIURI* aURI)
return clone.forget();
}

NS_IMPL_ISUPPORTS1(DomainSet, nsIDomainSet)
NS_IMPL_ISUPPORTS(DomainSet, nsIDomainSet)

NS_IMETHODIMP
DomainSet::Add(nsIURI* aDomain)
Expand Down
8 changes: 4 additions & 4 deletions caps/src/nsNullPrincipal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ using namespace mozilla;

NS_IMPL_CLASSINFO(nsNullPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY,
NS_NULLPRINCIPAL_CID)
NS_IMPL_QUERY_INTERFACE2_CI(nsNullPrincipal,
NS_IMPL_QUERY_INTERFACE_CI(nsNullPrincipal,
nsIPrincipal,
nsISerializable)
NS_IMPL_CI_INTERFACE_GETTER(nsNullPrincipal,
nsIPrincipal,
nsISerializable)
NS_IMPL_CI_INTERFACE_GETTER2(nsNullPrincipal,
nsIPrincipal,
nsISerializable)

NS_IMETHODIMP_(MozExternalRefCountType)
nsNullPrincipal::AddRef()
Expand Down
16 changes: 8 additions & 8 deletions caps/src/nsPrincipal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ void nsPrincipal::dumpImpl()

NS_IMPL_CLASSINFO(nsPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY,
NS_PRINCIPAL_CID)
NS_IMPL_QUERY_INTERFACE2_CI(nsPrincipal,
NS_IMPL_QUERY_INTERFACE_CI(nsPrincipal,
nsIPrincipal,
nsISerializable)
NS_IMPL_CI_INTERFACE_GETTER(nsPrincipal,
nsIPrincipal,
nsISerializable)
NS_IMPL_CI_INTERFACE_GETTER2(nsPrincipal,
nsIPrincipal,
nsISerializable)
NS_IMPL_ADDREF_INHERITED(nsPrincipal, nsBasePrincipal)
NS_IMPL_RELEASE_INHERITED(nsPrincipal, nsBasePrincipal)

Expand Down Expand Up @@ -627,10 +627,10 @@ static const char EXPANDED_PRINCIPAL_SPEC[] = "[Expanded Principal]";

NS_IMPL_CLASSINFO(nsExpandedPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY,
NS_EXPANDEDPRINCIPAL_CID)
NS_IMPL_QUERY_INTERFACE2_CI(nsExpandedPrincipal,
nsIPrincipal,
nsIExpandedPrincipal)
NS_IMPL_CI_INTERFACE_GETTER2(nsExpandedPrincipal,
NS_IMPL_QUERY_INTERFACE_CI(nsExpandedPrincipal,
nsIPrincipal,
nsIExpandedPrincipal)
NS_IMPL_CI_INTERFACE_GETTER(nsExpandedPrincipal,
nsIPrincipal,
nsIExpandedPrincipal)
NS_IMPL_ADDREF_INHERITED(nsExpandedPrincipal, nsBasePrincipal)
Expand Down
10 changes: 5 additions & 5 deletions caps/src/nsScriptSecurityManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,11 @@ nsScriptSecurityManager::GetCxSubjectPrincipal(JSContext *cx)
////////////////////////////////////
// Methods implementing ISupports //
////////////////////////////////////
NS_IMPL_ISUPPORTS4(nsScriptSecurityManager,
nsIScriptSecurityManager,
nsIXPCSecurityManager,
nsIChannelEventSink,
nsIObserver)
NS_IMPL_ISUPPORTS(nsScriptSecurityManager,
nsIScriptSecurityManager,
nsIXPCSecurityManager,
nsIChannelEventSink,
nsIObserver)

///////////////////////////////////////////////////
// Methods implementing nsIScriptSecurityManager //
Expand Down
Loading

0 comments on commit 5f1fde8

Please sign in to comment.