--- a/caps/idl/nsIScriptSecurityManager.idl
+++ b/caps/idl/nsIScriptSecurityManager.idl
@@ -235,10 +235,9 @@ interface nsIScriptSecurityManager : nsI
* inMozBrowser has to be true if the uri is inside a mozbrowser iframe.
*/
AUTF8String getExtendedOrigin(in nsIURI uri, in unsigned long appId,
in boolean inMozBrowser);
};
%{C++
#define NS_SCRIPTSECURITYMANAGER_CONTRACTID "@mozilla.org/scriptsecuritymanager;1"
-#define NS_SCRIPTSECURITYMANAGER_CLASSNAME "scriptsecuritymanager"
%}
--- a/caps/include/nsNullPrincipal.h
+++ b/caps/include/nsNullPrincipal.h
@@ -14,17 +14,16 @@
#include "nsIPrincipal.h"
#include "nsJSPrincipals.h"
#include "nsCOMPtr.h"
#include "nsPrincipal.h"
class nsIURI;
-#define NS_NULLPRINCIPAL_CLASSNAME "nullprincipal"
#define NS_NULLPRINCIPAL_CID \
{ 0xdd156d62, 0xd26f, 0x4441, \
{ 0x9c, 0xdb, 0xe8, 0xf0, 0x91, 0x07, 0xc2, 0x73 } }
#define NS_NULLPRINCIPAL_CONTRACTID "@mozilla.org/nullprincipal;1"
#define NS_NULLPRINCIPAL_SCHEME "moz-nullprincipal"
class nsNullPrincipal : public nsJSPrincipals
--- a/caps/include/nsPrincipal.h
+++ b/caps/include/nsPrincipal.h
@@ -161,21 +161,19 @@ public:
#endif
virtual void GetScriptLocation(nsACString &aStr) MOZ_OVERRIDE;
private:
nsTArray< nsCOMPtr<nsIPrincipal> > mPrincipals;
};
-#define NS_PRINCIPAL_CLASSNAME "principal"
#define NS_PRINCIPAL_CONTRACTID "@mozilla.org/principal;1"
#define NS_PRINCIPAL_CID \
{ 0x09b7e598, 0x490d, 0x423f, \
{ 0xa8, 0xa6, 0x2e, 0x6c, 0x4e, 0xc8, 0x77, 0x50 }}
-#define NS_EXPANDEDPRINCIPAL_CLASSNAME "expandedprincipal"
#define NS_EXPANDEDPRINCIPAL_CONTRACTID "@mozilla.org/expandedprincipal;1"
#define NS_EXPANDEDPRINCIPAL_CID \
{ 0xb33a3807, 0xb76c, 0x44e5, \
{ 0xb9, 0x9d, 0x95, 0x7e, 0xe9, 0xba, 0x6e, 0x39 }}
#endif // nsPrincipal_h__
--- a/caps/include/nsSystemPrincipal.h
+++ b/caps/include/nsSystemPrincipal.h
@@ -6,17 +6,16 @@
/* The privileged system principal. */
#ifndef nsSystemPrincipal_h__
#define nsSystemPrincipal_h__
#include "nsIPrincipal.h"
#include "nsJSPrincipals.h"
-#define NS_SYSTEMPRINCIPAL_CLASSNAME "systemprincipal"
#define NS_SYSTEMPRINCIPAL_CID \
{ 0x4a6212db, 0xaccb, 0x11d3, \
{ 0xb7, 0x65, 0x0, 0x60, 0xb0, 0xb6, 0xce, 0xcb }}
#define NS_SYSTEMPRINCIPAL_CONTRACTID "@mozilla.org/systemprincipal;1"
class nsSystemPrincipal : public nsJSPrincipals
{
--- a/dom/base/Crypto.h
+++ b/dom/base/Crypto.h
@@ -5,17 +5,16 @@
#define mozilla_dom_Crypto_h
#ifdef MOZ_DISABLE_CRYPTOLEGACY
#include "nsIDOMCrypto.h"
#else
#include "nsIDOMCryptoLegacy.h"
#endif
-#define NS_DOMCRYPTO_CLASSNAME "Crypto JavaScript Class"
#define NS_DOMCRYPTO_CID \
{0x929d9320, 0x251e, 0x11d4, { 0x8a, 0x7c, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
namespace mozilla {
namespace dom {
class Crypto : public nsIDOMCrypto
{
--- a/dom/base/nsStructuredCloneContainer.h
+++ b/dom/base/nsStructuredCloneContainer.h
@@ -7,17 +7,16 @@
#ifndef nsStructuredCloneContainer_h__
#define nsStructuredCloneContainer_h__
#include "nsIStructuredCloneContainer.h"
#include "jsapi.h"
#include "mozilla/Attributes.h"
-#define NS_STRUCTUREDCLONECONTAINER_CLASSNAME "nsStructuredCloneContainer"
#define NS_STRUCTUREDCLONECONTAINER_CONTRACTID \
"@mozilla.org/docshell/structured-clone-container;1"
#define NS_STRUCTUREDCLONECONTAINER_CID \
{ /* 38bd0634-0fd4-46f0-b85f-13ced889eeec */ \
0x38bd0634, \
0x0fd4, \
0x46f0, \
{0xb8, 0x5f, 0x13, 0xce, 0xd8, 0x89, 0xee, 0xec} \
--- a/embedding/components/appstartup/src/nsIAppStartupNotifier.h
+++ b/embedding/components/appstartup/src/nsIAppStartupNotifier.h
@@ -38,17 +38,16 @@
implements nsIObserver) and invoke its Observe() method.
Observe() will enumerate the components registered into the
APPSTARTUP_CATEGORY and notify them that startup has begun
and release them.
*/
#define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1"
-#define NS_APPSTARTUPNOTIFIER_CLASSNAME "AppStartup Notifier"
#define APPSTARTUP_CATEGORY "app-startup"
#define APPSTARTUP_TOPIC "app-startup"
/*
Please note that there's not a new interface in this file.
We're just leveraging nsIObserver instead of creating a
--- a/extensions/pref/autoconfig/public/nsIAutoConfig.idl
+++ b/extensions/pref/autoconfig/public/nsIAutoConfig.idl
@@ -13,16 +13,14 @@
0x1dd1,\
0x11b2,\
{ 0x93, 0x92, 0x9d, 0x94, 0xaa, 0x74, 0xb0, 0xc5 }\
}
#define NS_AUTOCONFIG_CONTRACTID \
"@mozilla.org/autoconfiguration;1"
-#define NS_AUTOCONFIG_CLASSNAME "AutoConfig Module"
-
%}
[uuid (80DB54AE-13F2-11d5-BE44-00108335A220)]
interface nsIAutoConfig : nsISupports {
attribute string configURL;
};
--- a/extensions/pref/autoconfig/public/nsIReadConfig.idl
+++ b/extensions/pref/autoconfig/public/nsIReadConfig.idl
@@ -12,15 +12,13 @@
0x1dd1, \
0x11b2, \
{ 0xbb, 0x89, 0xb8, 0x44, 0xc6, 0xec, 0x03, 0x39 }\
}
#define NS_READCONFIG_CONTRACTID \
"@mozilla.org/readconfig;1"
-#define NS_READCONFIG_CLASSNAME "ReadConfig Module"
-
%}
[uuid (ba5bc4c6-1dd1-11b2-bb89-b844c6ec0339)]
interface nsIReadConfig : nsISupports {
};
--- a/js/xpconnect/idl/nsIScriptError.idl
+++ b/js/xpconnect/idl/nsIScriptError.idl
@@ -87,15 +87,13 @@ interface nsIScriptError : nsIConsoleMes
in uint32_t flags,
in string category,
in unsigned long long innerWindowID);
AUTF8String toString();
};
%{ C++
-#define NS_SCRIPTERROR_CLASSNAME "Script Error"
-
#define NS_SCRIPTERROR_CID \
{ 0xe38e53b9, 0x5bb0, 0x456a, { 0xb5, 0x53, 0x57, 0x93, 0x70, 0xcb, 0x15, 0x67 }}
#define NS_SCRIPTERROR_CONTRACTID "@mozilla.org/scripterror;1"
%}
--- a/modules/libjar/nsJARProtocolHandler.h
+++ b/modules/libjar/nsJARProtocolHandler.h
@@ -57,18 +57,16 @@ protected:
nsClassHashtable<nsHashableHashKey, RemoteFileListenerArray>
mRemoteFileListeners;
bool mIsMainProcess;
};
extern nsJARProtocolHandler *gJarHandler;
-#define NS_JARPROTOCOLHANDLER_CLASSNAME \
- "nsJarProtocolHandler"
#define NS_JARPROTOCOLHANDLER_CID \
{ /* 0xc7e410d4-0x85f2-11d3-9f63-006008a6efe9 */ \
0xc7e410d4, \
0x85f2, \
0x11d3, \
{0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
}
--- a/modules/libjar/nsJARURI.h
+++ b/modules/libjar/nsJARURI.h
@@ -18,18 +18,16 @@
#define NS_THIS_JARURI_IMPL_CID \
{ /* 9a55f629-730b-4d08-b75b-fa7d9570a691 */ \
0x9a55f629, \
0x730b, \
0x4d08, \
{0xb7, 0x5b, 0xfa, 0x7d, 0x95, 0x70, 0xa6, 0x91} \
}
-#define NS_JARURI_CLASSNAME \
- "nsJARURI"
#define NS_JARURI_CID \
{ /* 245abae2-b947-4ded-a46d-9829d3cca462 */ \
0x245abae2, \
0xb947, \
0x4ded, \
{0xa4, 0x6d, 0x98, 0x29, 0xd3, 0xcc, 0xa4, 0x62} \
}
--- a/modules/libjar/zipwriter/src/nsDeflateConverter.h
+++ b/modules/libjar/zipwriter/src/nsDeflateConverter.h
@@ -7,17 +7,16 @@
#define _nsDeflateConverter_h_
#include "nsIStreamConverter.h"
#include "nsCOMPtr.h"
#include "nsIPipe.h"
#include "zlib.h"
#include "mozilla/Attributes.h"
-#define DEFLATECONVERTER_CLASSNAME "Deflate converter"
#define DEFLATECONVERTER_CID { 0x461cd5dd, 0x73c6, 0x47a4, \
{ 0x8c, 0xc3, 0x60, 0x3b, 0x37, 0xd8, 0x4a, 0x61 } }
#define ZIP_BUFLEN (4 * 1024 - 1)
class nsDeflateConverter MOZ_FINAL : public nsIStreamConverter
{
public:
--- a/modules/libjar/zipwriter/src/nsZipWriter.h
+++ b/modules/libjar/zipwriter/src/nsZipWriter.h
@@ -13,17 +13,16 @@
#include "nsZipHeader.h"
#include "nsCOMPtr.h"
#include "nsCOMArray.h"
#include "nsTArray.h"
#include "nsDataHashtable.h"
#include "mozilla/Attributes.h"
#define ZIPWRITER_CONTRACTID "@mozilla.org/zipwriter;1"
-#define ZIPWRITER_CLASSNAME "Zip Writer"
#define ZIPWRITER_CID { 0x430d416c, 0xa722, 0x4ad1, \
{ 0xbe, 0x98, 0xd9, 0xa4, 0x45, 0xf8, 0x5e, 0x3f } }
#define OPERATION_ADD 0
#define OPERATION_REMOVE 1
struct nsZipQueueItem
{
public:
--- a/modules/libpref/public/nsIPrefBranch.idl
+++ b/modules/libpref/public/nsIPrefBranch.idl
@@ -405,15 +405,14 @@ interface nsIPrefBranch : nsISupports
*/
void removeObserver(in string aDomain, in nsIObserver aObserver);
};
%{C++
#define NS_PREFBRANCH_CONTRACTID "@mozilla.org/preferencesbranch;1"
-#define NS_PREFBRANCH_CLASSNAME "Preferences Branch"
/**
* Notification sent when a preference changes.
*/
#define NS_PREFBRANCH_PREFCHANGE_TOPIC_ID "nsPref:changed"
%}
--- a/modules/libpref/public/nsIPrefLocalizedString.idl
+++ b/modules/libpref/public/nsIPrefLocalizedString.idl
@@ -58,11 +58,10 @@ interface nsIPrefLocalizedString : nsISu
{ /* {064d9cee-1dd2-11b2-83e3-d25ab0193c26} */ \
0x064d9cee, \
0x1dd2, \
0x11b2, \
{ 0x83, 0xe3, 0xd2, 0x5a, 0xb0, 0x19, 0x3c, 0x26 } \
}
#define NS_PREFLOCALIZEDSTRING_CONTRACTID "@mozilla.org/pref-localizedstring;1"
-#define NS_PREFLOCALIZEDSTRING_CLASSNAME "Pref LocalizedString"
%}
--- a/modules/libpref/public/nsIPrefService.idl
+++ b/modules/libpref/public/nsIPrefService.idl
@@ -133,17 +133,16 @@ interface nsIPrefService : nsISupports
{ /* {1cd91b88-1dd2-11b2-92e1-ed22ed298000} */ \
0x91ca2441, \
0x050f, \
0x4f7c, \
{ 0x9d, 0xf8, 0x75, 0xb4, 0x0e, 0xa4, 0x01, 0x56 } \
}
#define NS_PREFSERVICE_CONTRACTID "@mozilla.org/preferences-service;1"
-#define NS_PREFSERVICE_CLASSNAME "Preferences Server"
/**
* Notification sent before reading the default user preferences files.
*/
#define NS_PREFSERVICE_READ_TOPIC_ID "prefservice:before-read-userprefs"
/**
* Notification sent when resetPrefs has been called, but before the actual
--- a/modules/libpref/public/nsIRelativeFilePref.idl
+++ b/modules/libpref/public/nsIRelativeFilePref.idl
@@ -43,17 +43,16 @@ interface nsIRelativeFilePref : nsISuppo
{ /* {2f977d4f-5485-11d4-87e2-0010a4e75ef2} */ \
0x2f977d4f, \
0x5485, \
0x11d4, \
{ 0x87, 0xe2, 0x00, 0x10, 0xa4, 0xe7, 0x5e, 0xf2 } \
}
#define NS_RELATIVEFILEPREF_CONTRACTID "@mozilla.org/pref-relativefile;1"
-#define NS_RELATIVEFILEPREF_CLASSNAME "Relative File Pref"
#include "nsComponentManagerUtils.h"
inline nsresult
NS_NewRelativeFilePref(nsIFile* aFile, const nsACString& relativeToKey, nsIRelativeFilePref** result)
{
nsresult rv;
nsCOMPtr<nsIRelativeFilePref> local(do_CreateInstance(NS_RELATIVEFILEPREF_CONTRACTID, &rv));
--- a/netwerk/base/public/nsICryptoFIPSInfo.idl
+++ b/netwerk/base/public/nsICryptoFIPSInfo.idl
@@ -7,10 +7,9 @@
[scriptable, uuid(99e81922-7318-4431-b3aa-78b3cb4119bb)]
interface nsICryptoFIPSInfo : nsISupports
{
readonly attribute boolean isFIPSModeActive;
};
%{C++
#define NS_CRYPTO_FIPSINFO_SERVICE_CONTRACTID "@mozilla.org/crypto/fips-info-service;1"
-#define NS_CRYPTO_FIPSINFO_SERVICE_CLASSNAME "Mozilla Crypto FIPS Info Service"
%}
--- a/netwerk/base/public/nsISecureBrowserUI.idl
+++ b/netwerk/base/public/nsISecureBrowserUI.idl
@@ -15,10 +15,9 @@ interface nsISecureBrowserUI : nsISuppor
void init(in nsIDOMWindow window);
readonly attribute unsigned long state;
readonly attribute AString tooltipText;
};
%{C++
#define NS_SECURE_BROWSER_UI_CONTRACTID "@mozilla.org/secure_browser_ui;1"
-#define NS_SECURE_BROWSER_UI_CLASSNAME "Mozilla Secure Browser UI Handler"
%}
--- a/netwerk/base/public/nsIStrictTransportSecurityService.idl
+++ b/netwerk/base/public/nsIStrictTransportSecurityService.idl
@@ -76,13 +76,12 @@ interface nsIStrictTransportSecurityServ
* NO_PERMANENT_STORAGE
*/
boolean isStsURI(in nsIURI aURI, in uint32_t aFlags);
};
%{C++
#define NS_STSSERVICE_CONTRACTID "@mozilla.org/stsservice;1"
-#define NS_STSSERVICE_CLASSNAME "stsservice"
#define STS_PERMISSION "sts/use"
#define STS_SUBDOMAIN_PERMISSION "sts/subd"
%}
--- a/netwerk/base/src/nsMIMEInputStream.h
+++ b/netwerk/base/src/nsMIMEInputStream.h
@@ -8,17 +8,16 @@
* automatic creation of the content-length header.
*/
#ifndef _nsMIMEInputStream_h_
#define _nsMIMEInputStream_h_
#include "nsIMIMEInputStream.h"
-#define NS_MIMEINPUTSTREAM_CLASSNAME "nsMIMEInputStream"
#define NS_MIMEINPUTSTREAM_CONTRACTID "@mozilla.org/network/mime-input-stream;1"
#define NS_MIMEINPUTSTREAM_CID \
{ /* 58a1c31c-1dd2-11b2-a3f6-d36949d48268 */ \
0x58a1c31c, \
0x1dd2, \
0x11b2, \
{0xa3, 0xf6, 0xd3, 0x69, 0x49, 0xd4, 0x82, 0x68} \
}
--- a/netwerk/build/nsNetCID.h
+++ b/netwerk/build/nsNetCID.h
@@ -7,87 +7,75 @@
#define nsNetCID_h__
/******************************************************************************
* netwerk/base/ classes
*/
// service implementing nsIIOService and nsIIOService2.
-#define NS_IOSERVICE_CLASSNAME \
- "nsIOService"
#define NS_IOSERVICE_CONTRACTID \
"@mozilla.org/network/io-service;1"
#define NS_IOSERVICE_CID \
{ /* 9ac9e770-18bc-11d3-9337-00104ba0fd40 */ \
0x9ac9e770, \
0x18bc, \
0x11d3, \
{0x93, 0x37, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
}
// service implementing nsINetUtil
#define NS_NETUTIL_CONTRACTID \
"@mozilla.org/network/util;1"
// serialization scriptable helper
-#define NS_SERIALIZATION_HELPER_CLASSNAME \
- "nsSerializationHelper"
#define NS_SERIALIZATION_HELPER_CONTRACTID \
"@mozilla.org/network/serialization-helper;1"
#define NS_SERIALIZATION_HELPER_CID \
{ /* D6EF593D-A429-4b14-A887-D9E2F765D9ED */ \
0xd6ef593d, \
0xa429, \
0x4b14, \
{ 0xa8, 0x87, 0xd9, 0xe2, 0xf7, 0x65, 0xd9, 0xed } \
}
// service implementing nsIProtocolProxyService and nsPIProtocolProxyService.
-#define NS_PROTOCOLPROXYSERVICE_CLASSNAME \
- "nsProtocolProxyService"
#define NS_PROTOCOLPROXYSERVICE_CONTRACTID \
"@mozilla.org/network/protocol-proxy-service;1"
#define NS_PROTOCOLPROXYSERVICE_CID \
{ /* E9B301C0-E0E4-11d3-A1A8-0050041CAF44 */ \
0xe9b301c0, \
0xe0e4, \
0x11d3, \
{0xa1, 0xa8, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44} \
}
// service implementing nsIProxyAutoConfig.
-#define NS_PROXYAUTOCONFIG_CLASSNAME \
- "nsProxyAutoConfig"
#define NS_PROXYAUTOCONFIG_CONTRACTID \
"@mozilla.org/network/proxy-auto-config;1"
#define NS_PROXYAUTOCONFIG_CID \
{ /* 63ac8c66-1dd2-11b2-b070-84d00d3eaece */ \
0x63ac8c66, \
0x1dd2, \
0x11b2, \
{0xb0, 0x70, 0x84, 0xd0, 0x0d, 0x3e, 0xae, 0xce} \
}
// component implementing nsILoadGroup.
-#define NS_LOADGROUP_CLASSNAME \
- "nsLoadGroup"
#define NS_LOADGROUP_CONTRACTID \
"@mozilla.org/network/load-group;1"
#define NS_LOADGROUP_CID \
{ /* e1c61582-2a84-11d3-8cce-0060b0fc14a3 */ \
0xe1c61582, \
0x2a84, \
0x11d3, \
{0x8c, 0xce, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
}
// component implementing nsIURI, nsISerializable, and nsIClassInfo.
-#define NS_SIMPLEURI_CLASSNAME \
- "nsSimpleURI"
#define NS_SIMPLEURI_CONTRACTID \
"@mozilla.org/network/simple-uri;1"
#define NS_SIMPLEURI_CID \
{ /* e0da1d70-2f7b-11d3-8cd0-0060b0fc14a3 */ \
0xe0da1d70, \
0x2f7b, \
0x11d3, \
{0x8c, 0xd0, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
@@ -110,231 +98,197 @@
0x2f277c00, \
0x0eaf, \
0x4ddb, \
{ 0xb9, 0x36, 0x41, 0x32, 0x6b, 0xa4, 0x8a, 0xae } \
}
// component implementing nsIStandardURL, nsIURI, nsIURL, nsISerializable,
// and nsIClassInfo.
-#define NS_STANDARDURL_CLASSNAME \
- "nsStandardURL"
#define NS_STANDARDURL_CONTRACTID \
"@mozilla.org/network/standard-url;1"
#define NS_STANDARDURL_CID \
{ /* de9472d0-8034-11d3-9399-00104ba0fd40 */ \
0xde9472d0, \
0x8034, \
0x11d3, \
{0x93, 0x99, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
}
// service implementing nsIURLParser that assumes the URL will NOT contain an
// authority section.
-#define NS_NOAUTHURLPARSER_CLASSNAME \
- "nsNoAuthURLParser"
#define NS_NOAUTHURLPARSER_CONTRACTID \
"@mozilla.org/network/url-parser;1?auth=no"
#define NS_NOAUTHURLPARSER_CID \
{ /* 78804a84-8173-42b6-bb94-789f0816a810 */ \
0x78804a84, \
0x8173, \
0x42b6, \
{0xbb, 0x94, 0x78, 0x9f, 0x08, 0x16, 0xa8, 0x10} \
}
// service implementing nsIURLParser that assumes the URL will contain an
// authority section.
-#define NS_AUTHURLPARSER_CLASSNAME \
- "nsAuthURLParser"
#define NS_AUTHURLPARSER_CONTRACTID \
"@mozilla.org/network/url-parser;1?auth=yes"
#define NS_AUTHURLPARSER_CID \
{ /* 275d800e-3f60-4896-adb7-d7f390ce0e42 */ \
0x275d800e, \
0x3f60, \
0x4896, \
{0xad, 0xb7, 0xd7, 0xf3, 0x90, 0xce, 0x0e, 0x42} \
}
// service implementing nsIURLParser that does not make any assumptions about
// whether or not the URL contains an authority section.
-#define NS_STDURLPARSER_CLASSNAME \
- "nsStdURLParser"
#define NS_STDURLPARSER_CONTRACTID \
"@mozilla.org/network/url-parser;1?auth=maybe"
#define NS_STDURLPARSER_CID \
{ /* ff41913b-546a-4bff-9201-dc9b2c032eba */ \
0xff41913b, \
0x546a, \
0x4bff, \
{0x92, 0x01, 0xdc, 0x9b, 0x2c, 0x03, 0x2e, 0xba} \
}
// component implementing nsIRequestObserverProxy.
-#define NS_REQUESTOBSERVERPROXY_CLASSNAME \
- "nsRequestObserverProxy"
#define NS_REQUESTOBSERVERPROXY_CONTRACTID \
"@mozilla.org/network/request-observer-proxy;1"
#define NS_REQUESTOBSERVERPROXY_CID \
{ /* 51fa28c7-74c0-4b85-9c46-d03faa7b696b */ \
0x51fa28c7, \
0x74c0, \
0x4b85, \
{0x9c, 0x46, 0xd0, 0x3f, 0xaa, 0x7b, 0x69, 0x6b} \
}
// component implementing nsISimpleStreamListener.
-#define NS_SIMPLESTREAMLISTENER_CLASSNAME \
- "nsSimpleStreamListener"
#define NS_SIMPLESTREAMLISTENER_CONTRACTID \
"@mozilla.org/network/simple-stream-listener;1"
#define NS_SIMPLESTREAMLISTENER_CID \
{ /* fb8cbf4e-4701-4ba1-b1d6-5388e041fb67 */ \
0xfb8cbf4e, \
0x4701, \
0x4ba1, \
{0xb1, 0xd6, 0x53, 0x88, 0xe0, 0x41, 0xfb, 0x67} \
}
// component implementing nsIStreamListenerTee.
-#define NS_STREAMLISTENERTEE_CLASSNAME \
- "nsStreamListenerTee"
#define NS_STREAMLISTENERTEE_CONTRACTID \
"@mozilla.org/network/stream-listener-tee;1"
#define NS_STREAMLISTENERTEE_CID \
{ /* 831f8f13-7aa8-485f-b02e-77c881cc5773 */ \
0x831f8f13, \
0x7aa8, \
0x485f, \
{0xb0, 0x2e, 0x77, 0xc8, 0x81, 0xcc, 0x57, 0x73} \
}
// component implementing nsIAsyncStreamCopier.
-#define NS_ASYNCSTREAMCOPIER_CLASSNAME \
- "nsAsyncStreamCopier"
#define NS_ASYNCSTREAMCOPIER_CONTRACTID \
"@mozilla.org/network/async-stream-copier;1"
#define NS_ASYNCSTREAMCOPIER_CID \
{ /* e746a8b1-c97a-4fc5-baa4-66607521bd08 */ \
0xe746a8b1, \
0xc97a, \
0x4fc5, \
{0xba, 0xa4, 0x66, 0x60, 0x75, 0x21, 0xbd, 0x08} \
}
// component implementing nsIInputStreamPump.
-#define NS_INPUTSTREAMPUMP_CLASSNAME \
- "nsInputStreamPump"
#define NS_INPUTSTREAMPUMP_CONTRACTID \
"@mozilla.org/network/input-stream-pump;1"
#define NS_INPUTSTREAMPUMP_CID \
{ /* ccd0e960-7947-4635-b70e-4c661b63d675 */ \
0xccd0e960, \
0x7947, \
0x4635, \
{0xb7, 0x0e, 0x4c, 0x66, 0x1b, 0x63, 0xd6, 0x75} \
}
// component implementing nsIInputStreamChannel.
-#define NS_INPUTSTREAMCHANNEL_CLASSNAME \
- "nsInputStreamChannel"
#define NS_INPUTSTREAMCHANNEL_CONTRACTID \
"@mozilla.org/network/input-stream-channel;1"
#define NS_INPUTSTREAMCHANNEL_CID \
{ /* 6ddb050c-0d04-11d4-986e-00c04fa0cf4a */ \
0x6ddb050c, \
0x0d04, \
0x11d4, \
{0x98, 0x6e, 0x00, 0xc0, 0x4f, 0xa0, 0xcf, 0x4a} \
}
// component implementing nsIStreamLoader.
-#define NS_STREAMLOADER_CLASSNAME \
- "nsStreamLoader"
#define NS_STREAMLOADER_CONTRACTID \
"@mozilla.org/network/stream-loader;1"
#define NS_STREAMLOADER_CID \
{ /* 5BA6D920-D4E9-11d3-A1A5-0050041CAF44 */ \
0x5ba6d920, \
0xd4e9, \
0x11d3, \
{ 0xa1, 0xa5, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } \
}
// component implementing nsIUnicharStreamLoader.
-#define NS_UNICHARSTREAMLOADER_CLASSNAME \
- "nsUnicharStreamLoader"
#define NS_UNICHARSTREAMLOADER_CONTRACTID \
"@mozilla.org/network/unichar-stream-loader;1"
#define NS_UNICHARSTREAMLOADER_CID \
{ /* 9445791f-fa4c-4669-b174-df5032bb67b3 */ \
0x9445791f, \
0xfa4c, \
0x4669, \
{ 0xb1, 0x74, 0xdf, 0x50, 0x32, 0xbb, 0x67, 0xb3 } \
}
// component implementing nsIDownloader.
-#define NS_DOWNLOADER_CLASSNAME \
- "nsDownloader"
#define NS_DOWNLOADER_CONTRACTID \
"@mozilla.org/network/downloader;1"
#define NS_DOWNLOADER_CID \
{ /* 510a86bb-6019-4ed1-bb4f-965cffd23ece */ \
0x510a86bb, \
0x6019, \
0x4ed1, \
{0xbb, 0x4f, 0x96, 0x5c, 0xff, 0xd2, 0x3e, 0xce} \
}
// component implementing nsIBackgroundFileSaver and
// nsIOutputStream.
-#define NS_BACKGROUNDFILESAVEROUTPUTSTREAM_CLASSNAME \
- "BackgroundFileSaverOutputStream"
#define NS_BACKGROUNDFILESAVEROUTPUTSTREAM_CONTRACTID \
"@mozilla.org/network/background-file-saver;1?mode=outputstream"
#define NS_BACKGROUNDFILESAVEROUTPUTSTREAM_CID \
{ /* 62147d1e-ef6a-40e8-aaf8-d039f5caaa81 */ \
0x62147d1e, \
0xef6a, \
0x40e8, \
{0xaa, 0xf8, 0xd0, 0x39, 0xf5, 0xca, 0xaa, 0x81} \
}
// component implementing nsIBackgroundFileSaver and
// nsIStreamListener.
-#define NS_BACKGROUNDFILESAVERSTREAMLISTENER_CLASSNAME \
- "BackgroundFileSaverStreamListener"
#define NS_BACKGROUNDFILESAVERSTREAMLISTENER_CONTRACTID \
"@mozilla.org/network/background-file-saver;1?mode=streamlistener"
#define NS_BACKGROUNDFILESAVERSTREAMLISTENER_CID \
{ /* 208de7fc-a781-4031-bbae-cc0de539f61a */ \
0x208de7fc, \
0xa781, \
0x4031, \
{0xbb, 0xae, 0xcc, 0x0d, 0xe5, 0x39, 0xf6, 0x1a} \
}
// component implementing nsISyncStreamListener.
-#define NS_SYNCSTREAMLISTENER_CLASSNAME \
- "nsSyncStreamListener"
#define NS_SYNCSTREAMLISTENER_CONTRACTID \
"@mozilla.org/network/sync-stream-listener;1"
#define NS_SYNCSTREAMLISTENER_CID \
{ /* 439400d3-6f23-43db-8b06-8aafe1869bd8 */ \
0x439400d3, \
0x6f23, \
0x43db, \
{0x8b, 0x06, 0x8a, 0xaf, 0xe1, 0x86, 0x9b, 0xd8} \
}
// component implementing nsIURIChecker.
-#define NS_URICHECKER_CLASSNAME \
- "nsURIChecker"
#define NS_URICHECKER_CONTRACT_ID \
"@mozilla.org/network/urichecker;1"
#define NS_URICHECKER_CID \
{ /* cf3a0e06-1dd1-11b2-a904-ac1d6da77a02 */ \
0xcf3a0e06, \
0x1dd1, \
0x11b2, \
{0xa9, 0x04, 0xac, 0x1d, 0x6d, 0xa7, 0x7a, 0x02} \
@@ -344,143 +298,121 @@
#define NS_INCREMENTALDOWNLOAD_CONTRACTID \
"@mozilla.org/network/incremental-download;1"
// component implementing nsISystemProxySettings.
#define NS_SYSTEMPROXYSETTINGS_CONTRACTID \
"@mozilla.org/system-proxy-settings;1"
// service implementing nsIStreamTransportService
-#define NS_STREAMTRANSPORTSERVICE_CLASSNAME \
- "nsStreamTransportService"
#define NS_STREAMTRANSPORTSERVICE_CONTRACTID \
"@mozilla.org/network/stream-transport-service;1"
#define NS_STREAMTRANSPORTSERVICE_CID \
{ /* 0885d4f8-f7b8-4cda-902e-94ba38bc256e */ \
0x0885d4f8, \
0xf7b8, \
0x4cda, \
{0x90, 0x2e, 0x94, 0xba, 0x38, 0xbc, 0x25, 0x6e} \
}
// service implementing nsISocketTransportService
-#define NS_SOCKETTRANSPORTSERVICE_CLASSNAME \
- "nsSocketTransportService"
#define NS_SOCKETTRANSPORTSERVICE_CONTRACTID \
"@mozilla.org/network/socket-transport-service;1"
#define NS_SOCKETTRANSPORTSERVICE_CID \
{ /* c07e81e0-ef12-11d2-92b6-00105a1b0d64 */ \
0xc07e81e0, \
0xef12, \
0x11d2, \
{0x92, 0xb6, 0x00, 0x10, 0x5a, 0x1b, 0x0d, 0x64} \
}
// component implementing nsIServerSocket
-#define NS_SERVERSOCKET_CLASSNAME \
- "nsServerSocket"
#define NS_SERVERSOCKET_CONTRACTID \
"@mozilla.org/network/server-socket;1"
#define NS_SERVERSOCKET_CID \
{ /* 2ec62893-3b35-48fa-ab1d-5e68a9f45f08 */ \
0x2ec62893, \
0x3b35, \
0x48fa, \
{0xab, 0x1d, 0x5e, 0x68, 0xa9, 0xf4, 0x5f, 0x08} \
}
// component implementing nsIUDPServerSocket
-#define NS_UDPSERVERSOCKET_CLASSNAME \
- "nsUDPServerSocket"
#define NS_UDPSERVERSOCKET_CONTRACTID \
"@mozilla.org/network/server-socket-udp;1"
#define NS_UDPSERVERSOCKET_CID \
{ /* c9f74572-7b8e-4fec-bb4a-03c0d3021bd6 */ \
0xc9f74572, \
0x7b8e, \
0x4fec, \
{0xbb, 0x4a, 0x03, 0xc0, 0xd3, 0x02, 0x1b, 0xd6} \
}
-#define NS_LOCALFILEINPUTSTREAM_CLASSNAME \
- "nsFileInputStream"
#define NS_LOCALFILEINPUTSTREAM_CONTRACTID \
"@mozilla.org/network/file-input-stream;1"
#define NS_LOCALFILEINPUTSTREAM_CID \
{ /* be9a53ae-c7e9-11d3-8cda-0060b0fc14a3 */ \
0xbe9a53ae, \
0xc7e9, \
0x11d3, \
{0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
}
-#define NS_LOCALFILEOUTPUTSTREAM_CLASSNAME \
- "nsFileOutputStream"
#define NS_LOCALFILEOUTPUTSTREAM_CONTRACTID \
"@mozilla.org/network/file-output-stream;1"
#define NS_LOCALFILEOUTPUTSTREAM_CID \
{ /* c272fee0-c7e9-11d3-8cda-0060b0fc14a3 */ \
0xc272fee0, \
0xc7e9, \
0x11d3, \
{0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
}
-#define NS_PARTIALLOCALFILEINPUTSTREAM_CLASSNAME \
- "nsPartialFileInputStream"
#define NS_PARTIALLOCALFILEINPUTSTREAM_CONTRACTID \
"@mozilla.org/network/partial-file-input-stream;1"
#define NS_PARTIALLOCALFILEINPUTSTREAM_CID \
{ /* 8738afd6-162a-418d-a99b-75b3a6b10a56 */ \
0x8738afd6, \
0x162a, \
0x418d, \
{0xa9, 0x9b, 0x75, 0xb3, 0xa6, 0xb1, 0x0a, 0x56} \
}
-#define NS_BUFFEREDINPUTSTREAM_CLASSNAME \
- "nsBufferedInputStream"
#define NS_BUFFEREDINPUTSTREAM_CONTRACTID \
"@mozilla.org/network/buffered-input-stream;1"
#define NS_BUFFEREDINPUTSTREAM_CID \
{ /* 9226888e-da08-11d3-8cda-0060b0fc14a3 */ \
0x9226888e, \
0xda08, \
0x11d3, \
{0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
}
-#define NS_BUFFEREDOUTPUTSTREAM_CLASSNAME \
- "nsBufferedOutputStream"
#define NS_BUFFEREDOUTPUTSTREAM_CONTRACTID \
"@mozilla.org/network/buffered-output-stream;1"
#define NS_BUFFEREDOUTPUTSTREAM_CID \
{ /* 9868b4ce-da08-11d3-8cda-0060b0fc14a3 */ \
0x9868b4ce, \
0xda08, \
0x11d3, \
{0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
}
// component implementing nsISafeOutputStream
-#define NS_SAFELOCALFILEOUTPUTSTREAM_CLASSNAME \
- "nsSafeFileOutputStream"
#define NS_SAFELOCALFILEOUTPUTSTREAM_CONTRACTID \
"@mozilla.org/network/safe-file-output-stream;1"
#define NS_SAFELOCALFILEOUTPUTSTREAM_CID \
{ /* a181af0d-68b8-4308-94db-d4f859058215 */ \
0xa181af0d, \
0x68b8, \
0x4308, \
{0x94, 0xdb, 0xd4, 0xf8, 0x59, 0x05, 0x82, 0x15} \
}
// component implementing nsIFileStream
-#define NS_LOCALFILESTREAM_CLASSNAME \
- "nsFileStream"
#define NS_LOCALFILESTREAM_CONTRACTID \
"@mozilla.org/network/file-stream;1"
#define NS_LOCALFILESTREAM_CID \
{ /* f8a69bd7-176c-4a60-9a05-b6d92f8f229a */ \
0xf8a69bd7, \
0x176c, \
0x4a60, \
{0x9a, 0x05, 0xb6, 0xd9, 0x2f, 0x8f, 0x22, 0x9a} \
@@ -504,55 +436,47 @@
{ 0x8d, 0x17, 0xa2, 0x7e, 0x44, 0xa8, 0x39, 0x3e } \
}
/******************************************************************************
* netwerk/cache/ classes
*/
// service implementing nsICacheService.
-#define NS_CACHESERVICE_CLASSNAME \
- "nsCacheService"
#define NS_CACHESERVICE_CONTRACTID \
"@mozilla.org/network/cache-service;1"
#define NS_CACHESERVICE_CID \
{ /* 6c84aec9-29a5-4264-8fbc-bee8f922ea67 */ \
0x6c84aec9, \
0x29a5, \
0x4264, \
{0x8f, 0xbc, 0xbe, 0xe8, 0xf9, 0x22, 0xea, 0x67} \
}
// service implementing nsIApplicationCacheService.
-#define NS_APPLICATIONCACHESERVICE_CLASSNAME \
- "nsApplicationCacheService"
#define NS_APPLICATIONCACHESERVICE_CONTRACTID \
"@mozilla.org/network/application-cache-service;1"
#define NS_APPLICATIONCACHESERVICE_CID \
{ /* 02bf7a2a-39d8-4a23-a50c-2cbb085ab7a5 */ \
0x02bf7a2a, \
0x39d8, \
0x4a23, \
{0xa5, 0x0c, 0x2c, 0xbb, 0x08, 0x5a, 0xb7, 0xa5} \
}
-#define NS_APPLICATIONCACHENAMESPACE_CLASSNAME \
- "nsApplicationCacheNamespace"
#define NS_APPLICATIONCACHENAMESPACE_CONTRACTID \
"@mozilla.org/network/application-cache-namespace;1"
#define NS_APPLICATIONCACHENAMESPACE_CID \
{ /* b00ed78a-04e2-4f74-8e1c-d1af79dfd12f */ \
0xb00ed78a, \
0x04e2, \
0x4f74, \
{0x8e, 0x1c, 0xd1, 0xaf, 0x79, 0xdf, 0xd1, 0x2f} \
}
-#define NS_APPLICATIONCACHE_CLASSNAME \
- "nsApplicationCache"
#define NS_APPLICATIONCACHE_CONTRACTID \
"@mozilla.org/network/application-cache;1"
#define NS_APPLICATIONCACHE_CID \
{ /* 463440c5-baad-4f3c-9e50-0b107abe7183 */ \
0x463440c5, \
0xbaad, \
0x4f3c, \
@@ -598,124 +522,106 @@
#define NS_HTTPNTLMAUTH_CID \
{ /* bbef8185-c628-4cc1-b53e-e61e74c2451a */ \
0xbbef8185, \
0xc628, \
0x4cc1, \
{0xb5, 0x3e, 0xe6, 0x1e, 0x74, 0xc2, 0x45, 0x1a} \
}
-#define NS_HTTPAUTHMANAGER_CLASSNAME \
- "nsHttpAuthManager"
#define NS_HTTPAUTHMANAGER_CONTRACTID \
"@mozilla.org/network/http-auth-manager;1"
#define NS_HTTPAUTHMANAGER_CID \
{ /* 36b63ef3-e0fa-4c49-9fd4-e065e85568f4 */ \
0x36b63ef3, \
0xe0fa, \
0x4c49, \
{0x9f, 0xd4, 0xe0, 0x65, 0xe8, 0x55, 0x68, 0xf4} \
}
-#define NS_HTTPCHANNELAUTHPROVIDER_CLASSNAME \
- "nsHttpChannelAuthProvider"
#define NS_HTTPCHANNELAUTHPROVIDER_CONTRACTID \
"@mozilla.org/network/http-channel-auth-provider;1"
#define NS_HTTPCHANNELAUTHPROVIDER_CID \
{ /* 02f5a8d8-4ef3-48b1-b527-8a643056abbd */ \
0x02f5a8d8, \
0x4ef3, \
0x48b1, \
{0xb5, 0x27, 0x8a, 0x64, 0x30, 0x56, 0xab, 0xbd} \
}
-#define NS_HTTPACTIVITYDISTRIBUTOR_CLASSNAME \
- "nsHttpActivityDistributor"
#define NS_HTTPACTIVITYDISTRIBUTOR_CONTRACTID \
"@mozilla.org/network/http-activity-distributor;1"
#define NS_HTTPACTIVITYDISTRIBUTOR_CID \
{ /* 15629ada-a41c-4a09-961f-6553cd60b1a2 */ \
0x15629ada, \
0xa41c, \
0x4a09, \
{0x96, 0x1f, 0x65, 0x53, 0xcd, 0x60, 0xb1, 0xa2} \
}
/******************************************************************************
* netwerk/protocol/ftp/ classes
*/
-#define NS_FTPPROTOCOLHANDLER_CLASSNAME \
- "nsFtpProtocolHandler"
#define NS_FTPPROTOCOLHANDLER_CID \
{ /* 25029490-F132-11d2-9588-00805F369F95 */ \
0x25029490, \
0xf132, \
0x11d2, \
{0x95, 0x88, 0x0, 0x80, 0x5f, 0x36, 0x9f, 0x95} \
}
/******************************************************************************
* netwerk/protocol/res/ classes
*/
-#define NS_RESPROTOCOLHANDLER_CLASSNAME \
- "nsResProtocolHandler"
#define NS_RESPROTOCOLHANDLER_CID \
{ /* e64f152a-9f07-11d3-8cda-0060b0fc14a3 */ \
0xe64f152a, \
0x9f07, \
0x11d3, \
{0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
}
-#define NS_RESURL_CLASSNAME \
- "nsResURL"
#define NS_RESURL_CID \
{ /* ff8fe7ec-2f74-4408-b742-6b7a546029a8 */ \
0xff8fe7ec, \
0x2f74, \
0x4408, \
{0xb7, 0x42, 0x6b, 0x7a, 0x54, 0x60, 0x29, 0xa8} \
}
/******************************************************************************
* netwerk/protocol/file/ classes
*/
-#define NS_FILEPROTOCOLHANDLER_CLASSNAME \
- "nsFileProtocolHandler"
#define NS_FILEPROTOCOLHANDLER_CID \
{ /* fbc81170-1f69-11d3-9344-00104ba0fd40 */ \
0xfbc81170, \
0x1f69, \
0x11d3, \
{0x93, 0x44, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
}
/******************************************************************************
* netwerk/protocol/data/ classes
*/
-#define NS_DATAPROTOCOLHANDLER_CLASSNAME \
- "nsDataProtocolHandler"
#define NS_DATAPROTOCOLHANDLER_CID \
{ /* {B6ED3030-6183-11d3-A178-0050041CAF44} */ \
0xb6ed3030, \
0x6183, \
0x11d3, \
{0xa1, 0x78, 0x00, 0x50, 0x04, 0x1c, 0xaf, 0x44} \
}
/******************************************************************************
* netwerk/protocol/device classes
*/
-#define NS_DEVICEPROTOCOLHANDLER_CLASSNAME \
- "nsDeviceProtocolHandler"
#define NS_DEVICEPROTOCOLHANDLER_CID \
{ /* 6b0ffe9e-d114-486b-aeb7-da62e7273ed5 */ \
0x60ffe9e, \
0xd114, \
0x486b, \
{0xae, 0xb7, 0xda, 0x62, 0xe7, 0x27, 0x3e, 0xd5} \
}
@@ -763,101 +669,87 @@
0x4cbb, \
{0x82, 0xbb, 0x08, 0x5c, 0xce, 0x06, 0xc0, 0xbb} \
}
/******************************************************************************
* netwerk/protocol/about/ classes
*/
-#define NS_ABOUTPROTOCOLHANDLER_CLASSNAME \
- "About Protocol Handler"
#define NS_ABOUTPROTOCOLHANDLER_CID \
{ /* 9e3b6c90-2f75-11d3-8cd0-0060b0fc14a3 */ \
0x9e3b6c90, \
0x2f75, \
0x11d3, \
{0x8c, 0xd0, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
}
-#define NS_SAFEABOUTPROTOCOLHANDLER_CLASSNAME \
- "Safe About Protocol Handler"
#define NS_SAFEABOUTPROTOCOLHANDLER_CID \
{ /* 1423e739-782c-4081-b5d8-fe6fba68c0ef */ \
0x1423e739, \
0x782c, \
0x4081, \
{0xb5, 0xd8, 0xfe, 0x6f, 0xba, 0x68, 0xc0, 0xef} \
}
/******************************************************************************
* netwerk/dns/ classes
*/
-#define NS_DNSSERVICE_CLASSNAME \
- "nsDNSService"
#define NS_DNSSERVICE_CONTRACTID \
"@mozilla.org/network/dns-service;1"
#define NS_DNSSERVICE_CID \
{ /* b0ff4572-dae4-4bef-a092-83c1b88f6be9 */ \
0xb0ff4572, \
0xdae4, \
0x4bef, \
{0xa0, 0x92, 0x83, 0xc1, 0xb8, 0x8f, 0x6b, 0xe9} \
}
-#define NS_IDNSERVICE_CLASSNAME \
- "nsIDNService"
/* ContractID of the XPCOM package that implements nsIIDNService */
#define NS_IDNSERVICE_CONTRACTID \
"@mozilla.org/network/idn-service;1"
#define NS_IDNSERVICE_CID \
{ /* 62b778a6-bce3-456b-8c31-2865fbb68c91 */ \
0x62b778a6, \
0xbce3, \
0x456b, \
{0x8c, 0x31, 0x28, 0x65, 0xfb, 0xb6, 0x8c, 0x91} \
}
-#define NS_EFFECTIVETLDSERVICE_CLASSNAME \
- "nsEffectiveTLDService"
#define NS_EFFECTIVETLDSERVICE_CONTRACTID \
"@mozilla.org/network/effective-tld-service;1"
#define NS_EFFECTIVETLDSERVICE_CID \
{ /* cb9abbae-66b6-4609-8594-5c4ff300888e */ \
0xcb9abbae, \
0x66b6, \
0x4609, \
{0x85, 0x94, 0x5c, 0x4f, 0xf3, 0x00, 0x88, 0x8e} \
}
/******************************************************************************
* netwerk/mime classes
*/
-#define NS_MIMEHEADERPARAM_CLASSNAME \
- "nsMIMEHeaderParamImpl"
// {1F4DBCF7-245C-4c8c-943D-8A1DA0495E8A}
#define NS_MIMEHEADERPARAM_CID \
{ 0x1f4dbcf7, \
0x245c, \
0x4c8c, \
{ 0x94, 0x3d, 0x8a, 0x1d, 0xa0, 0x49, 0x5e, 0x8a } \
}
#define NS_MIMEHEADERPARAM_CONTRACTID "@mozilla.org/network/mime-hdrparam;1"
/******************************************************************************
* netwerk/socket classes
*/
-#define NS_SOCKETPROVIDERSERVICE_CLASSNAME \
- "nsSocketProviderService"
#define NS_SOCKETPROVIDERSERVICE_CONTRACTID \
"@mozilla.org/network/socket-provider-service;1"
#define NS_SOCKETPROVIDERSERVICE_CID \
{ /* ed394ba0-5472-11d3-bbc8-0000861d1237 */ \
0xed394ba0, \
0x5472, \
0x11d3, \
{ 0xbb, 0xc8, 0x00, 0x00, 0x86, 0x1d, 0x12, 0x37 } \
@@ -892,64 +784,57 @@
/* This code produces a normal socket which can be used to initiate the
* STARTTLS protocol by calling its nsISSLSocketControl->StartTLS()
*/
#define NS_STARTTLSSOCKETPROVIDER_CONTRACTID \
NS_NETWORK_SOCKET_CONTRACTID_PREFIX "starttls"
-#define NS_DASHBOARD_CLASSNAME \
- "Dashboard"
#define NS_DASHBOARD_CONTRACTID \
"@mozilla.org/network/dashboard;1"
#define NS_DASHBOARD_CID \
{ /*c79eb3c6-091a-45a6-8544-5a8d1ab79537 */ \
0xc79eb3c6, \
0x091a, \
0x45a6, \
{ 0x85, 0x44, 0x5a, 0x8d, 0x1a, 0xb7, 0x95, 0x37 } \
}
/******************************************************************************
* netwerk/cookie classes
*/
// service implementing nsICookieManager and nsICookieManager2.
-#define NS_COOKIEMANAGER_CLASSNAME \
- "CookieManager"
#define NS_COOKIEMANAGER_CONTRACTID \
"@mozilla.org/cookiemanager;1"
#define NS_COOKIEMANAGER_CID \
{ /* aaab6710-0f2c-11d5-a53b-0010a401eb10 */ \
0xaaab6710, \
0x0f2c, \
0x11d5, \
{ 0xa5, 0x3b, 0x00, 0x10, 0xa4, 0x01, 0xeb, 0x10 } \
}
// service implementing nsICookieService.
-#define NS_COOKIESERVICE_CLASSNAME \
- "CookieService"
#define NS_COOKIESERVICE_CONTRACTID \
"@mozilla.org/cookieService;1"
#define NS_COOKIESERVICE_CID \
{ /* c375fa80-150f-11d6-a618-0010a401eb10 */ \
0xc375fa80, \
0x150f, \
0x11d6, \
{ 0xa6, 0x18, 0x00, 0x10, 0xa4, 0x01, 0xeb, 0x10 } \
}
/******************************************************************************
* netwerk/wifi classes
*/
#ifdef NECKO_WIFI
-#define NS_WIFI_MONITOR_CLASSNAME "WIFI_MONITOR"
#define NS_WIFI_MONITOR_CONTRACTID "@mozilla.org/wifi/monitor;1"
#define NS_WIFI_MONITOR_COMPONENT_CID \
{ 0x3FF8FB9F, \
0xEE63, \
0x48DF, \
{ 0x89, 0xF0, 0xDA, 0xCE, 0x02, 0x42, 0xFD, 0x82 } \
}
@@ -986,17 +871,16 @@
#define NS_BINARYDETECTOR_CONTRACTID \
"@mozilla.org/network/binary-detector;1"
/******************************************************************************
* netwerk/system classes
*/
// service implementing nsINetworkLinkService
-#define NS_NETWORK_LINK_SERVICE_CLASSNAME "Network Link Status"
#define NS_NETWORK_LINK_SERVICE_CID \
{ 0x75a500a2, \
0x0030, \
0x40f7, \
{ 0x86, 0xf8, 0x63, 0xf2, 0x25, 0xb9, 0x40, 0xae } \
}
/******************************************************************************
--- a/netwerk/build/nsNetModule.cpp
+++ b/netwerk/build/nsNetModule.cpp
@@ -119,18 +119,16 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeriali
typedef mozilla::net::RedirectChannelRegistrar RedirectChannelRegistrar;
NS_GENERIC_FACTORY_CONSTRUCTOR(RedirectChannelRegistrar)
///////////////////////////////////////////////////////////////////////////////
extern nsresult
net_NewIncrementalDownload(nsISupports *, const nsIID &, void **);
-#define NS_INCREMENTALDOWNLOAD_CLASSNAME \
- "nsIncrementalDownload"
#define NS_INCREMENTALDOWNLOAD_CID \
{ /* a62af1ba-79b3-4896-8aaf-b148bfce4280 */ \
0xa62af1ba, \
0x79b3, \
0x4896, \
{0x8a, 0xaf, 0xb1, 0x48, 0xbf, 0xce, 0x42, 0x80} \
}
--- a/netwerk/streamconv/public/nsIAppleFileDecoder.idl
+++ b/netwerk/streamconv/public/nsIAppleFileDecoder.idl
@@ -3,18 +3,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIOutputStream.idl"
#include "nsIFile.idl"
%{C++
-#define NS_APPLEFILEDECODER_CLASSNAME "Apple Single/Double File decoder"
-
#define NS_APPLEFILEDECODER_CID \
{ /* 3a2bb281-64b8-11d5-9daa-bb433143c53c */ \
0x3a2bb281, \
0x64b8, \
0x11d5, \
{0x9d, 0xaa, 0xbb, 0x43, 0x31, 0x43, 0xc5, 0x3c} \
}
--- a/parser/xml/src/nsSAXAttributes.h
+++ b/parser/xml/src/nsSAXAttributes.h
@@ -9,17 +9,16 @@
#include "nsISupports.h"
#include "nsISAXAttributes.h"
#include "nsISAXMutableAttributes.h"
#include "nsTArray.h"
#include "nsString.h"
#include "mozilla/Attributes.h"
#define NS_SAXATTRIBUTES_CONTRACTID "@mozilla.org/saxparser/attributes;1"
-#define NS_SAXATTRIBUTES_CLASSNAME "SAX Attributes"
#define NS_SAXATTRIBUTES_CID \
{/* {7bb40992-77eb-43db-9a4e-39d3bcc483ae}*/ \
0x7bb40992, 0x77eb, 0x43db, \
{ 0x9a, 0x4e, 0x39, 0xd3, 0xbc, 0xc3, 0x83, 0xae} }
struct SAXAttr
{
nsString uri;
--- a/parser/xml/src/nsSAXLocator.h
+++ b/parser/xml/src/nsSAXLocator.h
@@ -6,17 +6,16 @@
#ifndef nsSAXLocator_h__
#define nsSAXLocator_h__
#include "nsISAXLocator.h"
#include "nsString.h"
#include "mozilla/Attributes.h"
#define NS_SAXLOCATOR_CONTRACTID "@mozilla.org/saxparser/locator;1"
-#define NS_SAXLOCATOR_CLASSNAME "SAX Locator"
#define NS_SAXLOCATOR_CID \
{/* {c1cd4045-846b-43bb-a95e-745a3d7b40e0}*/ \
0xc1cd4045, 0x846b, 0x43bb, \
{ 0xa9, 0x5e, 0x74, 0x5a, 0x3d, 0x7b, 0x40, 0xe0} }
class nsSAXLocator MOZ_FINAL : public nsISAXLocator
{
public:
--- a/parser/xml/src/nsSAXXMLReader.h
+++ b/parser/xml/src/nsSAXXMLReader.h
@@ -16,17 +16,16 @@
#include "nsISAXDTDHandler.h"
#include "nsISAXErrorHandler.h"
#include "nsISAXLexicalHandler.h"
#include "nsIMozSAXXMLDeclarationHandler.h"
#include "nsCycleCollectionParticipant.h"
#include "mozilla/Attributes.h"
#define NS_SAXXMLREADER_CONTRACTID "@mozilla.org/saxparser/xmlreader;1"
-#define NS_SAXXMLREADER_CLASSNAME "SAX XML Reader"
#define NS_SAXXMLREADER_CID \
{ 0xab1da296, 0x6125, 0x40ba, \
{ 0x96, 0xd0, 0x47, 0xa8, 0x28, 0x2a, 0xe3, 0xdb} }
class nsSAXXMLReader MOZ_FINAL : public nsISAXXMLReader,
public nsIExtendedExpatSink,
public nsIContentSink
{
--- a/security/manager/ssl/public/nsIUserCertPicker.idl
+++ b/security/manager/ssl/public/nsIUserCertPicker.idl
@@ -15,10 +15,9 @@ interface nsIUserCertPicker : nsISupport
in long certUsage, // as defined by NSS enum SECCertUsage
in boolean allowInvalid,
in boolean allowDuplicateNicknames,
out boolean canceled);
};
%{C++
#define NS_CERT_PICKER_CONTRACTID "@mozilla.org/user_cert_picker;1"
-#define NS_CERT_PICKER_CLASSNAME "Cert Picker Object"
%}
--- a/security/manager/ssl/src/nsCMS.h
+++ b/security/manager/ssl/src/nsCMS.h
@@ -15,17 +15,16 @@
#include "nsIX509Cert3.h"
#include "nsVerificationJob.h"
#include "nsICMSEncoder.h"
#include "nsICMSDecoder.h"
#include "sechash.h"
#include "cms.h"
#include "nsNSSShutDown.h"
-#define NS_CMSMESSAGE_CLASSNAME "CMS Message Object"
#define NS_CMSMESSAGE_CID \
{ 0xa4557478, 0xae16, 0x11d5, { 0xba,0x4b,0x00,0x10,0x83,0x03,0xb1,0x17 } }
class nsCMSMessage : public nsICMSMessage,
public nsICMSMessage2,
public nsNSSShutDownObject
{
public:
@@ -53,17 +52,16 @@ private:
friend class nsSMimeVerificationJob;
};
// ===============================================
// nsCMSDecoder - implementation of nsICMSDecoder
// ===============================================
-#define NS_CMSDECODER_CLASSNAME "CMS Decoder Object"
#define NS_CMSDECODER_CID \
{ 0x9dcef3a4, 0xa3bc, 0x11d5, { 0xba, 0x47, 0x00, 0x10, 0x83, 0x03, 0xb1, 0x17 } }
class nsCMSDecoder : public nsICMSDecoder,
public nsNSSShutDownObject
{
public:
NS_DECL_ISUPPORTS
@@ -78,17 +76,16 @@ private:
virtual void virtualDestroyNSSReference();
void destructorSafeDestroyNSSReference();
};
// ===============================================
// nsCMSEncoder - implementation of nsICMSEncoder
// ===============================================
-#define NS_CMSENCODER_CLASSNAME "CMS Decoder Object"
#define NS_CMSENCODER_CID \
{ 0xa15789aa, 0x8903, 0x462b, { 0x81, 0xe9, 0x4a, 0xa2, 0xcf, 0xf4, 0xd5, 0xcb } }
class nsCMSEncoder : public nsICMSEncoder,
public nsNSSShutDownObject
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSICMSENCODER
--- a/security/manager/ssl/src/nsCMSSecureMessage.h
+++ b/security/manager/ssl/src/nsCMSSecureMessage.h
@@ -9,17 +9,16 @@
#include "nsICMSSecureMessage.h"
#include "cms.h"
// ===============================================
// nsCMSManager - implementation of nsICMSManager
// ===============================================
-#define NS_CMSSECUREMESSAGE_CLASSNAME "CMS Secure Message"
#define NS_CMSSECUREMESSAGE_CID \
{ 0x5fb907e0, 0x1dd2, 0x11b2, { 0xa7, 0xc0, 0xf1, 0x4c, 0x41, 0x6a, 0x62, 0xa1 } }
class nsCMSSecureMessage
: public nsICMSSecureMessage
{
public:
NS_DECL_ISUPPORTS
--- a/security/manager/ssl/src/nsCrypto.h
+++ b/security/manager/ssl/src/nsCrypto.h
@@ -11,17 +11,16 @@
#include "nsCOMPtr.h"
#include "nsIDOMCRMFObject.h"
#include "nsIDOMCryptoLegacy.h"
#include "nsIRunnable.h"
#include "nsString.h"
#include "jsapi.h"
#include "nsIPrincipal.h"
-#define NS_CRYPTO_CLASSNAME "Crypto JavaScript Class"
#define NS_CRYPTO_CID \
{0x929d9320, 0x251e, 0x11d4, { 0x8a, 0x7c, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
#define PSM_VERSION_STRING "2.4"
class nsIPSMComponent;
class nsIDOMScriptObjectFactory;
@@ -59,17 +58,16 @@ private:
static already_AddRefed<nsIPrincipal> GetScriptPrincipal(JSContext *cx);
bool mEnableSmartCardEvents;
};
#endif // MOZ_DISABLE_CRYPTOLEGACY
#include "nsIPKCS11.h"
-#define NS_PKCS11_CLASSNAME "Pkcs11 JavaScript Class"
#define NS_PKCS11_CID \
{0x74b7a390, 0x3b41, 0x11d4, { 0x8a, 0x80, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
class nsPkcs11 : public nsIPKCS11
{
public:
nsPkcs11();
virtual ~nsPkcs11();
--- a/security/manager/ssl/src/nsKeyModule.h
+++ b/security/manager/ssl/src/nsKeyModule.h
@@ -4,23 +4,21 @@
#ifndef _NS_KEYMODULE_H_
#define _NS_KEYMODULE_H_
#include "nsIKeyModule.h"
#include "pk11pub.h"
#include "mozilla/Attributes.h"
-#define NS_KEYMODULEOBJECT_CLASSNAME "Key Object Component"
/* eae599aa-ecef-49c6-a8af-6ddcc6feb484 */
#define NS_KEYMODULEOBJECT_CID \
{ 0xeae599aa, 0xecef, 0x49c6, {0xa8, 0xaf, 0x6d, 0xdc, 0xc6, 0xfe, 0xb4, 0x84} }
#define NS_KEYMODULEOBJECT_CONTRACTID "@mozilla.org/security/keyobject;1"
-#define NS_KEYMODULEOBJECTFACTORY_CLASSNAME "Key Object Factory Component"
/* a39e0e9d-e567-41e3-b12c-5df67f18174d */
#define NS_KEYMODULEOBJECTFACTORY_CID \
{ 0xa39e0e9d, 0xe567, 0x41e3, {0xb1, 0x2c, 0x5d, 0xf6, 0x7f, 0x18, 0x17, 0x4d} }
#define NS_KEYMODULEOBJECTFACTORY_CONTRACTID \
"@mozilla.org/security/keyobjectfactory;1"
class nsKeyObject MOZ_FINAL : public nsIKeyObject
{
--- a/security/manager/ssl/src/nsNSSComponent.h
+++ b/security/manager/ssl/src/nsNSSComponent.h
@@ -38,33 +38,28 @@
#include "nsNSSHelper.h"
#include "nsClientAuthRemember.h"
#include "nsCERTValInParamWrapper.h"
#define NS_NSSCOMPONENT_CID \
{0xa277189c, 0x1dd1, 0x11b2, {0xa8, 0xc9, 0xe4, 0xe8, 0xbf, 0xb1, 0x33, 0x8e}}
#define PSM_COMPONENT_CONTRACTID "@mozilla.org/psm;1"
-#define PSM_COMPONENT_CLASSNAME "Mozilla PSM Component"
//Define an interface that we can use to look up from the
//callbacks passed to NSS.
#define NS_INSSCOMPONENT_IID_STR "6ffbb526-205b-49c5-ae3f-5959c084075e"
#define NS_INSSCOMPONENT_IID \
{ 0x6ffbb526, 0x205b, 0x49c5, \
{ 0xae, 0x3f, 0x59, 0x59, 0xc0, 0x84, 0x7, 0x5e } }
#define NS_PSMCONTENTLISTEN_CID {0xc94f4a30, 0x64d7, 0x11d4, {0x99, 0x60, 0x00, 0xb0, 0xd0, 0x23, 0x54, 0xa0}}
#define NS_PSMCONTENTLISTEN_CONTRACTID "@mozilla.org/security/psmdownload;1"
-
-#define NS_CRYPTO_HASH_CLASSNAME "Mozilla Crypto Hash Function Component"
#define NS_CRYPTO_HASH_CID {0x36a1d3b3, 0xd886, 0x4317, {0x96, 0xff, 0x87, 0xb0, 0x00, 0x5c, 0xfe, 0xf7}}
-
-#define NS_CRYPTO_HMAC_CLASSNAME "Mozilla Crypto HMAC Function Component"
#define NS_CRYPTO_HMAC_CID {0xa496d0a2, 0xdff7, 0x4e23, {0xbd, 0x65, 0x1c, 0xa7, 0x42, 0xfa, 0x17, 0x8a}}
enum EnsureNSSOperator
{
nssLoadingComponent = 0,
nssInitSucceeded = 1,
nssInitFailed = 2,
nssShutdown = 3,
--- a/security/manager/ssl/src/nsNTLMAuthModule.h
+++ b/security/manager/ssl/src/nsNTLMAuthModule.h
@@ -22,18 +22,16 @@ public:
static void SetSendLM(bool sendLM);
private:
nsString mDomain;
nsString mUsername;
nsString mPassword;
};
-#define NS_NTLMAUTHMODULE_CLASSNAME \
- "nsNTLMAuthModule"
#define NS_NTLMAUTHMODULE_CONTRACTID \
NS_AUTH_MODULE_CONTRACTID_PREFIX "ntlm"
#define NS_NTLMAUTHMODULE_CID \
{ /* a4e5888f-4fe4-4632-8e7e-745196ea7c70 */ \
0xa4e5888f, \
0x4fe4, \
0x4632, \
{0x8e, 0x7e, 0x74, 0x51, 0x96, 0xea, 0x7c, 0x70} \
--- a/security/manager/ssl/src/nsSDR.h
+++ b/security/manager/ssl/src/nsSDR.h
@@ -22,17 +22,16 @@
#ifndef NS_SDR_CONTRACTID
#define NS_SDR_CONTRACTID "@mozilla.org/security/sdr;1"
#endif
// ===============================================
// nsSecretDecoderRing - implementation of nsISecretDecoderRing
// ===============================================
-#define NS_SDR_CLASSNAME "PIPNSS Secret Decoder Ring"
#define NS_SDR_CID \
{ 0x0c4f1ddc, 0x1dd2, 0x11b2, { 0x9d, 0x95, 0xf2, 0xfd, 0xf1, 0x13, 0x04, 0x4b } }
class nsSecretDecoderRing
: public nsISecretDecoderRing,
public nsISecretDecoderRingConfig
{
public:
--- a/security/manager/ssl/src/nsSSLSocketProvider.h
+++ b/security/manager/ssl/src/nsSSLSocketProvider.h
@@ -4,17 +4,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef _NSSSLSOCKETPROVIDER_H_
#define _NSSSLSOCKETPROVIDER_H_
#include "nsISocketProvider.h"
-#define NS_SSLSOCKETPROVIDER_CLASSNAME "Mozilla SSL Socket Provider Component"
/* 217d014a-1dd2-11b2-999c-b0c4df79b324 */
#define NS_SSLSOCKETPROVIDER_CID \
{ 0x217d014a, 0x1dd2, 0x11b2, {0x99, 0x9c, 0xb0, 0xc4, 0xdf, 0x79, 0xb3, 0x24}}
class nsSSLSocketProvider : public nsISocketProvider
{
public:
--- a/security/manager/ssl/src/nsStreamCipher.h
+++ b/security/manager/ssl/src/nsStreamCipher.h
@@ -5,17 +5,16 @@
#ifndef _NS_STREAMCIPHER_H_
#define _NS_STREAMCIPHER_H_
#include "nsIStreamCipher.h"
#include "nsString.h"
#include "pk11func.h"
#include "mozilla/Attributes.h"
-#define NS_STREAMCIPHER_CLASSNAME "Stream Cipher Component"
/* dbfcbe4a-10f7-4d6f-a481-68e6d6b71d21 */
#define NS_STREAMCIPHER_CID \
{ 0xdbfcbe4a, 0x10f7, 0x4d6f, {0xa4, 0x81, 0x68, 0xe6, 0xd6, 0xb7, 0x1d, 0x21}}
#define NS_STREAMCIPHER_CONTRACTID "@mozilla.org/security/streamcipher;1"
class nsStreamCipher MOZ_FINAL : public nsIStreamCipher
{
public:
--- a/security/manager/ssl/src/nsTLSSocketProvider.h
+++ b/security/manager/ssl/src/nsTLSSocketProvider.h
@@ -5,17 +5,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef _NSTLSSOCKETPROVIDER_H_
#define _NSTLSSOCKETPROVIDER_H_
#include "nsISocketProvider.h"
-#define NS_STARTTLSSOCKETPROVIDER_CLASSNAME "Mozilla STARTTLS Capable Socket Provider Component"
#define NS_STARTTLSSOCKETPROVIDER_CID \
{ /* b9507aec-1dd1-11b2-8cd5-c48ee0c50307 */ \
0xb9507aec, \
0x1dd1, \
0x11b2, \
{0x8c, 0xd5, 0xc4, 0x8e, 0xe0, 0xc5, 0x03, 0x07} \
}
--- a/toolkit/components/statusfilter/nsBrowserStatusFilter.h
+++ b/toolkit/components/statusfilter/nsBrowserStatusFilter.h
@@ -60,18 +60,16 @@ private:
int32_t mFinishedRequests;
bool mUseRealProgressFlag;
// indicates whether a timeout is pending
bool mDelayedStatus;
bool mDelayedProgress;
};
-#define NS_BROWSERSTATUSFILTER_CLASSNAME \
- "nsBrowserStatusFilter"
#define NS_BROWSERSTATUSFILTER_CONTRACTID \
"@mozilla.org/appshell/component/browser-status-filter;1"
#define NS_BROWSERSTATUSFILTER_CID \
{ /* 6356aa16-7916-4215-a825-cbc2692ca87a */ \
0x6356aa16, \
0x7916, \
0x4215, \
{0xa8, 0x25, 0xcb, 0xc2, 0x69, 0x2c, 0xa8, 0x7a} \
--- a/toolkit/system/dbus/nsDBusModule.cpp
+++ b/toolkit/system/dbus/nsDBusModule.cpp
@@ -7,17 +7,16 @@
#include "nsServiceManagerUtils.h"
#include "nsICategoryManager.h"
#include "mozilla/ModuleUtils.h"
#include "nsIAppStartupNotifier.h"
#include "nsNetworkManagerListener.h"
#include "nsNetCID.h"
-#define NS_DBUS_NETWORK_LINK_SERVICE_CLASSNAME "DBus Network Link Status"
#define NS_DBUS_NETWORK_LINK_SERVICE_CID \
{ 0x75a500a2, \
0x0030, \
0x40f7, \
{ 0x86, 0xf8, 0x63, 0xf2, 0x25, 0xb9, 0x40, 0xae } \
}
/* ===== XPCOM registration stuff ======== */
--- a/uriloader/exthandler/nsIExternalSharingAppService.idl
+++ b/uriloader/exthandler/nsIExternalSharingAppService.idl
@@ -1,17 +1,16 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIMIMEInfo.idl"
%{C++
#define NS_EXTERNALSHARINGAPPSERVICE_CONTRACTID "@mozilla.org/uriloader/external-sharing-app-service;1"
-#define NS_IEXTERNALSHARINGAPPSERVICE_CLASSNAME "Mozilla Sharing App Service"
%}
[scriptable, uuid(7111f769-53ec-41fd-b314-613661d5b6ba)]
interface nsISharingHandlerApp : nsIHandlerApp
{
void share(in AString data, [optional] in AString title);
};
--- a/uriloader/exthandler/nsIHelperAppLauncherDialog.idl
+++ b/uriloader/exthandler/nsIHelperAppLauncherDialog.idl
@@ -79,10 +79,9 @@ interface nsIHelperAppLauncherDialog : n
in wstring aDefaultFileName,
in wstring aSuggestedFileExtension,
in boolean aForcePrompt);
};
%{C++
#define NS_HELPERAPPLAUNCHERDLG_CONTRACTID "@mozilla.org/helperapplauncherdialog;1"
-#define NS_IHELPERAPPLAUNCHERDLG_CLASSNAME "Mozilla Helper App Launcher Confirmation Dialog"
%}
--- a/uriloader/prefetch/nsCPrefetchService.h
+++ b/uriloader/prefetch/nsCPrefetchService.h
@@ -5,50 +5,44 @@
#ifndef nsCPrefetchService_h__
#define nsCPrefetchService_h__
#include "nsIPrefetchService.h"
/**
* nsPrefetchService : nsIPrefetchService
*/
-#define NS_PREFETCHSERVICE_CLASSNAME \
- "nsPrefetchService"
#define NS_PREFETCHSERVICE_CONTRACTID \
"@mozilla.org/prefetch-service;1"
#define NS_PREFETCHSERVICE_CID \
{ /* 6b8bdffc-3394-417d-be83-a81b7c0f63bf */ \
0x6b8bdffc, \
0x3394, \
0x417d, \
{0xbe, 0x83, 0xa8, 0x1b, 0x7c, 0x0f, 0x63, 0xbf} \
}
/**
* nsOfflineCacheUpdateService : nsIOfflineCacheUpdateService
*/
-#define NS_OFFLINECACHEUPDATESERVICE_CLASSNAME \
- "nsOfflineCacheUpdateService"
#define NS_OFFLINECACHEUPDATESERVICE_CONTRACTID \
"@mozilla.org/offlinecacheupdate-service;1"
#define NS_OFFLINECACHEUPDATESERVICE_CID \
{ /* ec06f3fc-70db-4ecd-94e0-a6e91ca44d8a */ \
0xec06f3fc, \
0x70db, \
0x4ecd , \
{0x94, 0xe0, 0xa6, 0xe9, 0x1c, 0xa4, 0x4d, 0x8a} \
}
/**
* nsOfflineCacheUpdate : nsIOfflineCacheUpdate
*/
-#define NS_OFFLINECACHEUPDATE_CLASSNAME \
- "nsOfflineCacheUpdate"
#define NS_OFFLINECACHEUPDATE_CONTRACTID \
"@mozilla.org/offlinecacheupdate;1"
#define NS_OFFLINECACHEUPDATE_CID \
{ /* e56f5e01-c7cc-4675-a9d7-b8f1e4127295 */ \
0xe56f5e01, \
0xc7cc, \
0x4675, \
{0xa9, 0xd7, 0xb8, 0xf1, 0xe4, 0x12, 0x72, 0x95} \
--- a/widget/cocoa/nsMacWebAppUtils.h
+++ b/widget/cocoa/nsMacWebAppUtils.h
@@ -2,17 +2,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef _MAC_WEB_APP_UTILS_H_
#define _MAC_WEB_APP_UTILS_H_
#include "nsIMacWebAppUtils.h"
#define NS_MACWEBAPPUTILS_CONTRACTID "@mozilla.org/widget/mac-web-app-utils;1"
-#define NS_MACWEBAPPUTILS_COMPONENT_CLASSNAME "Mac Web Application Utils"
class nsMacWebAppUtils : public nsIMacWebAppUtils {
public:
nsMacWebAppUtils() {}
virtual ~nsMacWebAppUtils() {}
NS_DECL_ISUPPORTS
NS_DECL_NSIMACWEBAPPUTILS
--- a/xpcom/base/nsDebugImpl.h
+++ b/xpcom/base/nsDebugImpl.h
@@ -21,16 +21,15 @@ public:
* If aDesc is not NULL, the string it points to must be
* statically-allocated (i.e., it must be a string literal).
*/
static void SetMultiprocessMode(const char *aDesc);
};
#define NS_DEBUG_CONTRACTID "@mozilla.org/xpcom/debug;1"
-#define NS_DEBUG_CLASSNAME "nsDebug Interface"
#define NS_DEBUG_CID \
{ /* a80b1fb3-aaf6-4852-b678-c27eb7a518af */ \
0xa80b1fb3, \
0xaaf6, \
0x4852, \
{0xb6, 0x78, 0xc2, 0x7e, 0xb7, 0xa5, 0x18, 0xaf} \
}
--- a/xpcom/base/nsIAllocator.h
+++ b/xpcom/base/nsIAllocator.h
@@ -13,12 +13,11 @@
#include "nsMemory.h"
#define nsIAllocator nsIMemory
#define nsAllocator nsMemory
#define GetGlobalAllocator GetGlobalMemoryService
#define NS_IALLOCATOR_IID NS_GET_IID(nsIMemory)
#define NS_ALLOCATOR_CONTRACTID NS_MEMORY_CONTRACTID
-#define NS_ALLOCATOR_CLASSNAME NS_MEMORY_CLASSNAME
#define NS_ALLOCATOR_CID NS_MEMORY_CID
#endif /* nsIAllocator_h___ */
--- a/xpcom/base/nsIConsoleService.idl
+++ b/xpcom/base/nsIConsoleService.idl
@@ -42,16 +42,14 @@ interface nsIConsoleService : nsISupport
/**
* Clear the message buffer (e.g. for privacy reasons).
*/
void reset();
};
%{ C++
-#define NS_CONSOLESERVICE_CLASSNAME "Console Service"
-
#define NS_CONSOLESERVICE_CID \
{ 0x7e3ff85c, 0x1dd2, 0x11b2, { 0x8d, 0x4b, 0xeb, 0x45, 0x2c, 0xb0, 0xff, 0x40 }}
#define NS_CONSOLESERVICE_CONTRACTID "@mozilla.org/consoleservice;1"
%}
--- a/xpcom/base/nsIExceptionService.idl
+++ b/xpcom/base/nsIExceptionService.idl
@@ -51,14 +51,13 @@ interface nsIExceptionService : nsIExcep
NOTE: This interface must be thread-safe - it will be called
on whatever thread needs the error translation performed.*/
void registerExceptionProvider( in nsIExceptionProvider provider, in uint32_t moduleCode );
void unregisterExceptionProvider( in nsIExceptionProvider provider, in uint32_t moduleCode );
};
%{ C++
-#define NS_EXCEPTIONSERVICE_CLASSNAME "Exception Service"
// {35A88F54-F267-4414-92A7-191F6454AB52}
#define NS_EXCEPTIONSERVICE_CID \
{ 0x35a88f54, 0xf267, 0x4414, { 0x92, 0xa7, 0x19, 0x1f, 0x64, 0x54, 0xab, 0x52 } }
#define NS_EXCEPTIONSERVICE_CONTRACTID "@mozilla.org/exceptionservice;1"
%}
--- a/xpcom/base/nsMacUtilsImpl.h
+++ b/xpcom/base/nsMacUtilsImpl.h
@@ -25,14 +25,13 @@ private:
// A string containing a "-" delimited list of architectures
// in our binary.
nsString mBinaryArchs;
};
// Global singleton service
// 697BD3FD-43E5-41CE-AD5E-C339175C0818
-#define NS_MACUTILSIMPL_CLASSNAME "Mac OS X Utilities"
#define NS_MACUTILSIMPL_CID \
{0x697BD3FD, 0x43E5, 0x41CE, {0xAD, 0x5E, 0xC3, 0x39, 0x17, 0x5C, 0x08, 0x18}}
#define NS_MACUTILSIMPL_CONTRACTID "@mozilla.org/xpcom/mac-utils;1"
#endif /* nsMacUtilsImpl_h___ */
--- a/xpcom/base/nsSystemInfo.h
+++ b/xpcom/base/nsSystemInfo.h
@@ -20,14 +20,13 @@ protected:
void SetUint64Property(const nsAString &aPropertyName,
const uint64_t aValue);
private:
~nsSystemInfo();
};
#define NS_SYSTEMINFO_CONTRACTID "@mozilla.org/system-info;1"
-#define NS_SYSTEMINFO_CLASSNAME "System Info Service"
#define NS_SYSTEMINFO_CID \
{ 0xd962398a, 0x99e5, 0x49b2, \
{ 0x85, 0x7a, 0xc1, 0x59, 0x04, 0x9c, 0x7f, 0x6c } }
#endif /* _NSSYSTEMINFO_H_ */
--- a/xpcom/base/nsTraceRefcntImpl.h
+++ b/xpcom/base/nsTraceRefcntImpl.h
@@ -39,17 +39,16 @@ public:
* activity that occurs because of static constructors or destructors.
*/
static void SetActivityIsLegal(bool aLegal);
static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr);
};
#define NS_TRACE_REFCNT_CONTRACTID "@mozilla.org/xpcom/trace-refcnt;1"
-#define NS_TRACE_REFCNT_CLASSNAME "nsTraceRefcnt Interface"
#define NS_TRACE_REFCNT_CID \
{ /* e3e7511e-a395-4924-94b1-d527861cded4 */ \
0xe3e7511e, \
0xa395, \
0x4924, \
{0x94, 0xb1, 0xd5, 0x27, 0x86, 0x1c, 0xde, 0xd4} \
} \
--- a/xpcom/base/nsUUIDGenerator.h
+++ b/xpcom/base/nsUUIDGenerator.h
@@ -30,14 +30,13 @@ protected:
#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
char mState[128];
char *mSavedState;
uint8_t mRBytes;
#endif
};
#define NS_UUID_GENERATOR_CONTRACTID "@mozilla.org/uuid-generator;1"
-#define NS_UUID_GENERATOR_CLASSNAME "UUID Generator"
#define NS_UUID_GENERATOR_CID \
{ 0x706d36bb, 0xbf79, 0x4293, \
{ 0x81, 0xf2, 0x8f, 0x68, 0x28, 0xc1, 0x8f, 0x9d } }
#endif /* _NSUUIDGENERATOR_H_ */
--- a/xpcom/base/nsVersionComparatorImpl.h
+++ b/xpcom/base/nsVersionComparatorImpl.h
@@ -14,10 +14,8 @@ public:
};
#define NS_VERSIONCOMPARATOR_CONTRACTID "@mozilla.org/xpcom/version-comparator;1"
// c6e47036-ca94-4be3-963a-9abd8705f7a8
#define NS_VERSIONCOMPARATOR_CID \
{ 0xc6e47036, 0xca94, 0x4be3, \
{ 0x96, 0x3a, 0x9a, 0xbd, 0x87, 0x05, 0xf7, 0xa8 } }
-
-#define NS_VERSIONCOMPARATOR_CLASSNAME "nsVersionComparatorImpl"
--- a/xpcom/ds/nsArray.h
+++ b/xpcom/ds/nsArray.h
@@ -7,19 +7,16 @@
#define nsArray_h__
#include "nsIMutableArray.h"
#include "nsCOMArray.h"
#include "nsCOMPtr.h"
#include "nsCycleCollectionParticipant.h"
#include "mozilla/Attributes.h"
-#define NS_ARRAY_CLASSNAME \
- "nsIArray implementation"
-
// {35C66FD1-95E9-4e0a-80C5-C3BD2B375481}
#define NS_ARRAY_CID \
{ 0x35c66fd1, 0x95e9, 0x4e0a, \
{ 0x80, 0xc5, 0xc3, 0xbd, 0x2b, 0x37, 0x54, 0x81 } }
class nsArray : public nsIMutableArray
{
public:
--- a/xpcom/ds/nsIAtomService.idl
+++ b/xpcom/ds/nsIAtomService.idl
@@ -9,17 +9,16 @@
#define NS_ATOMSERVICE_CID \
{ /* ed3db3fc-0168-4cab-8818-98f5475a490c */ \
0xed3db3fc, \
0x0168, \
0x4cab, \
{0x88, 0x18, 0x98, 0xf5, 0x47, 0x5a, 0x49, 0x0c} }
#define NS_ATOMSERVICE_CONTRACTID "@mozilla.org/atom-service;1"
-#define NS_ATOMSERVICE_CLASSNAME "Atom Service"
%}
/*
* Should this really be scriptable? Using atoms from script or proxies
* could be dangerous since double-wrapping could lead to loss of
* pointer identity.
*/
--- a/xpcom/ds/nsIByteBuffer.h
+++ b/xpcom/ds/nsIByteBuffer.h
@@ -13,17 +13,16 @@ class nsIInputStream;
#define NS_IBYTE_BUFFER_IID \
{ 0xe4a6e4b0, 0x93b4, 0x11d1, \
{0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
#define NS_IBYTEBUFFER_IID \
{ 0xe4a6e4b0, 0x93b4, 0x11d1, \
{0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
#define NS_BYTEBUFFER_CONTRACTID "@mozilla.org/byte-buffer;1"
-#define NS_BYTEBUFFER_CLASSNAME "Byte Buffer"
/** Interface to a buffer that holds bytes */
class nsIByteBuffer : public nsISupports {
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IBYTEBUFFER_IID)
NS_IMETHOD Init(uint32_t aBufferSize) = 0;
--- a/xpcom/ds/nsIPersistentProperties2.idl
+++ b/xpcom/ds/nsIPersistentProperties2.idl
@@ -60,12 +60,11 @@ interface nsIPersistentProperties : nsIP
%{C++
#define NS_IPERSISTENTPROPERTIES_CID \
{ 0x2245e573, 0x9464, 0x11d2, \
{ 0x9b, 0x8b, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9 } }
#define NS_PERSISTENTPROPERTIES_CONTRACTID "@mozilla.org/persistent-properties;1"
-#define NS_PERSISTENTPROPERTIES_CLASSNAME "Persistent Properties"
%}
--- a/xpcom/ds/nsISupportsArray.idl
+++ b/xpcom/ds/nsISupportsArray.idl
@@ -23,17 +23,16 @@ class nsISupportsArray;
#define NS_SUPPORTSARRAY_CID \
{ /* bda17d50-0d6b-11d3-9331-00104ba0fd40 */ \
0xbda17d50, \
0x0d6b, \
0x11d3, \
{0x93, 0x31, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
}
#define NS_SUPPORTSARRAY_CONTRACTID "@mozilla.org/supports-array;1"
-#define NS_SUPPORTSARRAY_CLASSNAME "Supports Array"
%}
[scriptable, uuid(241addc8-3608-4e73-8083-2fd6fa09eba2)]
interface nsISupportsArray : nsICollection {
[notxpcom] boolean Equals([const] in nsISupportsArray other);
--- a/xpcom/ds/nsObserverService.h
+++ b/xpcom/ds/nsObserverService.h
@@ -6,18 +6,16 @@
#ifndef nsObserverService_h___
#define nsObserverService_h___
#include "nsIObserverService.h"
#include "nsObserverList.h"
#include "nsTHashtable.h"
#include "mozilla/Attributes.h"
-#define NS_OBSERVERSERVICE_CLASSNAME "Observer Service"
-
// {D07F5195-E3D1-11d2-8ACD-00105A1B8860}
#define NS_OBSERVERSERVICE_CID \
{ 0xd07f5195, 0xe3d1, 0x11d2, { 0x8a, 0xcd, 0x0, 0x10, 0x5a, 0x1b, 0x88, 0x60 } }
class nsObserverService MOZ_FINAL : public nsIObserverService {
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_OBSERVERSERVICE_CID)
--- a/xpcom/ds/nsVariant.h
+++ b/xpcom/ds/nsVariant.h
@@ -170,11 +170,9 @@ protected:
#define NS_VARIANT_CID \
{ /* 0D6EA1D0-879C-11d5-90EF-0010A4E73D9A */ \
0xd6ea1d0, \
0x879c, \
0x11d5, \
{0x90, 0xef, 0x0, 0x10, 0xa4, 0xe7, 0x3d, 0x9a}}
-#define NS_VARIANT_CLASSNAME "Variant"
-
#endif // nsVariant_h
--- a/xpcom/ds/nsWindowsRegKey.h
+++ b/xpcom/ds/nsWindowsRegKey.h
@@ -23,18 +23,16 @@
*/
extern "C" nsresult
NS_NewWindowsRegKey(nsIWindowsRegKey **result);
//-----------------------------------------------------------------------------
#ifdef _IMPL_NS_COM
-#define NS_WINDOWSREGKEY_CLASSNAME "nsWindowsRegKey"
-
// a53bc624-d577-4839-b8ec-bb5040a52ff4
#define NS_WINDOWSREGKEY_CID \
{ 0xa53bc624, 0xd577, 0x4839, \
{ 0xb8, 0xec, 0xbb, 0x50, 0x40, 0xa5, 0x2f, 0xf4 } }
extern nsresult
nsWindowsRegKeyConstructor(nsISupports *outer, const nsIID &iid, void **result);
--- a/xpcom/glue/nsMemory.h
+++ b/xpcom/glue/nsMemory.h
@@ -5,17 +5,16 @@
#ifndef nsMemory_h__
#define nsMemory_h__
#include "nsXPCOM.h"
#include "nsIMemory.h"
#define NS_MEMORY_CONTRACTID "@mozilla.org/xpcom/memory-service;1"
-#define NS_MEMORY_CLASSNAME "Global Memory Service"
#define NS_MEMORY_CID \
{ /* 30a04e40-38e7-11d4-8cf5-0060b0fc14a3 */ \
0x30a04e40, \
0x38e7, \
0x11d4, \
{0x8c, 0xf5, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
}
--- a/xpcom/io/nsBinaryStream.h
+++ b/xpcom/io/nsBinaryStream.h
@@ -16,17 +16,16 @@
{ /* 86c37b9a-74e7-4672-844e-6e7dd83ba484 */ \
0x86c37b9a, \
0x74e7, \
0x4672, \
{0x84, 0x4e, 0x6e, 0x7d, 0xd8, 0x3b, 0xa4, 0x84} \
}
#define NS_BINARYOUTPUTSTREAM_CONTRACTID "@mozilla.org/binaryoutputstream;1"
-#define NS_BINARYOUTPUTSTREAM_CLASSNAME "Binary Output Stream"
// Derive from nsIObjectOutputStream so this class can be used as a superclass
// by nsObjectOutputStream.
class nsBinaryOutputStream : public nsIObjectOutputStream
{
public:
nsBinaryOutputStream() {}
// virtual dtor since subclasses call our Release()
@@ -56,17 +55,16 @@ protected:
{ /* c521a612-2aad-46db-b6ab-3b821fb150b1 */ \
0xc521a612, \
0x2aad, \
0x46db, \
{0xb6, 0xab, 0x3b, 0x82, 0x1f, 0xb1, 0x50, 0xb1} \
}
#define NS_BINARYINPUTSTREAM_CONTRACTID "@mozilla.org/binaryinputstream;1"
-#define NS_BINARYINPUTSTREAM_CLASSNAME "Binary Input Stream"
// Derive from nsIObjectInputStream so this class can be used as a superclass
// by nsObjectInputStream.
class nsBinaryInputStream : public nsIObjectInputStream
{
public:
nsBinaryInputStream() {}
// virtual dtor since subclasses call our Release()
--- a/xpcom/io/nsIOUtil.h
+++ b/xpcom/io/nsIOUtil.h
@@ -1,17 +1,16 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef nsIOUtil_h__
#define nsIOUtil_h__
-#define NS_IOUTIL_CLASSNAME "XPCOM I/O utility class"
#define NS_IOUTIL_CID \
{ 0xeb833911, 0x4f49, 0x4623, \
{ 0x84, 0x5f, 0xe5, 0x8a, 0x8e, 0x6d, 0xe4, 0xc2 } }
#include "nsIIOUtil.h"
#include "mozilla/Attributes.h"
--- a/xpcom/io/nsMultiplexInputStream.h
+++ b/xpcom/io/nsMultiplexInputStream.h
@@ -8,17 +8,16 @@
* stream.
*/
#ifndef _nsMultiplexInputStream_h_
#define _nsMultiplexInputStream_h_
#include "nsIMultiplexInputStream.h"
-#define NS_MULTIPLEXINPUTSTREAM_CLASSNAME "nsMultiplexInputStream"
#define NS_MULTIPLEXINPUTSTREAM_CONTRACTID "@mozilla.org/io/multiplex-input-stream;1"
#define NS_MULTIPLEXINPUTSTREAM_CID \
{ /* 565e3a2c-1dd2-11b2-8da1-b4cef17e568d */ \
0x565e3a2c, \
0x1dd2, \
0x11b2, \
{0x8d, 0xa1, 0xb4, 0xce, 0xf1, 0x7e, 0x56, 0x8d} \
}
--- a/xpcom/io/nsPipe.h
+++ b/xpcom/io/nsPipe.h
@@ -2,18 +2,16 @@
/* vim:set ts=2 sw=2 sts=2 et cindent: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef nsPipe_h__
#define nsPipe_h__
-#define NS_PIPE_CLASSNAME \
- "nsPipe"
#define NS_PIPE_CONTRACTID \
"@mozilla.org/pipe;1"
#define NS_PIPE_CID \
{ /* e4a0ee4e-0775-457b-9118-b3ae97a7c758 */ \
0xe4a0ee4e, \
0x0775, \
0x457b, \
{0x91,0x18,0xb3,0xae,0x97,0xa7,0xc7,0x58} \
--- a/xpcom/io/nsScriptableInputStream.h
+++ b/xpcom/io/nsScriptableInputStream.h
@@ -10,17 +10,16 @@
#include "nsIInputStream.h"
#include "nsCOMPtr.h"
#include "mozilla/Attributes.h"
#define NS_SCRIPTABLEINPUTSTREAM_CID \
{ 0x7225c040, 0xa9bf, 0x11d3, { 0xa1, 0x97, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
#define NS_SCRIPTABLEINPUTSTREAM_CONTRACTID "@mozilla.org/scriptableinputstream;1"
-#define NS_SCRIPTABLEINPUTSTREAM_CLASSNAME "Scriptable Input Stream"
class nsScriptableInputStream MOZ_FINAL : public nsIScriptableInputStream {
public:
// nsISupports methods
NS_DECL_ISUPPORTS
// nsIScriptableInputStream methods
NS_DECL_NSISCRIPTABLEINPUTSTREAM
--- a/xpcom/io/nsStorageStream.h
+++ b/xpcom/io/nsStorageStream.h
@@ -23,17 +23,16 @@
{ /* 669a9795-6ff7-4ed4-9150-c34ce2971b63 */ \
0x669a9795, \
0x6ff7, \
0x4ed4, \
{0x91, 0x50, 0xc3, 0x4c, 0xe2, 0x97, 0x1b, 0x63} \
}
#define NS_STORAGESTREAM_CONTRACTID "@mozilla.org/storagestream;1"
-#define NS_STORAGESTREAM_CLASSNAME "Storage Stream"
class nsSegmentedBuffer;
class nsStorageStream MOZ_FINAL : public nsIStorageStream,
public nsIOutputStream
{
public:
nsStorageStream();
--- a/xpcom/io/nsStringStream.h
+++ b/xpcom/io/nsStringStream.h
@@ -12,17 +12,16 @@
/**
* Implements:
* nsIStringInputStream
* nsIInputStream
* nsISeekableStream
* nsISupportsCString
*/
-#define NS_STRINGINPUTSTREAM_CLASSNAME "nsStringInputStream"
#define NS_STRINGINPUTSTREAM_CONTRACTID "@mozilla.org/io/string-input-stream;1"
#define NS_STRINGINPUTSTREAM_CID \
{ /* 0abb0835-5000-4790-af28-61b3ba17c295 */ \
0x0abb0835, \
0x5000, \
0x4790, \
{0xaf, 0x28, 0x61, 0xb3, 0xba, 0x17, 0xc2, 0x95} \
}
--- a/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
+++ b/xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl
@@ -34,19 +34,16 @@ interface nsIInterfaceInfoSuperManager :
void addAdditionalManager(in nsIInterfaceInfoManager manager);
void removeAdditionalManager(in nsIInterfaceInfoManager manager);
boolean hasAdditionalManagers();
nsISimpleEnumerator enumerateAdditionalManagers();
};
%{C++
-#define NS_INTERFACEINFOMANAGER_SERVICE_CLASSNAME \
- "Interface Information Manager Service"
-
#define NS_INTERFACEINFOMANAGER_SERVICE_CID \
{ /* 13bef784-f8e0-4f96-85c1-09f9ef4f9a19 */ \
0x13bef784, 0xf8e0, 0x4f96, \
{0x85, 0xc1, 0x09, 0xf9, 0xef, 0x4f, 0x9a, 0x19} }
#define NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID \
"@mozilla.org/xpti/interfaceinfomanager-service;1"
%}
--- a/xpcom/threads/nsIProcess.idl
+++ b/xpcom/threads/nsIProcess.idl
@@ -91,10 +91,9 @@ interface nsIProcess : nsISupports
* Returns whether the process is currently running or not.
*/
readonly attribute boolean isRunning;
};
%{C++
#define NS_PROCESS_CONTRACTID "@mozilla.org/process/util;1"
-#define NS_PROCESS_CLASSNAME "Process Specification"
%}
--- a/xpcom/threads/nsThreadManager.h
+++ b/xpcom/threads/nsThreadManager.h
@@ -61,17 +61,16 @@ private:
nsRefPtr<nsThread> mMainThread;
PRThread *mMainPRThread;
// This is a pointer in order to allow creating nsThreadManager from
// the static context in debug builds.
nsAutoPtr<mozilla::Mutex> mLock; // protects tables
bool mInitialized;
};
-#define NS_THREADMANAGER_CLASSNAME "nsThreadManager"
#define NS_THREADMANAGER_CID \
{ /* 7a4204c6-e45a-4c37-8ebb-6709a22c917c */ \
0x7a4204c6, \
0xe45a, \
0x4c37, \
{0x8e, 0xbb, 0x67, 0x09, 0xa2, 0x2c, 0x91, 0x7c} \
}
--- a/xpcom/threads/nsThreadPool.h
+++ b/xpcom/threads/nsThreadPool.h
@@ -40,17 +40,16 @@ private:
uint32_t mIdleThreadTimeout;
uint32_t mIdleCount;
nsCOMPtr<nsIThreadPoolListener> mListener;
bool mShutdown;
nsCString mName;
nsThreadPoolNaming mThreadNaming;
};
-#define NS_THREADPOOL_CLASSNAME "nsThreadPool"
#define NS_THREADPOOL_CID \
{ /* 547ec2a8-315e-4ec4-888e-6e4264fe90eb */ \
0x547ec2a8, \
0x315e, \
0x4ec4, \
{0x88, 0x8e, 0x6e, 0x42, 0x64, 0xfe, 0x90, 0xeb} \
}
--- a/xpcom/threads/nsTimerImpl.h
+++ b/xpcom/threads/nsTimerImpl.h
@@ -20,17 +20,16 @@
#if defined(PR_LOGGING)
extern PRLogModuleInfo *GetTimerLog();
#define DEBUG_TIMERS 1
#else
#undef DEBUG_TIMERS
#endif
-#define NS_TIMER_CLASSNAME "Timer"
#define NS_TIMER_CID \
{ /* 5ff24248-1dd2-11b2-8427-fbab44f29bc8 */ \
0x5ff24248, \
0x1dd2, \
0x11b2, \
{0x84, 0x27, 0xfb, 0xab, 0x44, 0xf2, 0x9b, 0xc8} \
}
