1 files changed, 10 insertions, 15 deletions

diff --git a/client/pracro.cc b/client/pracro.cc
index d281347..57a8da7 100644
--- a/client/pracro.cc
+++ b/client/pracro.cc
@@ -41,19 +41,15 @@
 
 #include "debug.h"
 
-#define CPR_DEFAULT ""
-#define MACRO_DEFAULT ""
-#define TEMPLATE_DEFAULT ""
 #define USER_DEFAULT "testuser"
 #define CONFIG_DEFAULT "pracro.ini"
 
-QString cpr = CPR_DEFAULT;
+QString cpr;
 QString user = USER_DEFAULT;
 QString config = CONFIG_DEFAULT;
 QString host;
 quint16 port;
 
-QWidget *viewer = NULL;
 QFont *fixedfont = NULL;
 
 #ifndef TESTING
@@ -65,10 +61,9 @@ static void print_usage()
   printf("\n");
   printf("  -h, --help                Displays this help text.\n");
   printf("  -t, --template TEMPLATE   Requests template TEMPLATE from the Pracro \n"
-         "                            Server, defaults to \""TEMPLATE_DEFAULT"\".\n");
+         "                            Server.\n");
   printf("  -C  --course COURSE       Lists templates in COURSE.\n");
-  printf("  -P, --patient PATIENTID   Defines the patientid for use with the macro,\n"
-         "                            defaults to \""CPR_DEFAULT"\".\n");
+  printf("  -P, --patient PATIENTID   Defines the patientid for use with the macro.\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");
@@ -96,8 +91,8 @@ int main(int argc, char *argv[])
 {
   QApplication app(argc, argv);
 
-  QString macro = MACRO_DEFAULT;
-  QString templ = TEMPLATE_DEFAULT;
+  QString macro;
+  QString templ;
   QString course;
   QString templs;
 
@@ -168,7 +163,8 @@ int main(int argc, char *argv[])
   QFont f = fontdb.font("Bitstream Vera Sans Mono", "", 8);
   fixedfont = &f;
 
-  if(cpr == CPR_DEFAULT || templ == TEMPLATE_DEFAULT) {
+  /*
+  if(cpr == "" || templ == "") {
     LauncherWindow lwnd(argv[0], cpr, templ);
     if(lwnd.exec() == QDialog::Accepted && lwnd.getCpr() != "") {
       cpr = lwnd.getCpr();
@@ -177,13 +173,12 @@ int main(int argc, char *argv[])
       return 1;
     }
   }
-  
-  MainWindow mainwindow(cpr, templ, host, port, user);
+  */
+
+  MainWindow mainwindow(cpr, course, templ, host, port, user);
   mainwindow.show();
 
   return app.exec();
 }
 
-
-
 #endif/*TESTING*/