Ignore:
Timestamp:
Aug 27, 2012, 11:36:59 AM (13 years ago)
Author:
Michael Ankele <ankele@…>
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:
852ea3
Parents:
a55e6f
git-author:
Michael Ankele <ankele@…> (08/14/12 14:52:25)
git-committer:
Michael Ankele <ankele@…> (08/27/12 11:36:59)
Message:

combined Query super classes into template

Location:
src/UIElements/Qt4/Query
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/Qt4/Query/AtomQtQuery.cpp

    ra55e6f r1c55b8  
    3030
    3131QtDialog::AtomQtQuery::AtomQtQuery(Parameter<const atom *> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    32     Dialog::AtomQuery(_param, _title),
     32    Dialog::TQuery<const atom *>(_param, _title),
    3333    parent(_parent),
    3434    dialog(_dialog)

  • src/UIElements/Qt4/Query/AtomsQtQuery.cpp

    ra55e6f r1c55b8  
    2929
    3030QtDialog::AtomsQtQuery::AtomsQtQuery(Parameter<std::vector<const atom *> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    31     Dialog::AtomsQuery(_param, _title),
     31    Dialog::TQuery<std::vector<const atom *> >(_param, _title),
    3232    QtQueryList<const atom *>(_parent, _dialog, temp)
    3333{

  • src/UIElements/Qt4/Query/BooleanQtQuery.cpp

    ra55e6f r1c55b8  
    2828
    2929QtDialog::BooleanQtQuery::BooleanQtQuery(Parameter<bool> &_param, std::string _title, QBoxLayout *_parent, Dialog *_dialog) :
    30     Dialog::BooleanQuery(_param, _title),
     30    Dialog::TQuery<bool>(_param, _title),
    3131    parent(_parent),
    3232    dialog(_dialog)

  • src/UIElements/Qt4/Query/DoubleQtQuery.cpp

    ra55e6f r1c55b8  
    2828
    2929QtDialog::DoubleQtQuery::DoubleQtQuery(Parameter<double> &_param, std::string title,QBoxLayout *_parent,Dialog *_dialog) :
    30     Dialog::DoubleQuery(_param, title),
     30    Dialog::TQuery<double>(_param, title),
    3131    parent(_parent),
    3232    dialog(_dialog)

  • src/UIElements/Qt4/Query/DoublesQtQuery.cpp

    ra55e6f r1c55b8  
    2929
    3030QtDialog::DoublesQtQuery::DoublesQtQuery(Parameter<std::vector<double> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    31     Dialog::DoublesQuery(_param, _title),
     31    Dialog::TQuery<std::vector<double> >(_param, _title),
    3232    QtQueryList<double>(_parent, _dialog, temp)
    3333{

  • src/UIElements/Qt4/Query/ElementQtQuery.cpp

    ra55e6f r1c55b8  
    3131
    3232QtDialog::ElementQtQuery::ElementQtQuery(Parameter<const element *> &_param, std::string _title, QBoxLayout *_parent, Dialog *_dialog) :
    33     Dialog::ElementQuery(_param, _title),
     33    Dialog::TQuery<const element *>(_param, _title),
    3434    parent(_parent),
    3535    dialog(_dialog)

  • src/UIElements/Qt4/Query/ElementsQtQuery.cpp

    ra55e6f r1c55b8  
    3030
    3131QtDialog::ElementsQtQuery::ElementsQtQuery(Parameter<std::vector<const element *> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    32     Dialog::ElementsQuery(_param, _title),
     32    Dialog::TQuery<std::vector<const element *> >(_param, _title),
    3333    QtQueryList<const element *>(_parent, _dialog, temp)
    3434{

  • src/UIElements/Qt4/Query/FileQtQuery.cpp

    ra55e6f r1c55b8  
    3030
    3131QtDialog::FileQtQuery::FileQtQuery(Parameter<boost::filesystem::path> &_param, std::string _title, QBoxLayout *_parent, Dialog *_dialog) :
    32     Dialog::FileQuery(_param, _title),
     32    Dialog::TQuery<boost::filesystem::path>(_param, _title),
    3333    parent(_parent),
    3434    dialog(_dialog)

  • src/UIElements/Qt4/Query/FilesQtQuery.cpp

    ra55e6f r1c55b8  
    3030
    3131QtDialog::FilesQtQuery::FilesQtQuery(Parameter<std::vector<boost::filesystem::path> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    32     Dialog::FilesQuery(_param, _title),
     32    Dialog::TQuery<std::vector<boost::filesystem::path> >(_param, _title),
    3333    QtQueryList<boost::filesystem::path>(_parent, _dialog, temp)
    3434{

  • src/UIElements/Qt4/Query/IntQtQuery.cpp

    ra55e6f r1c55b8  
    2828
    2929QtDialog::IntQtQuery::IntQtQuery(Parameter<int> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    30     Dialog::IntQuery(_param, _title),
     30    Dialog::TQuery<int>(_param, _title),
    3131    parent(_parent),
    3232    dialog(_dialog)

  • src/UIElements/Qt4/Query/IntsQtQuery.cpp

    ra55e6f r1c55b8  
    2929
    3030QtDialog::IntsQtQuery::IntsQtQuery(Parameter<std::vector<int> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    31     Dialog::IntsQuery(_param, _title),
     31    Dialog::TQuery<std::vector<int> >(_param, _title),
    3232    QtQueryList<int>(_parent, _dialog, temp)
    3333{

  • src/UIElements/Qt4/Query/MoleculeQtQuery.cpp

    ra55e6f r1c55b8  
    3131
    3232QtDialog::MoleculeQtQuery::MoleculeQtQuery(Parameter<const molecule *> &_param, std::string _title, QBoxLayout *_parent,Dialog *_dialog) :
    33     Dialog::MoleculeQuery(_param, _title),
     33    Dialog::TQuery<const molecule *>(_param, _title),
    3434    parent(_parent),
    3535    dialog(_dialog)

  • src/UIElements/Qt4/Query/MoleculesQtQuery.cpp

    ra55e6f r1c55b8  
    2929
    3030QtDialog::MoleculesQtQuery::MoleculesQtQuery(Parameter<std::vector<const molecule *> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    31     Dialog::MoleculesQuery(_param, _title),
     31    Dialog::TQuery<std::vector<const molecule *> >(_param, _title),
    3232    QtQueryList<const molecule *>(_parent, _dialog, temp)
    3333{

  • src/UIElements/Qt4/Query/QtQuery.hpp

    ra55e6f r1c55b8  
    3535class QFileDialog;
    3636
    37 class QtDialog::AtomQtQuery : public QWidget, public Dialog::AtomQuery {
     37class QtDialog::AtomQtQuery : public QWidget, public Dialog::TQuery<const atom *> {
    3838  Q_OBJECT
    3939public:
    … …  
    5353};
    5454
    55 class QtDialog::AtomsQtQuery : public QWidget, public Dialog::AtomsQuery, public QtQueryList<const atom *> {
     55class QtDialog::AtomsQtQuery : public QWidget, public Dialog::TQuery<std::vector<const atom *> >, public QtQueryList<const atom *> {
    5656  Q_OBJECT
    5757public:
    … …  
    7171};
    7272
    73 class QtDialog::BooleanQtQuery : public QWidget, public Dialog::BooleanQuery {
     73class QtDialog::BooleanQtQuery : public QWidget, public Dialog::TQuery<bool> {
    7474  Q_OBJECT
    7575public:
    … …  
    8989};
    9090
    91 class QtDialog::RealSpaceMatrixQtQuery : public QWidget, public Dialog::RealSpaceMatrixQuery {
     91class QtDialog::RealSpaceMatrixQtQuery : public QWidget, public Dialog::TQuery<RealSpaceMatrix> {
    9292  Q_OBJECT
    9393public:
    … …  
    107107};
    108108
    109 class QtDialog::DoubleQtQuery : public QWidget, public Dialog::DoubleQuery {
     109class QtDialog::DoubleQtQuery : public QWidget, public Dialog::TQuery<double> {
    110110  Q_OBJECT
    111111public:
    … …  
    125125};
    126126
    127 class QtDialog::DoublesQtQuery : public QWidget, public Dialog::DoublesQuery, public QtQueryList<double> {
     127class QtDialog::DoublesQtQuery : public QWidget, public Dialog::TQuery<std::vector<double> >, public QtQueryList<double> {
    128128  Q_OBJECT
    129129public:
    … …  
    143143};
    144144
    145 class QtDialog::ElementQtQuery : public QWidget, public Dialog::ElementQuery {
     145class QtDialog::ElementQtQuery : public QWidget, public Dialog::TQuery<const element *> {
    146146  Q_OBJECT
    147147public:
    … …  
    161161};
    162162
    163 class QtDialog::ElementsQtQuery : public QWidget, public Dialog::ElementsQuery, public QtQueryList<const element *> {
     163class QtDialog::ElementsQtQuery : public QWidget, public Dialog::TQuery<std::vector<const element *> >, public QtQueryList<const element *> {
    164164  Q_OBJECT
    165165public:
    … …  
    191191};
    192192
    193 class QtDialog::FileQtQuery : public QWidget, public Dialog::FileQuery {
     193class QtDialog::FileQtQuery : public QWidget, public Dialog::TQuery<boost::filesystem::path> {
    194194  Q_OBJECT
    195195public:
    … …  
    212212};
    213213
    214 class QtDialog::FilesQtQuery : public QWidget, public Dialog::FilesQuery, public QtQueryList<boost::filesystem::path> {
     214class QtDialog::FilesQtQuery : public QWidget, public Dialog::TQuery<std::vector<boost::filesystem::path> >, public QtQueryList<boost::filesystem::path> {
    215215  Q_OBJECT
    216216public:
    … …  
    230230};
    231231
    232 class QtDialog::IntQtQuery : public QWidget, public Dialog::IntQuery {
     232class QtDialog::IntQtQuery : public QWidget, public Dialog::TQuery<int> {
    233233  Q_OBJECT
    234234public:
    … …  
    248248};
    249249
    250 class QtDialog::IntsQtQuery : public QWidget, public Dialog::IntsQuery, public QtQueryList<int> {
     250class QtDialog::IntsQtQuery : public QWidget, public Dialog::TQuery<std::vector<int> >, public QtQueryList<int> {
    251251  Q_OBJECT
    252252public:
    … …  
    266266};
    267267
    268 class QtDialog::MoleculeQtQuery : public QWidget, public Dialog::MoleculeQuery {
     268class QtDialog::MoleculeQtQuery : public QWidget, public Dialog::TQuery<const molecule *> {
    269269  Q_OBJECT
    270270public:
    … …  
    284284};
    285285
    286 class QtDialog::MoleculesQtQuery : public QWidget, public Dialog::MoleculesQuery, public QtQueryList<const molecule *> {
     286class QtDialog::MoleculesQtQuery : public QWidget, public Dialog::TQuery<std::vector<const molecule *> >, public QtQueryList<const molecule *> {
    287287  Q_OBJECT
    288288public:
    … …  
    302302};
    303303
    304 class QtDialog::StringQtQuery : public QWidget, public Dialog::StringQuery {
     304class QtDialog::StringQtQuery : public QWidget, public Dialog::TQuery<std::string> {
    305305  Q_OBJECT
    306306public:
    … …  
    320320};
    321321
    322 class QtDialog::StringsQtQuery : public QWidget, public Dialog::StringsQuery, public QtQueryList<std::string> {
     322class QtDialog::StringsQtQuery : public QWidget, public Dialog::TQuery<std::vector<std::string> >, public QtQueryList<std::string> {
    323323  Q_OBJECT
    324324public:
    … …  
    338338};
    339339
    340 class QtDialog::UnsignedIntQtQuery : public QWidget, public Dialog::UnsignedIntQuery {
     340class QtDialog::UnsignedIntQtQuery : public QWidget, public Dialog::TQuery<unsigned int> {
    341341  Q_OBJECT
    342342public:
    … …  
    356356};
    357357
    358 class QtDialog::UnsignedIntsQtQuery : public QWidget, public Dialog::UnsignedIntsQuery, public QtQueryList<unsigned int> {
     358class QtDialog::UnsignedIntsQtQuery : public QWidget, public Dialog::TQuery<std::vector<unsigned int> >, public QtQueryList<unsigned int> {
    359359  Q_OBJECT
    360360public:
    … …  
    374374};
    375375
    376 class QtDialog::VectorQtQuery : public QWidget, public Dialog::VectorQuery {
     376class QtDialog::VectorQtQuery : public QWidget, public Dialog::TQuery<Vector> {
    377377  Q_OBJECT
    378378public:
    … …  
    399399};
    400400
    401 class QtDialog::VectorsQtQuery : public QWidget, public Dialog::VectorsQuery, public QtQueryList<Vector> {
     401class QtDialog::VectorsQtQuery : public QWidget, public Dialog::TQuery<std::vector<Vector> >, public QtQueryList<Vector> {
    402402  Q_OBJECT
    403403public:
    … …  
    417417};
    418418
    419 class QtDialog::RandomNumberDistribution_ParametersQtQuery : public QWidget, public Dialog::RandomNumberDistribution_ParametersQuery {
     419class QtDialog::RandomNumberDistribution_ParametersQtQuery : public QWidget, public Dialog::TQuery<RandomNumberDistribution_Parameters> {
    420420  Q_OBJECT
    421421public:

  • src/UIElements/Qt4/Query/RandomNumberDistribution_ParametersQtQuery.cpp

    ra55e6f r1c55b8  
    3131
    3232QtDialog::RandomNumberDistribution_ParametersQtQuery::RandomNumberDistribution_ParametersQtQuery(Parameter<RandomNumberDistribution_Parameters> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    33     Dialog::RandomNumberDistribution_ParametersQuery(_param, _title),
     33    Dialog::TQuery<RandomNumberDistribution_Parameters>(_param, _title),
    3434    parent(_parent),
    3535    dialog(_dialog)

  • src/UIElements/Qt4/Query/RealSpaceMatrixQtQuery.cpp

    ra55e6f r1c55b8  
    3030
    3131QtDialog::RealSpaceMatrixQtQuery::RealSpaceMatrixQtQuery(Parameter<RealSpaceMatrix> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    32     Dialog::RealSpaceMatrixQuery(_param, _title),
     32    Dialog::TQuery<RealSpaceMatrix>(_param, _title),
    3333    parent(_parent),
    3434    dialog(_dialog)

  • src/UIElements/Qt4/Query/StringQtQuery.cpp

    ra55e6f r1c55b8  
    2828
    2929QtDialog::StringQtQuery::StringQtQuery(Parameter<std::string> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    30     Dialog::StringQuery(_param, _title),
     30    Dialog::TQuery<std::string>(_param, _title),
    3131    parent(_parent),
    3232    dialog(_dialog)

  • src/UIElements/Qt4/Query/StringsQtQuery.cpp

    ra55e6f r1c55b8  
    2929
    3030QtDialog::StringsQtQuery::StringsQtQuery(Parameter<std::vector<std::string> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    31     Dialog::StringsQuery(_param, _title),
     31    Dialog::TQuery<std::vector<std::string> >(_param, _title),
    3232    QtQueryList<std::string>(_parent, _dialog, temp)
    3333{

  • src/UIElements/Qt4/Query/UnsignedIntQtQuery.cpp

    ra55e6f r1c55b8  
    2828
    2929QtDialog::UnsignedIntQtQuery::UnsignedIntQtQuery(Parameter<unsigned int> &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    30     Dialog::UnsignedIntQuery(_param, _title),
     30    Dialog::TQuery<unsigned int>(_param, _title),
    3131    parent(_parent),
    3232    dialog(_dialog)

  • src/UIElements/Qt4/Query/UnsignedIntsQtQuery.cpp

    ra55e6f r1c55b8  
    2929
    3030QtDialog::UnsignedIntsQtQuery::UnsignedIntsQtQuery(Parameter<std::vector<unsigned int> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    31     Dialog::UnsignedIntsQuery(_param, _title),
     31    Dialog::TQuery<std::vector<unsigned int> >(_param, _title),
    3232    QtQueryList<unsigned int>(_parent, _dialog, temp)
    3333{

  • src/UIElements/Qt4/Query/VectorQtQuery.cpp

    ra55e6f r1c55b8  
    2929
    3030QtDialog::VectorQtQuery::VectorQtQuery(Parameter<Vector> &_param, std::string title, QBoxLayout *_parent,Dialog *_dialog) :
    31     Dialog::VectorQuery(_param, title),
     31    Dialog::TQuery<Vector>(_param, title),
    3232    parent(_parent),
    3333    dialog(_dialog)

  • src/UIElements/Qt4/Query/VectorsQtQuery.cpp

    ra55e6f r1c55b8  
    3030
    3131QtDialog::VectorsQtQuery::VectorsQtQuery(Parameter<std::vector<Vector> > &_param, std::string _title,QBoxLayout *_parent,Dialog *_dialog) :
    32     Dialog::VectorsQuery(_param, _title),
     32    Dialog::TQuery<std::vector<Vector> >(_param, _title),
    3333    QtQueryList<Vector>(_parent, _dialog, temp)
    3434{
Note: See TracChangeset for help on using the changeset viewer.