Move the pixmap to calcdisplay.cpp to avoid warnings

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 @@
 /****************************************************************************
  *
  * File:        calcdisplay.cpp
  *
- * Description:  
- *              
- *               
+ * Description:
+ *
+ *
  * Authors:     Eric Santonacci <Eric.Santonacci@talc.fr>
  *
  * Requirements:    Qt
  *
@@ -19,8 +19,36 @@
 
 #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
@@ -22,36 +22,8 @@
 #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
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 @@
  *
  * File:        main.cpp
  *
  * Description: main file for OPIE Euroconv aapp
- *              
- *               
+ *
+ *
  * Authors:     Eric Santonacci <Eric.Santonacci@talc.fr>
  *
  * Requirements:    Qt
  *
@@ -21,17 +21,17 @@
 #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;