Index: /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc
===================================================================
--- /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 12174)
+++ /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 12175)
@@ -2443,4 +2443,15 @@
 
 
+void PrintUsage()
+{
+    cout << "\n"
+        "The FACT++ raw data viewer.\n"
+        "\n"
+        "Usage: viewer [OPTIONS] [datafile.fits[.gz] [calibration.drs.fits[.gz]]]\n"
+        "  or:  viewer [OPTIONS]\n";
+    cout << endl;
+
+}
+
 void PrintHelp()
 {
@@ -2471,7 +2482,13 @@
  * MAIN PROGRAM FUNCTION.
  ************************************************************/
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
+int main(int argc, const char *argv[])
+{
+    Configuration conf(argv[0]);
+    conf.SetPrintUsage(PrintUsage);
+    SetupConfiguration(conf);
+    if (!conf.DoParse(argc, argv, PrintHelp))
+        return -1;
+
+    QApplication app(argc, const_cast<char**>(argv));
 
     if (!QGLFormat::hasOpenGL()) {
@@ -2488,10 +2505,4 @@
 
     RawDataViewer *canvas = myUi.GLWindow;
-
-    Configuration conf(argv[0]);
-    conf.SetPrintUsage(PrintHelp);
-    SetupConfiguration(conf);
-    if (!conf.DoParse(argc, const_cast<const char**>(argv), PrintHelp))
-        return -1;
 
     if (conf.Has("color.range"))