-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 @@ | |||
1 | #include <opie2/odebug.h> | 1 | #include <opie2/odebug.h> |
2 | #include <opie2/oresource.h> | ||
2 | #include <opie2/multiauthpassword.h> | 3 | #include <opie2/multiauthpassword.h> |
3 | 4 | ||
4 | #include <qgroupbox.h> | 5 | #include <qgroupbox.h> |
5 | #include <qvgroupbox.h> | 6 | #include <qvgroupbox.h> |
6 | #include <qpe/resource.h> | ||
7 | #include <qlayout.h> | 7 | #include <qlayout.h> |
8 | #include <qlabel.h> | 8 | #include <qlabel.h> |
9 | #include <qhbox.h> | 9 | #include <qhbox.h> |
@@ -49,7 +49,7 @@ class ToolButton : public QToolButton { | |||
49 | public: | 49 | public: |
50 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) | 50 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) |
51 | : QToolButton( parent, name ) { | 51 | : QToolButton( parent, name ) { |
52 | setPixmap( Resource::loadPixmap( icon ) ); | 52 | setPixmap( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ); |
53 | setAutoRaise( TRUE ); | 53 | setAutoRaise( TRUE ); |
54 | setFocusPolicy( QWidget::NoFocus ); | 54 | setFocusPolicy( QWidget::NoFocus ); |
55 | setToggleButton( t ); | 55 | setToggleButton( t ); |
@@ -228,7 +228,8 @@ static void test_and_start() { | |||
228 | plugin.pluginObject->pluginName() ); | 228 | plugin.pluginObject->pluginName() ); |
229 | } | 229 | } |
230 | // set the order/activate tab | 230 | // set the order/activate tab |
231 | QPixmap icon = Resource::loadPixmap( plugin.pluginObject->pixmapNameWidget() ); | 231 | QPixmap icon = Opie::Core::OResource::loadPixmap( plugin.pluginObject->pixmapNameWidget(), |
232 | Opie::Core::OResource::SmallIcon ); | ||
232 | QCheckListItem * item = new QCheckListItem(m_pluginListView, plugin.pluginObject->pluginName(), QCheckListItem::CheckBox ); | 233 | QCheckListItem * item = new QCheckListItem(m_pluginListView, plugin.pluginObject->pluginName(), QCheckListItem::CheckBox ); |
233 | if ( !icon.isNull() ) { | 234 | if ( !icon.isNull() ) { |
234 | item->setPixmap( 0, icon ); | 235 | 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 | |||
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2, libopieui2, libopiesecurity2 |
8 | Recommends: opie-lockapplet, opie-multiauth | 8 | Recommends: opie-lockapplet, opie-multiauth |
9 | Description: Security settings dialog for the Opie environment. | 9 | Description: Security settings dialog for the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |