gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-22 14:27:58 +01:00
Code Issues Projects Releases Wiki Activity

Fix whitespace issues.

Browse Source 
--HG--
extra : rebase_source : f962251f04f0aced8dffd601a3ce7faf064f70b4
This commit is contained in:
Kris Maglione
2011-09-28 15:06:04 -04:00
parent 7bf68df95a
commit dc8004426f
4 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
binary/src/Makefile
View File

@@ -1,8 +1,8 @@
ROOT = .. ROOT = ..
XPTDIR = $(ROOT)/components/$(ABI)/ XPTDIR = $(ROOT)/components/$(ABI)/
SODIR = $(ROOT)/components/$(ABI)/ SODIR = $(ROOT)/components/$(ABI)/
OBJDIR = $(ABI)/ OBJDIR = $(ABI)/
MODULE = $(SODIR)dactyl MODULE = $(SODIR)dactyl
@@ -21,14 +21,14 @@ GECKO_DEFINES = -DMOZILLA_STRICT_API
GECKO_INCLUDES = -I$(ABI)/ \ GECKO_INCLUDES = -I$(ABI)/ \
-I$(GECKO_SDK_PATH) \ -I$(GECKO_SDK_PATH) \
-I$(GECKO_SDK_PATH)/idl \ -I$(GECKO_SDK_PATH)/idl \
-I$(GECKO_SDK_PATH)/include -I$(GECKO_SDK_PATH)/include
GECKO_LDFLAGS = -L$(GECKO_SDK_PATH)/bin \ GECKO_LDFLAGS = -L$(GECKO_SDK_PATH)/bin \
-L$(GECKO_SDK_PATH)/lib \ -L$(GECKO_SDK_PATH)/lib \
-lxpcomglue_s \ -lxpcomglue_s \
-lxpcom \ -lxpcom \
-lnspr4 \ -lnspr4 \
-shared \ -shared \
$(NULL) $(NULL)

30
binary/src/dactylModule.cpp
View File

@@ -4,37 +4,39 @@
#define NS_DACTYLUTILS_CID \ #define NS_DACTYLUTILS_CID \
{ 0x4d55a47c, 0x0627, 0x4339, \ { 0x4d55a47c, 0x0627, 0x4339, \
{ 0x97, 0x91, 0x52, 0xef, 0x5e, 0xd4, 0xc3, 0xd1 } } { 0x97, 0x91, 0x52, 0xef, 0x5e, 0xd4, 0xc3, 0xd1 } }
#define NS_DACTYLUTILS_CONTRACTID \ #define NS_DACTYLUTILS_CONTRACTID \
"@dactyl.googlecode.com/extra/utils" "@dactyl.googlecode.com/extra/utils"
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(dactylUtils, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(dactylUtils, Init)
NS_DEFINE_NAMED_CID(NS_DACTYLUTILS_CID); NS_DEFINE_NAMED_CID(NS_DACTYLUTILS_CID);
static const mozilla::Module::CIDEntry kDactylCIDs[] = { static const mozilla::Module::CIDEntry kDactylCIDs[] = {
{ &kNS_DACTYLUTILS_CID, true, NULL, dactylUtilsConstructor }, { &kNS_DACTYLUTILS_CID, true, NULL, dactylUtilsConstructor },
{ NULL } { NULL }
}; };
static const mozilla::Module::ContractIDEntry kDactylContracts[] = { static const mozilla::Module::ContractIDEntry kDactylContracts[] = {
{ NS_DACTYLUTILS_CONTRACTID, &kNS_DACTYLUTILS_CID }, { NS_DACTYLUTILS_CONTRACTID, &kNS_DACTYLUTILS_CID },
{ NULL } { NULL }
}; };
static const mozilla::Module::CategoryEntry kDactylCategories[] = { static const mozilla::Module::CategoryEntry kDactylCategories[] = {
{ NULL } { NULL }
}; };
static const mozilla::Module kDactylUtilsModule = { static const mozilla::Module kDactylUtilsModule = {
mozilla::Module::kVersion, mozilla::Module::kVersion,
kDactylCIDs, kDactylCIDs,
kDactylContracts, kDactylContracts,
kDactylCategories, kDactylCategories,
NULL, NULL,
NULL, NULL,
NULL NULL
}; };
NSMODULE_DEFN(dactylUtilsModule) = &kDactylUtilsModule; NSMODULE_DEFN(dactylUtilsModule) = &kDactylUtilsModule;
/* vim:se sts=4 sw=4 et cin ft=cpp: */

18
binary/src/dactylUtils.cpp
View File

@@ -70,8 +70,8 @@ typedef nsString nsSubstring;
class autoDropPrincipals { class autoDropPrincipals {
public: public:
autoDropPrincipals(JSContext *context, JSPrincipals *principals) : mContext(context), mJSPrincipals(principals) {} autoDropPrincipals(JSContext *context, JSPrincipals *principals) : mContext(context), mJSPrincipals(principals) {}
~autoDropPrincipals() { ~autoDropPrincipals() {
JSPRINCIPALS_DROP(mContext, mJSPrincipals); JSPRINCIPALS_DROP(mContext, mJSPrincipals);
} }
@@ -108,9 +108,9 @@ static JSFunctionSpec gGlobalFun[] = {
static dactylUtils* gService = nsnull; static dactylUtils* gService = nsnull;
dactylUtils::dactylUtils() dactylUtils::dactylUtils()
: mRuntime(nsnull) : mRuntime(nsnull)
{ {
NS_ASSERTION(gService == nsnull, "Service already exists"); NS_ASSERTION(gService == nsnull, "Service already exists");
} }
dactylUtils::~dactylUtils() dactylUtils::~dactylUtils()
@@ -122,14 +122,14 @@ dactylUtils::~dactylUtils()
nsresult nsresult
dactylUtils::Init() dactylUtils::Init()
{ {
nsresult rv; nsresult rv;
NS_ENSURE_TRUE(!gService, NS_ERROR_UNEXPECTED); NS_ENSURE_TRUE(!gService, NS_ERROR_UNEXPECTED);
mRuntimeService = do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv); mRuntimeService = do_GetService("@mozilla.org/js/xpc/RuntimeService;1", &rv);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
rv = mRuntimeService->GetRuntime(&mRuntime); rv = mRuntimeService->GetRuntime(&mRuntime);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIScriptSecurityManager> secman = nsCOMPtr<nsIScriptSecurityManager> secman =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID); do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID);
@@ -366,4 +366,4 @@ dactylUtils::GetScrollable(nsIDOMElement *aElement, PRUint32 *rval)
return NS_OK; return NS_OK;
} }
/* vim:se sts=4 sw=4 et ft=cpp: */ /* vim:se sts=4 sw=4 et cin ft=cpp: */

17
binary/src/dactylUtils.h
View File

@@ -17,19 +17,20 @@
class dactylUtils : public dactylIUtils { class dactylUtils : public dactylIUtils {
public: public:
dactylUtils() NS_HIDDEN; dactylUtils() NS_HIDDEN;
~dactylUtils() NS_HIDDEN; ~dactylUtils() NS_HIDDEN;
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_DACTYLIUTILS NS_DECL_DACTYLIUTILS
NS_HIDDEN_(nsresult) Init(); NS_HIDDEN_(nsresult) Init();
private: private:
nsCOMPtr<nsIJSRuntimeService> mRuntimeService; nsCOMPtr<nsIJSRuntimeService> mRuntimeService;
JSRuntime *mRuntime; JSRuntime *mRuntime;
nsCOMPtr<nsIPrincipal> mSystemPrincipal; nsCOMPtr<nsIPrincipal> mSystemPrincipal;
}; };
/* vim:se sts=4 sw=4 et cin ft=cpp: */