From kde-commits Thu Jun 25 12:23:42 2009 From: Carsten Niehaus Date: Thu, 25 Jun 2009 12:23:42 +0000 To: kde-commits Subject: branches/kalzium/gsoc2009/kalzium/src/calculator Message-Id: <1245932622.915540.28073.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=124593263130944 SVN commit 987045 by cniehaus: these ifdefs are needed in case you don't have libfacile installed M +4 -4 calculator.cpp M +4 -4 calculator.h --- branches/kalzium/gsoc2009/kalzium/src/calculator/calculator.cpp #987044:987045 @@ -45,11 +45,11 @@ // Add the molecular mass Calculator widget to the user interface // m_massCalculator = new massCalculator(this); // ui.stack->addWidget(m_massCalculator); -//#ifdef HAVE_FACILE +#ifdef HAVE_FACILE // Add the equation balancer widget to the user interface m_equationBalancer = new EQChemDialog(this); ui.stack->addWidget(m_equationBalancer); -//#endif +#endif // Connect the tree item selection signal to the corresponding slot connect(ui.tree, SIGNAL(itemClicked(QTreeWidgetItem * , int)), this, @@ -86,10 +86,10 @@ // The equation balancer needs FACILE library, if its present HAVE_FACILE = 1 // If the equation balancer was selected, open it in the UI. -//#ifdef HAVE_FACILE +#ifdef HAVE_FACILE else if (!(s.compare(i18n("Equation Balancer")))) ui.stack->setCurrentWidget(m_equationBalancer); -//#endif +#endif else if (!(s.compare(i18n("Molecular mass Calculator")))) ui.stack->setCurrentWidget(m_moleCalculator); } --- branches/kalzium/gsoc2009/kalzium/src/calculator/calculator.h #987044:987045 @@ -25,9 +25,9 @@ //#include "massCalculator.h" #include "molcalcwidget.h" #include -//#ifdef HAVE_FACILE +#ifdef HAVE_FACILE #include -//#endif +#endif /** * This widget implements the molecular calculator @@ -50,9 +50,9 @@ concCalculator * m_concCalculator; // The concentration calculator // massCalculator * m_massCalculator; // The molecular mass calculator MolcalcWidget * m_moleCalculator; // The molecular mass calculator -//#ifdef HAVE_FACILE +#ifdef HAVE_FACILE EQChemDialog * m_equationBalancer; // The equation balancer -//#endif +#endif private slots: void slotItemSelection(QTreeWidgetItem *item); // occurs when an tree item is selected public slots: