Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
michael@0 | 1 | /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
michael@0 | 2 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 5 | |
michael@0 | 6 | #include "mozilla/ModuleUtils.h" |
michael@0 | 7 | #include "nsAutoConfig.h" |
michael@0 | 8 | #include "nsReadConfig.h" |
michael@0 | 9 | #include "nsIAppStartupNotifier.h" |
michael@0 | 10 | |
michael@0 | 11 | NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAutoConfig, Init) |
michael@0 | 12 | NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsReadConfig, Init) |
michael@0 | 13 | |
michael@0 | 14 | NS_DEFINE_NAMED_CID(NS_AUTOCONFIG_CID); |
michael@0 | 15 | NS_DEFINE_NAMED_CID(NS_READCONFIG_CID); |
michael@0 | 16 | |
michael@0 | 17 | static const mozilla::Module::CIDEntry kAutoConfigCIDs[] = { |
michael@0 | 18 | { &kNS_AUTOCONFIG_CID, false, nullptr, nsAutoConfigConstructor }, |
michael@0 | 19 | { &kNS_READCONFIG_CID, false, nullptr, nsReadConfigConstructor }, |
michael@0 | 20 | { nullptr } |
michael@0 | 21 | }; |
michael@0 | 22 | |
michael@0 | 23 | static const mozilla::Module::ContractIDEntry kAutoConfigContracts[] = { |
michael@0 | 24 | { NS_AUTOCONFIG_CONTRACTID, &kNS_AUTOCONFIG_CID }, |
michael@0 | 25 | { NS_READCONFIG_CONTRACTID, &kNS_READCONFIG_CID }, |
michael@0 | 26 | { nullptr } |
michael@0 | 27 | }; |
michael@0 | 28 | |
michael@0 | 29 | static const mozilla::Module::CategoryEntry kAutoConfigCategories[] = { |
michael@0 | 30 | { "pref-config-startup", "ReadConfig Module", NS_READCONFIG_CONTRACTID }, |
michael@0 | 31 | { nullptr } |
michael@0 | 32 | }; |
michael@0 | 33 | |
michael@0 | 34 | static const mozilla::Module kAutoConfigModule = { |
michael@0 | 35 | mozilla::Module::kVersion, |
michael@0 | 36 | kAutoConfigCIDs, |
michael@0 | 37 | kAutoConfigContracts, |
michael@0 | 38 | kAutoConfigCategories |
michael@0 | 39 | }; |
michael@0 | 40 | |
michael@0 | 41 | NSMODULE_DEFN(nsAutoConfigModule) = &kAutoConfigModule; |