author | drw <drw> | 2005-05-23 23:47:35 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-23 23:47:35 (UTC) |
commit | a04b6cb80be1c2df466b69ed40450820056aff06 (patch) (unidiff) | |
tree | 4effe051bbc093f1cecd03ea31bd350c9b2751c2 | |
parent | 4d0e85830d39ef28f5ae8d3f9daa2cdf5616b2e2 (diff) | |
download | opie-a04b6cb80be1c2df466b69ed40450820056aff06.zip opie-a04b6cb80be1c2df466b69ed40450820056aff06.tar.gz opie-a04b6cb80be1c2df466b69ed40450820056aff06.tar.bz2 |
Resource -> OResource
-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 @@ | |||
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // changes added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002 | 20 | // changes added and Copyright (C) by L. J. Potter <ljp@llornkcor.com> 2002 |
21 | // changes added and Copyright (C) by Holger Freyther 2004,2005 | 21 | // changes added and Copyright (C) by Holger Freyther 2004,2005 |
22 | 22 | ||
23 | #include "clock.h" | 23 | #include "clock.h" |
24 | 24 | ||
25 | #include "analogclock.h" | 25 | #include "analogclock.h" |
26 | 26 | ||
27 | #include <qtabwidget.h> | 27 | #include <qtabwidget.h> |
28 | 28 | ||
29 | #include <opie2/ofiledialog.h> | 29 | #include <opie2/ofiledialog.h> |
30 | #include <opie2/oresource.h> | ||
30 | 31 | ||
31 | #include <qpe/qpeapplication.h> | 32 | #include <qpe/qpeapplication.h> |
32 | #include <qpe/qcopenvelope_qws.h> | 33 | #include <qpe/qcopenvelope_qws.h> |
33 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
34 | #include <qpe/timestring.h> | 35 | #include <qpe/timestring.h> |
35 | #include <qpe/alarmserver.h> | 36 | #include <qpe/alarmserver.h> |
36 | #include <qpe/sound.h> | 37 | #include <qpe/sound.h> |
37 | #include <qpe/resource.h> | ||
38 | #include <qsound.h> | 38 | #include <qsound.h> |
39 | #include <qtimer.h> | 39 | #include <qtimer.h> |
40 | 40 | ||
41 | 41 | ||
42 | 42 | ||
43 | #include <qlcdnumber.h> | 43 | #include <qlcdnumber.h> |
44 | #include <qslider.h> | 44 | #include <qslider.h> |
45 | #include <qlabel.h> | 45 | #include <qlabel.h> |
46 | #include <qtimer.h> | 46 | #include <qtimer.h> |
47 | #include <qpushbutton.h> | 47 | #include <qpushbutton.h> |
48 | #include <qtoolbutton.h> | 48 | #include <qtoolbutton.h> |
49 | #include <qpainter.h> | 49 | #include <qpainter.h> |
50 | #include <qmessagebox.h> | 50 | #include <qmessagebox.h> |
51 | #include <qdatetime.h> | 51 | #include <qdatetime.h> |
52 | #include <qspinbox.h> | 52 | #include <qspinbox.h> |
53 | #include <qcombobox.h> | 53 | #include <qcombobox.h> |
54 | #include <qcheckbox.h> | 54 | #include <qcheckbox.h> |
55 | #include <qgroupbox.h> | 55 | #include <qgroupbox.h> |
56 | #include <qlayout.h> | 56 | #include <qlayout.h> |
57 | #include <qhbox.h> | 57 | #include <qhbox.h> |
58 | #include <qlineedit.h> | 58 | #include <qlineedit.h> |
59 | 59 | ||
60 | static const int sw_prec = 2; | 60 | static const int sw_prec = 2; |
61 | static const int magic_daily = 2292922; | 61 | static const int magic_daily = 2292922; |
@@ -82,49 +82,49 @@ static void startPlayer() | |||
82 | { | 82 | { |
83 | Config config( "qpe" ); | 83 | Config config( "qpe" ); |
84 | config.setGroup( "Time" ); | 84 | config.setGroup( "Time" ); |
85 | sleep(15); | 85 | sleep(15); |
86 | QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" ); | 86 | QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" ); |
87 | e << config.readEntry( "mp3File", "" ); | 87 | e << config.readEntry( "mp3File", "" ); |
88 | } | 88 | } |
89 | 89 | ||
90 | class MySpinBox : public QSpinBox | 90 | class MySpinBox : public QSpinBox |
91 | { | 91 | { |
92 | public: | 92 | public: |
93 | QLineEdit *lineEdit() const { | 93 | QLineEdit *lineEdit() const { |
94 | return editor(); | 94 | return editor(); |
95 | } | 95 | } |
96 | }; | 96 | }; |
97 | 97 | ||
98 | // | 98 | // |
99 | // | 99 | // |
100 | // | 100 | // |
101 | AlarmDlg::AlarmDlg(QWidget *parent, const char *name, bool modal, | 101 | AlarmDlg::AlarmDlg(QWidget *parent, const char *name, bool modal, |
102 | const QString &txt) : | 102 | const QString &txt) : |
103 | AlarmDlgBase(parent, name, modal) | 103 | AlarmDlgBase(parent, name, modal) |
104 | { | 104 | { |
105 | setCaption( tr("Clock") ); | 105 | setCaption( tr("Clock") ); |
106 | pixmap->setPixmap( Resource::loadPixmap("clock/alarmbell") ); | 106 | pixmap->setPixmap( Opie::Core::OResource::loadPixmap("clock/alarmbell") ); |
107 | alarmDlgLabel->setText(txt); | 107 | alarmDlgLabel->setText(txt); |
108 | 108 | ||
109 | connect(snoozeTime, SIGNAL(valueChanged(int)), this, | 109 | connect(snoozeTime, SIGNAL(valueChanged(int)), this, |
110 | SLOT(changePrompt(int))); | 110 | SLOT(changePrompt(int))); |
111 | connect(cmdOk, SIGNAL(clicked()), this, SLOT(checkSnooze())); | 111 | connect(cmdOk, SIGNAL(clicked()), this, SLOT(checkSnooze())); |
112 | } | 112 | } |
113 | 113 | ||
114 | // | 114 | // |
115 | // | 115 | // |
116 | // | 116 | // |
117 | void | 117 | void |
118 | AlarmDlg::setText(const QString &txt) | 118 | AlarmDlg::setText(const QString &txt) |
119 | { | 119 | { |
120 | alarmDlgLabel->setText(txt); | 120 | alarmDlgLabel->setText(txt); |
121 | } | 121 | } |
122 | 122 | ||
123 | // | 123 | // |
124 | // | 124 | // |
125 | // | 125 | // |
126 | void | 126 | void |
127 | AlarmDlg::checkSnooze(void) | 127 | AlarmDlg::checkSnooze(void) |
128 | { | 128 | { |
129 | // | 129 | // |
130 | // Ensure we have only one snooze alarm. | 130 | // Ensure we have only one snooze alarm. |