1 files changed, 30 insertions, 28 deletions

diff --git a/libopie2/opiecore/device/odevice_yopy.cpp b/libopie2/opiecore/device/odevice_yopy.cpp
index 8f22514..f81e452 100644
--- a/libopie2/opiecore/device/odevice_yopy.cpp
+++ b/libopie2/opiecore/device/odevice_yopy.cpp
@@ -1,67 +1,69 @@
 /*
-                            This file is part of the Opie Project
-                            Copyright (C) The Opie Team <opie-devel@handhelds.org>
-             =.
-           .=l.
-          .>+-=
-_;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
-- .   .-<_>     .<>         Foundation; either version 2 of the License,
-    ._= =}       :          or (at your option) any later version.
-   .%`+i>       _;_.
-   .i_,=:_.      -<s.       This program is distributed in the hope that
-    +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-   : ..    .:,     . . .    without even the implied warranty of
-   =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
- _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
-:     =  ...= . :.=-
--.   .:....=;==+<;          You should have received a copy of the GNU
- -_. . .   )=.  =           Library General Public License along with
-   --        :-=`           this library; see the file COPYING.LIB.
-                            If not, write to the Free Software Foundation,
-                            Inc., 59 Temple Place - Suite 330,
-                            Boston, MA 02111-1307, USA.
+                             This file is part of the Opie Project
+
+                             Copyright (C)2002-2005 The Opie Team <opie-devel@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
 */
 
 #include "odevice_yopy.h"
 
 /* QT */
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qwindowsystem_qws.h>
 
 /* OPIE */
 #include <qpe/config.h>
-#include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 
+#include <opie2/oresource.h>
+
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
 
 using namespace Opie::Core;
 using namespace Opie::Core::Internal;
 
 struct yopy_button yopy_buttons [] = {
     { Qt::Key_F10, QT_TRANSLATE_NOOP( "Button", "Action Button" ),
         "devicebuttons/yopy_action",
         "datebook", "nextView()",
         "today", "raise()" },
     { Qt::Key_F11, QT_TRANSLATE_NOOP( "Button", "OK Button" ),
         "devicebuttons/yopy_ok",
         "addressbook", "raise()",
         "addressbook", "beamBusinessCard()" },
@@ -79,49 +81,49 @@ void Yopy::init(const QString&)
     d->m_model = Model_Yopy_3700;
     d->m_rotation = Rot0;
     d->m_systemstr = "Linupy";
     d->m_system = System_Linupy;
     // Distribution detection code now in the base class
 }
 
 
 void Yopy::initButtons()
 {
     if ( d->m_buttons )
         return ;
 
     d->m_buttons = new QValueList <ODeviceButton>;
 
     for ( uint i = 0; i < ( sizeof( yopy_buttons ) / sizeof( yopy_button ) ); i++ )
     {
 
         yopy_button *ib = yopy_buttons + i;
 
         ODeviceButton b;
 
         b. setKeycode ( ib->code );
         b. setUserText ( QObject::tr ( "Button", ib->utext ) );
-        b. setPixmap ( Resource::loadPixmap ( ib->pix ) );
+        b. setPixmap ( OResource::loadPixmap ( ib->pix ) );
         b. setFactoryPresetPressedAction
         ( OQCopMessage( makeChannel( ib->fpressedservice ), ib->fpressedaction ) );
         b. setFactoryPresetHeldAction
         ( OQCopMessage( makeChannel( ib->fheldservice ), ib->fheldaction ) );
 
         d->m_buttons->append ( b );
     }
     reloadButtonMapping();
 }
 
 
 bool Yopy::suspend()
 {
     /* Opie for Yopy does not implement its own power management at the
         moment.  The public version runs parallel to X, and relies on the
         existing power management features. */
     return false;
 }
 
 
 bool Yopy::setDisplayBrightness( int bright )
 {
     /* The code here works, but is disabled as the current version runs
         parallel to X, and relies on the existing backlight demon. */