From 2cabd9ad4b49eefccdf99ad59550c76546b473c9 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Sun, 03 Jul 2005 22:13:00 +0000
Subject: Resource -> OResource

This is a large diff and I'd appreciate some additional pairs of eyes checking it
---
(limited to 'core/launcher/taskbar.cpp')

diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 7cbfe13..1356c77 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -1,23 +1,30 @@
-/**********************************************************************
-** 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 "startmenu.h"
 #include "inputmethods.h"
 #include "runningappbar.h"
@@ -30,6 +37,7 @@
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <qtopia/config.h>
 #include <qtopia/qpeapplication.h>
 #ifdef QWS
@@ -138,8 +146,8 @@ public:
 	QWidget(parent),
 	nl(initNumLock()), cl(FALSE)
     {
-	nl_pm = Resource::loadPixmap("numlock");
-	cl_pm = Resource::loadPixmap("capslock");
+        nl_pm = OResource::loadPixmap("numlock", OResource::NoScale);
+        cl_pm = OResource::loadPixmap("capslock", OResource::NoScale);
     }
     QSize sizeHint() const
     {
--
cgit v0.9.0.2