Changeset 955b91 for src/UIElements


Ignore:
Timestamp:
Mar 27, 2012, 3:53:35 PM (14 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, Candidate_v1.7.0, 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:
4d2b33
Parents:
912c40
git-author:
Frederik Heber <heber@…> (03/14/12 18:08:24)
git-committer:
Frederik Heber <heber@…> (03/27/12 15:53:35)
Message:

FIX: Removed using namespace std in Vector.hpp.

  • this caused some follow-up problems in other LinearAlgebra modules,
mostly stuff from iostream not having std
prefix then.
this also caused more of them in MoleCuilder modules, mostly due to string,
stringstream, and numeric_limits with std
prefix.
Location:
src/UIElements
Files:
75 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/CommandLineUI/CommandLineDialog.cpp

    r912c40 r955b91  
    3636
    3737
    38 void CommandLineDialog::queryEmpty(const char* title, string _description){
     38void CommandLineDialog::queryEmpty(const char* title, std::string _description){
    3939  registerQuery(new EmptyCommandLineQuery(title, _description));
    4040}
    4141
    42 void CommandLineDialog::queryInt(const char* title, string _description){
     42void CommandLineDialog::queryInt(const char* title, std::string _description){
    4343  registerQuery(new IntCommandLineQuery(title, _description));
    4444}
    4545
    46 void CommandLineDialog::queryInts(const char* title, string _description){
     46void CommandLineDialog::queryInts(const char* title, std::string _description){
    4747  registerQuery(new IntsCommandLineQuery(title, _description));
    4848}
    4949
    50 void CommandLineDialog::queryUnsignedInt(const char* title, string _description){
     50void CommandLineDialog::queryUnsignedInt(const char* title, std::string _description){
    5151  registerQuery(new UnsignedIntCommandLineQuery(title, _description));
    5252}
    5353
    54 void CommandLineDialog::queryUnsignedInts(const char* title, string _description){
     54void CommandLineDialog::queryUnsignedInts(const char* title, std::string _description){
    5555  registerQuery(new UnsignedIntsCommandLineQuery(title, _description));
    5656}
    5757
    58 void CommandLineDialog::queryBoolean(const char* title, string _description){
     58void CommandLineDialog::queryBoolean(const char* title, std::string _description){
    5959  registerQuery(new BooleanCommandLineQuery(title, _description));
    6060}
    6161
    62 void CommandLineDialog::queryDouble(const char* title, string _description){
     62void CommandLineDialog::queryDouble(const char* title, std::string _description){
    6363  registerQuery(new DoubleCommandLineQuery(title, _description));
    6464}
    6565
    66 void CommandLineDialog::queryDoubles(const char* title, string _description){
     66void CommandLineDialog::queryDoubles(const char* title, std::string _description){
    6767  registerQuery(new DoublesCommandLineQuery(title, _description));
    6868}
    6969
    70 void CommandLineDialog::queryString(const char* title, string _description){
     70void CommandLineDialog::queryString(const char* title, std::string _description){
    7171  registerQuery(new StringCommandLineQuery(title, _description));
    7272}
    7373
    74 void CommandLineDialog::queryStrings(const char* title, string _description){
     74void CommandLineDialog::queryStrings(const char* title, std::string _description){
    7575  registerQuery(new StringsCommandLineQuery(title, _description));
    7676}
    7777
    78 void CommandLineDialog::queryAtom(const char* title, string _description) {
     78void CommandLineDialog::queryAtom(const char* title, std::string _description) {
    7979  registerQuery(new AtomCommandLineQuery(title, _description));
    8080}
    8181
    82 void CommandLineDialog::queryAtoms(const char* title, string _description) {
     82void CommandLineDialog::queryAtoms(const char* title, std::string _description) {
    8383  registerQuery(new AtomsCommandLineQuery(title, _description));
    8484}
    8585
    86 void CommandLineDialog::queryMolecule(const char* title, string _description) {
     86void CommandLineDialog::queryMolecule(const char* title, std::string _description) {
    8787  registerQuery(new MoleculeCommandLineQuery(title, _description));
    8888}
    8989
    90 void CommandLineDialog::queryMolecules(const char* title, string _description) {
     90void CommandLineDialog::queryMolecules(const char* title, std::string _description) {
    9191  registerQuery(new MoleculesCommandLineQuery(title, _description));
    9292}
    9393
    94 void CommandLineDialog::queryVector(const char* title, bool check, string _description) {
     94void CommandLineDialog::queryVector(const char* title, bool check, std::string _description) {
    9595  registerQuery(new VectorCommandLineQuery(title,check, _description));
    9696}
    9797
    98 void CommandLineDialog::queryVectors(const char* title, bool check, string _description) {
     98void CommandLineDialog::queryVectors(const char* title, bool check, std::string _description) {
    9999  registerQuery(new VectorsCommandLineQuery(title,check, _description));
    100100}
    101101
    102 void CommandLineDialog::queryBox(const char* title, string _description) {
     102void CommandLineDialog::queryBox(const char* title, std::string _description) {
    103103  registerQuery(new BoxCommandLineQuery(title,_description));
    104104}
    105105
    106 void CommandLineDialog::queryElement(const char* title, string _description){
     106void CommandLineDialog::queryElement(const char* title, std::string _description){
    107107  registerQuery(new ElementCommandLineQuery(title, _description));
    108108}
    109109
    110 void CommandLineDialog::queryElements(const char* title, string _description){
     110void CommandLineDialog::queryElements(const char* title, std::string _description){
    111111  registerQuery(new ElementsCommandLineQuery(title, _description));
    112112}
    113113
    114 void CommandLineDialog::queryFile(const char* title, string _description){
     114void CommandLineDialog::queryFile(const char* title, std::string _description){
    115115  registerQuery(new FileCommandLineQuery(title, _description));
    116116}
    117117
    118 void CommandLineDialog::queryRandomNumberDistribution_Parameters(const char* title, string _description){
     118void CommandLineDialog::queryRandomNumberDistribution_Parameters(const char* title, std::string _description){
    119119  registerQuery(new RandomNumberDistribution_ParametersCommandLineQuery(title, _description));
    120120}

  • src/UIElements/CommandLineUI/Query/AtomCommandLineQuery.cpp

    r912c40 r955b91  
    3333using namespace std;
    3434
    35 CommandLineDialog::AtomCommandLineQuery::AtomCommandLineQuery(string title, string _description) :
     35CommandLineDialog::AtomCommandLineQuery::AtomCommandLineQuery(std::string title, std::string _description) :
    3636    Dialog::AtomQuery(title, _description)
    3737{}

  • src/UIElements/CommandLineUI/Query/AtomsCommandLineQuery.cpp

    r912c40 r955b91  
    2828#include "World.hpp"
    2929
    30 CommandLineDialog::AtomsCommandLineQuery::AtomsCommandLineQuery(string title, string _description) :
     30CommandLineDialog::AtomsCommandLineQuery::AtomsCommandLineQuery(std::string title, std::string _description) :
    3131    Dialog::AtomsQuery(title, _description)
    3232{}

  • src/UIElements/CommandLineUI/Query/BooleanCommandLineQuery.cpp

    r912c40 r955b91  
    2525#include "CodePatterns/Verbose.hpp"
    2626
    27 CommandLineDialog::BooleanCommandLineQuery::BooleanCommandLineQuery(string title, string _description) :
     27CommandLineDialog::BooleanCommandLineQuery::BooleanCommandLineQuery(std::string title, std::string _description) :
    2828    Dialog::BooleanQuery(title, _description)
    2929{}

  • src/UIElements/CommandLineUI/Query/BoxCommandLineQuery.cpp

    r912c40 r955b91  
    2727#include "LinearAlgebra/RealSpaceMatrix.hpp"
    2828
    29 CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(string title, string _description) :
     29CommandLineDialog::BoxCommandLineQuery::BoxCommandLineQuery(std::string title, std::string _description) :
    3030    Dialog::BoxQuery(title, _description)
    3131{}

  • src/UIElements/CommandLineUI/Query/DoubleCommandLineQuery.cpp

    r912c40 r955b91  
    2626
    2727
    28 CommandLineDialog::DoubleCommandLineQuery::DoubleCommandLineQuery(string title, string _description) :
     28CommandLineDialog::DoubleCommandLineQuery::DoubleCommandLineQuery(std::string title, std::string _description) :
    2929    Dialog::DoubleQuery(title, _description)
    3030{}

  • src/UIElements/CommandLineUI/Query/DoublesCommandLineQuery.cpp

    r912c40 r955b91  
    2525#include "CodePatterns/Verbose.hpp"
    2626
    27 CommandLineDialog::DoublesCommandLineQuery::DoublesCommandLineQuery(string title, string _description) :
     27CommandLineDialog::DoublesCommandLineQuery::DoublesCommandLineQuery(std::string title, std::string _description) :
    2828    Dialog::DoublesQuery(title, _description)
    2929{}

  • src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp

    r912c40 r955b91  
    2828#include "World.hpp"
    2929
    30 CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(string title, string _description) :
     30CommandLineDialog::ElementCommandLineQuery::ElementCommandLineQuery(std::string title, std::string _description) :
    3131    Dialog::ElementQuery(title, _description)
    3232{}

  • src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp

    r912c40 r955b91  
    2828#include "World.hpp"
    2929
    30 CommandLineDialog::ElementsCommandLineQuery::ElementsCommandLineQuery(string title, string _description) :
     30CommandLineDialog::ElementsCommandLineQuery::ElementsCommandLineQuery(std::string title, std::string _description) :
    3131    Dialog::ElementsQuery(title, _description)
    3232{}

  • src/UIElements/CommandLineUI/Query/EmptyCommandLineQuery.cpp

    r912c40 r955b91  
    2727#include "CodePatterns/Verbose.hpp"
    2828
    29 CommandLineDialog::EmptyCommandLineQuery::EmptyCommandLineQuery(string title, string _description) :
     29CommandLineDialog::EmptyCommandLineQuery::EmptyCommandLineQuery(std::string title, std::string _description) :
    3030    Dialog::EmptyQuery(title, _description)
    3131{}

  • src/UIElements/CommandLineUI/Query/FileCommandLineQuery.cpp

    r912c40 r955b91  
    2525#include "CodePatterns/Verbose.hpp"
    2626
    27 CommandLineDialog::FileCommandLineQuery::FileCommandLineQuery(string title, string _description) :
     27CommandLineDialog::FileCommandLineQuery::FileCommandLineQuery(std::string title, std::string _description) :
    2828    Dialog::FileQuery(title, _description)
    2929{}

  • src/UIElements/CommandLineUI/Query/IntCommandLineQuery.cpp

    r912c40 r955b91  
    2525#include "CodePatterns/Verbose.hpp"
    2626
    27 CommandLineDialog::IntCommandLineQuery::IntCommandLineQuery(string title, string _description) :
     27CommandLineDialog::IntCommandLineQuery::IntCommandLineQuery(std::string title, std::string _description) :
    2828    Dialog::IntQuery(title, _description)
    2929{}

  • src/UIElements/CommandLineUI/Query/IntsCommandLineQuery.cpp

    r912c40 r955b91  
    2525#include "CodePatterns/Verbose.hpp"
    2626
    27 CommandLineDialog::IntsCommandLineQuery::IntsCommandLineQuery(string title, string _description) :
     27CommandLineDialog::IntsCommandLineQuery::IntsCommandLineQuery(std::string title, std::string _description) :
    2828    Dialog::IntsQuery(title, _description)
    2929{}

  • src/UIElements/CommandLineUI/Query/MoleculeCommandLineQuery.cpp

    r912c40 r955b91  
    2828#include "CodePatterns/Verbose.hpp"
    2929
    30 CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(string title, string _description) :
     30CommandLineDialog::MoleculeCommandLineQuery::MoleculeCommandLineQuery(std::string title, std::string _description) :
    3131    Dialog::MoleculeQuery(title, _description)
    3232{}

  • src/UIElements/CommandLineUI/Query/MoleculesCommandLineQuery.cpp

    r912c40 r955b91  
    2929#include "World.hpp"
    3030
    31 CommandLineDialog::MoleculesCommandLineQuery::MoleculesCommandLineQuery(string title, string _description) :
     31CommandLineDialog::MoleculesCommandLineQuery::MoleculesCommandLineQuery(std::string title, std::string _description) :
    3232    Dialog::MoleculesQuery(title, _description)
    3333{}

  • src/UIElements/CommandLineUI/Query/RandomNumberDistribution_ParametersCommandLineQuery.cpp

    r912c40 r955b91  
    3131#include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
    3232
    33 CommandLineDialog::RandomNumberDistribution_ParametersCommandLineQuery::RandomNumberDistribution_ParametersCommandLineQuery(string title, string _description) :
     33CommandLineDialog::RandomNumberDistribution_ParametersCommandLineQuery::RandomNumberDistribution_ParametersCommandLineQuery(std::string title, std::string _description) :
    3434    Dialog::RandomNumberDistribution_ParametersQuery(title, _description)
    3535{}

  • src/UIElements/CommandLineUI/Query/StringCommandLineQuery.cpp

    r912c40 r955b91  
    2525#include "CodePatterns/Verbose.hpp"
    2626
    27 CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(string title, string _description) :
     27CommandLineDialog::StringCommandLineQuery::StringCommandLineQuery(std::string title, std::string _description) :
    2828    Dialog::StringQuery(title, _description)
    2929{}

  • src/UIElements/CommandLineUI/Query/StringsCommandLineQuery.cpp

    r912c40 r955b91  
    2525#include "CodePatterns/Verbose.hpp"
    2626
    27 CommandLineDialog::StringsCommandLineQuery::StringsCommandLineQuery(string title, string _description) :
     27CommandLineDialog::StringsCommandLineQuery::StringsCommandLineQuery(std::string title, std::string _description) :
    2828    Dialog::StringsQuery(title, _description)
    2929{}

  • src/UIElements/CommandLineUI/Query/UnsignedIntCommandLineQuery.cpp

    r912c40 r955b91  
    2525#include "CodePatterns/Verbose.hpp"
    2626
    27 CommandLineDialog::UnsignedIntCommandLineQuery::UnsignedIntCommandLineQuery(string title, string _description) :
     27CommandLineDialog::UnsignedIntCommandLineQuery::UnsignedIntCommandLineQuery(std::string title, std::string _description) :
    2828    Dialog::UnsignedIntQuery(title, _description)
    2929{}

  • src/UIElements/CommandLineUI/Query/UnsignedIntsCommandLineQuery.cpp

    r912c40 r955b91  
    2525#include "CodePatterns/Verbose.hpp"
    2626
    27 CommandLineDialog::UnsignedIntsCommandLineQuery::UnsignedIntsCommandLineQuery(string title, string _description) :
     27CommandLineDialog::UnsignedIntsCommandLineQuery::UnsignedIntsCommandLineQuery(std::string title, std::string _description) :
    2828    Dialog::UnsignedIntsQuery(title, _description)
    2929{}

  • src/UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp

    r912c40 r955b91  
    2929#include "World.hpp"
    3030
    31 CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(string title, bool _check, string _description) :
     31CommandLineDialog::VectorCommandLineQuery::VectorCommandLineQuery(std::string title, bool _check, std::string _description) :
    3232    Dialog::VectorQuery(title,_check, _description)
    3333{}

  • src/UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp

    r912c40 r955b91  
    2929#include "World.hpp"
    3030
    31 CommandLineDialog::VectorsCommandLineQuery::VectorsCommandLineQuery(string title, bool _check, string _description) :
     31CommandLineDialog::VectorsCommandLineQuery::VectorsCommandLineQuery(std::string title, bool _check, std::string _description) :
    3232    Dialog::VectorsQuery(title,_check, _description)
    3333{}

  • src/UIElements/Qt4/Pipe/StringQtQueryPipe.cpp

    r912c40 r955b91  
    2626
    2727
    28 StringQtQueryPipe::StringQtQueryPipe(string *_content, QtDialog *_dialog) :
     28StringQtQueryPipe::StringQtQueryPipe(std::string *_content, QtDialog *_dialog) :
    2929  content(_content),
    3030  dialog(_dialog)

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

    r912c40 r955b91  
    3030#include "World.hpp"
    3131
    32 QtDialog::AtomQtQuery::AtomQtQuery(string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     32QtDialog::AtomQtQuery::AtomQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    3333    Dialog::AtomQuery(_title),
    3434    parent(_parent)

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

    r912c40 r955b91  
    3333
    3434
    35 QtDialog::AtomsQtQuery::AtomsQtQuery(string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     35QtDialog::AtomsQtQuery::AtomsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    3636    Dialog::AtomsQuery(_title),
    3737    parent(_parent)

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

    r912c40 r955b91  
    3030#include "World.hpp"
    3131
    32 QtDialog::BoxQtQuery::BoxQtQuery(string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     32QtDialog::BoxQtQuery::BoxQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    3333    Dialog::BoxQuery(_title),
    3434    parent(_parent)

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

    r912c40 r955b91  
    2828
    2929
    30 QtDialog::DoubleQtQuery::DoubleQtQuery(string title,QBoxLayout *_parent,QtDialog *_dialog) :
     30QtDialog::DoubleQtQuery::DoubleQtQuery(std::string title,QBoxLayout *_parent,QtDialog *_dialog) :
    3131    Dialog::DoubleQuery(title),
    3232    parent(_parent)
    … …  
    3636  inputBox = new QDoubleSpinBox();
    3737  inputBox->setValue(0);
    38   inputBox->setRange(-numeric_limits<double>::max(),numeric_limits<double>::max());
     38  inputBox->setRange(-std::numeric_limits<double>::max(),std::numeric_limits<double>::max());
    3939  inputBox->setDecimals(3);
    4040  parent->addLayout(thisLayout);

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

    r912c40 r955b91  
    3030
    3131
    32 QtDialog::DoublesQtQuery::DoublesQtQuery(string title,QBoxLayout *_parent,QtDialog *_dialog) :
     32QtDialog::DoublesQtQuery::DoublesQtQuery(std::string title,QBoxLayout *_parent,QtDialog *_dialog) :
    3333    Dialog::DoublesQuery(title),
    3434    parent(_parent)

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

    r912c40 r955b91  
    2828
    2929
    30 QtDialog::IntQtQuery::IntQtQuery(string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     30QtDialog::IntQtQuery::IntQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    3131    Dialog::IntQuery(_title),
    3232    parent(_parent)

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

    r912c40 r955b91  
    3030
    3131
    32 QtDialog::IntsQtQuery::IntsQtQuery(string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     32QtDialog::IntsQtQuery::IntsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    3333    Dialog::IntsQuery(_title),
    3434    parent(_parent)

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

    r912c40 r955b91  
    3131
    3232
    33 QtDialog::MoleculeQtQuery::MoleculeQtQuery(string _title, QBoxLayout *_parent,QtDialog *_dialog) :
     33QtDialog::MoleculeQtQuery::MoleculeQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog) :
    3434    Dialog::MoleculeQuery(_title),
    3535    parent(_parent)

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

    r912c40 r955b91  
    3131
    3232
    33 QtDialog::MoleculesQtQuery::MoleculesQtQuery(string _title, QBoxLayout *_parent,QtDialog *_dialog) :
     33QtDialog::MoleculesQtQuery::MoleculesQtQuery(std::string _title, QBoxLayout *_parent,QtDialog *_dialog) :
    3434    Dialog::MoleculesQuery(_title),
    3535    parent(_parent)

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

    r912c40 r955b91  
    3131#include "World.hpp"
    3232
    33 QtDialog::RandomNumberDistribution_ParametersQtQuery::RandomNumberDistribution_ParametersQtQuery(string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     33QtDialog::RandomNumberDistribution_ParametersQtQuery::RandomNumberDistribution_ParametersQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    3434    Dialog::RandomNumberDistribution_ParametersQuery(_title),
    3535    parent(_parent)

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

    r912c40 r955b91  
    2828
    2929
    30 QtDialog::StringQtQuery::StringQtQuery(string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     30QtDialog::StringQtQuery::StringQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    3131    Dialog::StringQuery(_title),
    3232    parent(_parent)

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

    r912c40 r955b91  
    3030
    3131
    32 QtDialog::StringsQtQuery::StringsQtQuery(string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     32QtDialog::StringsQtQuery::StringsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    3333    Dialog::StringsQuery(_title),
    3434    parent(_parent)
    … …  
    7676  // dissect by ","
    7777  std::string::iterator olditer = temp.begin();
    78   for(string::iterator iter = temp.begin(); iter != temp.end(); ++iter) {
     78  for(std::string::iterator iter = temp.begin(); iter != temp.end(); ++iter) {
    7979    if (*iter == ' ') {
    80       tmp.push_back(string(iter, olditer));
     80      tmp.push_back(std::string(iter, olditer));
    8181      olditer = iter;
    8282    }
    8383  }
    8484  if (olditer != temp.begin())  // insert last part also
    85     tmp.push_back(string(olditer, temp.end()));
     85    tmp.push_back(std::string(olditer, temp.end()));
    8686
    8787  return temp!="";

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

    r912c40 r955b91  
    2828
    2929
    30 QtDialog::UnsignedIntQtQuery::UnsignedIntQtQuery(string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     30QtDialog::UnsignedIntQtQuery::UnsignedIntQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    3131    Dialog::UnsignedIntQuery(_title),
    3232    parent(_parent)

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

    r912c40 r955b91  
    3030
    3131
    32 QtDialog::UnsignedIntsQtQuery::UnsignedIntsQtQuery(string _title,QBoxLayout *_parent,QtDialog *_dialog) :
     32QtDialog::UnsignedIntsQtQuery::UnsignedIntsQtQuery(std::string _title,QBoxLayout *_parent,QtDialog *_dialog) :
    3333    Dialog::UnsignedIntsQuery(_title),
    3434    parent(_parent)

  • src/UIElements/Query/AtomQuery.cpp

    r912c40 r955b91  
    2323
    2424// Atom Queries
    25 Dialog::AtomQuery::AtomQuery(string title, std::string _description) :
     25Dialog::AtomQuery::AtomQuery(std::string title, std::string _description) :
    2626    Query(title, _description),
    2727    tmp(0)

  • src/UIElements/Query/AtomsQuery.cpp

    r912c40 r955b91  
    2424
    2525// Atoms Queries
    26 Dialog::AtomsQuery::AtomsQuery(string title, std::string _description) :
     26Dialog::AtomsQuery::AtomsQuery(std::string title, std::string _description) :
    2727    Query(title, _description),
    2828    tmp(0)

  • src/UIElements/Query/BooleanQuery.cpp

    r912c40 r955b91  
    2424
    2525// Bool Queries
    26 Dialog::BooleanQuery::BooleanQuery(string title,std::string description) :
     26Dialog::BooleanQuery::BooleanQuery(std::string title,std::string description) :
    2727    Query(title, description)
    2828{}

  • src/UIElements/Query/DoubleQuery.cpp

    r912c40 r955b91  
    2424
    2525// Double Queries
    26 Dialog::DoubleQuery::DoubleQuery(string title, std::string _description) :
     26Dialog::DoubleQuery::DoubleQuery(std::string title, std::string _description) :
    2727    Query(title, _description)
    2828{}

  • src/UIElements/Query/DoublesQuery.cpp

    r912c40 r955b91  
    2424
    2525// Doubles Queries
    26 Dialog::DoublesQuery::DoublesQuery(string title, std::string _description) :
     26Dialog::DoublesQuery::DoublesQuery(std::string title, std::string _description) :
    2727    Query(title, _description)
    2828{}

  • src/UIElements/Query/EmptyQuery.cpp

    r912c40 r955b91  
    2424
    2525// empty Queries
    26 Dialog::EmptyQuery::EmptyQuery(string title, std::string description) :
     26Dialog::EmptyQuery::EmptyQuery(std::string title, std::string description) :
    2727    Query(title, description)
    2828{}

  • src/UIElements/Query/IntQuery.cpp

    r912c40 r955b91  
    2424
    2525// Int Queries
    26 Dialog::IntQuery::IntQuery(string title, std::string description) :
     26Dialog::IntQuery::IntQuery(std::string title, std::string description) :
    2727    Query(title, description)
    2828{}

  • src/UIElements/Query/IntsQuery.cpp

    r912c40 r955b91  
    2424
    2525// Ints Queries
    26 Dialog::IntsQuery::IntsQuery(string title, std::string description) :
     26Dialog::IntsQuery::IntsQuery(std::string title, std::string description) :
    2727    Query(title, description)
    2828{}

  • src/UIElements/Query/MoleculeQuery.cpp

    r912c40 r955b91  
    2424
    2525// Molecule Queries
    26 Dialog::MoleculeQuery::MoleculeQuery(string title, std::string _description) :
     26Dialog::MoleculeQuery::MoleculeQuery(std::string title, std::string _description) :
    2727    Query(title, _description),
    2828    tmp(0)

  • src/UIElements/Query/MoleculesQuery.cpp

    r912c40 r955b91  
    2424
    2525// Molecules Queries
    26 Dialog::MoleculesQuery::MoleculesQuery(string title, std::string _description) :
     26Dialog::MoleculesQuery::MoleculesQuery(std::string title, std::string _description) :
    2727    Query(title, _description),
    2828    tmp(0)

  • src/UIElements/Query/Query.cpp

    r912c40 r955b91  
    2323
    2424// Base class
    25 Dialog::Query::Query(string _title, string _description) :
     25Dialog::Query::Query(std::string _title, std::string _description) :
    2626    title(_title),
    2727    description(_description)

  • src/UIElements/Query/RandomNumberDistribution_ParametersQuery.cpp

    r912c40 r955b91  
    2323
    2424// RandomNumberDistribution_Parameters Queries
    25 Dialog::RandomNumberDistribution_ParametersQuery::RandomNumberDistribution_ParametersQuery(string title, std::string _description) :
     25Dialog::RandomNumberDistribution_ParametersQuery::RandomNumberDistribution_ParametersQuery(std::string title, std::string _description) :
    2626    Query(title, _description)
    2727{}

  • src/UIElements/Query/StringQuery.cpp

    r912c40 r955b91  
    2424
    2525// String Queries
    26 Dialog::StringQuery::StringQuery(string title,std::string _description) :
     26Dialog::StringQuery::StringQuery(std::string title,std::string _description) :
    2727    Query(title, _description)
    2828{}

  • src/UIElements/Query/StringsQuery.cpp

    r912c40 r955b91  
    2424
    2525// Strings Queries
    26 Dialog::StringsQuery::StringsQuery(string title,std::string _description) :
     26Dialog::StringsQuery::StringsQuery(std::string title,std::string _description) :
    2727    Query(title, _description)
    2828{}

  • src/UIElements/Query/UnsignedIntQuery.cpp

    r912c40 r955b91  
    2424
    2525// UnsignedInt Queries
    26 Dialog::UnsignedIntQuery::UnsignedIntQuery(string title, std::string description) :
     26Dialog::UnsignedIntQuery::UnsignedIntQuery(std::string title, std::string description) :
    2727    Query(title, description)
    2828{}

  • src/UIElements/Query/UnsignedIntsQuery.cpp

    r912c40 r955b91  
    2424
    2525// UnsignedInts Queries
    26 Dialog::UnsignedIntsQuery::UnsignedIntsQuery(string title, std::string description) :
     26Dialog::UnsignedIntsQuery::UnsignedIntsQuery(std::string title, std::string description) :
    2727    Query(title, description)
    2828{}

  • src/UIElements/TextUI/Query/AtomTextQuery.cpp

    r912c40 r955b91  
    3030#include "World.hpp"
    3131
    32 TextDialog::AtomTextQuery::AtomTextQuery(string title, std::string _description) :
     32TextDialog::AtomTextQuery::AtomTextQuery(std::string title, std::string _description) :
    3333    Dialog::AtomQuery(title,_description)
    3434{}

  • src/UIElements/TextUI/Query/AtomsTextQuery.cpp

    r912c40 r955b91  
    3131
    3232
    33 TextDialog::AtomsTextQuery::AtomsTextQuery(string title, std::string _description) :
     33TextDialog::AtomsTextQuery::AtomsTextQuery(std::string title, std::string _description) :
    3434    Dialog::AtomsQuery(title,_description)
    3535{}
    … …  
    4444  // dissect by " "
    4545  std::string::iterator olditer = line.begin();
    46   for(string::iterator iter = line.begin(); iter != line.end(); ++iter) {
     46  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    4747    if (*iter == ' ') {
    48       std::istringstream stream(string(iter, olditer));
     48      std::istringstream stream(std::string(iter, olditer));
    4949      stream >> idxOfAtom;
    5050      temp = World::getInstance().getAtom(AtomById(idxOfAtom));
    … …  
    5858  }
    5959  if (olditer != line.begin()) { // insert last part also
    60     std::istringstream stream(string(olditer, line.end()));
     60    std::istringstream stream(std::string(olditer, line.end()));
    6161    stream >> idxOfAtom;
    6262    temp = World::getInstance().getAtom(AtomById(idxOfAtom));

  • src/UIElements/TextUI/Query/BooleanTextQuery.cpp

    r912c40 r955b91  
    2828
    2929
    30 TextDialog::BooleanTextQuery::BooleanTextQuery(string title, std::string _description) :
     30TextDialog::BooleanTextQuery::BooleanTextQuery(std::string title, std::string _description) :
    3131    Dialog::BooleanQuery(title,_description)
    3232{}

  • src/UIElements/TextUI/Query/DoubleTextQuery.cpp

    r912c40 r955b91  
    2828
    2929
    30 TextDialog::DoubleTextQuery::DoubleTextQuery(string title, std::string _description) :
     30TextDialog::DoubleTextQuery::DoubleTextQuery(std::string title, std::string _description) :
    3131    Dialog::DoubleQuery(title,_description)
    3232{}

  • src/UIElements/TextUI/Query/DoublesTextQuery.cpp

    r912c40 r955b91  
    2828
    2929
    30 TextDialog::DoublesTextQuery::DoublesTextQuery(string title, std::string _description) :
     30TextDialog::DoublesTextQuery::DoublesTextQuery(std::string title, std::string _description) :
    3131    Dialog::DoublesQuery(title,_description)
    3232{}
    … …  
    4040  // dissect by " "
    4141  std::string::iterator olditer = line.begin();
    42   for(string::iterator iter = line.begin(); iter != line.end(); ++iter) {
     42  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    4343    if (*iter == ' ') {
    44       std::istringstream stream(string(iter, olditer));
     44      std::istringstream stream(std::string(iter, olditer));
    4545      stream >> temp;
    4646      tmp.push_back(temp);
    … …  
    4949  }
    5050  if (olditer != line.begin()) { // insert last part also
    51     std::istringstream stream(string(olditer, line.end()));
     51    std::istringstream stream(std::string(olditer, line.end()));
    5252    stream >> temp;
    5353    tmp.push_back(temp);

  • src/UIElements/TextUI/Query/ElementsTextQuery.cpp

    r912c40 r955b91  
    5050  // dissect by " "
    5151  std::string::iterator olditer = line.begin();
    52   for(string::iterator iter = line.begin(); iter != line.end(); ++iter) {
     52  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    5353    if (*iter == ' ') {
    54       std::istringstream stream(string(iter, olditer));
     54      std::istringstream stream(std::string(iter, olditer));
    5555      stream >> shorthand;
    5656      try {
    … …  
    6969  }
    7070  if (olditer != line.begin()) { // insert last part also
    71     std::istringstream stream(string(olditer, line.end()));
     71    std::istringstream stream(std::string(olditer, line.end()));
    7272    stream >> shorthand;
    7373    try {

  • src/UIElements/TextUI/Query/EmptyTextQuery.cpp

    r912c40 r955b91  
    2828
    2929
    30 TextDialog::EmptyTextQuery::EmptyTextQuery(string title, std::string _description) :
     30TextDialog::EmptyTextQuery::EmptyTextQuery(std::string title, std::string _description) :
    3131    Dialog::EmptyQuery(title,_description)
    3232{}

  • src/UIElements/TextUI/Query/FileTextQuery.cpp

    r912c40 r955b91  
    3131
    3232
    33 TextDialog::FileTextQuery::FileTextQuery(string title, std::string _description) :
     33TextDialog::FileTextQuery::FileTextQuery(std::string title, std::string _description) :
    3434    Dialog::FileQuery(title,_description)
    3535{}

  • src/UIElements/TextUI/Query/IntTextQuery.cpp

    r912c40 r955b91  
    2828
    2929
    30 TextDialog::IntTextQuery::IntTextQuery(string title, std::string _description) :
     30TextDialog::IntTextQuery::IntTextQuery(std::string title, std::string _description) :
    3131    Dialog::IntQuery(title,_description)
    3232{}

  • src/UIElements/TextUI/Query/IntsTextQuery.cpp

    r912c40 r955b91  
    2828
    2929
    30 TextDialog::IntsTextQuery::IntsTextQuery(string title, std::string _description) :
     30TextDialog::IntsTextQuery::IntsTextQuery(std::string title, std::string _description) :
    3131    Dialog::IntsQuery(title,_description)
    3232{}
    … …  
    4040  // dissect by " "
    4141  std::string::iterator olditer = line.begin();
    42   for(string::iterator iter = line.begin(); iter != line.end(); ++iter) {
     42  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    4343    if (*iter == ' ') {
    44       std::istringstream stream(string(iter, olditer));
     44      std::istringstream stream(std::string(iter, olditer));
    4545      stream >> temp;
    4646      tmp.push_back(temp);
    … …  
    4949  }
    5050  if (olditer != line.begin()) { // insert last part also
    51     std::istringstream stream(string(olditer, line.end()));
     51    std::istringstream stream(std::string(olditer, line.end()));
    5252    stream >> temp;
    5353    tmp.push_back(temp);

  • src/UIElements/TextUI/Query/MoleculeTextQuery.cpp

    r912c40 r955b91  
    3131
    3232
    33 TextDialog::MoleculeTextQuery::MoleculeTextQuery(string title, std::string _description) :
     33TextDialog::MoleculeTextQuery::MoleculeTextQuery(std::string title, std::string _description) :
    3434    Dialog::MoleculeQuery(title,_description)
    3535{}

  • src/UIElements/TextUI/Query/MoleculesTextQuery.cpp

    r912c40 r955b91  
    3131
    3232
    33 TextDialog::MoleculesTextQuery::MoleculesTextQuery(string title, std::string _description) :
     33TextDialog::MoleculesTextQuery::MoleculesTextQuery(std::string title, std::string _description) :
    3434    Dialog::MoleculesQuery(title,_description)
    3535{}
    … …  
    4444  // dissect by " "
    4545  std::string::iterator olditer = line.begin();
    46   for(string::iterator iter = line.begin(); iter != line.end(); ++iter) {
     46  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    4747    if (*iter == ' ') {
    48       std::istringstream stream(string(iter, olditer));
     48      std::istringstream stream(std::string(iter, olditer));
    4949      stream >> idxOfMol;
    5050      temp = World::getInstance().getMolecule(MoleculeById(idxOfMol));
    … …  
    5858  }
    5959  if (olditer != line.begin()) { // insert last part also
    60     std::istringstream stream(string(olditer, line.end()));
     60    std::istringstream stream(std::string(olditer, line.end()));
    6161    stream >> idxOfMol;
    6262    temp = World::getInstance().getMolecule(MoleculeById(idxOfMol));

  • src/UIElements/TextUI/Query/RandomNumberDistribution_ParametersTextQuery.cpp

    r912c40 r955b91  
    3030#include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
    3131
    32 TextDialog::RandomNumberDistribution_ParametersTextQuery::RandomNumberDistribution_ParametersTextQuery(string title, std::string _description) :
     32TextDialog::RandomNumberDistribution_ParametersTextQuery::RandomNumberDistribution_ParametersTextQuery(std::string title, std::string _description) :
    3333    Dialog::RandomNumberDistribution_ParametersQuery(title,_description)
    3434{}

  • src/UIElements/TextUI/Query/StringTextQuery.cpp

    r912c40 r955b91  
    2828
    2929
    30 TextDialog::StringTextQuery::StringTextQuery(string title, std::string _description) :
     30TextDialog::StringTextQuery::StringTextQuery(std::string title, std::string _description) :
    3131    Dialog::StringQuery(title,_description)
    3232{}

  • src/UIElements/TextUI/Query/StringsTextQuery.cpp

    r912c40 r955b91  
    2828
    2929
    30 TextDialog::StringsTextQuery::StringsTextQuery(string title, std::string _description) :
     30TextDialog::StringsTextQuery::StringsTextQuery(std::string title, std::string _description) :
    3131    Dialog::StringsQuery(title,_description)
    3232{}
    … …  
    3939  // dissect by " "
    4040  std::string::iterator olditer = temp.begin();
    41   for(string::iterator iter = temp.begin(); iter != temp.end(); ++iter) {
     41  for(std::string::iterator iter = temp.begin(); iter != temp.end(); ++iter) {
    4242    if (*iter == ' ') {
    43       tmp.push_back(string(iter, olditer));
     43      tmp.push_back(std::string(iter, olditer));
    4444      olditer = iter;
    4545    }
    4646  }
    4747  if (olditer != temp.begin())  // insert last part also
    48     tmp.push_back(string(olditer, temp.end()));
     48    tmp.push_back(std::string(olditer, temp.end()));
    4949
    5050  return true;

  • src/UIElements/TextUI/Query/UnsignedIntTextQuery.cpp

    r912c40 r955b91  
    2828
    2929
    30 TextDialog::UnsignedIntTextQuery::UnsignedIntTextQuery(string title, std::string _description) :
     30TextDialog::UnsignedIntTextQuery::UnsignedIntTextQuery(std::string title, std::string _description) :
    3131    Dialog::UnsignedIntQuery(title,_description)
    3232{}

  • src/UIElements/TextUI/Query/UnsignedIntsTextQuery.cpp

    r912c40 r955b91  
    2828
    2929
    30 TextDialog::UnsignedIntsTextQuery::UnsignedIntsTextQuery(string title, std::string _description) :
     30TextDialog::UnsignedIntsTextQuery::UnsignedIntsTextQuery(std::string title, std::string _description) :
    3131    Dialog::UnsignedIntsQuery(title,_description)
    3232{}
    … …  
    4040  // dissect by " "
    4141  std::string::iterator olditer = line.begin();
    42   for(string::iterator iter = line.begin(); iter != line.end(); ++iter) {
     42  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    4343    if (*iter == ' ') {
    44       std::istringstream stream(string(iter, olditer));
     44      std::istringstream stream(std::string(iter, olditer));
    4545      stream >> temp;
    4646      tmp.push_back(temp);
    … …  
    4949  }
    5050  if (olditer != line.begin()) { // insert last part also
    51     std::istringstream stream(string(olditer, line.end()));
     51    std::istringstream stream(std::string(olditer, line.end()));
    5252    stream >> temp;
    5353    tmp.push_back(temp);

  • src/UIElements/TextUI/Query/VectorTextQuery.cpp

    r912c40 r955b91  
    5252  int counter = 0;
    5353  std::string::iterator olditer = line.begin();
    54   for(string::iterator iter = line.begin(); (iter != line.end()) && (counter != 3); ++iter) {
     54  for(std::string::iterator iter = line.begin(); (iter != line.end()) && (counter != 3); ++iter) {
    5555    if (*iter == ',') {
    56       std::istringstream stream(string(iter, olditer));
     56      std::istringstream stream(std::string(iter, olditer));
    5757      stream >> coord;
    5858      tmp[counter++] = coord;
    … …  
    6161  }
    6262  if ((olditer != line.begin()) && (counter != 3)) { // insert last part also
    63     std::istringstream stream(string(olditer, line.end()));
     63    std::istringstream stream(std::string(olditer, line.end()));
    6464    stream >> coord;
    6565    tmp[counter++] = coord;

  • src/UIElements/TextUI/Query/VectorsTextQuery.cpp

    r912c40 r955b91  
    5353  std::string::iterator olditercomma = line.begin();
    5454  int counter = 0;
    55   for(string::iterator vectoriter = line.begin(); vectoriter != line.end(); ++vectoriter) {
     55  for(std::string::iterator vectoriter = line.begin(); vectoriter != line.end(); ++vectoriter) {
    5656    if (*vectoriter == ',')
    5757      counter++;
    5858    if ((*vectoriter == ' ') && (counter == 2)) {
    5959      counter = 0;
    60       for(string::iterator componentiter = olditerspace; (componentiter != vectoriter) && (counter !=3); ++componentiter) {
     60      for(std::string::iterator componentiter = olditerspace; (componentiter != vectoriter) && (counter !=3); ++componentiter) {
    6161        if (*componentiter == ',') {
    62           std::istringstream stream(string(componentiter, olditercomma));
     62          std::istringstream stream(std::string(componentiter, olditercomma));
    6363          stream >> coord;
    6464          temp[counter++] = coord;
    … …  
    6767      }
    6868      if ((olditercomma != line.begin()) && (counter != 3)) { // insert last part also
    69         std::istringstream stream(string(olditercomma, vectoriter));
     69        std::istringstream stream(std::string(olditercomma, vectoriter));
    7070        stream >> coord;
    7171        temp[counter++] = coord;

  • src/UIElements/UIFactory.cpp

    r912c40 r955b91  
    5454CONSTRUCT_SINGLETON(UIFactory)
    5555
    56 UIFactory::factoryDescription::factoryDescription(string _name) :
     56UIFactory::factoryDescription::factoryDescription(std::string _name) :
    5757  name(_name)
    5858{}

  • src/UIElements/Views/Qt4/QtMoleculeView.cpp

    r912c40 r955b91  
    8686/************************ Tab for single Molecules *****************/
    8787
    88 QTMoleculePage::QTMoleculePage(molecule *_mol, string _name) :
     88QTMoleculePage::QTMoleculePage(molecule *_mol, std::string _name) :
    8989    Observer("QTMoleculePage"),
    9090    mol(_mol), name(_name)

  • src/UIElements/Views/Qt4/QtStatusBar.cpp

    r912c40 r955b91  
    113113
    114114
    115 QtStatusBar::progressIndicator::progressIndicator(string name){
     115QtStatusBar::progressIndicator::progressIndicator(std::string name){
    116116  stringstream sstr;
    117117  sstr << "Busy (" << name << ")";
Note: See TracChangeset for help on using the changeset viewer.