Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 798033 - Remove 'using namespace' from toolkit/ headers. r=bsmedberg

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-12-08 21:53:46 -05:00
parent bfaa1613a3
commit f2fd740542
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/components/alerts/nsXULAlerts.cpp
View File

@ -13,6 +13,8 @@
#include "nsPIDOMWindow.h"
#include "nsIWindowWatcher.h"
using namespace mozilla;
#define ALERT_CHROME_URL "chrome://global/content/alerts/alert.xul"
NS_IMPL_ISUPPORTS1(nsXULAlertObserver, nsIObserver)

2
toolkit/components/alerts/nsXULAlerts.h
View File

@ -12,8 +12,6 @@
#include "nsIDOMWindow.h"
#include "nsIObserver.h"
using namespace mozilla;
class nsXULAlerts {
friend class nsXULAlertObserver;
public:

10
toolkit/components/build/nsToolkitCompsModule.cpp
View File

@ -36,6 +36,8 @@
#include "nsBrowserStatusFilter.h"
#include "mozilla/FinalizationWitnessService.h"
using namespace mozilla;
/////////////////////////////////////////////////////////////////////////////
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAppStartup, Init)
@ -113,7 +115,7 @@ NS_DEFINE_NAMED_CID(NS_UPDATEPROCESSOR_CID);
#endif
NS_DEFINE_NAMED_CID(FINALIZATIONWITNESSSERVICE_CID);
static const mozilla::Module::CIDEntry kToolkitCIDs[] = {
static const Module::CIDEntry kToolkitCIDs[] = {
{ &kNS_TOOLKIT_APPSTARTUP_CID, false, nullptr, nsAppStartupConstructor },
{ &kNS_USERINFO_CID, false, nullptr, nsUserInfoConstructor },
{ &kNS_ALERTSSERVICE_CID, false, nullptr, nsAlertsServiceConstructor },
@ -141,7 +143,7 @@ static const mozilla::Module::CIDEntry kToolkitCIDs[] = {
{ nullptr }
};
static const mozilla::Module::ContractIDEntry kToolkitContracts[] = {
static const Module::ContractIDEntry kToolkitContracts[] = {
{ NS_APPSTARTUP_CONTRACTID, &kNS_TOOLKIT_APPSTARTUP_CID },
{ NS_USERINFO_CONTRACTID, &kNS_USERINFO_CID },
{ NS_ALERTSERVICE_CONTRACTID, &kNS_ALERTSSERVICE_CID },
@ -170,8 +172,8 @@ static const mozilla::Module::ContractIDEntry kToolkitContracts[] = {
{ nullptr }
};
static const mozilla::Module kToolkitModule = {
mozilla::Module::kVersion,
static const Module kToolkitModule = {
Module::kVersion,
kToolkitCIDs,
kToolkitContracts
};