Resource -> OResource

1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 3473d01..9b324e0 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -1,298 +1,298 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 // changes added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002
 // changes added and Copyright (C) by Holger Freyther 2004,2005
 
 #include "clock.h"
 
 #include "analogclock.h"
 
 #include <qtabwidget.h>
 
 #include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 #include <qpe/timestring.h>
 #include <qpe/alarmserver.h>
 #include <qpe/sound.h>
-#include <qpe/resource.h>
 #include <qsound.h>
 #include <qtimer.h>
 
 
 
 #include <qlcdnumber.h>
 #include <qslider.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qpushbutton.h>
 #include <qtoolbutton.h>
 #include <qpainter.h>
 #include <qmessagebox.h>
 #include <qdatetime.h>
 #include <qspinbox.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qlineedit.h>
 
 static const int sw_prec = 2;
 static const int magic_daily = 2292922;
 static const int magic_countdown = 2292923;
 static const int magic_snooze = 2292924;
 static const int magic_playmp = 2292925;
 static const char ALARM_CLOCK_CHANNEL [] = "QPE/Application/clock";
 static const char ALARM_CLOCK_MESSAGE [] = "alarm(QDateTime,int)";
 
 #include <math.h>
 #include <unistd.h>
 #include <sys/types.h>
 
 #include <pthread.h>
 
 
 static void toggleScreenSaver( bool on )
 {
     QCopEnvelope e( "QPE/System", "setScreenSaverMode(int)" );
     e << ( on ? QPEApplication::Enable : QPEApplication::DisableSuspend );
 }
 
 static void startPlayer()
 {
     Config config( "qpe" );
     config.setGroup( "Time" );
     sleep(15);
     QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
     e << config.readEntry( "mp3File", "" );
 }
 
 class MySpinBox : public QSpinBox
 {
 public:
     QLineEdit *lineEdit() const {
         return editor();
     }
 };
 
 //
 //
 //
 AlarmDlg::AlarmDlg(QWidget *parent, const char *name, bool modal,
     const QString &txt) :
     AlarmDlgBase(parent, name, modal)
 {
     setCaption( tr("Clock") );
-    pixmap->setPixmap( Resource::loadPixmap("clock/alarmbell") );
+    pixmap->setPixmap( Opie::Core::OResource::loadPixmap("clock/alarmbell") );
     alarmDlgLabel->setText(txt);
 
     connect(snoozeTime, SIGNAL(valueChanged(int)), this,
         SLOT(changePrompt(int)));
     connect(cmdOk, SIGNAL(clicked()), this, SLOT(checkSnooze()));
 }
 
 //
 //
 //
 void
 AlarmDlg::setText(const QString &txt)
 {
     alarmDlgLabel->setText(txt);
 }
 
 //
 //
 //
 void
 AlarmDlg::checkSnooze(void)
 {
     //
     // Ensure we have only one snooze alarm.
     //
     AlarmServer::deleteAlarm(QDateTime(), ALARM_CLOCK_CHANNEL,
         ALARM_CLOCK_MESSAGE, magic_snooze);
 
     if (snoozeTime->value() > 0) {
         QDateTime wake = QDateTime::currentDateTime();
         wake = wake.addSecs(snoozeTime->value() * 60); // snoozeTime in minutes
 
         AlarmServer::addAlarm(wake, ALARM_CLOCK_CHANNEL,
             ALARM_CLOCK_MESSAGE, magic_snooze);
     }
     accept();
 }
 
 
 
 void
 AlarmDlg::changePrompt(int mins)
 {
     cmdOk->setText(mins > 0 ? tr("Snooze") : tr("Close") );
 }
 
 
 
 Clock::Clock( QWidget * parent, const char *, WFlags f )
     : ClockBase( parent, "clock", f ), swatch_splitms(99), init(FALSE) // No tr
 {
     alarmDlg = 0;
     swLayout = 0;
     dayBtn = new QToolButton * [7];
 
     Config config( "qpe" );
     config.setGroup("Time");
     ampm = config.readBoolEntry( "AMPM", TRUE );
     onMonday = config.readBoolEntry( "MONDAY" );
 
     connect( tabs, SIGNAL(currentChanged(QWidget*)),
              this, SLOT(tabChanged(QWidget*)) );
 
     analogStopwatch = new AnalogClock( swFrame );
     stopwatchLcd = new QLCDNumber( swFrame );
     stopwatchLcd->setFrameStyle( QFrame::NoFrame );
     stopwatchLcd->setSegmentStyle( QLCDNumber::Flat );
     stopwatchLcd->setSizePolicy( QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred) );
 
     analogClock->display( QTime::currentTime() );
     clockLcd->setNumDigits( 5 );
     clockLcd->setFixedWidth( clockLcd->sizeHint().width() );
     date->setText( TimeString::dateString( QDate::currentDate(), TimeString::currentDateFormat() ) );
     if ( qApp->desktop()->width() < 200 )
         date->setFont( QFont(date->font().family(), 14, QFont::Bold) );
     if ( qApp->desktop()->height() > 240 ) {
         clockLcd->setFixedHeight( 30 );
         stopwatchLcd->setFixedHeight( 30 );
     }
 
     connect( stopStart, SIGNAL(pressed()), SLOT(stopStartStopWatch()) );
     connect( reset, SIGNAL(pressed()), SLOT(resetStopWatch()) );
 
     t = new QTimer( this );
     connect( t, SIGNAL(timeout()), SLOT(updateClock()) );
     t->start( 1000 );
 
     applyAlarmTimer = new QTimer( this );
     connect( applyAlarmTimer, SIGNAL(timeout()),
         this, SLOT(applyDailyAlarm()) );
 
     alarmt = new QTimer( this );
     connect( alarmt, SIGNAL(timeout()), SLOT(alarmTimeout()) );
 
     connect( qApp, SIGNAL(timeChanged()), SLOT(updateClock()) );
     connect( qApp, SIGNAL(timeChanged()), SLOT(applyDailyAlarm()) );
 
     swatch_running = FALSE;
     swatch_totalms = 0;
     swatch_currLap = 0;
     swatch_dispLap = 0;
     stopwatchLcd->setNumDigits( 8+1+sw_prec );
     stopwatchLcd->display( "00:00:00.00" );
 
     QVBoxLayout *lvb = new QVBoxLayout( lapFrame );
     nextLapBtn = new QToolButton( UpArrow, lapFrame );
     connect( nextLapBtn, SIGNAL(clicked()), this, SLOT(nextLap()) );
     nextLapBtn->setAccel( Key_Up );
     lvb->addWidget( nextLapBtn );
     prevLapBtn = new QToolButton( DownArrow, lapFrame );
     connect( prevLapBtn, SIGNAL(clicked()), this, SLOT(prevLap()) );
     prevLapBtn->setAccel( Key_Down );
     prevLapBtn->setMinimumWidth( 15 );
     lvb->addWidget( prevLapBtn );
     prevLapBtn->setEnabled( FALSE );
     nextLapBtn->setEnabled( FALSE );
 
     reset->setEnabled( FALSE );
 
     lapLcd->setNumDigits( 8+1+sw_prec );
     lapLcd->display( "00:00:00.00" );
 
     splitLcd->setNumDigits( 8+1+sw_prec );
     splitLcd->display( "00:00:00.00" );
 
     lapNumLcd->display( 1 );
 
     lapTimer = new QTimer( this );
     connect( lapTimer, SIGNAL(timeout()), this, SLOT(lapTimeout()) );
 
     for (uint s = 0; s < swatch_splitms.count(); s++ )
         swatch_splitms[(int)s] = 0;
 
     connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(changeClock(bool)) );
 
     cdGroup->hide(); // XXX implement countdown timer.
 
     connect( dailyHour, SIGNAL(valueChanged(int)), this, SLOT(scheduleApplyDailyAlarm()) );
     connect( dailyMinute, SIGNAL(valueChanged(int)), this, SLOT(setDailyMinute(int)) );
     connect( dailyAmPm, SIGNAL(activated(int)), this, SLOT(setDailyAmPm(int)) );
     connect( dailyEnabled, SIGNAL(toggled(bool)), this, SLOT(enableDaily(bool)) );
     cdLcd->display( "00:00" );
 
     dailyMinute->setValidator(0);
 
     Config cConfig( "Clock" ); // No tr
     cConfig.setGroup( "Daily Alarm" );
 
     QStringList days;
     days.append( tr("Mon", "Monday") );
     days.append( tr("Tue", "Tuesday") );
     days.append( tr("Wed", "Wednesday") );
     days.append( tr("Thu", "Thursday") );
     days.append( tr("Fri", "Friday") );
     days.append( tr("Sat", "Saturday") );
     days.append( tr("Sun", "Sunday") );
 
     int i;
     QHBoxLayout *hb = new QHBoxLayout( daysFrame );
     for ( i = 0; i < 7; i++ ) {
         dayBtn[i] = new QToolButton( daysFrame );
         hb->addWidget( dayBtn[i] );
         dayBtn[i]->setToggleButton( TRUE );
         dayBtn[i]->setOn( TRUE );
         dayBtn[i]->setFocusPolicy( StrongFocus );
         connect( dayBtn[i], SIGNAL(toggled(bool)), this, SLOT(scheduleApplyDailyAlarm()) );
     }
 
     for ( i = 0; i < 7; i++ )
         dayBtn[dayBtnIdx(i+1)]->setText( days[i] );
 
     QStringList exclDays = cConfig.readListEntry( "ExcludeDays", ',' );
     QStringList::Iterator it;
     for ( it = exclDays.begin(); it != exclDays.end(); ++it ) {
         int d = (*it).toInt();
         if ( d >= 1 && d <= 7 )
             dayBtn[dayBtnIdx(d)]->setOn( FALSE );
     }
 
     bool alarm = cConfig.readBoolEntry("Enabled", FALSE);
     bool sound = cConfig.readBoolEntry("SoundEnabled", FALSE );
     dailyEnabled->setChecked( alarm );
     sndGroup->setEnabled( alarm );
     sndCheck->setChecked( sound );
     sndChoose->setEnabled( sound );
     sndFileName->setEnabled( sound );
 
     // FIXME ODP migrate to own config class.. merge config options
     Config cfg_qpe( "qpe" );
     cfg_qpe.setGroup( "Time" );
     sndFileName->setText( cfg_qpe.readEntry( "mp3File" ) );
     //