Changeset 5079a0 for src

Timestamp:

May 18, 2010, 3:18:24 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

4eb4fe, e58856b

Parents:

2a5eb7

Message:

Actions put into libMolecuilderActions, UIElements into libMolecuilderUI

• due to great number of Actions it is sensible to put them into their own library
• this is advantageous overall, but right now especially as all the unit tests do not depend on this lib.
• it was also needed as Actions depend on UIElements and to resolve to correct ordering, UIElements have to be available before the libMolecuilderActions is aded (if compiled into libmolecuilder it is appended after!)

Location:

src

Files:

• Actions/Makefile.am (added)
• Makefile.am (modified) (12 diffs)
• UIElements/CommandLineUI/CommandLineDialog.cpp (moved) (moved from src/UIElements/CommandLineDialog.cpp ) (1 diff)
• UIElements/CommandLineUI/CommandLineDialog.hpp (moved) (moved from src/UIElements/CommandLineDialog.hpp ) (1 diff)
• UIElements/CommandLineUI/CommandLineStatusIndicator.cpp (moved) (moved from src/UIElements/CommandLineStatusIndicator.cpp ) (1 diff)
• UIElements/CommandLineUI/CommandLineStatusIndicator.hpp (moved) (moved from src/UIElements/CommandLineStatusIndicator.hpp )
• UIElements/CommandLineUI/CommandLineUIFactory.cpp (moved) (moved from src/UIElements/CommandLineUIFactory.cpp ) (1 diff)
• UIElements/CommandLineUI/CommandLineUIFactory.hpp (moved) (moved from src/UIElements/CommandLineUIFactory.hpp ) (1 diff)
• UIElements/CommandLineUI/CommandLineWindow.cpp (moved) (moved from src/UIElements/CommandLineWindow.cpp ) (1 diff)
• UIElements/CommandLineUI/CommandLineWindow.hpp (moved) (moved from src/UIElements/CommandLineWindow.hpp ) (1 diff)
• UIElements/Dialog.cpp (modified) (1 diff)
• UIElements/MainWindow.cpp (modified) (1 diff)
• UIElements/Makefile.am (added)
• UIElements/Menu/ActionMenuItem.cpp (moved) (moved from src/Menu/ActionMenuItem.cpp )
• UIElements/Menu/ActionMenuItem.hpp (moved) (moved from src/Menu/ActionMenuItem.hpp )
• UIElements/Menu/DisplayMenuItem.cpp (moved) (moved from src/Menu/DisplayMenuItem.cpp )
• UIElements/Menu/DisplayMenuItem.hpp (moved) (moved from src/Menu/DisplayMenuItem.hpp )
• UIElements/Menu/Menu.cpp (moved) (moved from src/Menu/Menu.cpp )
• UIElements/Menu/Menu.hpp (moved) (moved from src/Menu/Menu.hpp )
• UIElements/Menu/MenuItem.cpp (moved) (moved from src/Menu/MenuItem.cpp )
• UIElements/Menu/MenuItem.hpp (moved) (moved from src/Menu/MenuItem.hpp )
• UIElements/Menu/SeperatorItem.cpp (moved) (moved from src/Menu/SeperatorItem.cpp )
• UIElements/Menu/SeperatorItem.hpp (moved) (moved from src/Menu/SeperatorItem.hpp )
• UIElements/Menu/SubMenuItem.cpp (moved) (moved from src/Menu/SubMenuItem.cpp )
• UIElements/Menu/SubMenuItem.hpp (moved) (moved from src/Menu/SubMenuItem.hpp )
• UIElements/Menu/TextMenu.cpp (moved) (moved from src/Menu/TextMenu.cpp )
• UIElements/Menu/TextMenu.hpp (moved) (moved from src/Menu/TextMenu.hpp )
• UIElements/TextUI/TextDialog.cpp (moved) (moved from src/UIElements/TextDialog.cpp ) (1 diff)
• UIElements/TextUI/TextDialog.hpp (moved) (moved from src/UIElements/TextDialog.hpp ) (1 diff)
• UIElements/TextUI/TextStatusIndicator.cpp (moved) (moved from src/UIElements/TextStatusIndicator.cpp ) (1 diff)
• UIElements/TextUI/TextStatusIndicator.hpp (moved) (moved from src/UIElements/TextStatusIndicator.hpp )
• UIElements/TextUI/TextUIFactory.cpp (moved) (moved from src/UIElements/TextUIFactory.cpp ) (1 diff)
• UIElements/TextUI/TextUIFactory.hpp (moved) (moved from src/UIElements/TextUIFactory.hpp ) (1 diff)
• UIElements/TextUI/TextWindow.cpp (moved) (moved from src/UIElements/TextWindow.cpp ) (3 diffs)
• UIElements/TextUI/TextWindow.hpp (moved) (moved from src/UIElements/TextWindow.hpp ) (1 diff)
• UIElements/UIFactory.cpp (modified) (1 diff)
• UIElements/Views/MethodStringView.cpp (moved) (moved from src/Views/MethodStringView.cpp )
• UIElements/Views/MethodStringView.hpp (moved) (moved from src/Views/MethodStringView.hpp )
• UIElements/Views/StreamStringView.cpp (moved) (moved from src/Views/StreamStringView.cpp )
• UIElements/Views/StreamStringView.hpp (moved) (moved from src/Views/StreamStringView.hpp )
• UIElements/Views/StringView.cpp (moved) (moved from src/Views/StringView.cpp )
• UIElements/Views/StringView.hpp (moved) (moved from src/Views/StringView.hpp )
• UIElements/Views/View.cpp (moved) (moved from src/Views/View.cpp )
• UIElements/Views/View.hpp (moved) (moved from src/Views/View.hpp )

src/Makefile.am ¶

@@ -1 +1 @@
 # PLEASE adhere to the alphabetical ordering in this Makefile!
 # Also indentation by a single tab
+
+SUBDIRS = Actions UIElements
 
 # this includes source files that need to be present at multiple points
@@ -49 +51 @@
   analysis_correlation.hpp
 
-ACTIONSSOURCE = Actions/Action.cpp \
-  ${ANALYSISACTIONSOURCE} \
-  ${ATOMACTIONSOURCE} \
-  ${CMDACTIONSOURCE} \
-  ${FRAGMENTATIONACTIONSOURCE} \
-  ${MOLECULEACTIONSOURCE} \
-  ${PARSERACTIONSOURCE} \
-  ${TESSELATIONACTIONSOURCE} \
-  ${WORLDACTIONSOURCE} \
+ACTIONSSOURCE = \
+  Actions/Action.cpp \
   Actions/ActionHistory.cpp \
   Actions/ActionRegistry.cpp \
@@ -64 +59 @@
   Actions/MakroAction.cpp \
   Actions/ManipulateAtomsProcess.cpp \
-  Actions/MapOfActions.cpp \
   Actions/MethodAction.cpp \
   Actions/Process.cpp
 
-ACTIONSHEADER = Actions/Action.hpp \
+ACTIONSHEADER = \
   ${ANALYSISACTIONHEADER} \
   ${ATOMACTIONHEADER} \
@@ -77 +71 @@
   ${TESSELATIONACTIONHEADER} \
   ${WORLDACTIONHEADER} \
+  Actions/Action.hpp \
   Actions/ActionHistory.hpp \
   Actions/ActionRegistry.hpp \
@@ -89 +84 @@
   Actions/Process.hpp
   
-ANALYSISACTIONSOURCE = \
-  Actions/AnalysisAction/MolecularVolumeAction.cpp \
-  Actions/AnalysisAction/PairCorrelationAction.cpp \
-  Actions/AnalysisAction/PairCorrelationToPointAction.cpp \
-  Actions/AnalysisAction/PairCorrelationToSurfaceAction.cpp \
-  Actions/AnalysisAction/PrincipalAxisSystemAction.cpp
-ANALYSISACTIONHEADER = \
-  Actions/AnalysisAction/MolecularVolumeAction.hpp \
-  Actions/AnalysisAction/PairCorrelationAction.hpp \
-  Actions/AnalysisAction/PairCorrelationToPointAction.hpp \
-  Actions/AnalysisAction/PairCorrelationToSurfaceAction.hpp \
-  Actions/AnalysisAction/PrincipalAxisSystemAction.hpp
-
-ATOMACTIONSOURCE = \
-  Actions/AtomAction/AddAction.cpp \
-  Actions/AtomAction/ChangeElementAction.cpp \
-  Actions/AtomAction/RemoveAction.cpp
-ATOMACTIONHEADER = \
-  Actions/AtomAction/AddAction.hpp \
-  Actions/AtomAction/ChangeElementAction.hpp \
-  Actions/AtomAction/RemoveAction.cpp
-
-CMDACTIONSOURCE = \
-  Actions/CmdAction/BondLengthTableAction.cpp \
-  Actions/CmdAction/ElementDbAction.cpp \
-  Actions/CmdAction/FastParsingAction.cpp \
-  Actions/CmdAction/HelpAction.cpp \
-  Actions/CmdAction/VerboseAction.cpp \
-  Actions/CmdAction/VersionAction.cpp
-CMDACTIONHEADER = \
-  Actions/CmdAction/BondLengthTableAction.hpp \
-  Actions/CmdAction/ElementDbAction.hpp \
-  Actions/CmdAction/FastParsingAction.hpp \
-  Actions/CmdAction/HelpAction.hpp \
-  Actions/CmdAction/VerboseAction.hpp \
-  Actions/CmdAction/VersionAction.hpp
-
-FRAGMENTATIONACTIONSOURCE = \
-  Actions/FragmentationAction/DepthFirstSearchAction.cpp \
-  Actions/FragmentationAction/FragmentationAction.cpp \
-  Actions/FragmentationAction/SubgraphDissectionAction.cpp               
-FRAGMENTATIONACTIONHEADER = \
-  Actions/FragmentationAction/DepthFirstSearchAction.hpp \
-  Actions/FragmentationAction/FragmentationAction.hpp \
-  Actions/FragmentationAction/SubgraphDissectionAction.hpp
-
-MOLECULEACTIONSOURCE = \
-  Actions/MoleculeAction/BondFileAction.cpp \
-  Actions/MoleculeAction/ChangeNameAction.cpp \
-  Actions/MoleculeAction/FillWithMoleculeAction.cpp \
-  Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp \
-  Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp \
-  Actions/MoleculeAction/SaveAdjacencyAction.cpp \
-  Actions/MoleculeAction/SaveBondsAction.cpp \
-  Actions/MoleculeAction/SaveTemperatureAction.cpp \
-  Actions/MoleculeAction/SuspendInWaterAction.cpp \
-  Actions/MoleculeAction/TranslateAction.cpp \
-  Actions/MoleculeAction/VerletIntegrationAction.cpp
-MOLECULEACTIONHEADER = \
-  Actions/MoleculeAction/BondFileAction.hpp \
-  Actions/MoleculeAction/ChangeNameAction.hpp \
-  Actions/MoleculeAction/FillWithMoleculeAction.hpp \
-  Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp \
-  Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.hpp \
-  Actions/MoleculeAction/SaveAdjacencyAction.hpp \
-  Actions/MoleculeAction/SaveBondsAction.hpp \
-  Actions/MoleculeAction/SaveTemperatureAction.hpp \
-  Actions/MoleculeAction/SuspendInWaterAction.hpp \
-  Actions/MoleculeAction/TranslateAction.hpp \
-  Actions/MoleculeAction/VerletIntegrationAction.hpp
-                 
-PARSERACTIONSOURCE = \
-  Actions/ParserAction/LoadXyzAction.cpp \
-  Actions/ParserAction/SaveXyzAction.cpp       
-PARSERACTIONHEADER = \
-  Actions/ParserAction/LoadXyzAction.hpp \
-  Actions/ParserAction/SaveXyzAction.hpp
-
-TESSELATIONACTIONSOURCE = \
-  Actions/TesselationAction/ConvexEnvelopeAction.cpp \
-  Actions/TesselationAction/NonConvexEnvelopeAction.cpp               
-TESSELATIONACTIONHEADER = \
-  Actions/TesselationAction/ConvexEnvelopeAction.hpp \
-  Actions/TesselationAction/NonConvexEnvelopeAction.hpp
-
-WORLDACTIONSOURCE = \
-  Actions/WorldAction/AddEmptyBoundaryAction.cpp \
-  Actions/WorldAction/BoundInBoxAction.cpp \
-  Actions/WorldAction/CenterInBoxAction.cpp \
-  Actions/WorldAction/CenterOnEdgeAction.cpp \
-  Actions/WorldAction/ChangeBoxAction.cpp \
-  Actions/WorldAction/RemoveSphereOfAtomsAction.cpp \
-  Actions/WorldAction/RepeatBoxAction.cpp \
-  Actions/WorldAction/ScaleBoxAction.cpp \
-  Actions/WorldAction/SetDefaultNameAction.cpp \
-  Actions/WorldAction/SetGaussianBasisAction.cpp               
-WORLDACTIONHEADER = \
-  Actions/WorldAction/AddEmptyBoundaryAction.hpp \
-  Actions/WorldAction/BoundInBoxAction.hpp \
-  Actions/WorldAction/CenterInBoxAction.hpp \
-  Actions/WorldAction/CenterOnEdgeAction.hpp \
-  Actions/WorldAction/ChangeBoxAction.hpp \
-  Actions/WorldAction/RemoveSphereOfAtomsAction.hpp \
-  Actions/WorldAction/RepeatBoxAction.hpp \
-  Actions/WorldAction/ScaleBoxAction.hpp \
-  Actions/WorldAction/SetDefaultNameAction.hpp \
-  Actions/WorldAction/SetGaussianBasisAction.hpp
-
-
 
 PARSERSOURCE = \
@@ -216 +102 @@
   Patterns/Observer.hpp \
   Patterns/Singleton.hpp
-
-# Below is all for the User Interface
-
-VIEWSOURCE = \
-  Views/View.cpp \
-  Views/StringView.cpp \
-  Views/MethodStringView.cpp \
-  Views/StreamStringView.cpp
-VIEWHEADER = \
-  Views/View.hpp \
-  Views/StringView.hpp \
-  Views/MethodStringView.hpp \
-  Views/StreamStringView.hpp
-
-MENUSOURCE = \
-  Menu/Menu.cpp \
-  Menu/TextMenu.cpp \
-  Menu/MenuItem.cpp \
-  Menu/SubMenuItem.cpp \
-  Menu/ActionMenuItem.cpp \
-  Menu/SeperatorItem.cpp \
-  Menu/DisplayMenuItem.cpp
-  
-MENUHEADER = \
-  Menu/Menu.hpp \
-  Menu/TextMenu.hpp \
-  Menu/MenuItem.hpp \
-  Menu/SubMenuItem.hpp \
-  Menu/ActionMenuItem.hpp \
-  Menu/SeperatorItem.hpp \
-  Menu/DisplayMenuItem.hpp
-
-UISOURCE = \
-  ${ACTIONSSOURCE} \
-  ${COMMANDLINEUISOURCE} \
-  ${MENUSOURCE} \
-  ${TEXTUISOURCE} \
-  ${VIEWSOURCE} \
-  UIElements/Dialog.cpp \
-  UIElements/MainWindow.cpp \
-  UIElements/UIFactory.cpp
-  
-UIHEADER = \
-  ${ACTIONSHEADER} \
-  ${COMMANDLINEUIHEADER} \
-  ${MENUHEADER} \
-  ${TEXTUIHEADER} \
-  ${VIEWHEADER} \
-  UIElements/Dialog.hpp \
-  UIElements/MainWindow.hpp \
-  UIElements/UIFactory.hpp
-
-TEXTUISOURCE = \
-  UIElements/TextDialog.cpp \
-  UIElements/TextStatusIndicator.cpp \
-  UIElements/TextUIFactory.cpp \
-  UIElements/TextWindow.cpp
-TEXTUIHEADER = \
-  UIElements/TextDialog.hpp \
-  UIElements/TextStatusIndicator.hpp \
-  UIElements/TextUIFactory.hpp \
-  UIElements/TextWindow.hpp
-
-COMMANDLINEUISOURCE = \
-  UIElements/CommandLineDialog.cpp \
-  UIElements/CommandLineStatusIndicator.cpp \
-  UIElements/CommandLineUIFactory.cpp \
-  UIElements/CommandLineWindow.cpp
-COMMANDLINEUIHEADER = \
-  UIElements/CommandLineDialog.hpp \
-  UIElements/CommandLineStatusIndicator.hpp \
-  UIElements/CommandLineUIFactory.hpp \
-  UIElements/CommandLineWindow.hpp
 
 # all these files are only used for legacy reasons while the transition is in progress
@@ -321 +134 @@
 SOURCE = \
   ${ANALYSISSOURCE} \
+  ${ACTIONSSOURCE} \
   ${ATOMSOURCE} \
   ${PATTERNSOURCE} \
   ${PARSERSOURCE} \
-  ${UISOURCE} \
   ${DESCRIPTORSOURCE} \
   ${HELPERSOURCE} \
@@ -335 +148 @@
   config.cpp \
   element.cpp \
+  elements_db.cpp \
   ellipsoid.cpp \
   errorlogger.cpp \
@@ -366 +180 @@
 HEADER = \
   ${ANALYSISHEADER} \
+  ${ACTIONSHEADER} \
   ${ATOMHEADER} \
   ${PARSERHEADER} \
   ${PATTERNHEADER} \
-  ${UIHEADER} \
   ${DESCRIPTORHEADER} \
   ${EXCEPTIONHEADER} \
@@ -380 +194 @@
   defs.hpp \
   element.hpp \
+  elements_db.hpp \
   ellipsoid.hpp \
   errorlogger.hpp \
@@ -407 +222 @@
 
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)
-INCLUDES = -I$(top_srcdir)/src/unittests
+INCLUDES = -I$(top_srcdir)/src/unittests -I$(top_srcdir)/src/Actions -I$(top_srcdir)/src/UIElements
 
 noinst_LIBRARIES = libmolecuilder.a libgslwrapper.a
@@ -414 +229 @@
 libmolecuilder_a_SOURCES = ${SOURCE} ${HEADER}
 libgslwrapper_a_SOURCES = ${LINALGSOURCE} ${LINALGHEADER}
-molecuilder_DATA = elements.db valence.db orbitals.db Hbonddistance.db Hbondangle.db
 molecuilder_LDFLAGS = $(BOOST_LDFLAGS)
 molecuilder_SOURCES = builder.cpp
-molecuilder_LDADD = libmolecuilder.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB}
+molecuilder_LDADD =  UIElements/libMolecuilderUI.a Actions/libMolecuilderActions.a libmolecuilder.a libgslwrapper.a $(BOOST_LIB) ${BOOST_THREAD_LIB} ${BOOST_PROGRAM_OPTIONS_LIB} 
 joiner_SOURCES = joiner.cpp datacreator.cpp parser.cpp datacreator.hpp helpers.hpp parser.hpp periodentafel.hpp
 joiner_LDADD = libmolecuilder.a $(BOOST_LIB) ${BOOST_THREAD_LIB}

src/UIElements/CommandLineUI/CommandLineDialog.cpp ¶

@@ -14 +14 @@
 #include <Descriptors/MoleculeDescriptor.hpp>
 #include <Descriptors/MoleculeIdDescriptor.hpp>
-#include "UIElements/CommandLineDialog.hpp"
+#include "CommandLineUI/CommandLineDialog.hpp"
 
 #include "element.hpp"

src/UIElements/CommandLineUI/CommandLineDialog.hpp ¶

@@ -16 +16 @@
 class Vector;
 
-#include "UIElements/Dialog.hpp"
+#include "Dialog.hpp"
 
 /** CommandLineUIFactory implementation of the Dialog.

src/UIElements/CommandLineUI/CommandLineStatusIndicator.cpp ¶

@@ -7 +7 @@
 
 
-#include "CommandLineStatusIndicator.hpp"
+#include "CommandLineUI/CommandLineStatusIndicator.hpp"
 
 #include <iostream>

src/UIElements/CommandLineUI/CommandLineUIFactory.cpp ¶

@@ -7 +7 @@
 
 
-#include "UIElements/CommandLineUIFactory.hpp"
-#include "UIElements/CommandLineWindow.hpp"
-#include "UIElements/CommandLineDialog.hpp"
+#include "CommandLineUI/CommandLineUIFactory.hpp"
+#include "CommandLineUI/CommandLineWindow.hpp"
+#include "CommandLineUI/CommandLineDialog.hpp"
 
 

src/UIElements/CommandLineUI/CommandLineUIFactory.hpp ¶

@@ -9 +9 @@
 #define COMMANDLINEUIFACTORY_HPP_
 
-#include "UIElements/UIFactory.hpp"
+#include "UIFactory.hpp"
 
 class CommandLineUIFactory : public UIFactory

src/UIElements/CommandLineUI/CommandLineWindow.cpp ¶

@@ -8 +8 @@
 #include <boost/bind.hpp>
 
-#include "UIElements/CommandLineWindow.hpp"
-#include "UIElements/CommandLineStatusIndicator.hpp"
+#include "CommandLineUI/CommandLineWindow.hpp"
+#include "CommandLineUI/CommandLineStatusIndicator.hpp"
 
 #include "Actions/ActionRegistry.hpp"

src/UIElements/CommandLineUI/CommandLineWindow.hpp ¶

@@ -9 +9 @@
 #define COMMANDLINEWINDOW_HPP_
 
-#include "UIElements/MainWindow.hpp"
+#include "MainWindow.hpp"
 
 class CommandLineStatusIndicator;

src/UIElements/Dialog.cpp ¶

@@ -8 +8 @@
 #include <cassert>
 
-#include "UIElements/Dialog.hpp"
+#include "Dialog.hpp"
 
 #include "atom.hpp"

src/UIElements/MainWindow.cpp ¶

@@ -6 +6 @@
  */
 
-#include "UIElements/MainWindow.hpp"
+#include "MainWindow.hpp"
 
 MainWindow::MainWindow()

src/UIElements/TextUI/TextDialog.cpp ¶

@@ -12 +12 @@
 #include <Descriptors/MoleculeDescriptor.hpp>
 #include <Descriptors/MoleculeIdDescriptor.hpp>
-#include "UIElements/TextDialog.hpp"
+#include "TextUI/TextDialog.hpp"
 
 #include "World.hpp"

src/UIElements/TextUI/TextDialog.hpp ¶

@@ -11 +11 @@
 #include <string>
 
-#include "UIElements/Dialog.hpp"
+#include "Dialog.hpp"
 
 class atom;

src/UIElements/TextUI/TextStatusIndicator.cpp ¶

@@ -6 +6 @@
  */
 
-#include "TextStatusIndicator.hpp"
+#include "TextUI/TextStatusIndicator.hpp"
 
 #include <iostream>

src/UIElements/TextUI/TextUIFactory.cpp ¶

@@ -6 +6 @@
  */
 
-#include "UIElements/TextUIFactory.hpp"
-#include "UIElements/TextWindow.hpp"
-#include "UIElements/TextDialog.hpp"
+#include "TextUI/TextUIFactory.hpp"
+#include "TextUI/TextWindow.hpp"
+#include "TextUI/TextDialog.hpp"
 
 

src/UIElements/TextUI/TextUIFactory.hpp ¶

@@ -9 +9 @@
 #define TEXTUIFACTORY_HPP_
 
-#include "UIElements/UIFactory.hpp"
+#include "UIFactory.hpp"
 
 class TextUIFactory : public UIFactory

src/UIElements/TextUI/TextWindow.cpp ¶

@@ -6 +6 @@
  */
 
-#include "UIElements/TextWindow.hpp"
+#include "TextUI/TextWindow.hpp"
 
 #include <boost/bind.hpp>
@@ -24 +24 @@
 #include "linkedcell.hpp"
 #include "log.hpp"
-#include "memoryusageobserverunittest.hpp"
+#include "memoryusageobserver.hpp"
 #include "molecule.hpp"
 #include "periodentafel.hpp"
@@ -37 +37 @@
 #include "Menu/DisplayMenuItem.hpp"
 #include "Menu/SubMenuItem.hpp"
-#include "UIElements/TextStatusIndicator.hpp"
+#include "TextUI/TextStatusIndicator.hpp"
 #include "Actions/MethodAction.hpp"
 #include "Actions/MoleculeAction/ChangeNameAction.hpp"

src/UIElements/TextUI/TextWindow.hpp ¶

@@ -9 +9 @@
 #define TEXTWINDOW_HPP_
 
-#include "UIElements/MainWindow.hpp"
+#include "MainWindow.hpp"
 
 class TextMenu;

src/UIElements/UIFactory.cpp ¶

@@ -9 +9 @@
 #include <cassert>
 #include "Patterns/Singleton_impl.hpp"
-#include "UIElements/UIFactory.hpp"
+#include "UIFactory.hpp"
 
 // all factories that can be used:
-#include "UIElements/TextUIFactory.hpp"
-#include "UIElements/CommandLineUIFactory.hpp"
+#include "TextUI/TextUIFactory.hpp"
+#include "CommandLineUI/CommandLineUIFactory.hpp"
 
 UIFactory::UIFactory()