summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/calc2/calc.cpp2
-rw-r--r--noncore/tools/calc2/calc.pro50
2 files changed, 26 insertions, 26 deletions
diff --git a/noncore/tools/calc2/calc.cpp b/noncore/tools/calc2/calc.cpp
index 883ab33..f75eb69 100644
--- a/noncore/tools/calc2/calc.cpp
+++ b/noncore/tools/calc2/calc.cpp
@@ -5,49 +5,49 @@
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include <qvaluelist.h> 21#include <qvaluelist.h>
22#include <qpe/qpeapplication.h> 22#include <qpe/qpeapplication.h>
23#include <qdir.h> 23#include <qdir.h>
24#include <qwidgetstack.h> 24#include <qwidgetstack.h>
25 25
26#include "calc.h" 26#include "calc.h"
27#include "plugininterface.h" 27#include "plugininterface.h"
28 28
29calc::calc (QWidget * p = 0, const char *n = 0):QWidget (p, n) 29calc::calc (QWidget * p, const char *n):QWidget (p, n)
30{ 30{
31 setCaption (tr ("Calculator")); 31 setCaption (tr ("Calculator"));
32 32
33// widgets 33// widgets
34 LCD = new QLCDNumber (this); 34 LCD = new QLCDNumber (this);
35 LCD->setMaximumSize (QSize (240, 30)); 35 LCD->setMaximumSize (QSize (240, 30));
36 LCD->setNumDigits(12); 36 LCD->setNumDigits(12);
37LCD->setSegmentStyle(QLCDNumber::Filled); 37LCD->setSegmentStyle(QLCDNumber::Filled);
38 pluginWidgetStack = new QWidgetStack (this); 38 pluginWidgetStack = new QWidgetStack (this);
39 39
40// layout widgets 40// layout widgets
41 calculatorLayout = new QVBoxLayout (this); 41 calculatorLayout = new QVBoxLayout (this);
42 calculatorLayout->addWidget (LCD); 42 calculatorLayout->addWidget (LCD);
43 calculatorLayout->addWidget (pluginWidgetStack); 43 calculatorLayout->addWidget (pluginWidgetStack);
44 44
45// no formatting of display for now 45// no formatting of display for now
46 connect (&engine, SIGNAL(display (double)), LCD, SLOT(display (double))); 46 connect (&engine, SIGNAL(display (double)), LCD, SLOT(display (double)));
47 connect (&engine, SIGNAL(display (const QString &)), LCD, SLOT(display (const QString &))); 47 connect (&engine, SIGNAL(display (const QString &)), LCD, SLOT(display (const QString &)));
48 connect (&engine, SIGNAL(setBinMode()), LCD, SLOT(setBinMode())); 48 connect (&engine, SIGNAL(setBinMode()), LCD, SLOT(setBinMode()));
49 connect (&engine, SIGNAL(setOctMode()), LCD, SLOT(setOctMode())); 49 connect (&engine, SIGNAL(setOctMode()), LCD, SLOT(setOctMode()));
50 connect (&engine, SIGNAL(setDecMode()), LCD, SLOT(setDecMode())); 50 connect (&engine, SIGNAL(setDecMode()), LCD, SLOT(setDecMode()));
51 connect (&engine, SIGNAL(setHexMode()), LCD, SLOT(setHexMode())); 51 connect (&engine, SIGNAL(setHexMode()), LCD, SLOT(setHexMode()));
52 52
53#ifndef NO_PLUGINS 53#ifndef NO_PLUGINS
diff --git a/noncore/tools/calc2/calc.pro b/noncore/tools/calc2/calc.pro
index 8dfba95..c9f5fa1 100644
--- a/noncore/tools/calc2/calc.pro
+++ b/noncore/tools/calc2/calc.pro
@@ -1,29 +1,29 @@
1#TEMPLATE = app 1TEMPLATE = app
2#CONFIG += qt release 2CONFIG += qt release
3## Input 3# Input
4#HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h 4HEADERS += calc.h plugininterface.h instruction.h engine.h stdinstructions.h
5#SOURCES += calc.cpp main.cpp engine.cpp 5SOURCES += calc.cpp main.cpp engine.cpp
6#INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
7#DEPENDPATH += $(OPIEDIR)/include 7DEPENDPATH += $(OPIEDIR)/include
8#LIBS += -lqpe -Wl,-export-dynamic 8LIBS += -lqpe -Wl,-export-dynamic
9#TARGET = calc 9TARGET = calc
10#DESTDIR = $(OPIEDIR)/bin 10DESTDIR = $(OPIEDIR)/bin
11# 11
12#TRANSLATIONS = ../../../i18n/de/calc.pro \ 12TRANSLATIONS = ../../../i18n/de/calc.pro \
13 # ../../../i18n/en/calc.pro \ 13 ../../../i18n/en/calc.pro \
14 # ../../../i18n/es/calc.pro \ 14 ../../../i18n/es/calc.pro \
15 # ../../../i18n/fr/calc.pro \ 15 ../../../i18n/fr/calc.pro \
16 # ../../../i18n/hu/calc.pro \ 16 ../../../i18n/hu/calc.pro \
17 # ../../../i18n/ja/calc.pro \ 17 ../../../i18n/ja/calc.pro \
18 # ../../../i18n/ko/calc.pro \ 18 ../../../i18n/ko/calc.pro \
19 # ../../../i18n/no/calc.pro \ 19 ../../../i18n/no/calc.pro \
20 # ../../../i18n/pl/calc.pro \ 20 ../../../i18n/pl/calc.pro \
21 # ../../../i18n/pt/calc.pro \ 21 ../../../i18n/pt/calc.pro \
22 # ../../../i18n/pt_BR/calc.pro \ 22 ../../../i18n/pt_BR/calc.pro \
23 # ../../../i18n/sl/calc.pro \ 23 ../../../i18n/sl/calc.pro \
24 # ../../../i18n/zh_CN/calc.pro \ 24 ../../../i18n/zh_CN/calc.pro \
25 # ../../../i18n/zh_TW/calc.pro 25 ../../../i18n/zh_TW/calc.pro
26 26
27 27
28 28
29include ( $(OPIEDIR)/include.pro ) 29include ( $(OPIEDIR)/include.pro )