1 files changed, 30 insertions, 23 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index d960908..6275fcb 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -1,36 +1,43 @@
-/**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-**
-** This file is part of the Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-
+/*
+                             This file is part of the Opie Project
+              =.             (C) 2000-2002 Trolltech AS
+            .=l.             (C) 2002-2005 The Opie Team <opie-devel@handhelds.org>
+           .>+-=
+ _;:,     .>    :=|.         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; version 2 of the License.
+     ._= =}       :
+    .%`+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 "launcherview.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <qpe/config.h>
 #include <qtopia/qpeapplication.h>
 #include <qtopia/private/categories.h>
 #include <qtopia/categoryselect.h>
 #include <qtopia/mimetype.h>
-#include <qtopia/resource.h>
 using namespace Opie::Core;
 
 #include <qpe/qcopenvelope_qws.h>
 
 /* QT */
 #include <qtimer.h>
@@ -423,13 +430,13 @@ void LauncherIconView::addCatsAndMimes(AppLnk* app)
 
 void LauncherIconView::setBusy(bool on)
 {
 #ifdef USE_ANIMATED_BUSY_ICON_OVERLAY
     if ( busyPix.isNull() ) {
         int size = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize();
-        busyPix.convertFromImage( Resource::loadImage( "busy" ).smoothScale( size * 16, size ) );
+        busyPix.convertFromImage( OResource::loadImage( "busy", OResource::NoScale ).smoothScale( size * 16, size ) );
     }
 #endif
 
     if ( on ) {
         busyTimer = startTimer( 100 );
     } else {
@@ -998,13 +1005,13 @@ void LauncherView::setBackgroundType( BackgroundType t, const QString &val )
             (*bgCache)[bgName]->ref++;
             bg = (*bgCache)[bgName]->pm;
         } else {
             QString imgFile = bgName;
             bool tile = FALSE;
             if ( imgFile[0]!='/' || !QFile::exists(imgFile) ) {
-            imgFile = Resource::findPixmap( imgFile );
+            imgFile = OResource::findPixmap( imgFile );
             tile = TRUE;
             }
             QImage img = loadBackgroundImage(imgFile);
 
 
             if ( img.depth() == 1 )