summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-10 11:18:05 (UTC)
committer zecke <zecke>2004-09-10 11:18:05 (UTC)
commitd66bae289ee2c3c359fa959764ac2e814a179f69 (patch) (side-by-side diff)
tree577cf54a964459308b4653b4572aca007301c8f7
parent59dbb076579e0387f960525b415511946eb83b17 (diff)
downloadopie-d66bae289ee2c3c359fa959764ac2e814a179f69.zip
opie-d66bae289ee2c3c359fa959764ac2e814a179f69.tar.gz
opie-d66bae289ee2c3c359fa959764ac2e814a179f69.tar.bz2
Move the pixmap to calcdisplay.cpp to avoid warnings
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/euroconv/calcdisplay.cpp34
-rw-r--r--noncore/tools/euroconv/calcdisplay.h28
-rw-r--r--noncore/tools/euroconv/main.cpp12
3 files changed, 37 insertions, 37 deletions
diff --git a/noncore/tools/euroconv/calcdisplay.cpp b/noncore/tools/euroconv/calcdisplay.cpp
index e5a49e6..8f3de22 100644
--- a/noncore/tools/euroconv/calcdisplay.cpp
+++ b/noncore/tools/euroconv/calcdisplay.cpp
@@ -1,46 +1,74 @@
/****************************************************************************
*
* File: calcdisplay.cpp
*
- * Description:
- *
- *
+ * Description:
+ *
+ *
* Authors: Eric Santonacci <Eric.Santonacci@talc.fr>
*
* Requirements: Qt
*
* $Id$
*
***************************************************************************/
#include <stdio.h>
#include <qvbox.h>
#include <qpixmap.h>
#include "currency.h"
#include "calcdisplay.h"
+/* XPM */
+static char *swap_xpm[] = {
+/* width height num_colors chars_per_pixel */
+" 13 18 2 1",
+/* colors */
+". c None",
+"# c #000000",
+/* pixels */
+"..#######....",
+"..#####......",
+"..######.....",
+"..#...###....",
+"........##...",
+".........##..",
+"..........##.",
+"...........##",
+"...........##",
+"...........##",
+"...........##",
+"..........##.",
+".........##..",
+"........##...",
+"..#...###....",
+"..######.....",
+"..#####......",
+"..#######....",
+};
+
LCDDisplay::LCDDisplay( QWidget *parent, const char *name )
: QHBox( parent, name ){
this->setMargin(5);
this->setSpacing(5);
// Create display
QVBox *vbxlayout = new QVBox (this);
/*************** Top LCD ***********************/
grpbxTop = new QHGroupBox(vbxlayout, "grpbxTop");
grpbxStyle = grpbxTop->frameStyle();
grpbxTop->setMaximumHeight(48);
cbbxTop = new QComboBox(grpbxTop, "cbbxTop");
cbbxTop->setMaximumWidth(50);
cbbxTop->insertStrList(aCurrency);
lcdTop = new QLCDNumber(10, grpbxTop, "lcdTop");
lcdTop->setMode( QLCDNumber::DEC );
lcdTop->setSmallDecimalPoint(false);
diff --git a/noncore/tools/euroconv/calcdisplay.h b/noncore/tools/euroconv/calcdisplay.h
index d1902cf..a48ab77 100644
--- a/noncore/tools/euroconv/calcdisplay.h
+++ b/noncore/tools/euroconv/calcdisplay.h
@@ -2,76 +2,48 @@
*
* File: calcdisplay.h
*
* Description: Header file for the class LCDDisplay
*
*
* Authors: Eric Santonacci <Eric.Santonacci@talc.fr>
*
* Requirements: Qt
*
* $Id$
*
*
***************************************************************************/
#ifndef CALCDISPLAY_H
#define CALCDISPLAY_H
#include <qhbox.h>
#include <qlcdnumber.h>
#include <qhgroupbox.h>
#include <qpushbutton.h>
#include <qcombobox.h>
-/* XPM */
-static char *swap_xpm[] = {
-/* width height num_colors chars_per_pixel */
-" 13 18 2 1",
-/* colors */
-". c None",
-"# c #000000",
-/* pixels */
-"..#######....",
-"..#####......",
-"..######.....",
-"..#...###....",
-"........##...",
-".........##..",
-"..........##.",
-"...........##",
-"...........##",
-"...........##",
-"...........##",
-"..........##.",
-".........##..",
-"........##...",
-"..#...###....",
-"..######.....",
-"..#####......",
-"..#######....",
-};
-
class LCDDisplay : public QHBox{
Q_OBJECT
public:
LCDDisplay( QWidget *parent=0, const char *name=0 );
public slots:
void setValue(double);
void swapLCD(void);
void cbbxChange(void);
//signals:
// void valueChanged( int );
private:
int grpbxStyle;
QHGroupBox *grpbxTop;
QComboBox *cbbxTop;
QLCDNumber *lcdTop;
QHGroupBox *grpbxBottom;
QComboBox *cbbxBottom;
QLCDNumber *lcdBottom;
diff --git a/noncore/tools/euroconv/main.cpp b/noncore/tools/euroconv/main.cpp
index dd4ff1d..8b417fe 100644
--- a/noncore/tools/euroconv/main.cpp
+++ b/noncore/tools/euroconv/main.cpp
@@ -1,39 +1,39 @@
/****************************************************************************
*
* File: main.cpp
*
* Description: main file for OPIE Euroconv aapp
- *
- *
+ *
+ *
* Authors: Eric Santonacci <Eric.Santonacci@talc.fr>
*
* Requirements: Qt
*
*
***************************************************************************/
#include <qpe/qpeapplication.h>
#include <qvbox.h>
#include "calcdisplay.h"
#include "calckeypad.h"
#include <opie2/oapplicationfactory.h>
struct Layout : QVBox{
static QString appName() { return QString::fromLatin1("euroconv"); }
- Layout(QWidget *p, const char* n, WFlags)
+ Layout(QWidget *p, const char* n, WFlags)
:QVBox(0,"fond" )
{
LCDDisplay *lcd = new LCDDisplay(this, "lcd");
- KeyPad *num = new KeyPad(lcd, this, "keypad");
-
+ (void)new KeyPad(lcd, this, "keypad");
+
setCaption( QObject::tr("Euroconv") );
};
-
+
};
using namespace Opie::Core;
OPIE_EXPORT_APP( OApplicationFactory<Layout> )