From d66bae289ee2c3c359fa959764ac2e814a179f69 Mon Sep 17 00:00:00 2001 From: zecke Date: Fri, 10 Sep 2004 11:18:05 +0000 Subject: Move the pixmap to calcdisplay.cpp to avoid warnings --- (limited to 'noncore/tools') 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 @@ -2,9 +2,9 @@ * * File: calcdisplay.cpp * - * Description: - * - * + * Description: + * + * * Authors: Eric Santonacci * * Requirements: Qt @@ -20,6 +20,34 @@ #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 ){ 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 @@ -23,34 +23,6 @@ #include -/* 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{ 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 @@ -3,8 +3,8 @@ * File: main.cpp * * Description: main file for OPIE Euroconv aapp - * - * + * + * * Authors: Eric Santonacci * * Requirements: Qt @@ -22,15 +22,15 @@ 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; -- cgit v0.9.0.2