Fixed names needed for some languages for Kross

4 files changed, 9 insertions, 7 deletions

diff --git a/sigcore/Script.h b/sigcore/Script.h
index b5e2f6a5..6a12725e 100644
--- a/sigcore/Script.h
+++ b/sigcore/Script.h
@@ -51,7 +51,7 @@ class SIGCORE_EXPORT Script
          * 
          *  - \b mono -- C# <http://www.mono-project.com/Main_Page>
          *  - \b falcon -- Falcon <http://www.falconpl.org/>
-         *  - \b kjs -- KDE JavaScript <http://api.kde.org/4.x-api/kdelibs-apidocs/kjs/html/index.html>
+         *  - \b javascript -- KDE JavaScript <http://api.kde.org/4.x-api/kdelibs-apidocs/kjs/html/index.html>
          *  - \b qtscript -- QtScript <http://doc.trolltech.com/latest/qtscript.html>
          *  - \b java -- Java <http://www.java.com/en/>
          *  - \b lua -- Lua <http://www.lua.org/>
diff --git a/sigcore/test/TestScript.cpp b/sigcore/test/TestScript.cpp
index 9d23a728..2fb3b313 100644
--- a/sigcore/test/TestScript.cpp
+++ b/sigcore/test/TestScript.cpp
@@ -156,10 +156,11 @@ object.connect(\"signal2()\", \"slot2()\")\n\
     QCOMPARE(m_bar, true);
     QCOMPARE(m_value, QString("set"));
 }
+*/
 
-void TestScript::kjs()
+void TestScript::javascript()
 {
-    Sigcore::Script script("kjs", "object.value = \"set\"\n\
+    Sigcore::Script script("javascript", "object.value = \"set\"\n\
 function slot()\n\
 {\n\
     object.slot1()\n\
@@ -182,7 +183,7 @@ connect(object, \"signal2()\", object, \"slot2()\")\n\
     QCOMPARE(m_value, QString("set"));
 }
 
-void TestScript::qtscript()
+void TestScript::qts()
 {
     Sigcore::Script script("qtscript", "object.value = \"set\"\n\
 function slot()\n\
@@ -207,6 +208,7 @@ connect(object, \"signal2()\", object, \"slot2()\")\n\
     QCOMPARE(m_value, QString("set"));
 }
 
+/*
 void java()
 {
     Sigcore::Script script("java", "import object\n\
diff --git a/sigcore/test/TestScript.h b/sigcore/test/TestScript.h
index dd4c5a48..2c7823e5 100644
--- a/sigcore/test/TestScript.h
+++ b/sigcore/test/TestScript.h
@@ -57,8 +57,8 @@ class TestScript : public QObject
         
         void python();
 //         void falcon();
-//         void kjs();
-//         void qtscript();
+        void javascript();
+        void qts();
 //         void java();
 //         void lua();
 //         void ruby();
diff --git a/sigmodr/ScriptWidget.cpp b/sigmodr/ScriptWidget.cpp
index bab74833..9a944035 100644
--- a/sigmodr/ScriptWidget.cpp
+++ b/sigmodr/ScriptWidget.cpp
@@ -44,7 +44,7 @@ Sigmodr::ScriptWidget::ScriptWidget(QWidget* parent, const Sigcore::Script& valu
     languages["C#"] = "mono";
     languages["Falcon"] = "falcon";
     languages["Java"] = "java";
-    languages["JavaScript"] = "kjs";
+    languages["JavaScript"] = "javascript";
     languages["QtScript"] = "qtscript";
     languages["Lua"] = "lua";
     languages["PHP"] = "php";