| author | drw <drw> | 2005-05-04 22:04:34 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-05-04 22:04:34 (UTC) |
| commit | 6378f86d96d8d0003cdb9242871066b2db640cec (patch) (side-by-side diff) | |
| tree | f4f8e0bd169a49fc38121c5f6937812fa7b7fb0b /core | |
| parent | a829bcb3e78882cf9070a75dfacf9906931e8e80 (diff) | |
| download | opie-6378f86d96d8d0003cdb9242871066b2db640cec.zip opie-6378f86d96d8d0003cdb9242871066b2db640cec.tar.gz opie-6378f86d96d8d0003cdb9242871066b2db640cec.tar.bz2 | |
Resource -> OResource and add missing lib dependencies
| -rw-r--r-- | core/settings/security/multiauthconfig.cpp | 7 | ||||
| -rw-r--r-- | core/settings/security/opie-security.control | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp index da99804..43b453f 100644 --- a/core/settings/security/multiauthconfig.cpp +++ b/core/settings/security/multiauthconfig.cpp @@ -1,9 +1,9 @@ #include <opie2/odebug.h> +#include <opie2/oresource.h> #include <opie2/multiauthpassword.h> #include <qgroupbox.h> #include <qvgroupbox.h> -#include <qpe/resource.h> #include <qlayout.h> #include <qlabel.h> #include <qhbox.h> @@ -49,7 +49,7 @@ class ToolButton : public QToolButton { public: ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) : QToolButton( parent, name ) { - setPixmap( Resource::loadPixmap( icon ) ); + setPixmap( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ); setAutoRaise( TRUE ); setFocusPolicy( QWidget::NoFocus ); setToggleButton( t ); @@ -228,7 +228,8 @@ static void test_and_start() { plugin.pluginObject->pluginName() ); } // set the order/activate tab - QPixmap icon = Resource::loadPixmap( plugin.pluginObject->pixmapNameWidget() ); + QPixmap icon = Opie::Core::OResource::loadPixmap( plugin.pluginObject->pixmapNameWidget(), + Opie::Core::OResource::SmallIcon ); QCheckListItem * item = new QCheckListItem(m_pluginListView, plugin.pluginObject->pluginName(), QCheckListItem::CheckBox ); if ( !icon.isNull() ) { item->setPixmap( 0, icon ); diff --git a/core/settings/security/opie-security.control b/core/settings/security/opie-security.control index ab08c05..7d393a8 100644 --- a/core/settings/security/opie-security.control +++ b/core/settings/security/opie-security.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/settings Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2, libopiesecurity2 Recommends: opie-lockapplet, opie-multiauth Description: Security settings dialog for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION |