wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 798033 - Remove 'using namespace' from remaining headers. r=froydnj

Browse Source
This commit is contained in:
Birunthan Mohanathas 2014-05-18 19:34:00 -04:00
parent dedadb9188
commit d54d5f6f1f
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dom/system/gonk/NetworkUtils.h
View File

@ -14,12 +14,13 @@
class NetworkParams;
class CommandChain;
using namespace mozilla::dom;
typedef void (*CommandCallback)(CommandChain*, bool, NetworkResultOptions& aResult);
typedef void (*CommandFunc)(CommandChain*, CommandCallback, NetworkResultOptions& aResult);
typedef void (*MessageCallback)(NetworkResultOptions& aResult);
typedef void (*ErrorCallback)(NetworkParams& aOptions, NetworkResultOptions& aResult);
typedef void (*CommandCallback)(CommandChain*, bool,
mozilla::dom::NetworkResultOptions& aResult);
typedef void (*CommandFunc)(CommandChain*, CommandCallback,
mozilla::dom::NetworkResultOptions& aResult);
typedef void (*MessageCallback)(mozilla::dom::NetworkResultOptions& aResult);
typedef void (*ErrorCallback)(NetworkParams& aOptions,
mozilla::dom::NetworkResultOptions& aResult);
class NetworkParams
{
@ -73,7 +74,7 @@ public:
mThreshold = aOther.mThreshold;
}
NetworkParams(const NetworkCommandOptions& aOther) {
NetworkParams(const mozilla::dom::NetworkCommandOptions& aOther) {
#define COPY_SEQUENCE_FIELD(prop, type) \
if (aOther.prop.WasPassed()) { \
@ -304,7 +305,8 @@ private:
/**
* Individual netd command stored in command chain.
*/
#define PARAMS CommandChain* aChain, CommandCallback aCallback, NetworkResultOptions& aResult
#define PARAMS CommandChain* aChain, CommandCallback aCallback, \
mozilla::dom::NetworkResultOptions& aResult
static void wifiFirmwareReload(PARAMS);
static void startAccessPointDriver(PARAMS);
static void stopAccessPointDriver(PARAMS);
@ -346,7 +348,8 @@ private:
/**
* Error callback function executed when a command is fail.
*/
#define PARAMS NetworkParams& aOptions, NetworkResultOptions& aResult
#define PARAMS NetworkParams& aOptions, \
mozilla::dom::NetworkResultOptions& aResult
static void wifiTetheringFail(PARAMS);
static void wifiOperationModeFail(PARAMS);
static void usbTetheringFail(PARAMS);
@ -360,7 +363,8 @@ private:
/**
* Command chain processing functions.
*/
static void next(CommandChain* aChain, bool aError, NetworkResultOptions& aResult);
static void next(CommandChain* aChain, bool aError,
mozilla::dom::NetworkResultOptions& aResult);
static void nextNetdCommand();
static void doCommand(const char* aCommand, CommandChain* aChain, CommandCallback aCallback);

6
xpcom/base/nsDumpUtils.h
View File

@ -26,8 +26,6 @@
#define LOG(...)
#endif
using namespace mozilla;
#if defined(XP_LINUX) || defined(__FreeBSD__) || defined(XP_MACOSX) // {
/**
@ -130,7 +128,7 @@ public:
private:
nsAutoCString mDirPath;
static StaticRefPtr<FifoWatcher> sSingleton;
static mozilla::StaticRefPtr<FifoWatcher> sSingleton;
FifoWatcher(nsCString aPath)
: mDirPath(aPath)
@ -168,7 +166,7 @@ public:
virtual void OnFileCanReadWithoutBlocking(int aFd);
private:
static StaticRefPtr<SignalPipeWatcher> sSingleton;
static mozilla::StaticRefPtr<SignalPipeWatcher> sSingleton;
SignalPipeWatcher()
: mSignalInfoLock("SignalPipeWatcher.mSignalInfoLock")