Resource -> OResource and add missing lib dependencies

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,100 +1,100 @@
 #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>
 #include <qheader.h>
 #include <qvbox.h>
 #include <qwhatsthis.h>
 #include <qtoolbutton.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qpe/qlibrary.h>
 #include <qpe/qpeapplication.h>
 
 #include "multiauthconfig.h"
 
 
 using Opie::Security::MultiauthPluginInterface;
 using Opie::Security::MultiauthPluginObject;
 using Opie::Security::MultiauthConfigWidget;
 /// keeps information about MultiauthPluginObject plugins
 struct MultiauthPlugin {
     MultiauthPlugin() : library( 0 ), iface( 0 ), pluginObject( 0 ) {}
     /// plugin file
     QLibrary *library;
     /// the plugin object interface
     QInterfacePtr<MultiauthPluginInterface> iface;
     /// the plugin object itself
     MultiauthPluginObject *pluginObject;
     /// name of the plugin file
     QString name;
     /// should the plugin be launched during authentication or not
     bool active;
     /// order of the plugin, in the pluginListWidget and during authentication
     int pos;
 };
 
 /// list of available MultiauthPlugin objects
 static QValueList<MultiauthPlugin> pluginList;
 
 
 /// extension of QToolButton that adds signals, icons and stuff (taken from todayconfig.cpp)
 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 );
                 connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
             }
 };
 
     MultiauthGeneralConfig::MultiauthGeneralConfig(MultiauthConfig * parentConfig, QWidget * parent, const char * name = "general Opie-multiauthentication config widget")
 : QWidget(parent, name), m_onStart(0), m_onResume(0), m_noProtectConfig(0), m_explanScreens(0), m_nbSuccessMin(0), m_tryButton(0)
 {
     // keep track of the MultiauthConfig parent in one of our attributes
     m_parentConfig = parentConfig;
     QVBoxLayout *vb = new QVBoxLayout(this);
     vb->setSpacing(11);
     vb->setMargin(11);
     vb->setAlignment( Qt::AlignTop );
 
     QGroupBox *lockBox = new QGroupBox(0, Qt::Vertical, tr("When to lock Opie"), this, "lock box");
     vb->addWidget(lockBox);
     QGridLayout *boxLayout = new QGridLayout( lockBox->layout() );
     m_onStart = new QCheckBox( tr( "on Opie start" ), lockBox, "lock on opie start");
     m_onResume = new QCheckBox( tr( "on Opie resume" ), lockBox, "lock on opie resume");
     boxLayout->addWidget(m_onStart, 0, 0);
     boxLayout->addWidget(m_onResume, 0, 1);
 
     QGroupBox *nbBox = new QGroupBox(0, Qt::Vertical, tr("Multiple plugins authentication"), this, "nb box");
     vb->addWidget(nbBox);
     QGridLayout *nbBoxLayout = new QGridLayout( nbBox->layout() );
     m_nbSuccessMin = new QSpinBox(nbBox);
     QLabel *lNbSuccessMin = new QLabel( tr( "Required successes" ), nbBox);
     nbBoxLayout->addWidget(m_nbSuccessMin, 0, 0);
     nbBoxLayout->addWidget(lNbSuccessMin, 0, 1);
     m_nbSuccessMin->setMinValue(1); // the max value is defined in MultiauthConfig constructor
 
     QGroupBox *devBox = new QGroupBox(0, Qt::Vertical, tr("Options"), this, "dev box");
     vb->addWidget(devBox);
     QGridLayout *devBoxLayout = new QGridLayout( devBox->layout() );
     m_noProtectConfig = new QCheckBox( tr("Don't protect this config screen"), devBox, "don't protect config");
     m_explanScreens = new QCheckBox( tr("Show explanatory screens"), devBox, "Show explan. screens");
     devBoxLayout->addWidget(m_noProtectConfig, 0, 0);
     devBoxLayout->addWidget(m_explanScreens, 1, 0);
 
     QVGroupBox *tryBox = new QVGroupBox(tr("Testing"), this, "try box");
     vb->addWidget(tryBox);
     m_tryButton = new QPushButton( tr("Test the authentication now"), tryBox, "try button");
     connect( m_tryButton, SIGNAL(clicked()), this, SLOT(tryAuth()) );
 
 }
@@ -183,97 +183,98 @@ static void test_and_start() {
         m_pluginListView->header()->hide();
         m_pluginListView->setSorting(-1);
         QWhatsThis::add(m_pluginListView, tr( "Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in" ));
 
         QVBox * pluginListVB = new QVBox(pluginListHB);
         new ToolButton( pluginListVB, tr( "Move Up" ), "up",  this , SLOT( moveSelectedUp() ) );
         new ToolButton( pluginListVB, tr( "Move Down" ), "down", this , SLOT( moveSelectedDown() ) );
         m_mainTW->addTab( m_pluginListWidget, "pass", tr( "plugins" ) );
 
         connect ( m_pluginListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( pluginsChanged ( ) ) );
 
         // general Opie multi-authentication configuration tab
         m_generalConfig = new MultiauthGeneralConfig(this, m_mainTW);
         m_mainTW->addTab(m_generalConfig, "SettingsIcon", tr( "Authentication") );
 
     }
     // login settings page
     m_loginWidget = new LoginBase(m_mainTW, "login config widget");
     m_mainTW->addTab(m_loginWidget, "security/users", tr( "Login") );
 
     // sync settings page
     m_syncWidget = new SyncBase( m_mainTW, "sync config widget" );
     m_mainTW->addTab(m_syncWidget, "security/sync", tr( "Sync") );
 
     // read the "Security" Config file and update our UI
     readConfig();
 
 
     if (m_pluginsInstalled)
     {
         /* loads plugins configuration widgets in mainTW tabs and in pluginListView
         */
 
         loadPlugins();
 
         for ( int i = pluginList.count() - 1; i >= 0; i-- ) {
             MultiauthPlugin plugin = pluginList[i];
 
             // load the config widgets in the tabs
             // (configWidget will return 0l if there is no configuration GUI)
             MultiauthConfigWidget* widget = plugin.pluginObject->configWidget(m_mainTW);
             if ( widget != 0l ) {
                 odebug << "plugin " << plugin.name << " has a configuration widget" << oendl;
                 configWidgetList.append(widget);
                 m_mainTW->addTab( widget, plugin.pluginObject->pixmapNameConfig(),
                                   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 );
             }
             if ( m_excludePlugins.find( plugin.name ) == m_excludePlugins.end() ) {
                 item->setOn( TRUE );
             }
             m_plugins[plugin.name] = item;
         }
 
         // set the first tab as default.
         m_mainTW->setCurrentTab(m_pluginListWidget);
 
         // put the number of plugins as the max number of req. auth.
         m_generalConfig->m_nbSuccessMin->setMaxValue( pluginList.count() );
     }
     else
     {
         /* we don't have any installed plugin there. Let's tell
          * that to the user in a third tab, using the m_pluginListWidget widget
          */
         m_pluginListWidget = new QWidget(m_mainTW, "plugin list widget (no plugins warning)");
         QVBoxLayout * pluginListLayout = new QVBoxLayout(m_pluginListWidget);
         pluginListLayout->setSpacing(11);
         pluginListLayout->setMargin(11);
         pluginListLayout->setAlignment( Qt::AlignTop );
         QVGroupBox *warningBox = new QVGroupBox(tr("Important notice"), m_pluginListWidget, "noPlugins warning box");
         pluginListLayout->addWidget(warningBox);
         QLabel * warningText = new QLabel( "<p>" + tr("To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one <em>opie-securityplugin-*</em> package! Once you have done that, you will be able to configure your PDA protection here.") + "</p>", warningBox );
 
         m_mainTW->addTab(m_pluginListWidget, "security/Security", tr( "Locking") );
 
         // set the first tab as default.
         m_mainTW->setCurrentTab(m_loginWidget);
     }
 
     showMaximized();
 }
 
 /// nothing to do
 MultiauthConfig::~MultiauthConfig()
 {
 }
 
 /// saves the general and plugin(s) configurations
 void MultiauthConfig::writeConfigs() {
     MultiauthConfigWidget* confWidget = 0;
     for ( confWidget = configWidgetList.first(); confWidget != 0;
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
@@ -1,10 +1,10 @@
 Package: opie-security
 Files: plugins/application/libsecurity.so* bin/security apps/Settings/security.desktop pics/security/sync.png pics/security/users.png pics/security/Security.png
 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