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
@@ -18,5 +18,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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
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
@@ -17,7 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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
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
@@ -16,5 +16,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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>
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
@@ -19,5 +19,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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
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
@@ -18,5 +18,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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