summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-10 11:18:05 (UTC)
committer zecke <zecke>2004-09-10 11:18:05 (UTC)
commitd66bae289ee2c3c359fa959764ac2e814a179f69 (patch) (unidiff)
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,11 +1,11 @@
1/**************************************************************************** 1/****************************************************************************
2 * 2 *
3 * File: calcdisplay.cpp 3 * File: calcdisplay.cpp
4 * 4 *
5 * Description: 5 * Description:
6 * 6 *
7 * 7 *
8 * Authors: Eric Santonacci <Eric.Santonacci@talc.fr> 8 * Authors: Eric Santonacci <Eric.Santonacci@talc.fr>
9 * 9 *
10 * Requirements: Qt 10 * Requirements: Qt
11 * 11 *
@@ -19,8 +19,36 @@
19 19
20#include "currency.h" 20#include "currency.h"
21#include "calcdisplay.h" 21#include "calcdisplay.h"
22 22
23/* XPM */
24static char *swap_xpm[] = {
25/* width height num_colors chars_per_pixel */
26" 13 18 2 1",
27/* colors */
28". c None",
29"# c #000000",
30/* pixels */
31"..#######....",
32"..#####......",
33"..######.....",
34"..#...###....",
35"........##...",
36".........##..",
37"..........##.",
38"...........##",
39"...........##",
40"...........##",
41"...........##",
42"..........##.",
43".........##..",
44"........##...",
45"..#...###....",
46"..######.....",
47"..#####......",
48"..#######....",
49};
50
23 51
24LCDDisplay::LCDDisplay( QWidget *parent, const char *name ) 52LCDDisplay::LCDDisplay( QWidget *parent, const char *name )
25 : QHBox( parent, name ){ 53 : QHBox( parent, name ){
26 54
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
@@ -22,36 +22,8 @@
22#include <qpushbutton.h> 22#include <qpushbutton.h>
23#include <qcombobox.h> 23#include <qcombobox.h>
24 24
25 25
26/* XPM */
27static char *swap_xpm[] = {
28/* width height num_colors chars_per_pixel */
29" 13 18 2 1",
30/* colors */
31". c None",
32"# c #000000",
33/* pixels */
34"..#######....",
35"..#####......",
36"..######.....",
37"..#...###....",
38"........##...",
39".........##..",
40"..........##.",
41"...........##",
42"...........##",
43"...........##",
44"...........##",
45"..........##.",
46".........##..",
47"........##...",
48"..#...###....",
49"..######.....",
50"..#####......",
51"..#######....",
52};
53
54 26
55class LCDDisplay : public QHBox{ 27class LCDDisplay : public QHBox{
56 28
57Q_OBJECT 29Q_OBJECT
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
@@ -2,10 +2,10 @@
2 * 2 *
3 * File: main.cpp 3 * File: main.cpp
4 * 4 *
5 * Description: main file for OPIE Euroconv aapp 5 * Description: main file for OPIE Euroconv aapp
6 * 6 *
7 * 7 *
8 * Authors: Eric Santonacci <Eric.Santonacci@talc.fr> 8 * Authors: Eric Santonacci <Eric.Santonacci@talc.fr>
9 * 9 *
10 * Requirements: Qt 10 * Requirements: Qt
11 * 11 *
@@ -21,17 +21,17 @@
21#include <opie2/oapplicationfactory.h> 21#include <opie2/oapplicationfactory.h>
22 22
23struct Layout : QVBox{ 23struct Layout : QVBox{
24 static QString appName() { return QString::fromLatin1("euroconv"); } 24 static QString appName() { return QString::fromLatin1("euroconv"); }
25 Layout(QWidget *p, const char* n, WFlags) 25 Layout(QWidget *p, const char* n, WFlags)
26 :QVBox(0,"fond" ) 26 :QVBox(0,"fond" )
27 { 27 {
28 LCDDisplay *lcd = new LCDDisplay(this, "lcd"); 28 LCDDisplay *lcd = new LCDDisplay(this, "lcd");
29 KeyPad *num = new KeyPad(lcd, this, "keypad"); 29 (void)new KeyPad(lcd, this, "keypad");
30 30
31 setCaption( QObject::tr("Euroconv") ); 31 setCaption( QObject::tr("Euroconv") );
32 }; 32 };
33 33
34}; 34};
35 35
36using namespace Opie::Core; 36using namespace Opie::Core;
37 37