From 4fd7fb9d40cdbcbe560a5b6e261a292f0cf46246 Mon Sep 17 00:00:00 2001 From: Ivan De Marino Date: Wed, 4 Jan 2012 16:56:31 +0000 Subject: [PATCH] Fixing what seems like a "copy & paste went wrong". The parameter "startingScript" was never used, and I think it comes from the sibling method "injectJsInFrame". --- src/phantom.cpp | 2 +- src/utils.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/phantom.cpp b/src/phantom.cpp index 89881ea2..c9b589e3 100644 --- a/src/phantom.cpp +++ b/src/phantom.cpp @@ -151,7 +151,7 @@ bool Phantom::execute() if (m_config.debug()) { - if (!Utils::loadJSForDebug(m_config.scriptFile(), m_scriptFileEnc, QDir::currentPath(), m_page->mainFrame(), true)) { + if (!Utils::loadJSForDebug(m_config.scriptFile(), m_scriptFileEnc, QDir::currentPath(), m_page->mainFrame())) { m_returnValue = -1; return false; } diff --git a/src/utils.cpp b/src/utils.cpp index baa0a926..53b9aa1a 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -98,12 +98,12 @@ bool Utils::injectJsInFrame(const QString &jsFilePath, const Encoding &jsFileEnc return true; } -bool Utils::loadJSForDebug(const QString& jsFilePath, const QString& libraryPath, QWebFrame* targetFrame, const bool startingScript) +bool Utils::loadJSForDebug(const QString& jsFilePath, const QString& libraryPath, QWebFrame* targetFrame) { - return loadJSForDebug(jsFilePath, Encoding::UTF8, libraryPath, targetFrame, startingScript); + return loadJSForDebug(jsFilePath, Encoding::UTF8, libraryPath, targetFrame); } -bool Utils::loadJSForDebug(const QString& jsFilePath, const Encoding& jsFileEnc, const QString& libraryPath, QWebFrame* targetFrame, const bool startingScript) +bool Utils::loadJSForDebug(const QString& jsFilePath, const Encoding& jsFileEnc, const QString& libraryPath, QWebFrame* targetFrame) { QString scriptPath = findScript(jsFilePath, libraryPath);