mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 23:31:56 +00:00
69790bc62e
The inclusions were removed with the following very crude script and the
resulting breakage was fixed up by hand. The manual fixups did either
revert the changes done by the script, replace a generic header with a more
specific one or replace a header with a forward declaration.
find . -name "*.idl" | grep -v web-platform | grep -v third_party | while read path; do
interfaces=$(grep "^\(class\|interface\).*:.*" "$path" | cut -d' ' -f2)
if [ -n "$interfaces" ]; then
if [[ "$interfaces" == *$'\n'* ]]; then
regexp="\("
for i in $interfaces; do regexp="$regexp$i\|"; done
regexp="${regexp%%\\\|}\)"
else
regexp="$interfaces"
fi
interface=$(basename "$path")
rg -l "#include.*${interface%%.idl}.h" . | while read path2; do
hits=$(grep -v "#include.*${interface%%.idl}.h" "$path2" | grep -c "$regexp" )
if [ $hits -eq 0 ]; then
echo "Removing ${interface} from ${path2}"
grep -v "#include.*${interface%%.idl}.h" "$path2" > "$path2".tmp
mv -f "$path2".tmp "$path2"
fi
done
fi
done
Differential Revision: https://phabricator.services.mozilla.com/D55443
--HG--
extra : moz-landing-system : lando
40 lines
1.7 KiB
C++
40 lines
1.7 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* 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 nsLocaleConstructors_h__
|
|
#define nsLocaleConstructors_h__
|
|
|
|
#include "nsCollation.h"
|
|
#include "nsCollationCID.h"
|
|
#include "mozilla/ModuleUtils.h"
|
|
#include "LocaleService.h"
|
|
#include "OSPreferences.h"
|
|
|
|
#define NSLOCALE_MAKE_CTOR(ctor_, iface_, func_) \
|
|
static nsresult ctor_(nsISupports* aOuter, REFNSIID aIID, void** aResult) { \
|
|
*aResult = nullptr; \
|
|
if (aOuter) return NS_ERROR_NO_AGGREGATION; \
|
|
iface_* inst; \
|
|
nsresult rv = func_(&inst); \
|
|
if (NS_SUCCEEDED(rv)) { \
|
|
rv = inst->QueryInterface(aIID, aResult); \
|
|
NS_RELEASE(inst); \
|
|
} \
|
|
return rv; \
|
|
}
|
|
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsCollationFactory)
|
|
|
|
namespace mozilla {
|
|
namespace intl {
|
|
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(LocaleService,
|
|
LocaleService::GetInstanceAddRefed)
|
|
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(OSPreferences,
|
|
OSPreferences::GetInstanceAddRefed)
|
|
} // namespace intl
|
|
} // namespace mozilla
|
|
|
|
#endif
|