Changeset 4cf323d for src/UIElements/Qt4/QtMainWindow.cpp

Timestamp:

Oct 25, 2010, 12:08:39 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, 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:

379b7e, 9784cf

Parents:

81126a

Message:

Renamed QT -> Qt in files, dirs, and class names.

File:

• src/UIElements/Qt4/QtMainWindow.cpp (moved) (moved from src/UIElements/QT4/QTMainWindow.cpp ) (9 diffs)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -7 +7 @@
 
 /*
- * QTMainWindow.cpp
+ * QtMainWindow.cpp
  *
  *  Created on: Jan 14, 2010
@@ -18 +18 @@
 #endif
 
-#include "QTMainWindow.hpp"
+#include "QtMainWindow.hpp"
 
 #include<Qt/qapplication.h>
@@ -40 +40 @@
 #include "Actions/MapOfActions.hpp"
 #include "Menu/Menu.hpp"
-#include "Menu/QT4/QTMenu.hpp"
+#include "Menu/Qt4/QtMenu.hpp"
 #include "Menu/ActionMenuItem.hpp"
-#include "Views/QT4/QTWorldView.hpp"
-#include "Views/QT4/GLMoleculeView.hpp"
-#include "Views/QT4/QTMoleculeView.hpp"
-#include "Views/QT4/QTStatusBar.hpp"
+#include "Views/Qt4/QtWorldView.hpp"
+#include "Views/Qt4/GLMoleculeView.hpp"
+#include "Views/Qt4/QtMoleculeView.hpp"
+#include "Views/Qt4/QtStatusBar.hpp"
 
 using namespace std;
 
-QTMainWindow::QTMainWindow(QApplication *_theApp) :
+QtMainWindow::QtMainWindow(QApplication *_theApp) :
     theApp(_theApp)
 {
@@ -55 +55 @@
   QSplitter *splitter2 = new QSplitter (Qt::Vertical, splitter1 );
 
-  worldDisplay = new QTWorldView(splitter2);
+  worldDisplay = new QtWorldView(splitter2);
 
-  moleculeDisplay = new QTMoleculeView();
+  moleculeDisplay = new QtMoleculeView();
   molecule3dDisplay = new GLMoleculeView();
 
   MenuBar = menuBar();
 
-  std::map <std::string, QTMenu *> NametoTextMenuMap;
+  std::map <std::string, QtMenu *> NametoTextMenuMap;
   // go through all menus and create them
-  QTMenu *Menu = NULL;
+  QtMenu *Menu = NULL;
   for(std::map<std::string, std::pair<std::string,std::string> >::iterator iter = MapOfActions::getInstance().MenuDescription.begin(); iter != MapOfActions::getInstance().MenuDescription.end(); ++iter) {
     cout << "Creating menu " << iter->first << endl;
-    Menu = new QTMenu(iter->first.c_str());
+    Menu = new QtMenu(iter->first.c_str());
     MenuBar->addMenu(Menu);
-    NametoTextMenuMap.insert( pair <std::string, QTMenu *> (iter->first, Menu) );
+    NametoTextMenuMap.insert( pair <std::string, QtMenu *> (iter->first, Menu) );
     //new SubMenuItem(getSuitableShortForm(iter->first),iter->second.first,main_menu,Menu);
   }
@@ -77 +77 @@
 
   // go through all actions and add them to its menu
-  for (std::map <std::string, QTMenu *>::iterator MenuRunner = NametoTextMenuMap.begin(); MenuRunner != NametoTextMenuMap.end(); ++MenuRunner) {
+  for (std::map <std::string, QtMenu *>::iterator MenuRunner = NametoTextMenuMap.begin(); MenuRunner != NametoTextMenuMap.end(); ++MenuRunner) {
     cout << "Creating Action " << MenuRunner->first << " in menu " << MenuRunner->second << endl;
     populateMenu(MenuRunner->second, MenuRunner->first);
@@ -88 +88 @@
   splitter2->addWidget(worldDisplay);
 
-  statusBar = new QTStatusBar(this);
+  statusBar = new QtStatusBar(this);
   setStatusBar(statusBar);
 
@@ -95 +95 @@
 }
 
-QTMainWindow::~QTMainWindow()
+QtMainWindow::~QtMainWindow()
 {
   menuBar()->clear();
@@ -101 +101 @@
 }
 
-void QTMainWindow::display() {
+void QtMainWindow::display() {
   this->show();
   theApp->exec();
 }
 
-char QTMainWindow::getSuitableShortForm(set <char> &ShortcutList, const std::string name) const
+char QtMainWindow::getSuitableShortForm(set <char> &ShortcutList, const std::string name) const
 {
   for (std::string::const_iterator CharRunner = name.begin(); CharRunner != name.end(); ++CharRunner) {
@@ -116 +116 @@
 }
 
-void QTMainWindow::populateMenu(QTMenu* Menu, const  std::string &MenuName)
+void QtMainWindow::populateMenu(QtMenu* Menu, const  std::string &MenuName)
 {
   Action *ActionItem = NULL;