Changeset 6a661c

Timestamp:

Feb 26, 2010, 2:52:16 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

e6a9c1

Parents:

2561df

Message:

FIX: Some QT-Related memory leaks

Location:

src

Files:

• UIElements/QT4/QTMainWindow.cpp (modified) (1 diff)
• UIElements/QT4/QTUIFactory.cpp (modified) (2 diffs)
• UIElements/QT4/QTUIFactory.hpp (modified) (1 diff)
• builder.cpp (modified) (3 diffs)

src/UIElements/QT4/QTMainWindow.cpp

@@ -53 +53 @@
 
 QTMainWindow::~QTMainWindow()
-{
-  // TODO Auto-generated destructor stub
-}
+{}
 
 void QTMainWindow::display() {

src/UIElements/QT4/QTUIFactory.cpp

@@ -16 +16 @@
 #include "UIElements/QT4/QTMainWindow.hpp"
 #include "UIElements/QT4/QTDialog.hpp"
+#include "version.h"
 #include "defs.hpp"
 
 QTUIFactory::QTUIFactory()
 {
-  // TODO Auto-generated constructor stub
-
+  // For now we just fake the command line parameters to make QT happy
+  argc=1;
+  argv = new char*[1];
+  argv[0] = new char[256];
+  strcpy(argv[0],ESPACKVersion);
+  app = new QApplication(argc,argv);
 }
 
 QTUIFactory::~QTUIFactory()
 {
-  // TODO Auto-generated destructor stub
+  delete app;
+  delete [] argv[0];
+  delete [] argv;
 }
 
@@ -34 +41 @@
 
 MainWindow* QTUIFactory::makeMainWindow(menuPopulaters populaters,MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName) {
-  // For now we just fake the command line parameters to make QT happy
-  int argc=1;
-  char **argv;
-  argv = new char*[1];
-  argv[0] = new char[64];
-  strcpy(argv[0],MOLECUILDER_NAME);
-  app = new QApplication(argc,argv);
   return new QTMainWindow(populaters,molecules,configuration,periode,ConfigFileName,app);
 }

src/UIElements/QT4/QTUIFactory.hpp

@@ -27 +27 @@
 
 private:
+  // faked command line arguments
+  int argc;
+  char **argv;
   QApplication *app;
 };

src/builder.cpp

@@ -2206 +2206 @@
         mol = World::get()->createMolecule();
         World::get()->getMolecules()->insert(mol);
-        cout << "Molecule created" << endl;
         if(mol->cell_size[0] == 0.){
             Log() << Verbose(0) << "enter lower tridiagonal form of basis matrix" << endl << endl;
@@ -2218 +2217 @@
 
     {
-      cout << ESPACKVersion << endl;
-
       setVerbosity(0);
 
@@ -2228 +2225 @@
       UIFactory::makeUserInterface(UIFactory::QT4);
 #else
+      cout << ESPACKVersion << endl;
       UIFactory::makeUserInterface(UIFactory::Text);
 #endif