summaryrefslogtreecommitdiff
authordrw <drw>2005-05-23 23:54:52 (UTC)
committer drw <drw>2005-05-23 23:54:52 (UTC)
commit6f01d6a0d9daa537b2aa54ed36ea77e755a463d3 (patch) (side-by-side diff)
tree6bed3b5a9895abdfa716e3255eeef5776198f3b9
parentf5d45036d2a444f9ee27311895c430babcf947e5 (diff)
downloadopie-6f01d6a0d9daa537b2aa54ed36ea77e755a463d3.zip
opie-6f01d6a0d9daa537b2aa54ed36ea77e755a463d3.tar.gz
opie-6f01d6a0d9daa537b2aa54ed36ea77e755a463d3.tar.bz2
Resource -> OResource and clean up includes
Diffstat (more/less context) (show 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
@@ -4,24 +4,23 @@ Copyright (C) 2002 Thomas Stephens
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <qwidget.h>
#include <qpushbutton.h>
#include <qlayout.h>
-#include <qpe/resource.h>
#include <qiconset.h>
class DVDGroup : public QWidget
{
public:
DVDGroup(QWidget *parent=0, const char *name=0);
};
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
@@ -3,35 +3,37 @@ Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie.
Copyright (C) 2002 Thomas Stephens
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "mainview.h"
+#include <opie2/oresource.h>
+
MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name)
{
- setIcon( Resource::loadPixmap( "remote" ) );
+ setIcon( Opie::Core::OResource::loadPixmap( "remote", Opie::Core::OResource::SmallIcon ) );
setCaption(tr("Remote") );
QVBoxLayout *layout = new QVBoxLayout(this);
QTabWidget *tabs = new QTabWidget(this);
layout->addWidget(tabs);
remote = new RemoteTab(tabs);
learn = new LearnTab(tabs);
config = new ConfigTab(tabs);
help = new HelpTab(tabs);
connect(config, SIGNAL(remotesChanged()), this, SLOT(updateRemotesList()) );
remote->setIRSocket(fd);
tabs->addTab(remote, tr("Remote") );
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
@@ -2,33 +2,32 @@
Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie.
Copyright (C) 2002 Thomas Stephens
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
#include <qpe/config.h>
#include <qpushbutton.h>
#include <qtabwidget.h>
#include <qlayout.h>
#include <qmessagebox.h>
#include <qpaintdevice.h>
#include <qobject.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
#include <unistd.h>
#include <stdio.h>
#include <signal.h>
#include "remotetab.h"
#include "learntab.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
@@ -5,33 +5,32 @@ Copyright (C) 2002 Thomas Stephens
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "mainview.h"
/* OPIE */
#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
#include <qpe/config.h>
/* QT */
#include <qpushbutton.h>
#include <qtabwidget.h>
#include <qlayout.h>
#include <qmessagebox.h>
#include <qpaintdevice.h>
#include <qobject.h>
/* STD */
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
#include <unistd.h>
#include <stdio.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
@@ -4,24 +4,23 @@ Copyright (C) 2002 Thomas Stephens
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <qwidget.h>
#include <qpushbutton.h>
#include <qlayout.h>
-#include <qpe/resource.h>
#include <qiconset.h>
class VCRGroup : public QWidget
{
public:
VCRGroup(QWidget *parent=0, const char *name=0);
};