summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/calculator/calculatorimpl.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/noncore/tools/calculator/calculatorimpl.cpp b/noncore/tools/calculator/calculatorimpl.cpp
index 05cb9b5..21c1e2e 100644
--- a/noncore/tools/calculator/calculatorimpl.cpp
+++ b/noncore/tools/calculator/calculatorimpl.cpp
@@ -25,13 +25,12 @@
// Sat 03-09-2002 L.J. Potter added the inlined pixmaps here
#include "calculatorimpl.h"
/* OPIE */
#include <opie2/odebug.h>
-#include <qpe/resource.h>
#include <qpe/qmath.h>
#include <qpe/qpeapplication.h>
using namespace Opie::Core;
/* QT */
#include <qpushbutton.h>
@@ -106,16 +105,12 @@ static char *xtopowerofy_xpm[] = {
};
CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name,
WFlags f )
: Calculator( parent, name, f )
{
-// xtopowerofy = Resource::loadPixmap("xtopowerofy");
-// ythrootofx = Resource::loadPixmap("ythrootofx");
-// oneoverx = Resource::loadPixmap("oneoverx");
-
memMark = new QLabel( "m", LCD );
memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) );
memMark->resize( 12, 12 );
memMark->move( 4, 2 );
memMark->hide();
mem = 0;
@@ -130,19 +125,19 @@ CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name,
QObject::tr("Weight");
QObject::tr("Distance");
QObject::tr("Area");
QObject::tr("Temperatures");
QObject::tr("Volume");
QObject::tr("acres");
- QObject::tr("°C");
+ QObject::tr("C");
QObject::tr("carats");
QObject::tr("cm");
QObject::tr("cu cm");
QObject::tr("cu ft");
QObject::tr("cu in");
- QObject::tr("°F");
+ QObject::tr("F");
QObject::tr("fl oz (US)");
QObject::tr("ft");
QObject::tr("g");
QObject::tr("gal (US)");
QObject::tr("hectares");
QObject::tr("in");