Removed the term 'course' everywhere, and replaced it by 'template'. This reduced/simplified the Template class structure a bit.

1 files changed, 11 insertions, 10 deletions

diff --git a/client/pracro.cc b/client/pracro.cc
index 93c9429..6d9c574 100644
--- a/client/pracro.cc
+++ b/client/pracro.cc
@@ -38,7 +38,7 @@
 
 #define CPR_DEFAULT ""
 #define MACRO_DEFAULT ""
-#define COURSE_DEFAULT ""
+#define TEMPLATE_DEFAULT ""
 #define USER_DEFAULT "testuser"
 #define CONFIG_DEFAULT "pracro.ini"
 
@@ -58,11 +58,11 @@ static void print_usage()
   printf("  -m, --macro MACRO         Requests macro MACRO from the Pracro \n"
          "                            Server, defaults to \""MACRO_DEFAULT"\".\n");
   */
-  printf("  -c, --course COURSE       Requests course COURSE from the Pracro \n"
-         "                            Server, defaults to \""COURSE_DEFAULT"\".\n");
+  printf("  -t, --template TEMPLATE   Requests template TEMPLATE from the Pracro \n"
+         "                            Server, defaults to \""TEMPLATE_DEFAULT"\".\n");
   printf("  -C, --cpr CPR             Defines the cpr for use with the macro,\n"
          "                            defaults to \""CPR_DEFAULT"\".\n");
-  printf("  -C, --config FILE         The configfile to use. Default is \""CONFIG_DEFAULT"\"\n");
+  printf("  -c, --config FILE         The configfile to use. Default is \""CONFIG_DEFAULT"\"\n");
   printf("  -u, -U, --user USER       Defines the requesting user(not the patient),\n"
          "                            defaults to \""USER_DEFAULT"\"\n");
   //  printf("  -t, --test macro          Run client in testmode, i.e. run without contactig any\n"
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
   QApplication app(argc, argv);
 
   QString macro = MACRO_DEFAULT;
-  QString course = COURSE_DEFAULT;
+  QString templ = TEMPLATE_DEFAULT;
 
   QStringList args = app.arguments();
   QStringList::iterator arg = args.begin();
@@ -115,15 +115,16 @@ int main(int argc, char *argv[])
       macro = getParam(args, arg);
     }
     */
-    else if(*arg == "--course" ||
-            *arg == "-c") {
-      course = getParam(args, arg);
+    else if(*arg == "--template" ||
+            *arg == "-t") {
+      templ = getParam(args, arg);
     }
     else if(*arg == "--cpr" ||
             *arg == "-C") {
       cpr = getParam(args, arg); 
     }
-    else if(*arg == "--config") {
+    else if(*arg == "--config" ||
+            *arg == "-c") {
       config = getParam(args, arg); 
     }
     else {
@@ -146,7 +147,7 @@ int main(int argc, char *argv[])
   translator.load("pracro_dk");
   app.installTranslator(&translator);
 
-  MainWindow mainwindow(cpr, course, host, port, user);
+  MainWindow mainwindow(cpr, templ, host, port, user);
   mainwindow.show();
 
   int ret = app.exec();