[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/kcalc
From:       Evan Teran <eteran () alum ! rit ! edu>
Date:       2010-09-04 0:55:21
Message-ID: 20100904005521.2C6F1AC884 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1171503 by teran:

got rid of uneccessary struct keyword when refering to the "science_constant" type
in c++ the struct keyword isn't neccessary except for when declaring the type itself, 
not when using it.



 M  +7 -7      kcalc.cpp  
 M  +7 -7      kcalc.h  
 M  +1 -1      kcalc_const_button.cpp  
 M  +3 -1      kcalc_const_button.h  
 M  +2 -2      kcalc_const_menu.cpp  
 M  +2 -2      kcalc_const_menu.h  


--- trunk/KDE/kdeutils/kcalc/kcalc.cpp #1171502:1171503
@@ -772,7 +772,7 @@
     }
 }
 
-void KCalculator::slotConstantToDisplay(const struct science_constant &const_chosen)
+void KCalculator::slotConstantToDisplay(const science_constant &const_chosen)
 {
     calc_display->setAmount(const_chosen.value);
 
@@ -1501,42 +1501,42 @@
 // these 6 slots are just a quick hack, instead of setting the
 // TextEdit fields in the configuration dialog, we are setting the
 // Settingvalues themselves!!
-void KCalculator::slotChooseScientificConst0(const struct science_constant &chosen_const)
+void KCalculator::slotChooseScientificConst0(const science_constant &chosen_const)
 {
     constants_->kcfg_valueConstant0->setText(chosen_const.value);
 
     constants_->kcfg_nameConstant0->setText(chosen_const.label);
 }
 
-void KCalculator::slotChooseScientificConst1(const struct science_constant &chosen_const)
+void KCalculator::slotChooseScientificConst1(const science_constant &chosen_const)
 {
     constants_->kcfg_valueConstant1->setText(chosen_const.value);
 
     constants_->kcfg_nameConstant1->setText(chosen_const.label);
 }
 
-void KCalculator::slotChooseScientificConst2(const struct science_constant &chosen_const)
+void KCalculator::slotChooseScientificConst2(const science_constant &chosen_const)
 {
     constants_->kcfg_valueConstant2->setText(chosen_const.value);
 
     constants_->kcfg_nameConstant2->setText(chosen_const.label);
 }
 
-void KCalculator::slotChooseScientificConst3(const struct science_constant &chosen_const)
+void KCalculator::slotChooseScientificConst3(const science_constant &chosen_const)
 {
     constants_->kcfg_valueConstant3->setText(chosen_const.value);
 
     constants_->kcfg_nameConstant3->setText(chosen_const.label);
 }
 
-void KCalculator::slotChooseScientificConst4(const struct science_constant &chosen_const)
+void KCalculator::slotChooseScientificConst4(const science_constant &chosen_const)
 {
     constants_->kcfg_valueConstant4->setText(chosen_const.value);
 
     constants_->kcfg_nameConstant4->setText(chosen_const.label);
 }
 
-void KCalculator::slotChooseScientificConst5(const struct science_constant &chosen_const)
+void KCalculator::slotChooseScientificConst5(const science_constant &chosen_const)
 {
     constants_->kcfg_valueConstant5->setText(chosen_const.value);
 
--- trunk/KDE/kdeutils/kcalc/kcalc.h #1171502:1171503
@@ -190,13 +190,13 @@
     void slotHyptoggled(bool flag);
     void slotConstclicked(int);
 
-    void slotConstantToDisplay(const struct science_constant &const_chosen);
-    void slotChooseScientificConst0(const struct science_constant &);
-    void slotChooseScientificConst1(const struct science_constant &);
-    void slotChooseScientificConst2(const struct science_constant &);
-    void slotChooseScientificConst3(const struct science_constant &);
-    void slotChooseScientificConst4(const struct science_constant &);
-    void slotChooseScientificConst5(const struct science_constant &);
+    void slotConstantToDisplay(const science_constant &const_chosen);
+    void slotChooseScientificConst0(const science_constant &);
+    void slotChooseScientificConst1(const science_constant &);
+    void slotChooseScientificConst2(const science_constant &);
+    void slotChooseScientificConst3(const science_constant &);
+    void slotChooseScientificConst4(const science_constant &);
+    void slotChooseScientificConst5(const science_constant &);
 
     void slotBitsetChanged(quint64);
     void slotUpdateBitset(const KNumber &);
--- trunk/KDE/kdeutils/kcalc/kcalc_const_button.cpp #1171502:1171503
@@ -97,7 +97,7 @@
     }
 }
 
-void KCalcConstButton::slotChooseScientificConst(const struct science_constant &const_chosen)
+void KCalcConstButton::slotChooseScientificConst(const science_constant &const_chosen)
 {
     KCalcSettings::setValueConstant(button_num_, const_chosen.value);
 
--- trunk/KDE/kdeutils/kcalc/kcalc_const_button.h #1171502:1171503
@@ -27,7 +27,9 @@
 #include <klocale.h>
 #include "kcalc_button.h"
 
+struct science_constant;
 
+
 class KCalcConstButton : public KCalcButton
 {
     Q_OBJECT
@@ -50,7 +52,7 @@
 
 private slots:
     void slotConfigureButton();
-    void slotChooseScientificConst(const struct science_constant &const_chosen);
+    void slotChooseScientificConst(const science_constant &const_chosen);
     void slotClicked();
 
 private:
--- trunk/KDE/kdeutils/kcalc/kcalc_const_menu.cpp #1171502:1171503
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-QList<struct science_constant> KCalcConstMenu::Constants;
+QList<science_constant> KCalcConstMenu::Constants;
 
 
 void KCalcConstMenu::init_consts()
@@ -57,7 +57,7 @@
     while (!n.isNull()) {
         QDomElement e = n.toElement(); // try to convert the node to an element.
         if (!e.isNull()  &&  e.tagName() == "constant") {
-            struct science_constant tmp_const;
+            science_constant tmp_const;
 
             tmp_const.name = I18N_NOOP(e.attributeNode("name").value());
             tmp_const.label = e.attributeNode("symbol").value();
--- trunk/KDE/kdeutils/kcalc/kcalc_const_menu.h #1171502:1171503
@@ -46,11 +46,11 @@
     KCalcConstMenu(QWidget * parent = 0);
     explicit KCalcConstMenu(const QString &title, QWidget * parent = 0);
 
-    static QList<struct science_constant> Constants;
+    static QList<science_constant> Constants;
     static void init_consts();
 
 signals:
-    void triggeredConstant(const struct science_constant &);
+    void triggeredConstant(const science_constant &);
 
 
 private:
[prev in list] [next in list] [prev in thread] [next in thread]