Update headers, fix style for some py files

[alexxy/gromacs.git] / src / python / sip / trajectoryanalysis / analysismodule.sip

diff --git a/src/python/sip/trajectoryanalysis/analysismodule.sip b/src/python/sip/trajectoryanalysis/analysismodule.sip
index a10caffaceb03d511e8cb6015c8fdcbfb1a649b4..cd5c65628d586318e104bfd68010ba3c260ad501 100644 (file)
--- a/src/python/sip/trajectoryanalysis/analysismodule.sip
+++ b/src/python/sip/trajectoryanalysis/analysismodule.sip
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014, by the GROMACS development team, led by
+ * Copyright (c) 2014,2015, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -164,8 +164,8 @@ class TrajectoryAnalysisModule /VirtualErrorHandler=vehandler/ {
 using namespace gmx;
 %End
 public:
-    virtual void initOptions(Options *options, TrajectoryAnalysisSettings *settings) = 0;
-    virtual void optionsFinished(Options *options, TrajectoryAnalysisSettings *settings);
+    virtual void initOptions(IOptionsContainer *options, TrajectoryAnalysisSettings *settings) = 0;
+    virtual void optionsFinished(TrajectoryAnalysisSettings *settings);
     virtual void initAnalysis(const TrajectoryAnalysisSettings &settings, const TopologyInformation &top) = 0;
     virtual void initAfterFirstFrame(const TrajectoryAnalysisSettings &settings, const t_trxframe &fr);
 //    virtual TrajectoryAnalysisModuleDataPointer      startFrames (const AnalysisDataParallelOptions &opt, const SelectionCollection &selections);