| author | drw <drw> | 2005-05-23 23:54:52 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-05-23 23:54:52 (UTC) |
| commit | 6f01d6a0d9daa537b2aa54ed36ea77e755a463d3 (patch) (side-by-side diff) | |
| tree | 6bed3b5a9895abdfa716e3255eeef5776198f3b9 | |
| 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 @@ -17,7 +17,6 @@ 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 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 @@ -16,9 +16,11 @@ 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); 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 @@ -15,7 +15,6 @@ 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> 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 @@ -18,7 +18,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA /* OPIE */ #include <qpe/qpeapplication.h> -#include <qpe/resource.h> #include <qpe/config.h> /* QT */ 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 @@ -17,7 +17,6 @@ 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 |