summaryrefslogtreecommitdiff
authordrw <drw>2005-05-23 23:54:52 (UTC)
committer drw <drw>2005-05-23 23:54:52 (UTC)
commit6f01d6a0d9daa537b2aa54ed36ea77e755a463d3 (patch) (unidiff)
tree6bed3b5a9895abdfa716e3255eeef5776198f3b9
parentf5d45036d2a444f9ee27311895c430babcf947e5 (diff)
downloadopie-6f01d6a0d9daa537b2aa54ed36ea77e755a463d3.zip
opie-6f01d6a0d9daa537b2aa54ed36ea77e755a463d3.tar.gz
opie-6f01d6a0d9daa537b2aa54ed36ea77e755a463d3.tar.bz2
Resource -> OResource and clean up includes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/remote/dvdgroup.h1
-rw-r--r--noncore/tools/remote/mainview.cpp4
-rw-r--r--noncore/tools/remote/mainview.h1
-rw-r--r--noncore/tools/remote/remote.cpp1
-rw-r--r--noncore/tools/remote/vcrgroup.h1
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
@@ -1,27 +1,26 @@
1/* 1/*
2Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. 2Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie.
3Copyright (C) 2002 Thomas Stephens 3Copyright (C) 2002 Thomas Stephens
4 4
5This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public 5This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software 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
23class DVDGroup : public QWidget 22class DVDGroup : public QWidget
24{ 23{
25public: 24public:
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
@@ -1,45 +1,47 @@
1/* 1/*
2Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. 2Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie.
3Copyright (C) 2002 Thomas Stephens 3Copyright (C) 2002 Thomas Stephens
4 4
5This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public 5This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software 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
19MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name) 21MainView::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);
30 learn = new LearnTab(tabs); 32 learn = new LearnTab(tabs);
31 config = new ConfigTab(tabs); 33 config = new ConfigTab(tabs);
32 help = new HelpTab(tabs); 34 help = new HelpTab(tabs);
33 connect(config, SIGNAL(remotesChanged()), this, SLOT(updateRemotesList()) ); 35 connect(config, SIGNAL(remotesChanged()), this, SLOT(updateRemotesList()) );
34 36
35 remote->setIRSocket(fd); 37 remote->setIRSocket(fd);
36 38
37 tabs->addTab(remote, tr("Remote") ); 39 tabs->addTab(remote, tr("Remote") );
38 tabs->addTab(learn,tr("Learn") ); 40 tabs->addTab(learn,tr("Learn") );
39 tabs->addTab(config,tr("Config") ); 41 tabs->addTab(config,tr("Config") );
40 tabs->addTab(help, tr("Help") ); 42 tabs->addTab(help, tr("Help") );
41 43
42 printf("1\n"); 44 printf("1\n");
43 cfg = new Config("Remote"); 45 cfg = new Config("Remote");
44 printf("2\n"); 46 printf("2\n");
45 47
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
@@ -1,42 +1,41 @@
1/* 1/*
2Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. 2Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie.
3Copyright (C) 2002 Thomas Stephens 3Copyright (C) 2002 Thomas Stephens
4 4
5This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public 5This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software 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>
27#include <sys/types.h> 26#include <sys/types.h>
28#include <sys/un.h> 27#include <sys/un.h>
29#include <unistd.h> 28#include <unistd.h>
30#include <stdio.h> 29#include <stdio.h>
31#include <signal.h> 30#include <signal.h>
32 31
33#include "remotetab.h" 32#include "remotetab.h"
34#include "learntab.h" 33#include "learntab.h"
35#include "configtab.h" 34#include "configtab.h"
36#include "helptab.h" 35#include "helptab.h"
37 36
38#define BUFFERSIZE 256 37#define BUFFERSIZE 256
39 38
40class MainView : public QWidget 39class MainView : public QWidget
41{ 40{
42 Q_OBJECT 41 Q_OBJECT
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
@@ -1,45 +1,44 @@
1/* 1/*
2Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. 2Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie.
3Copyright (C) 2002 Thomas Stephens 3Copyright (C) 2002 Thomas Stephens
4 4
5This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public 5This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software 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>
30#include <qobject.h> 29#include <qobject.h>
31 30
32/* STD */ 31/* STD */
33#include <sys/socket.h> 32#include <sys/socket.h>
34#include <sys/types.h> 33#include <sys/types.h>
35#include <sys/un.h> 34#include <sys/un.h>
36#include <unistd.h> 35#include <unistd.h>
37#include <stdio.h> 36#include <stdio.h>
38#include <signal.h> 37#include <signal.h>
39 38
40 39
41/*void reconnect(int &fd) 40/*void reconnect(int &fd)
42{ 41{
43 //struct sockaddr_un addr; 42 //struct sockaddr_un addr;
44 43
45 addr.sun_family=AF_UNIX; 44 addr.sun_family=AF_UNIX;
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
@@ -1,27 +1,26 @@
1/* 1/*
2Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. 2Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie.
3Copyright (C) 2002 Thomas Stephens 3Copyright (C) 2002 Thomas Stephens
4 4
5This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public 5This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software 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
23class VCRGroup : public QWidget 22class VCRGroup : public QWidget
24{ 23{
25public: 24public:
26 VCRGroup(QWidget *parent=0, const char *name=0); 25 VCRGroup(QWidget *parent=0, const char *name=0);
27}; 26};