Merge branch 'rockwork'

Conflicts:
	po/de.po
	po/en_GB.po
	po/eu.po
	po/fr.po
	po/hu.po
	po/it.po
	po/pt.po
	po/rockwork.mzanetti.pot
	po/ru.po
	po/template.pot
	rockwork/InfoPage.qml
	rockwork/Main.qml
	rockwork/NotificationsPage.qml
	rockworkd/rockworkd.pro
	version.pri

1 files changed, 52 insertions, 4 deletions

diff --git a/rockworkd/libpebble/jskit/jskitconsole.h b/rockworkd/libpebble/jskit/jskitconsole.h
index 3896ae3..6f8970d 100644
--- a/rockworkd/libpebble/jskit/jskitconsole.h
+++ b/rockworkd/libpebble/jskit/jskitconsole.h
@@ -3,18 +3,66 @@
 
 #include <QLoggingCategory>
 
+/*
+  We opted to do multiple overloaded functions rather than one with default
+  arguments as this method produces nicer log messages and wont omit (possibly)
+  important messages like empty string, undefined, or null.
+*/
+
 class JSKitConsole : public QObject
 {
     Q_OBJECT
     QLoggingCategory l;
+    QLoggingCategory w;
+    QLoggingCategory e;
+    QLoggingCategory i;
 
 public:
     explicit JSKitConsole(QObject *parent=0);
 
-    Q_INVOKABLE void log(const QString &msg);
-    Q_INVOKABLE void warn(const QString &msg);
-    Q_INVOKABLE void error(const QString &msg);
-    Q_INVOKABLE void info(const QString &msg);
+    Q_INVOKABLE void log(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7, const QString &msg8, const QString &msg9);
+    Q_INVOKABLE void log(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7, const QString &msg8);
+    Q_INVOKABLE void log(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7);
+    Q_INVOKABLE void log(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6);
+    Q_INVOKABLE void log(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5);
+    Q_INVOKABLE void log(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4);
+    Q_INVOKABLE void log(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3);
+    Q_INVOKABLE void log(const QString &msg0, const QString &msg1, const QString &msg2);
+    Q_INVOKABLE void log(const QString &msg0, const QString &msg1);
+    Q_INVOKABLE void log(const QString &msg0);
+
+    Q_INVOKABLE void warn(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7, const QString &msg8, const QString &msg9);
+    Q_INVOKABLE void warn(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7, const QString &msg8);
+    Q_INVOKABLE void warn(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7);
+    Q_INVOKABLE void warn(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6);
+    Q_INVOKABLE void warn(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5);
+    Q_INVOKABLE void warn(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4);
+    Q_INVOKABLE void warn(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3);
+    Q_INVOKABLE void warn(const QString &msg0, const QString &msg1, const QString &msg2);
+    Q_INVOKABLE void warn(const QString &msg0, const QString &msg1);
+    Q_INVOKABLE void warn(const QString &msg0);
+
+    Q_INVOKABLE void error(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7, const QString &msg8, const QString &msg9);
+    Q_INVOKABLE void error(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7, const QString &msg8);
+    Q_INVOKABLE void error(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7);
+    Q_INVOKABLE void error(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6);
+    Q_INVOKABLE void error(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5);
+    Q_INVOKABLE void error(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4);
+    Q_INVOKABLE void error(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3);
+    Q_INVOKABLE void error(const QString &msg0, const QString &msg1, const QString &msg2);
+    Q_INVOKABLE void error(const QString &msg0, const QString &msg1);
+    Q_INVOKABLE void error(const QString &msg0);
+
+    Q_INVOKABLE void info(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7, const QString &msg8, const QString &msg9);
+    Q_INVOKABLE void info(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7, const QString &msg8);
+    Q_INVOKABLE void info(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6, const QString &msg7);
+    Q_INVOKABLE void info(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5, const QString &msg6);
+    Q_INVOKABLE void info(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4, const QString &msg5);
+    Q_INVOKABLE void info(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3, const QString &msg4);
+    Q_INVOKABLE void info(const QString &msg0, const QString &msg1, const QString &msg2, const QString &msg3);
+    Q_INVOKABLE void info(const QString &msg0, const QString &msg1, const QString &msg2);
+    Q_INVOKABLE void info(const QString &msg0, const QString &msg1);
+    Q_INVOKABLE void info(const QString &msg0);
 };
 
 #endif // JSKITCONSOLE_H