Resource -> OResource

2 files changed, 8 insertions, 6 deletions

diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp
index 7f984c3..b0a8ac3 100644
--- a/noncore/multimedia/opierec/helpwindow.cpp
+++ b/noncore/multimedia/opierec/helpwindow.cpp
@@ -1,74 +1,76 @@
 /****************************************************************************
 ** $Id$
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
 
 #include "helpwindow.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qlayout.h>
 #include <qtoolbar.h>
 #include <qaction.h>
 #include <qmenubar.h>
 
 /* STD */
 #include <ctype.h>
 
 HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name )
     : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL()
 {
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 2);
     layout->setMargin( 2);
     odebug << _path << oendl; 
     browser = new QTextBrowser( this );
     QStringList Strlist;
     Strlist.append( home_);
     browser->mimeSourceFactory()->setFilePath( Strlist );
     browser->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 
     connect( browser, SIGNAL( textChanged() ), this, SLOT( textChanged() ) );
 
     if ( !home_.isEmpty() )
         browser->setSource( home_ );
     QToolBar *toolbar = new QToolBar( this );
 
-    QAction *a = new QAction( tr( "Backward" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
+    QAction *a = new QAction( tr( "Backward" ), Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ),
+                              QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) );
     a->addTo( toolbar );
 
-    a = new QAction( tr( "Forward" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Forward" ), Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ),
+                     QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), browser, SLOT( forward() ) );
     a->addTo( toolbar );
 
 
     layout->addMultiCellWidget( toolbar, 0, 0, 0, 0);
 
     layout->addMultiCellWidget( browser, 1, 2, 0, 2);
     
     browser->setFocus();
 }
 
 
 void HelpWindow::setBackwardAvailable( bool b)
 {
     menuBar()->setItemEnabled( backwardId, b);
 }
 
 void HelpWindow::setForwardAvailable( bool b)
 {
     menuBar()->setItemEnabled( forwardId, b);
 }
 
 
 void HelpWindow::textChanged()
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 9d3d5cf..75413be 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -1,44 +1,44 @@
 /****************************************************************************
 	 // qtrec.cpp
  Created: Thu Jan 17 11:19:58 2002
  copyright 2002 by L.J. Potter <ljp@llornkcor.com>
 ****************************************************************************/
 //#define DEV_VERSION
 
 #include "pixmaps.h"
 #include "qtrec.h"
 #include "waveform.h"
 extern "C" {
 #include "adpcm.h"
 }
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #include <qpe/storage.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdir.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlistview.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qslider.h>
 #include <qtabwidget.h>
 #include <qtimer.h>
 
 /* STD */
 #include <errno.h>
 #include <fcntl.h>
 #include <math.h>
 #include <mntent.h>
 #include <stdio.h>
@@ -485,54 +485,54 @@ void QtRec::init() {
 
 		QGridLayout *layout1 = new QGridLayout( tab);
 		layout1->setSpacing( 2);
 		layout1->setMargin( 2);
 
 		timeSlider = new QSlider( 0,100,10,0, QSlider::Horizontal, tab, (const char *) "timeSlider" );
 		layout1->addMultiCellWidget( timeSlider, 1, 1, 0, 3);
 
 // 		timeLabel = new QLabel( tab, "TimeLabel" );
 // 		layout1->addMultiCellWidget( timeLabel, 0, 0, 0, 3);
 
 // 		playLabel2 = new QLabel(tab, "PlayLabel2" );
 // 		playLabel2->setText(tr("Play") );
 // 		playLabel2->setFixedHeight( 18);
 // 		layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4);
 
 		Stop_PushButton = new QPushButton(  tab, "Stop_PushButton" );
 		layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4);
 		Stop_PushButton->setFixedSize( 22, 22);
 		Stop_PushButton->setPixmap( image4 );
 
 		toBeginningButton = new QPushButton(  tab, "Beginning_PushButton" );
 		layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5);
 		toBeginningButton->setFixedSize( 22, 22);
-		toBeginningButton->setPixmap( Resource::loadPixmap("fastback") );
+		toBeginningButton->setPixmap( Opie::Core::OResource::loadPixmap("fastback", Opie::Core::OResource::SmallIcon) );
 
 		toEndButton = new QPushButton(  tab, "End_PushButton" );
 		layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6);
 		toEndButton->setFixedSize( 22, 22);
-		toEndButton->setPixmap(  Resource::loadPixmap( "fastforward" )  );
+		toEndButton->setPixmap(  Opie::Core::OResource::loadPixmap( "fastforward", Opie::Core::OResource::SmallIcon )  );
 
 // 		QLabel *recLabel2;
 // 		recLabel2 = new QLabel( tab, "recLabel2" );
 // 		recLabel2->setText(tr("Rec"));
 // 		recLabel2->setFixedHeight( 18);
 // 		layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7);
 
 		Rec_PushButton = new QPushButton( tab, "Rec_PushButton" );
 		layout1->addMultiCellWidget(  Rec_PushButton, 1, 1, 7, 7);
 		Rec_PushButton->setFixedSize( 22, 22);
 		Rec_PushButton->setPixmap( image6 );
 
 		t = new QTimer( this );
 		connect( t, SIGNAL( timeout() ), SLOT( timerBreak() ) );
 
 		rewindTimer = new QTimer( this );
 		connect( rewindTimer, SIGNAL( timeout() ),
 						 this, SLOT( rewindTimerTimeout() ) );
 
 		forwardTimer = new QTimer( this );
 		connect( forwardTimer, SIGNAL( timeout() ),
 						 this, SLOT( forwardTimerTimeout() ) );
 
 		deleteSoundButton  = new QPushButton( tab, "deleteSoundButton" );