summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Iacovitti <aiacovitti@libero.it>2012-06-25 18:31:50 (GMT)
committerAndrea Iacovitti <aiacovitti@libero.it>2012-06-25 18:31:50 (GMT)
commitd591c81e04e92461e30b2db403d1a4ea6a6ac9d2 (patch)
treefaa7e3898c705757953044a5928e579c51b2dab3
parent223196e00c9f35a6c5a41a4ada595ed73c3fbf62 (diff)
CamelCase func, var, enum from my previous commit
-rw-r--r--khtml/ecma/kjs_events.cpp12
-rw-r--r--khtml/ecma/kjs_events.h2
-rw-r--r--khtml/xml/dom2_eventsimpl.cpp6
-rw-r--r--khtml/xml/dom2_eventsimpl.h12
4 files changed, 16 insertions, 16 deletions
diff --git a/khtml/ecma/kjs_events.cpp b/khtml/ecma/kjs_events.cpp
index 4aa82f9..2a37665 100644
--- a/khtml/ecma/kjs_events.cpp
+++ b/khtml/ecma/kjs_events.cpp
@@ -1112,8 +1112,8 @@ JSValue *DOMMessageEventProtoFunc::callAsFunction(ExecState *exec, JSObject *thi
const ClassInfo DOMHashChangeEvent::info = { "HashChangeEvent", &DOMEvent::info, &DOMHashChangeEventTable, 0 };
/*
@begin DOMHashChangeEventTable 2
- oldURL DOMHashChangeEvent::OldURL DontDelete|ReadOnly
- newURL DOMHashChangeEvent::NewURL DontDelete|ReadOnly
+ oldURL DOMHashChangeEvent::OldUrl DontDelete|ReadOnly
+ newURL DOMHashChangeEvent::NewUrl DontDelete|ReadOnly
@end
@begin DOMHashChangeEventProtoTable 1
initHashChangeEvent DOMHashChangeEvent::InitHashChangeEvent DontDelete|Function 5
@@ -1137,10 +1137,10 @@ JSValue *DOMHashChangeEvent::getValueProperty(ExecState *exec, int token) const
{
DOM::HashChangeEventImpl& event = *impl();
switch (token) {
- case NewURL:
- return jsString(event.newURL());
- case OldURL:
- return jsString(event.oldURL());
+ case NewUrl:
+ return jsString(event.newUrl());
+ case OldUrl:
+ return jsString(event.oldUrl());
default:
kDebug(6070) << "WARNING: Unhandled token in DOMHashChangeEvent::getValueProperty : " << token;
return jsUndefined();
diff --git a/khtml/ecma/kjs_events.h b/khtml/ecma/kjs_events.h
index d54c6f0..1df010e 100644
--- a/khtml/ecma/kjs_events.h
+++ b/khtml/ecma/kjs_events.h
@@ -285,7 +285,7 @@ namespace KJS {
// no put - all read-only
virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info;
- enum { NewURL, OldURL, InitHashChangeEvent };
+ enum { NewUrl, OldUrl, InitHashChangeEvent };
DOM::HashChangeEventImpl* impl() const { return static_cast<DOM::HashChangeEventImpl*>(m_impl.get()); }
};
DEFINE_PSEUDO_CONSTRUCTOR(HashChangeEventPseudoCtor)
diff --git a/khtml/xml/dom2_eventsimpl.cpp b/khtml/xml/dom2_eventsimpl.cpp
index 0cbe605..82999a9 100644
--- a/khtml/xml/dom2_eventsimpl.cpp
+++ b/khtml/xml/dom2_eventsimpl.cpp
@@ -1115,9 +1115,9 @@ bool HashChangeEventImpl::isHashChangeEvent() const
return true;
}
-void HashChangeEventImpl::initHashChangeEvent(const DOMString& eventTypeArg, bool canBubbleArg, bool cancelableArg, const DOMString& oldURL, const DOMString& newURL)
+void HashChangeEventImpl::initHashChangeEvent(const DOMString& eventTypeArg, bool canBubbleArg, bool cancelableArg, const DOMString& oldUrl, const DOMString& newUrl)
{
EventImpl::initEvent(eventTypeArg, canBubbleArg, cancelableArg);
- m_oldURL = oldURL;
- m_newURL = newURL;
+ m_oldUrl = oldUrl;
+ m_newUrl = newUrl;
}
diff --git a/khtml/xml/dom2_eventsimpl.h b/khtml/xml/dom2_eventsimpl.h
index 99b6fb2..75f41ee 100644
--- a/khtml/xml/dom2_eventsimpl.h
+++ b/khtml/xml/dom2_eventsimpl.h
@@ -619,21 +619,21 @@ private:
class HashChangeEventImpl : public EventImpl {
public:
- const DOMString &oldURL() const { return m_oldURL; }
- const DOMString &newURL() const { return m_newURL; }
+ const DOMString &oldUrl() const { return m_oldUrl; }
+ const DOMString &newUrl() const { return m_newUrl; }
HashChangeEventImpl();
void initHashChangeEvent(const DOMString &eventTypeArg,
bool canBubbleArg,
bool cancelableArg,
- const DOMString &oldURL,
- const DOMString &newURL
+ const DOMString &oldUrl,
+ const DOMString &newUrl
);
virtual bool isHashChangeEvent() const;
private:
- DOMString m_oldURL;
- DOMString m_newURL;
+ DOMString m_oldUrl;
+ DOMString m_newUrl;
};
} //namespace