summaryrefslogtreecommitdiffstats
path: root/src/fbgui/javascriptinterface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/fbgui/javascriptinterface.cpp')
-rw-r--r--src/fbgui/javascriptinterface.cpp21
1 files changed, 15 insertions, 6 deletions
diff --git a/src/fbgui/javascriptinterface.cpp b/src/fbgui/javascriptinterface.cpp
index b45a2f9..9db803a 100644
--- a/src/fbgui/javascriptinterface.cpp
+++ b/src/fbgui/javascriptinterface.cpp
@@ -2,6 +2,15 @@
#include "javascriptinterface.h"
#include "sysinfo.h"
+
+#include <log4cxx/logger.h>
+#include "qlog4cxx.h"
+
+using namespace log4cxx;
+using namespace log4cxx::helpers;
+LoggerPtr jsiLogger(Logger::getLogger("fbgui.jsi"));
+
+
//-------------------------------------------------------------------------------------------------------
// Initialisation
//-------------------------------------------------------------------------------------------------------
@@ -12,7 +21,7 @@
* Is of type QWebFrame.
*/
JavascriptInterface::JavascriptInterface(QWebFrame *parent) {
- qxtLog->debug() << "Initializing javascript interface...";
+ LOG4CXX_DEBUG(jsiLogger, "Initializing javascript interface...");
_parent = parent;
}
//-------------------------------------------------------------------------------------------------------
@@ -61,7 +70,7 @@ foreach(fi, fiList)
{
if (fi.suffix() == "js") {
//qDebug()<< fi.fileName();
- //qxtLog->debug() << fi.fileName();
+ //LOG4CXX_DEBUG(jsiLogger, fi.fileName());
if (fi.fileName() != "test.js") {
QFile file;
file.setFileName(pathToJsDir + "/" + fi.fileName());
@@ -70,7 +79,7 @@ foreach(fi, fiList)
file.close();
_parent->evaluateJavaScript(js);
- //qxtLog->debug() << "evaluated " + fi.fileName();
+ //LOG4CXX_DEBUG(jsiLogger, "evaluated " + fi.fileName());
}
}
}
@@ -103,7 +112,7 @@ void JavascriptInterface::startDownload(const QString& filename) {
* @todo add some more informations
*/
void JavascriptInterface::setCallbackOnFinished(const QString& function) {
- qxtLog->debug() << "[jsi] Callback set: " << function;
+ LOG4CXX_DEBUG(jsiLogger, "[jsi] Callback set: " << function);
_callbackOnDownloadsFinished = QString(function);
}
//-------------------------------------------------------------------------------------------------------
@@ -208,7 +217,7 @@ void JavascriptInterface::updateProgressBar(const int& percent,
* on the webpage to receive these.
*/
void JavascriptInterface::notify(const QString& msg) {
- qxtLog->debug() << "[jsi] Notifying: " << msg;
+ LOG4CXX_DEBUG(jsiLogger, "[jsi] Notifying: " << msg);
QString code = QString("notify('\%1')").arg(msg);
_parent->evaluateJavaScript(code);
}
@@ -229,7 +238,7 @@ void JavascriptInterface::trigger() {
QFile file(fileToTriggerURL);
if (file.open(QIODevice::WriteOnly)) {
file.write("data\n");
- qxtLog->debug() << "[jsi] *trigger watcher*";
+ LOG4CXX_DEBUG(jsiLogger, "[jsi] *trigger watcher*");
}
file.close();
}