From ba25514d1c1010d84ffdbf75331ff71596e56c99 Mon Sep 17 00:00:00 2001
From: Kent Hansen <khansen@trolltech.com>
Date: Mon, 17 Aug 2009 15:43:07 +0200
Subject: remove unnecessary ifdefs

---
 src/script/api/qscriptengine.cpp      | 17 +++++++----------
 src/script/bridge/qscriptfunction.cpp |  6 ++----
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 207521d..eef0b5d 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -2158,13 +2158,11 @@ QScriptValue QScriptEngine::evaluate(const QString &program, const QString &file
     JSC::ExecState* exec = d->currentFrame;
     JSC::SourceCode source = JSC::makeSource(jscProgram, jscFileName, lineNumber);
 
-#ifdef QT_BUILD_SCRIPT_LIB
     intptr_t sourceId = source.provider()->asID();
     JSC::Debugger* debugger = d->originalGlobalObject()->debugger();
     exec->globalData().scriptpool->startEvaluating(source);
     if (debugger)
         debugger->evaluateStart(sourceId);
-#endif
 
     exec->clearException();
     JSC::DynamicGlobalObjectScope dynamicGlobalObjectScope(exec, exec->scopeChain()->globalObject());
@@ -2175,13 +2173,13 @@ QScriptValue QScriptEngine::evaluate(const QString &program, const QString &file
     if (!evalNode) {
         JSC::JSValue exceptionValue = JSC::Error::create(exec, JSC::SyntaxError, errorMessage, errorLine, source.provider()->asID(), 0);
         exec->setException(exceptionValue);
-#ifdef QT_BUILD_SCRIPT_LIB
+
         if (debugger) {
             debugger->exceptionThrow(JSC::DebuggerCallFrame(exec, exceptionValue), sourceId, false);
             debugger->evaluateStop(exceptionValue, sourceId);
         }
         exec->globalData().scriptpool->stopEvaluating(source);
-#endif
+
         return d->scriptValueFromJSCValue(exceptionValue);
     }
 
@@ -2194,29 +2192,28 @@ QScriptValue QScriptEngine::evaluate(const QString &program, const QString &file
     if (d->timeoutChecker()->shouldAbort()) {
         if (d->abortResult.isError())
             exec->setException(d->scriptValueToJSCValue(d->abortResult));
-#ifdef QT_BUILD_SCRIPT_LIB
+
         if (debugger)
             debugger->evaluateStop(d->scriptValueToJSCValue(d->abortResult), sourceId);
         exec->globalData().scriptpool->stopEvaluating(source);
-#endif
+
         return d->abortResult;
     }
 
     if (exceptionValue) {
         exec->setException(exceptionValue);
-#ifdef QT_BUILD_SCRIPT_LIB
+
         if (debugger)
             debugger->evaluateStop(exceptionValue, sourceId);
         exec->globalData().scriptpool->stopEvaluating(source);
-#endif
+
         return d->scriptValueFromJSCValue(exceptionValue);
     }
 
-#ifdef QT_BUILD_SCRIPT_LIB
     if (debugger)
         debugger->evaluateStop(result, sourceId);
     exec->globalData().scriptpool->stopEvaluating(source);
-#endif
+
     Q_ASSERT(!exec->hadException());
     return d->scriptValueFromJSCValue(result);
 }
diff --git a/src/script/bridge/qscriptfunction.cpp b/src/script/bridge/qscriptfunction.cpp
index 396a787..27ec203 100644
--- a/src/script/bridge/qscriptfunction.cpp
+++ b/src/script/bridge/qscriptfunction.cpp
@@ -81,9 +81,7 @@ FunctionWrapper::~FunctionWrapper()
 JSC::ConstructType FunctionWrapper::getConstructData(JSC::ConstructData& consData)
 {
     consData.native.function = proxyConstruct;
-#ifdef QT_BUILD_SCRIPT_LIB
     consData.native.function.doNotCallDebuggerFunctionExit();
-#endif
     return JSC::ConstructTypeHost;
 }
 
@@ -118,10 +116,10 @@ JSC::JSObject* FunctionWrapper::proxyConstruct(JSC::ExecState *exec, JSC::JSObje
     QScriptContext *ctx = eng_p->contextForFrame(eng_p->currentFrame);
 
     QScriptValue result = self->data->function(ctx, QScriptEnginePrivate::get(eng_p));
-#ifdef QT_BUILD_SCRIPT_LIB
+
     if (JSC::Debugger* debugger = eng_p->originalGlobalObject()->debugger())
         debugger->functionExit(QScriptValuePrivate::get(result)->jscValue, -1);
-#endif
+
     if (!result.isObject())
         result = ctx->thisObject();
 
-- 
cgit v0.12