From 5de1ed130677d0755f4c8b8cfc4a740b42d973fb Mon Sep 17 00:00:00 2001
From: Gabriel Studer <gabriel.studer@unibas.ch>
Date: Thu, 7 May 2015 11:28:12 +0200
Subject: [PATCH] resolve some header mess
---
modules/mol/mm/src/heuristic_block_modifiers.cc | 1 -
modules/mol/mm/src/modeller.hh | 3 +--
modules/mol/mm/src/observer.hh | 2 +-
modules/mol/mm/src/topology_creator.cc | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/modules/mol/mm/src/heuristic_block_modifiers.cc b/modules/mol/mm/src/heuristic_block_modifiers.cc
index 3e21681bd..09734d1dc 100644
--- a/modules/mol/mm/src/heuristic_block_modifiers.cc
+++ b/modules/mol/mm/src/heuristic_block_modifiers.cc
@@ -18,7 +18,6 @@
//------------------------------------------------------------------------------
#include <ost/mol/mm/heuristic_block_modifiers.hh>
-#include <ost/mol/mm/mm_interaction.hh>
#include <ost/geom/geom.hh>
#include <math.h>
diff --git a/modules/mol/mm/src/modeller.hh b/modules/mol/mm/src/modeller.hh
index da2b721ed..2ec09e194 100644
--- a/modules/mol/mm/src/modeller.hh
+++ b/modules/mol/mm/src/modeller.hh
@@ -35,11 +35,10 @@
#include <ost/mol/xcs_editor.hh>
#include <ost/mol/bond_handle.hh>
#include <ost/message.hh>
-//#include <ost/mol/mm/gromacs_data.hh>
#include <ost/mol/bounding_box.hh>
#include <ost/mol/mm/buildingblock.hh>
#include <ost/mol/mm/forcefield.hh>
-#include <ost/mol/mm/mm_settings.hh>
+#include <ost/mol/mm/settings.hh>
#include <ost/mol/mm/index.hh>
#include <ost/mol/mm/topology.hh>
#include <ost/conop/heuristic.hh>
diff --git a/modules/mol/mm/src/observer.hh b/modules/mol/mm/src/observer.hh
index aa88d20ae..d36229a9c 100644
--- a/modules/mol/mm/src/observer.hh
+++ b/modules/mol/mm/src/observer.hh
@@ -30,7 +30,7 @@
#include <ost/mol/coord_group.hh>
#include <ost/mol/mm/state_extractor.hh>
#include <ost/mol/mm/topology.hh>
-#include <ost/mol/mm/mm_modeller.hh>
+#include <ost/mol/mm/modeller.hh>
namespace OpenMM{
class Context; //hacky way of telling the Context is around.
diff --git a/modules/mol/mm/src/topology_creator.cc b/modules/mol/mm/src/topology_creator.cc
index 3a461dd56..bb1c418f6 100644
--- a/modules/mol/mm/src/topology_creator.cc
+++ b/modules/mol/mm/src/topology_creator.cc
@@ -18,7 +18,7 @@
//------------------------------------------------------------------------------
#include <ost/mol/mm/topology_creator.hh>
-#include <ost/mol/mm/mm_modeller.hh>
+#include <ost/mol/mm/modeller.hh>
namespace{
--
GitLab