author | drw <drw> | 2005-04-24 20:24:00 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-24 20:24:00 (UTC) |
commit | 01ab9377017060c7ad3ab9e4ed2b76a879d442f6 (patch) (side-by-side diff) | |
tree | c265ad8794f510a4808e545d8d18ca73ea32f04e /core/settings/button/buttonutils.cpp | |
parent | 9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b (diff) | |
download | opie-01ab9377017060c7ad3ab9e4ed2b76a879d442f6.zip opie-01ab9377017060c7ad3ab9e4ed2b76a879d442f6.tar.gz opie-01ab9377017060c7ad3ab9e4ed2b76a879d442f6.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'core/settings/button/buttonutils.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/button/buttonutils.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/settings/button/buttonutils.cpp b/core/settings/button/buttonutils.cpp index 9bf4b53..05fa883 100644 --- a/core/settings/button/buttonutils.cpp +++ b/core/settings/button/buttonutils.cpp @@ -1,13 +1,14 @@ #include <stdlib.h> +#include <opie2/oresource.h> + #include <qapplication.h> #include <qlistview.h> #include <qpe/applnk.h> #include <qpe/mimetype.h> -#include <qpe/resource.h> #include "buttonutils.h" using namespace Opie; using namespace Opie::Core; @@ -69,13 +70,14 @@ qCopInfo ButtonUtils::messageToInfo ( const OQCopMessage &c ) if ( ch == "ignore" ) return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Ignored</nobr>" )); for ( const predef_qcop *p = predef; p-> m_text; p++ ) { if (( ch == p-> m_channel ) && ( f == p-> m_function )) - return qCopInfo ( qApp-> translate ( "ButtonSettings", p-> m_text ), Resource::loadPixmap ( p-> m_pixmap )); + return qCopInfo ( qApp-> translate ( "ButtonSettings", p-> m_text ), + Opie::Core::OResource::loadPixmap( p->m_pixmap, Opie::Core::OResource::SmallIcon ) ); } if ( ch. left ( 16 ) == "QPE/Application/" ) { QString app = ch. mid ( 16 ); const AppLnk *applnk = m_apps-> findExec ( app ); if ( applnk ) @@ -93,13 +95,13 @@ qCopInfo ButtonUtils::messageToInfo ( const OQCopMessage &c ) void ButtonUtils::insertActions ( QListViewItem *here ) { for ( const predef_qcop *p = predef; p-> m_text; p++ ) { QListViewItem *item = new QListViewItem ( here, qApp-> translate ( "ButtonSettings", p-> m_text ), p-> m_channel, p-> m_function ); - item-> setPixmap ( 0, Resource::loadPixmap ( p-> m_pixmap )); + item-> setPixmap ( 0, Opie::Core::OResource::loadPixmap( p->m_pixmap, Opie::Core::OResource::SmallIcon ) ); } } void ButtonUtils::insertAppLnks ( QListViewItem *here ) { |