-rw-r--r-- | noncore/tools/calculator/calculatorimpl.cpp | 9 |
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 | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | /* OPIE */ | 29 | /* OPIE */ |
30 | #include <opie2/odebug.h> | 30 | #include <opie2/odebug.h> |
31 | #include <qpe/resource.h> | ||
32 | #include <qpe/qmath.h> | 31 | #include <qpe/qmath.h> |
33 | #include <qpe/qpeapplication.h> | 32 | #include <qpe/qpeapplication.h> |
34 | using namespace Opie::Core; | 33 | using namespace Opie::Core; |
@@ -109,10 +108,6 @@ CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, | |||
109 | WFlags f ) | 108 | WFlags f ) |
110 | : Calculator( parent, name, f ) | 109 | : Calculator( parent, name, f ) |
111 | { | 110 | { |
112 | // xtopowerofy = Resource::loadPixmap("xtopowerofy"); | ||
113 | // ythrootofx = Resource::loadPixmap("ythrootofx"); | ||
114 | // oneoverx = Resource::loadPixmap("oneoverx"); | ||
115 | |||
116 | memMark = new QLabel( "m", LCD ); | 111 | memMark = new QLabel( "m", LCD ); |
117 | memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) ); | 112 | memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) ); |
118 | memMark->resize( 12, 12 ); | 113 | memMark->resize( 12, 12 ); |
@@ -133,13 +128,13 @@ CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, | |||
133 | QObject::tr("Temperatures"); | 128 | QObject::tr("Temperatures"); |
134 | QObject::tr("Volume"); | 129 | QObject::tr("Volume"); |
135 | QObject::tr("acres"); | 130 | QObject::tr("acres"); |
136 | QObject::tr("°C"); | 131 | QObject::tr("C"); |
137 | QObject::tr("carats"); | 132 | QObject::tr("carats"); |
138 | QObject::tr("cm"); | 133 | QObject::tr("cm"); |
139 | QObject::tr("cu cm"); | 134 | QObject::tr("cu cm"); |
140 | QObject::tr("cu ft"); | 135 | QObject::tr("cu ft"); |
141 | QObject::tr("cu in"); | 136 | QObject::tr("cu in"); |
142 | QObject::tr("°F"); | 137 | QObject::tr("F"); |
143 | QObject::tr("fl oz (US)"); | 138 | QObject::tr("fl oz (US)"); |
144 | QObject::tr("ft"); | 139 | QObject::tr("ft"); |
145 | QObject::tr("g"); | 140 | QObject::tr("g"); |