forked from mirrors/gecko-dev
5dc21d568c
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/D55444
--HG--
extra : moz-landing-system : lando
76 lines
2.6 KiB
C++
76 lines
2.6 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 nsServiceManagerUtils_h__
|
|
#define nsServiceManagerUtils_h__
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsString.h"
|
|
|
|
inline const nsGetServiceByCID do_GetService(const nsCID& aCID) {
|
|
return nsGetServiceByCID(aCID);
|
|
}
|
|
|
|
inline const nsGetServiceByCIDWithError do_GetService(const nsCID& aCID,
|
|
nsresult* aError) {
|
|
return nsGetServiceByCIDWithError(aCID, aError);
|
|
}
|
|
|
|
inline const nsGetServiceByContractID do_GetService(const char* aContractID) {
|
|
return nsGetServiceByContractID(aContractID);
|
|
}
|
|
|
|
inline const nsGetServiceByContractIDWithError do_GetService(
|
|
const char* aContractID, nsresult* aError) {
|
|
return nsGetServiceByContractIDWithError(aContractID, aError);
|
|
}
|
|
|
|
class MOZ_STACK_CLASS nsGetServiceFromCategory final : public nsCOMPtr_helper {
|
|
public:
|
|
nsGetServiceFromCategory(const nsACString& aCategory,
|
|
const nsACString& aEntry, nsresult* aErrorPtr)
|
|
: mCategory(aCategory), mEntry(aEntry), mErrorPtr(aErrorPtr) {}
|
|
|
|
virtual nsresult NS_FASTCALL operator()(const nsIID&, void**) const override;
|
|
|
|
protected:
|
|
const nsCString mCategory;
|
|
const nsCString mEntry;
|
|
nsresult* mErrorPtr;
|
|
};
|
|
|
|
inline const nsGetServiceFromCategory do_GetServiceFromCategory(
|
|
const nsACString& aCategory, const nsACString& aEntry,
|
|
nsresult* aError = 0) {
|
|
return nsGetServiceFromCategory(aCategory, aEntry, aError);
|
|
}
|
|
|
|
nsresult CallGetService(const nsCID& aClass, const nsIID& aIID, void** aResult);
|
|
|
|
nsresult CallGetService(const char* aContractID, const nsIID& aIID,
|
|
void** aResult);
|
|
|
|
// type-safe shortcuts for calling |GetService|
|
|
template <class DestinationType>
|
|
inline nsresult CallGetService(const nsCID& aClass,
|
|
DestinationType** aDestination) {
|
|
MOZ_ASSERT(aDestination, "null parameter");
|
|
|
|
return CallGetService(aClass, NS_GET_TEMPLATE_IID(DestinationType),
|
|
reinterpret_cast<void**>(aDestination));
|
|
}
|
|
|
|
template <class DestinationType>
|
|
inline nsresult CallGetService(const char* aContractID,
|
|
DestinationType** aDestination) {
|
|
MOZ_ASSERT(aContractID, "null parameter");
|
|
MOZ_ASSERT(aDestination, "null parameter");
|
|
|
|
return CallGetService(aContractID, NS_GET_TEMPLATE_IID(DestinationType),
|
|
reinterpret_cast<void**>(aDestination));
|
|
}
|
|
|
|
#endif
|