mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-22 12:57:58 +01:00
Fix whitespace issues.
--HG-- extra : rebase_source : f962251f04f0aced8dffd601a3ce7faf064f70b4
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
ROOT = ..
|
||||
|
||||
XPTDIR = $(ROOT)/components/$(ABI)/
|
||||
SODIR = $(ROOT)/components/$(ABI)/
|
||||
OBJDIR = $(ABI)/
|
||||
XPTDIR = $(ROOT)/components/$(ABI)/
|
||||
SODIR = $(ROOT)/components/$(ABI)/
|
||||
OBJDIR = $(ABI)/
|
||||
|
||||
MODULE = $(SODIR)dactyl
|
||||
|
||||
@@ -21,14 +21,14 @@ GECKO_DEFINES = -DMOZILLA_STRICT_API
|
||||
|
||||
GECKO_INCLUDES = -I$(ABI)/ \
|
||||
-I$(GECKO_SDK_PATH) \
|
||||
-I$(GECKO_SDK_PATH)/idl \
|
||||
-I$(GECKO_SDK_PATH)/include
|
||||
-I$(GECKO_SDK_PATH)/idl \
|
||||
-I$(GECKO_SDK_PATH)/include
|
||||
|
||||
GECKO_LDFLAGS = -L$(GECKO_SDK_PATH)/bin \
|
||||
-L$(GECKO_SDK_PATH)/lib \
|
||||
-lxpcomglue_s \
|
||||
-lxpcom \
|
||||
-lnspr4 \
|
||||
-lnspr4 \
|
||||
-shared \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -4,37 +4,39 @@
|
||||
|
||||
#define NS_DACTYLUTILS_CID \
|
||||
{ 0x4d55a47c, 0x0627, 0x4339, \
|
||||
{ 0x97, 0x91, 0x52, 0xef, 0x5e, 0xd4, 0xc3, 0xd1 } }
|
||||
{ 0x97, 0x91, 0x52, 0xef, 0x5e, 0xd4, 0xc3, 0xd1 } }
|
||||
|
||||
#define NS_DACTYLUTILS_CONTRACTID \
|
||||
"@dactyl.googlecode.com/extra/utils"
|
||||
"@dactyl.googlecode.com/extra/utils"
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(dactylUtils, Init)
|
||||
|
||||
NS_DEFINE_NAMED_CID(NS_DACTYLUTILS_CID);
|
||||
|
||||
static const mozilla::Module::CIDEntry kDactylCIDs[] = {
|
||||
{ &kNS_DACTYLUTILS_CID, true, NULL, dactylUtilsConstructor },
|
||||
{ NULL }
|
||||
{ &kNS_DACTYLUTILS_CID, true, NULL, dactylUtilsConstructor },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
static const mozilla::Module::ContractIDEntry kDactylContracts[] = {
|
||||
{ NS_DACTYLUTILS_CONTRACTID, &kNS_DACTYLUTILS_CID },
|
||||
{ NULL }
|
||||
{ NS_DACTYLUTILS_CONTRACTID, &kNS_DACTYLUTILS_CID },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
static const mozilla::Module::CategoryEntry kDactylCategories[] = {
|
||||
{ NULL }
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
static const mozilla::Module kDactylUtilsModule = {
|
||||
mozilla::Module::kVersion,
|
||||
kDactylCIDs,
|
||||
kDactylContracts,
|
||||
kDactylCategories,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
mozilla::Module::kVersion,
|
||||
kDactylCIDs,
|
||||
kDactylContracts,
|
||||
kDactylCategories,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
|
||||
NSMODULE_DEFN(dactylUtilsModule) = &kDactylUtilsModule;
|
||||
|
||||
/* vim:se sts=4 sw=4 et cin ft=cpp: */
|
||||
|
||||
@@ -70,8 +70,8 @@ typedef nsString nsSubstring;
|
||||
|
||||
class autoDropPrincipals {
|
||||
public:
|
||||
autoDropPrincipals(JSContext *context, JSPrincipals *principals) : mContext(context), mJSPrincipals(principals) {}
|
||||
~autoDropPrincipals() {
|
||||
autoDropPrincipals(JSContext *context, JSPrincipals *principals) : mContext(context), mJSPrincipals(principals) {}
|
||||
~autoDropPrincipals() {
|
||||
JSPRINCIPALS_DROP(mContext, mJSPrincipals);
|
||||
}
|
||||
|
||||
@@ -108,9 +108,9 @@ static JSFunctionSpec gGlobalFun[] = {
|
||||
static dactylUtils* gService = nsnull;
|
||||
|
||||
dactylUtils::dactylUtils()
|
||||
: mRuntime(nsnull)
|
||||
: mRuntime(nsnull)
|
||||
{
|
||||
NS_ASSERTION(gService == nsnull, "Service already exists");
|
||||
NS_ASSERTION(gService == nsnull, "Service already exists");
|
||||
}
|
||||
|
||||
dactylUtils::~dactylUtils()
|
||||
@@ -122,14 +122,14 @@ dactylUtils::~dactylUtils()
|
||||
nsresult
|
||||
dactylUtils::Init()
|
||||
{
|
||||
nsresult rv;
|
||||
NS_ENSURE_TRUE(!gService, NS_ERROR_UNEXPECTED);
|
||||
nsresult rv;
|
||||
NS_ENSURE_TRUE(!gService, NS_ERROR_UNEXPECTED);
|
||||
|
||||
mRuntimeService = do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
rv = mRuntimeService->GetRuntime(&mRuntime);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsCOMPtr<nsIScriptSecurityManager> secman =
|
||||
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID);
|
||||
@@ -366,4 +366,4 @@ dactylUtils::GetScrollable(nsIDOMElement *aElement, PRUint32 *rval)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/* vim:se sts=4 sw=4 et ft=cpp: */
|
||||
/* vim:se sts=4 sw=4 et cin ft=cpp: */
|
||||
|
||||
@@ -17,19 +17,20 @@
|
||||
|
||||
class dactylUtils : public dactylIUtils {
|
||||
public:
|
||||
dactylUtils() NS_HIDDEN;
|
||||
~dactylUtils() NS_HIDDEN;
|
||||
dactylUtils() NS_HIDDEN;
|
||||
~dactylUtils() NS_HIDDEN;
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_DACTYLIUTILS
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_DACTYLIUTILS
|
||||
|
||||
NS_HIDDEN_(nsresult) Init();
|
||||
NS_HIDDEN_(nsresult) Init();
|
||||
|
||||
private:
|
||||
|
||||
nsCOMPtr<nsIJSRuntimeService> mRuntimeService;
|
||||
JSRuntime *mRuntime;
|
||||
nsCOMPtr<nsIJSRuntimeService> mRuntimeService;
|
||||
JSRuntime *mRuntime;
|
||||
|
||||
nsCOMPtr<nsIPrincipal> mSystemPrincipal;
|
||||
nsCOMPtr<nsIPrincipal> mSystemPrincipal;
|
||||
};
|
||||
|
||||
/* vim:se sts=4 sw=4 et cin ft=cpp: */
|
||||
|
||||
Reference in New Issue
Block a user