diff options
| -rw-r--r-- | binary/src/Makefile | 12 | ||||
| -rw-r--r-- | binary/src/dactylModule.cpp | 30 | ||||
| -rw-r--r-- | binary/src/dactylUtils.cpp | 18 | ||||
| -rw-r--r-- | binary/src/dactylUtils.h | 17 |
4 files changed, 40 insertions, 37 deletions
diff --git a/binary/src/Makefile b/binary/src/Makefile index bf22ef35..65221515 100644 --- a/binary/src/Makefile +++ b/binary/src/Makefile @@ -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) diff --git a/binary/src/dactylModule.cpp b/binary/src/dactylModule.cpp index 21625d8c..3bc8f370 100644 --- a/binary/src/dactylModule.cpp +++ b/binary/src/dactylModule.cpp @@ -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: */ diff --git a/binary/src/dactylUtils.cpp b/binary/src/dactylUtils.cpp index 230a06d3..a2a9e883 100644 --- a/binary/src/dactylUtils.cpp +++ b/binary/src/dactylUtils.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: */ diff --git a/binary/src/dactylUtils.h b/binary/src/dactylUtils.h index d0146c57..74545366 100644 --- a/binary/src/dactylUtils.h +++ b/binary/src/dactylUtils.h @@ -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: */ |