Commit 78f6d068 authored by bsmedberg%covad.net's avatar bsmedberg%covad.net
Browse files

Bug 313309 part 2 - change the NS_DEFINE_STATIC_IID_ACCESSOR macro to... 

Bug 313309 part 2 - change the NS_DEFINE_STATIC_IID_ACCESSOR macro to NS_DECLARE, and make a NS_DEFINE_ macro that's outside the class declaration, r=shaver
parent 01e04345

camino/src/history/nsIHistoryDisplay.h

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class NS_NO_VTABLE nsIHistoryDisplay : public nsISupports 
{

 public: 



  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHISTORYDISPLAY_IID)

  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHISTORYDISPLAY_IID)





  /**
@@ -71,6 +71,7 @@ class NS_NO_VTABLE nsIHistoryDisplay : public nsISupports 


};



NS_DEFINE_STATIC_IID_ACCESSOR(nsIHistoryDisplay, NS_IHISTORYDISPLAY_IID)



#define NS_DECL_NSIHISTORYDISPLAY \

  NS_IMETHOD GetItemCount(PRUint32 *outCount); \

camino/src/history/nsIHistoryItems.h

+4 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ class NS_NO_VTABLE nsIHistoryItem : public nsISupports 
{

public:



  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHISTORYITEM_IID)

  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHISTORYITEM_IID)



  NS_IMETHOD GetURL(nsACString& outURL) = 0;

  NS_IMETHOD GetReferrer(nsACString& outReferrer) = 0;
@@ -95,6 +95,7 @@ public: 
  NS_IMETHOD GetID(nsACString& outIDString) = 0;

};



NS_DEFINE_STATIC_IID_ACCESSOR(nsIHistoryItem, NS_IHISTORYITEM_IID)



#define NS_DECL_NSIHISTORYITEM \

  NS_IMETHOD GetURL(nsACString& outURL); \
@@ -115,7 +116,7 @@ class NS_NO_VTABLE nsIHistoryItems : public nsISupports 
{

public:



  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHISTORYITEMS_IID)

  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHISTORYITEMS_IID)



  /**

     * GetMaxItemCount
@@ -149,6 +150,7 @@ public: 


};



NS_DEFINE_STATIC_IID_ACCESSOR(nsIHistoryItems, NS_IHISTORYITEMS_IID)



#define NS_DECL_NSIHISTORYITEMS \

  NS_IMETHOD GetMaxItemCount(PRUint32 *outCount); \

camino/src/history/nsIHistoryObserver.h

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ class nsIHistoryObserver : public nsISupports 
{

public:



  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHISTORYOBSERVER_IID)

  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHISTORYOBSERVER_IID)



  NS_IMETHOD HistoryLoaded() = 0;

  NS_IMETHOD HistoryClosing() = 0;
@@ -72,6 +72,7 @@ public: 
  

};



NS_DEFINE_STATIC_IID_ACCESSOR(nsIHistoryObserver, NS_IHISTORYOBSERVER_IID)



#define NS_DECL_NSIHISTORYOBSERVER \

  NS_IMETHOD HistoryLoaded(); \

content/base/public/mozISanitizingSerializer.h

+4 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 
class mozISanitizingHTMLSerializer : public nsISupports {

 public: 



  NS_DEFINE_STATIC_IID_ACCESSOR(MOZ_ISANITIZINGHTMLSERIALIZER_IID)

  NS_DECLARE_STATIC_IID_ACCESSOR(MOZ_ISANITIZINGHTMLSERIALIZER_IID)



  NS_IMETHOD Initialize(nsAString* aOutString,

                        PRUint32 aFlags,
@@ -121,4 +121,7 @@ class mozISanitizingHTMLSerializer : public nsISupports { 
  // This function violates string ownership rules, see impl.

};



NS_DEFINE_STATIC_IID_ACCESSOR(mozISanitizingHTMLSerializer,

                              MOZ_ISANITIZINGHTMLSERIALIZER_IID)



#endif

content/base/public/nsIAttribute.h

+3 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class nsDOMAttributeMap; 
class nsIAttribute : public nsISupports

{

public:

  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IATTRIBUTE_IID)

  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IATTRIBUTE_IID)



  virtual void SetMap(nsDOMAttributeMap *aMap) = 0;
@@ -106,4 +106,6 @@ private: 
  nsIAttribute(); // Not to be implemented.

};



NS_DEFINE_STATIC_IID_ACCESSOR(nsIAttribute, NS_IATTRIBUTE_IID)



#endif /* nsIAttribute_h___ */