author | drw <drw> | 2005-05-23 23:54:52 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-23 23:54:52 (UTC) |
commit | 6f01d6a0d9daa537b2aa54ed36ea77e755a463d3 (patch) (unidiff) | |
tree | 6bed3b5a9895abdfa716e3255eeef5776198f3b9 /noncore/tools | |
parent | f5d45036d2a444f9ee27311895c430babcf947e5 (diff) | |
download | opie-6f01d6a0d9daa537b2aa54ed36ea77e755a463d3.zip opie-6f01d6a0d9daa537b2aa54ed36ea77e755a463d3.tar.gz opie-6f01d6a0d9daa537b2aa54ed36ea77e755a463d3.tar.bz2 |
Resource -> OResource and clean up includes
-rw-r--r-- | noncore/tools/remote/dvdgroup.h | 1 | ||||
-rw-r--r-- | noncore/tools/remote/mainview.cpp | 4 | ||||
-rw-r--r-- | noncore/tools/remote/mainview.h | 1 | ||||
-rw-r--r-- | noncore/tools/remote/remote.cpp | 1 | ||||
-rw-r--r-- | noncore/tools/remote/vcrgroup.h | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/noncore/tools/remote/dvdgroup.h b/noncore/tools/remote/dvdgroup.h index 04c301b..c9fe347 100644 --- a/noncore/tools/remote/dvdgroup.h +++ b/noncore/tools/remote/dvdgroup.h | |||
@@ -12,16 +12,15 @@ Public License for more details. | |||
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <qwidget.h> | 17 | #include <qwidget.h> |
18 | #include <qpushbutton.h> | 18 | #include <qpushbutton.h> |
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | #include <qpe/resource.h> | ||
21 | #include <qiconset.h> | 20 | #include <qiconset.h> |
22 | 21 | ||
23 | class DVDGroup : public QWidget | 22 | class DVDGroup : public QWidget |
24 | { | 23 | { |
25 | public: | 24 | public: |
26 | DVDGroup(QWidget *parent=0, const char *name=0); | 25 | DVDGroup(QWidget *parent=0, const char *name=0); |
27 | }; | 26 | }; |
diff --git a/noncore/tools/remote/mainview.cpp b/noncore/tools/remote/mainview.cpp index eaba7df..724eba9 100644 --- a/noncore/tools/remote/mainview.cpp +++ b/noncore/tools/remote/mainview.cpp | |||
@@ -11,19 +11,21 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "mainview.h" | 17 | #include "mainview.h" |
18 | 18 | ||
19 | #include <opie2/oresource.h> | ||
20 | |||
19 | MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name) | 21 | MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name) |
20 | { | 22 | { |
21 | setIcon( Resource::loadPixmap( "remote" ) ); | 23 | setIcon( Opie::Core::OResource::loadPixmap( "remote", Opie::Core::OResource::SmallIcon ) ); |
22 | setCaption(tr("Remote") ); | 24 | setCaption(tr("Remote") ); |
23 | 25 | ||
24 | QVBoxLayout *layout = new QVBoxLayout(this); | 26 | QVBoxLayout *layout = new QVBoxLayout(this); |
25 | QTabWidget *tabs = new QTabWidget(this); | 27 | QTabWidget *tabs = new QTabWidget(this); |
26 | 28 | ||
27 | layout->addWidget(tabs); | 29 | layout->addWidget(tabs); |
28 | 30 | ||
29 | remote = new RemoteTab(tabs); | 31 | remote = new RemoteTab(tabs); |
diff --git a/noncore/tools/remote/mainview.h b/noncore/tools/remote/mainview.h index e93da5c..7ea82a6 100644 --- a/noncore/tools/remote/mainview.h +++ b/noncore/tools/remote/mainview.h | |||
@@ -10,17 +10,16 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY | |||
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
18 | #include <qpe/resource.h> | ||
19 | #include <qpe/config.h> | 18 | #include <qpe/config.h> |
20 | #include <qpushbutton.h> | 19 | #include <qpushbutton.h> |
21 | #include <qtabwidget.h> | 20 | #include <qtabwidget.h> |
22 | #include <qlayout.h> | 21 | #include <qlayout.h> |
23 | #include <qmessagebox.h> | 22 | #include <qmessagebox.h> |
24 | #include <qpaintdevice.h> | 23 | #include <qpaintdevice.h> |
25 | #include <qobject.h> | 24 | #include <qobject.h> |
26 | #include <sys/socket.h> | 25 | #include <sys/socket.h> |
diff --git a/noncore/tools/remote/remote.cpp b/noncore/tools/remote/remote.cpp index 638629f..35d06bc 100644 --- a/noncore/tools/remote/remote.cpp +++ b/noncore/tools/remote/remote.cpp | |||
@@ -13,17 +13,16 @@ Public License for more details. | |||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "mainview.h" | 17 | #include "mainview.h" |
18 | 18 | ||
19 | /* OPIE */ | 19 | /* OPIE */ |
20 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
21 | #include <qpe/resource.h> | ||
22 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
23 | 22 | ||
24 | /* QT */ | 23 | /* QT */ |
25 | #include <qpushbutton.h> | 24 | #include <qpushbutton.h> |
26 | #include <qtabwidget.h> | 25 | #include <qtabwidget.h> |
27 | #include <qlayout.h> | 26 | #include <qlayout.h> |
28 | #include <qmessagebox.h> | 27 | #include <qmessagebox.h> |
29 | #include <qpaintdevice.h> | 28 | #include <qpaintdevice.h> |
diff --git a/noncore/tools/remote/vcrgroup.h b/noncore/tools/remote/vcrgroup.h index fe40e42..dac31fd 100644 --- a/noncore/tools/remote/vcrgroup.h +++ b/noncore/tools/remote/vcrgroup.h | |||
@@ -12,16 +12,15 @@ Public License for more details. | |||
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <qwidget.h> | 17 | #include <qwidget.h> |
18 | #include <qpushbutton.h> | 18 | #include <qpushbutton.h> |
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | #include <qpe/resource.h> | ||
21 | #include <qiconset.h> | 20 | #include <qiconset.h> |
22 | 21 | ||
23 | class VCRGroup : public QWidget | 22 | class VCRGroup : public QWidget |
24 | { | 23 | { |
25 | public: | 24 | public: |
26 | VCRGroup(QWidget *parent=0, const char *name=0); | 25 | VCRGroup(QWidget *parent=0, const char *name=0); |
27 | }; | 26 | }; |