Index: /trunk/FACT++/src/Configuration.cc
===================================================================
--- /trunk/FACT++/src/Configuration.cc	(revision 10371)
+++ /trunk/FACT++/src/Configuration.cc	(revision 10372)
@@ -258,5 +258,8 @@
  - An example can be found in \ref argv.cc
 
-@todo Maybe we should remove the necessity to propagate argv[0] in the constructor?
+@todo
+
+ - Maybe we should remove the necessity to propagate argv[0] in the constructor?
+ - Add an option to the constructor to switch of database/file access
 
 */
@@ -776,5 +779,5 @@
 //!    - proper handling and error messages if files not available
 //
-const po::variables_map &Configuration::Parse(int argc, char **argv)
+const po::variables_map &Configuration::Parse(int argc, const char **argv)
 {
     const po::positional_options_description &opt_positional = fArgumentPositions;
@@ -803,5 +806,5 @@
     // ------------------------ (2) --------------------------
 
-    po::command_line_parser parser(argc, argv);
+    po::command_line_parser parser(argc, const_cast<char**>(argv));
     parser.options(opt_commandline);
     parser.positional(opt_positional);
Index: /trunk/FACT++/src/Configuration.h
===================================================================
--- /trunk/FACT++/src/Configuration.h	(revision 10371)
+++ /trunk/FACT++/src/Configuration.h	(revision 10372)
@@ -100,5 +100,5 @@
 
     // Process command line arguments
-    const po::variables_map &Parse(int argc, char **argv);
+    const po::variables_map &Parse(int argc, const char **argv);
 
     bool HasVersion() const
Index: /trunk/FACT++/src/argv.cc
===================================================================
--- /trunk/FACT++/src/argv.cc	(revision 10371)
+++ /trunk/FACT++/src/argv.cc	(revision 10372)
@@ -135,5 +135,5 @@
 
 
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
     int opt;
Index: /trunk/FACT++/src/dclient5.cc
===================================================================
--- /trunk/FACT++/src/dclient5.cc	(revision 10371)
+++ /trunk/FACT++/src/dclient5.cc	(revision 10372)
@@ -598,5 +598,5 @@
 }
 
-int main(int argc, char* argv[])
+int main(int argc, const char* argv[])
 {
     Configuration conf(argv[0]);
Index: /trunk/FACT++/src/test3.cc
===================================================================
--- /trunk/FACT++/src/test3.cc	(revision 10371)
+++ /trunk/FACT++/src/test3.cc	(revision 10372)
@@ -1,17 +1,10 @@
 #include <boost/regex.hpp>
 #include <boost/filesystem.hpp>
-#include <readline/readline.h>
 
-#include "tools.h"
-#include "Time.h"
-#include "StateMachineDim.h"
-#include "MessageDim.h"
 #include "Shell.h"
-#include "ServiceList.h"
 #include "Configuration.h"
+#include "RemoteControl.h"
 
 using namespace std;
-
-#include "RemoteControl.h"
 
 template <class T>
@@ -137,5 +130,5 @@
 }
 
-int main(int argc, char *argv[])
+int main(int argc, const char *argv[])
 {
     Configuration conf(argv[0]);