summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJedrzej Nowacki <jedrzej.nowacki@nokia.com>2009-08-18 10:19:30 (GMT)
committerJedrzej Nowacki <jedrzej.nowacki@nokia.com>2009-08-18 11:17:27 (GMT)
commit32b8cd59515d714b7ddf8436dc6306af7df18091 (patch)
tree8dc68eefb3fd37f2fc6f1e25b6520b4bd77b30ab
parentfbfd3d0dd5de147bd841dc144a735ca5e02d76e7 (diff)
downloadQt-32b8cd59515d714b7ddf8436dc6306af7df18091.zip
Qt-32b8cd59515d714b7ddf8436dc6306af7df18091.tar.gz
Qt-32b8cd59515d714b7ddf8436dc6306af7df18091.tar.bz2
Clean up.
Get rid off some compilation warnings about unused variables. Reviewed-by: Kent Hansen
-rw-r--r--src/script/api/qscriptengineagent_p.h34
-rw-r--r--src/script/bridge/qscriptqobject.cpp1
2 files changed, 29 insertions, 6 deletions
diff --git a/src/script/api/qscriptengineagent_p.h b/src/script/api/qscriptengineagent_p.h
index 6f400c8..183a02c 100644
--- a/src/script/api/qscriptengineagent_p.h
+++ b/src/script/api/qscriptengineagent_p.h
@@ -95,24 +95,46 @@ public:
};
//exceptions
- virtual void exception(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno) {};
+ virtual void exception(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno)
+ {
+ Q_UNUSED(frame);
+ Q_UNUSED(sourceID);
+ Q_UNUSED(lineno);
+ };
virtual void exceptionThrow(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, bool hasHandler);
virtual void exceptionCatch(const JSC::DebuggerCallFrame& frame, intptr_t sourceID);
//statements
virtual void atStatement(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno, int column);
- virtual void callEvent(const JSC::DebuggerCallFrame&, intptr_t sourceID, int /*lineno*/)
+ virtual void callEvent(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno)
{
+ Q_UNUSED(lineno);
q_ptr->contextPush();
q_ptr->functionEntry(sourceID);
};
- virtual void returnEvent(const JSC::DebuggerCallFrame&, intptr_t sourceID, int /*lineno*/) {}
- virtual void willExecuteProgram(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno) {};
- virtual void didExecuteProgram(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno) {};
+ virtual void returnEvent(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno)
+ {
+ Q_UNUSED(frame);
+ Q_UNUSED(sourceID);
+ Q_UNUSED(lineno);
+ }
+ virtual void willExecuteProgram(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno)
+ {
+ Q_UNUSED(frame);
+ Q_UNUSED(sourceID);
+ Q_UNUSED(lineno);
+ };
+ virtual void didExecuteProgram(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno)
+ {
+ Q_UNUSED(frame);
+ Q_UNUSED(sourceID);
+ Q_UNUSED(lineno);
+ };
virtual void functionExit(const JSC::JSValue& returnValue, intptr_t sourceID);
//others
- virtual void didReachBreakpoint(const JSC::DebuggerCallFrame&, intptr_t sourceID, int lineno, int column)
+ virtual void didReachBreakpoint(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, int lineno, int column)
{
+ Q_UNUSED(frame);
QList<QVariant> args;
args << qint64(sourceID) << lineno << column;
if (q_ptr->supportsExtension(QScriptEngineAgent::DebuggerInvocationRequest))
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index e98ec8a..8e5a844 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -1867,6 +1867,7 @@ JSC::JSValue QMetaObjectWrapperObject::execute(JSC::ExecState *exec,
const JSC::ArgList &args,
bool calledAsConstructor)
{
+ Q_UNUSED(calledAsConstructor);
if (data->ctor) {
QScriptEnginePrivate *eng_p = QScript::scriptEngineFromExec(exec);
QScriptContext *ctx = eng_p->contextForFrame(exec);