20 files changed, 75 insertions, 51 deletions
diff --git a/noncore/securityplugins/blueping/bluepingplugin.cpp b/noncore/securityplugins/blueping/bluepingplugin.cpp index af0448b..f4c5e95 100644 --- a/noncore/securityplugins/blueping/bluepingplugin.cpp +++ b/noncore/securityplugins/blueping/bluepingplugin.cpp @@ -14,2 +14,5 @@ using namespace Opie::Core; +using Opie::Security::MultiauthPluginObject; +using Opie::Security::MultiauthConfigWidget; + diff --git a/noncore/securityplugins/blueping/bluepingplugin.h b/noncore/securityplugins/blueping/bluepingplugin.h index c122471..0df3f78 100644 --- a/noncore/securityplugins/blueping/bluepingplugin.h +++ b/noncore/securityplugins/blueping/bluepingplugin.h @@ -48,3 +48,3 @@ */ -class BluepingPlugin : public QObject, public MultiauthPluginObject { +class BluepingPlugin : public QObject, public Opie::Security::MultiauthPluginObject { @@ -56,3 +56,3 @@ class BluepingPlugin : public QObject, public MultiauthPluginObject { int authenticate(); - MultiauthConfigWidget * configWidget(QWidget * parent); + Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent); QString pixmapNameConfig() const; diff --git a/noncore/securityplugins/blueping/bluepingpluginimpl.cpp b/noncore/securityplugins/blueping/bluepingpluginimpl.cpp index f7b1bfc..dbca91f 100644 --- a/noncore/securityplugins/blueping/bluepingpluginimpl.cpp +++ b/noncore/securityplugins/blueping/bluepingpluginimpl.cpp @@ -2,2 +2,5 @@ +using Opie::Security::MultiauthPluginInterface; +using Opie::Security::MultiauthPluginObject; + BluepingPluginImpl::BluepingPluginImpl() { diff --git a/noncore/securityplugins/blueping/bluepingpluginimpl.h b/noncore/securityplugins/blueping/bluepingpluginimpl.h index 2fd023a..4663602 100644 --- a/noncore/securityplugins/blueping/bluepingpluginimpl.h +++ b/noncore/securityplugins/blueping/bluepingpluginimpl.h @@ -39,3 +39,3 @@ /// Standard multiauth plugin class -class BluepingPluginImpl : public MultiauthPluginInterface{ +class BluepingPluginImpl : public Opie::Security::MultiauthPluginInterface{ @@ -49,3 +49,3 @@ class BluepingPluginImpl : public MultiauthPluginInterface{ - virtual MultiauthPluginObject *plugin(); + virtual Opie::Security::MultiauthPluginObject *plugin(); @@ -54,3 +54,2 @@ class BluepingPluginImpl : public MultiauthPluginInterface{ BluepingPlugin *bluepingPlugin; - ulong ref; }; diff --git a/noncore/securityplugins/dummy/dummyplugin.cpp b/noncore/securityplugins/dummy/dummyplugin.cpp index 0d19e43..594825e 100644 --- a/noncore/securityplugins/dummy/dummyplugin.cpp +++ b/noncore/securityplugins/dummy/dummyplugin.cpp @@ -9,2 +9,5 @@ +using Opie::Security::MultiauthConfigWidget; +using Opie::Security::MultiauthPluginObject; + /// Simply return its name (Dummy plugin) @@ -56,3 +59,3 @@ int DummyPlugin::authenticate() { dummyDialog.setGeometry( 0, 0, desk.width(), desk.height() ); - + /* Creation of the particular widgets of our Dummy user interface @@ -65,3 +68,3 @@ int DummyPlugin::authenticate() { layout.setAlignment( Qt::AlignTop ); - + QLabel title("<center><h1>" + tr("\"Dummy\" <br />demonstration plugin") + "</h1></center>", &dummyDialog); @@ -78,3 +81,3 @@ int DummyPlugin::authenticate() { hl.addWidget(&pbFailure, 0, Qt::AlignHCenter); - + /* Linking our pushbuttons to exit functions @@ -85,3 +88,3 @@ int DummyPlugin::authenticate() { QObject::connect(&pbSkip, SIGNAL(clicked()), this, SLOT(skip())); - + /* The value of the signal these three slots will emit corresponds to diff --git a/noncore/securityplugins/dummy/dummyplugin.h b/noncore/securityplugins/dummy/dummyplugin.h index 9680dff..3bfca98 100644 --- a/noncore/securityplugins/dummy/dummyplugin.h +++ b/noncore/securityplugins/dummy/dummyplugin.h @@ -44,3 +44,3 @@ */ -class DummyPlugin : public QObject, public MultiauthPluginObject { +class DummyPlugin : public QObject, public Opie::Security::MultiauthPluginObject { @@ -50,3 +50,3 @@ class DummyPlugin : public QObject, public MultiauthPluginObject { int authenticate(); - MultiauthConfigWidget * configWidget(QWidget * parent); + Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent); QString pixmapNameConfig() const; diff --git a/noncore/securityplugins/dummy/dummypluginimpl.cpp b/noncore/securityplugins/dummy/dummypluginimpl.cpp index 518996c..54dbdd1 100644 --- a/noncore/securityplugins/dummy/dummypluginimpl.cpp +++ b/noncore/securityplugins/dummy/dummypluginimpl.cpp @@ -2,2 +2,5 @@ +using Opie::Security::MultiauthPluginInterface; +using Opie::Security::MultiauthPluginObject; + DummyPluginImpl::DummyPluginImpl() { diff --git a/noncore/securityplugins/dummy/dummypluginimpl.h b/noncore/securityplugins/dummy/dummypluginimpl.h index 49a18cd..ce8620d 100644 --- a/noncore/securityplugins/dummy/dummypluginimpl.h +++ b/noncore/securityplugins/dummy/dummypluginimpl.h @@ -39,3 +39,3 @@ /// Standard multiauth plugin class -class DummyPluginImpl : public MultiauthPluginInterface{ +class DummyPluginImpl : public Opie::Security::MultiauthPluginInterface{ @@ -49,3 +49,3 @@ class DummyPluginImpl : public MultiauthPluginInterface{ - virtual MultiauthPluginObject *plugin(); + virtual Opie::Security::MultiauthPluginObject *plugin(); @@ -54,3 +54,2 @@ class DummyPluginImpl : public MultiauthPluginInterface{ DummyPlugin *dummyPlugin; - ulong ref; }; diff --git a/noncore/securityplugins/notice/noticeConfigWidget.cpp b/noncore/securityplugins/notice/noticeConfigWidget.cpp index e2c2d83..e532232 100644 --- a/noncore/securityplugins/notice/noticeConfigWidget.cpp +++ b/noncore/securityplugins/notice/noticeConfigWidget.cpp @@ -10,2 +10,4 @@ +using Opie::Security::MultiauthConfigWidget; + /// constructs the widget, filling the noticeMLE QMultiLineEdit with the "noticeText" entry @@ -48,3 +50,3 @@ void NoticeConfigWidget::writeConfig() { - if ( noticeMLE->edited() ) { + if ( noticeMLE->edited() ) { odebug << "writing new notice text in Security.conf" << oendl; diff --git a/noncore/securityplugins/notice/noticeConfigWidget.h b/noncore/securityplugins/notice/noticeConfigWidget.h index 69f15bf..c90484c 100644 --- a/noncore/securityplugins/notice/noticeConfigWidget.h +++ b/noncore/securityplugins/notice/noticeConfigWidget.h @@ -9,3 +9,3 @@ .>+-= - _;:, .> :=|. This library is free software; you can + _;:, .> :=|. This library is free software; you can .> <`_, > . <= redistribute it and/or modify it under @@ -15,4 +15,4 @@ ._= =} : or (at your option) any later version. - .%`+i> _;_. - .i_,=:_. -<s. This library is distributed in the hope that + .%`+i> _;_. + .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; @@ -23,6 +23,6 @@ ++= -. .` .: details. - : = ...= . :.=- + : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with - -- :-=` this library; see the file COPYING.LIB. + -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, @@ -50,4 +50,4 @@ static char defaultNoticeText [] = "<h2>NOTICE TO USERS</h2>\n" "terms. LOG OFF IMMEDIATELY if you do not agree to them.</em></strong></p>"; - -class NoticeConfigWidget : public MultiauthConfigWidget { + +class NoticeConfigWidget : public Opie::Security::MultiauthConfigWidget { @@ -71 +71,2 @@ private: #endif // NOTICECONFIGWIDGET_H + diff --git a/noncore/securityplugins/notice/noticeplugin.cpp b/noncore/securityplugins/notice/noticeplugin.cpp index bacc439..25a452a 100644 --- a/noncore/securityplugins/notice/noticeplugin.cpp +++ b/noncore/securityplugins/notice/noticeplugin.cpp @@ -7,2 +7,4 @@ +using Opie::Security::MultiauthPluginObject; +using Opie::Security::MultiauthConfigWidget; @@ -63,6 +65,6 @@ int NoticePlugin::authenticate() { noticeDialog.setButtonText(QMessageBox::Yes, tr("I accept")); - + QRect desk = oApp->desktop()->geometry(); noticeDialog.setGeometry( 0, 0, desk.width(), desk.height() ); - + switch (noticeDialog.exec()) diff --git a/noncore/securityplugins/notice/noticeplugin.h b/noncore/securityplugins/notice/noticeplugin.h index 842d47b..4aa6f02 100644 --- a/noncore/securityplugins/notice/noticeplugin.h +++ b/noncore/securityplugins/notice/noticeplugin.h @@ -45,3 +45,3 @@ */ -class NoticePlugin : public QObject, public MultiauthPluginObject { +class NoticePlugin : public QObject, public Opie::Security::MultiauthPluginObject { @@ -53,3 +53,3 @@ public: int authenticate(); - MultiauthConfigWidget * configWidget(QWidget * parent); + Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent); QString pixmapNameConfig() const; diff --git a/noncore/securityplugins/notice/noticepluginimpl.cpp b/noncore/securityplugins/notice/noticepluginimpl.cpp index 34e3cfc..7524512 100644 --- a/noncore/securityplugins/notice/noticepluginimpl.cpp +++ b/noncore/securityplugins/notice/noticepluginimpl.cpp @@ -2,2 +2,5 @@ +using Opie::Security::MultiauthPluginObject; +using Opie::Security::MultiauthPluginInterface; + NoticePluginImpl::NoticePluginImpl() { diff --git a/noncore/securityplugins/notice/noticepluginimpl.h b/noncore/securityplugins/notice/noticepluginimpl.h index b2a1140..1b1e22f 100644 --- a/noncore/securityplugins/notice/noticepluginimpl.h +++ b/noncore/securityplugins/notice/noticepluginimpl.h @@ -41,3 +41,3 @@ */ -class NoticePluginImpl : public MultiauthPluginInterface{ +class NoticePluginImpl : public Opie::Security::MultiauthPluginInterface{ @@ -51,3 +51,3 @@ class NoticePluginImpl : public MultiauthPluginInterface{ - virtual MultiauthPluginObject *plugin(); + virtual Opie::Security::MultiauthPluginObject *plugin(); @@ -56,3 +56,2 @@ class NoticePluginImpl : public MultiauthPluginInterface{ NoticePlugin *noticePlugin; - ulong ref; }; diff --git a/noncore/securityplugins/pin/pin.cpp b/noncore/securityplugins/pin/pin.cpp index 37dc5be..c21ffcd 100644 --- a/noncore/securityplugins/pin/pin.cpp +++ b/noncore/securityplugins/pin/pin.cpp @@ -43,4 +43,7 @@ extern "C" char *crypt(const char *key, const char *salt); +using Opie::Security::MultiauthConfigWidget; +using Opie::Security::MultiauthPluginObject; + /// set to TRUE when we press the 'Skip' button -bool isSkip = FALSE; +static bool isSkip = FALSE; @@ -234,6 +237,6 @@ QString PinPlugin::getPIN( const QString& prompt ) pd.pinD->setPrompt( prompt ); - + pd.showMaximized(); int r = pd.exec(); - + if ( r == QDialog::Accepted ) { @@ -304,3 +307,3 @@ int PinPlugin::authenticate() pd.exec(); - + // analyse the result @@ -310,3 +313,3 @@ int PinPlugin::authenticate() return MultiauthPluginObject::Success; - else + else return MultiauthPluginObject::Failure; @@ -333,6 +336,6 @@ MultiauthConfigWidget * PinPlugin::configWidget(QWidget * parent) { PinConfigWidget * pinw = new PinConfigWidget(parent, "PIN configuration widget"); - + connect(pinw->changePIN, SIGNAL( clicked() ), this, SLOT( changePIN() )); connect(pinw->clearPIN, SIGNAL( clicked() ), this, SLOT( clearPIN() )); - + return pinw; diff --git a/noncore/securityplugins/pin/pin.h b/noncore/securityplugins/pin/pin.h index 6cd328a..1832210 100644 --- a/noncore/securityplugins/pin/pin.h +++ b/noncore/securityplugins/pin/pin.h @@ -45,3 +45,3 @@ */ -class PinPlugin : public QObject, public MultiauthPluginObject { +class PinPlugin : public QObject, public Opie::Security::MultiauthPluginObject { @@ -51,3 +51,3 @@ public: int authenticate(); - MultiauthConfigWidget * configWidget(QWidget * parent); + Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent); QString pixmapNameConfig() const; diff --git a/noncore/securityplugins/pin/pinConfigWidget.cpp b/noncore/securityplugins/pin/pinConfigWidget.cpp index 53e1a20..b34db8b 100644 --- a/noncore/securityplugins/pin/pinConfigWidget.cpp +++ b/noncore/securityplugins/pin/pinConfigWidget.cpp @@ -7,2 +7,4 @@ +using Opie::Security::MultiauthConfigWidget; + PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN configuration widget") @@ -14,3 +16,3 @@ PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN co baseLayout->setAlignment( Qt::AlignTop ); - + QGroupBox * configBox = new QGroupBox(0, Qt::Vertical, tr("Configure your PIN here"), this); @@ -29,3 +31,3 @@ PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN co boxLayout->addLayout(buttonLayout); - + } diff --git a/noncore/securityplugins/pin/pinConfigWidget.h b/noncore/securityplugins/pin/pinConfigWidget.h index 3242ad0..6d5edff 100644 --- a/noncore/securityplugins/pin/pinConfigWidget.h +++ b/noncore/securityplugins/pin/pinConfigWidget.h @@ -9,3 +9,3 @@ .>+-= - _;:, .> :=|. This library is free software; you can + _;:, .> :=|. This library is free software; you can .> <`_, > . <= redistribute it and/or modify it under @@ -15,4 +15,4 @@ ._= =} : or (at your option) any later version. - .%`+i> _;_. - .i_,=:_. -<s. This library is distributed in the hope that + .%`+i> _;_. + .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; @@ -23,6 +23,6 @@ ++= -. .` .: details. - : = ...= . :.=- + : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with - -- :-=` this library; see the file COPYING.LIB. + -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, @@ -39,3 +39,3 @@ -class PinConfigWidget : public MultiauthConfigWidget { +class PinConfigWidget : public Opie::Security::MultiauthConfigWidget { public: @@ -46,4 +46,4 @@ public: QPushButton *changePIN; - QPushButton *clearPIN; - + QPushButton *clearPIN; + }; diff --git a/noncore/securityplugins/pin/pinpluginimpl.cpp b/noncore/securityplugins/pin/pinpluginimpl.cpp index 1c32f81..6cd2467 100644 --- a/noncore/securityplugins/pin/pinpluginimpl.cpp +++ b/noncore/securityplugins/pin/pinpluginimpl.cpp @@ -2,2 +2,5 @@ +using Opie::Security::MultiauthPluginObject; +using Opie::Security::MultiauthPluginInterface; + PinPluginImpl::PinPluginImpl() { diff --git a/noncore/securityplugins/pin/pinpluginimpl.h b/noncore/securityplugins/pin/pinpluginimpl.h index e604b64..cbb9ef0 100644 --- a/noncore/securityplugins/pin/pinpluginimpl.h +++ b/noncore/securityplugins/pin/pinpluginimpl.h @@ -39,3 +39,3 @@ /// Standard multiauth plugin class -class PinPluginImpl : public MultiauthPluginInterface{ +class PinPluginImpl : public Opie::Security::MultiauthPluginInterface{ @@ -49,3 +49,3 @@ class PinPluginImpl : public MultiauthPluginInterface{ - virtual MultiauthPluginObject *plugin(); + virtual Opie::Security::MultiauthPluginObject *plugin(); @@ -54,3 +54,2 @@ class PinPluginImpl : public MultiauthPluginInterface{ PinPlugin *pinPlugin; - ulong ref; }; |