| -rw-r--r-- | noncore/tools/clock/clock.cpp | 4 |
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 @@ -6,56 +6,56 @@ ** 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; @@ -82,49 +82,49 @@ 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. |