Ignore:
Timestamp:
Mar 27, 2012, 3:53:35 PM (13 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:
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/TextUI/Query
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • 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;
Note: See TracChangeset for help on using the changeset viewer.