author | zecke <zecke> | 2004-09-10 11:18:05 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-10 11:18:05 (UTC) |
commit | d66bae289ee2c3c359fa959764ac2e814a179f69 (patch) (side-by-side diff) | |
tree | 577cf54a964459308b4653b4572aca007301c8f7 | |
parent | 59dbb076579e0387f960525b415511946eb83b17 (diff) | |
download | opie-d66bae289ee2c3c359fa959764ac2e814a179f69.zip opie-d66bae289ee2c3c359fa959764ac2e814a179f69.tar.gz opie-d66bae289ee2c3c359fa959764ac2e814a179f69.tar.bz2 |
Move the pixmap to calcdisplay.cpp to avoid warnings
-rw-r--r-- | noncore/tools/euroconv/calcdisplay.cpp | 34 | ||||
-rw-r--r-- | noncore/tools/euroconv/calcdisplay.h | 28 | ||||
-rw-r--r-- | noncore/tools/euroconv/main.cpp | 12 |
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,13 +1,13 @@ /**************************************************************************** * * File: calcdisplay.cpp * - * Description: - * - * + * Description: + * + * * Authors: Eric Santonacci <Eric.Santonacci@talc.fr> * * Requirements: Qt * * $Id$ * @@ -17,12 +17,40 @@ #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 ){ 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 @@ -20,40 +20,12 @@ #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 ); 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,13 +1,13 @@ /**************************************************************************** * * File: main.cpp * * Description: main file for OPIE Euroconv aapp - * - * + * + * * Authors: Eric Santonacci <Eric.Santonacci@talc.fr> * * Requirements: Qt * * ***************************************************************************/ @@ -19,21 +19,21 @@ #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> ) |