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

List:       kde-commits
Subject:    Re: kdeutils/kcalc
From:       "Aaron J. Seigo" <aseigo () olympusproject ! org>
Date:       2004-10-16 18:19:54
Message-ID: 200410161219.55284.aseigo () olympusproject ! org
[Download RAW message or body]

On Saturday 16 October 2004 02:52, Klaus Niederkrüger wrote:
> CVS commit by kniederk:
>
> improve Const-Buttons: set value by using INV-Button instead of config-menu
>
>
>   M +3 -0      ChangeLog   1.65
>   M +1 -83     constants.ui   1.3
>   M +110 -39   kcalc.cpp   1.175
>   M +1 -1      kcalc_button.cpp   1.13
>   M +1 -1      kcalc_settings.kcfgc   1.7

the attached patch fixes the build on my system (and others on IRC i would 
also imagine). w/out it i get errors like: 

kcalc.cpp:1766: error: call of overloaded `number(CALCAMNT)' is ambiguous
/home/kdecvs/qt-copy/include/qstring.h:616: error: candidates are: static
   QString QString::number(long int, int)
/home/kdecvs/qt-copy/include/qstring.h:617: error:                 static
   QString QString::number(long unsigned int, int)
/home/kdecvs/qt-copy/include/qstring.h:618: error:                 static
   QString QString::number(long long int, int)
/home/kdecvs/qt-copy/include/qstring.h:619: error:                 static
   QString QString::number(long long unsigned int, int)
/home/kdecvs/qt-copy/include/qstring.h:620: error:                 static
   QString QString::number(int, int)
/home/kdecvs/qt-copy/include/qstring.h:621: error:                 static
   QString QString::number(unsigned int, int)
/home/kdecvs/qt-copy/include/qstring.h:622: error:                 static
   QString QString::number(double, char, int)

i assume this is because CALCAMNT is a long double here and it's trying to 
figure out the appropriate type, but QString::number doesn't provide a 
number(long double,...) variant.. however, i fear with the patch, which 
compiles, that there will be a loss in precision. you may have to provide 
your own implementation of such a thing?

-- 
Aaron J. Seigo
GPG Fingerprint: 8B8B 2209 0C6F 7C47 B1EA  EE75 D6B7 2EB1 A7F1 DB43

seems to me that
if i could find the right music
i'd never have to sleep again

["kcalc.diff" (text/x-diff)]

Index: kcalc.cpp
===================================================================
RCS file: /home/kde/kdeutils/kcalc/kcalc.cpp,v
retrieving revision 1.175
diff -u -3 -d -p -r1.175 kcalc.cpp
--- kcalc.cpp	16 Oct 2004 08:52:17 -0000	1.175
+++ kcalc.cpp	16 Oct 2004 18:22:19 -0000
@@ -1763,7 +1763,7 @@ void KCalculator::slotC1clicked(void)
 	else
 	{
 		pbInv->setOn(false);
-		KCalcSettings::setValueConstant1(QString::number(calc_display->getAmount()));
+		KCalcSettings::setValueConstant1(QString::number((double)calc_display->getAmount()));
 	}
 
 	UpdateDisplay(false);
@@ -1779,7 +1779,7 @@ void KCalculator::slotC2clicked(void)
 	else
 	{
 		pbInv->setOn(false);
-		KCalcSettings::setValueConstant2(QString::number(calc_display->getAmount()));
+		KCalcSettings::setValueConstant2(QString::number((double)calc_display->getAmount()));
 	}
 
 	UpdateDisplay(false);
@@ -1795,7 +1795,7 @@ void KCalculator::slotC3clicked(void)
 	else
 	{
 		pbInv->setOn(false);
-		KCalcSettings::setValueConstant3(QString::number(calc_display->getAmount()));
+		KCalcSettings::setValueConstant3(QString::number((double)calc_display->getAmount()));
 	}
 
 	UpdateDisplay(false);
@@ -1811,7 +1811,7 @@ void KCalculator::slotC4clicked(void)
 	else
 	{
 		pbInv->setOn(false);
-		KCalcSettings::setValueConstant4(QString::number(calc_display->getAmount()));
+		KCalcSettings::setValueConstant4(QString::number((double)calc_display->getAmount()));
 	}
 
 	UpdateDisplay(false);
@@ -1827,7 +1827,7 @@ void KCalculator::slotC5clicked(void)
 	else
 	{
 		pbInv->setOn(false);
-		KCalcSettings::setValueConstant5(QString::number(calc_display->getAmount()));
+		KCalcSettings::setValueConstant5(QString::number((double)calc_display->getAmount()));
 	}
 
 	UpdateDisplay(false);
@@ -1843,7 +1843,7 @@ void KCalculator::slotC6clicked(void)
 	else
 	{
 		pbInv->setOn(false);
-		KCalcSettings::setValueConstant6(QString::number(calc_display->getAmount()));
+		KCalcSettings::setValueConstant6(QString::number((double)calc_display->getAmount()));
 	}
 
 	UpdateDisplay(false);


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