Be less verbose

clean ups

6 files changed, 7 insertions, 16 deletions

diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp
index f161109..7f24490 100644
--- a/core/settings/security/main.cpp
+++ b/core/settings/security/main.cpp
@@ -19,11 +19,9 @@ int main(int argc, char **argv) {
             // authentication failed
             show = false;
         }
     }
-    if ( show == true )
-    {
-    printf("building dialog\n");
+    if ( show == true ){
         MultiauthConfig dialog;
         app.setMainWidget(&dialog);
 
         if ( dialog.exec() == QDialog::Accepted ) {
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp
index 0ce4542..93e73c3 100644
--- a/core/settings/security/multiauthconfig.cpp
+++ b/core/settings/security/multiauthconfig.cpp
@@ -411,9 +411,8 @@ void MultiauthConfig::pluginsChanged() {
 
 /// loads each multiauth plugin
 void MultiauthConfig::loadPlugins() {
 
-    odebug << "loading plugins..." << oendl;
     QString path = QPEApplication::qpeDir() + "/plugins/security";
     QDir dir( path, "lib*.so" );
 
     QStringList list = dir.entryList();
@@ -425,14 +424,10 @@ void MultiauthConfig::loadPlugins() {
     for ( it = list.begin(); it != list.end(); ++it ) {
         QInterfacePtr<MultiauthPluginInterface> iface;
         QLibrary *lib = new QLibrary( path + "/" + *it );
         QString libPath(path + "/" + *it);
-        odebug << "library path: " << libPath << oendl;
 
-        odebug <<  "querying: " << QString( path + "/" + *it ) << oendl;
         if ( lib->queryInterface( IID_MultiauthPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
-            odebug <<  "accepted: " << QString( path + "/" + *it ) << oendl;
-
             MultiauthPlugin plugin;
             plugin.library = lib;
             plugin.iface = iface;
             plugin.name = QString(*it);
@@ -458,9 +453,8 @@ void MultiauthConfig::loadPlugins() {
                 pluginList.append( plugin );
             }
 
         } else {
-            odebug <<  "could not recognize " << QString( path + "/" + *it ) << oendl;
             delete lib;
         }
 
     } // end for
diff --git a/noncore/securityplugins/blueping/bluepingplugin.cpp b/noncore/securityplugins/blueping/bluepingplugin.cpp
index f4c5e95..05fd3c2 100644
--- a/noncore/securityplugins/blueping/bluepingplugin.cpp
+++ b/noncore/securityplugins/blueping/bluepingplugin.cpp
@@ -25,10 +25,9 @@ BluepingPlugin::BluepingPlugin() : MultiauthPluginObject(), m_ping(0) {
 
 /// deletes the m_config Config object and noticeW if necessary
 BluepingPlugin::~BluepingPlugin() {
     delete m_config;
-    if (m_ping != 0)
-        delete m_ping;
+    delete m_ping;
 }
 
 /// Simply return its name (Blueping plugin)
 QString BluepingPlugin::pluginName() const {
diff --git a/noncore/securityplugins/notice/noticeConfigWidget.cpp b/noncore/securityplugins/notice/noticeConfigWidget.cpp
index e532232..e0468a7 100644
--- a/noncore/securityplugins/notice/noticeConfigWidget.cpp
+++ b/noncore/securityplugins/notice/noticeConfigWidget.cpp
@@ -56,9 +56,9 @@ void NoticeConfigWidget::writeConfig()
 
 /// reset the notice text to the hard-coded example defaultNoticeText
 void NoticeConfigWidget::resetNotice()
 {
-    noticeMLE->setText(defaultNoticeText);
+    noticeMLE->setText(QObject::tr(defaultNoticeText));
 }
 
 /// get the notice text from the config file (with true new lines)
 /**
@@ -67,9 +67,9 @@ void NoticeConfigWidget::resetNotice()
 QString NoticeConfigWidget::getNoticeText() {
     m_config = new Config("Security");
     m_config->setGroup("NoticePlugin");
     // Note: C++ processes '\' character, so we have to type \\\\ to mean \\ to QRegExp
-    QString noticeText = m_config->readEntry("noticeText", defaultNoticeText).replace( QRegExp("\\\\n"), "\n" );
+    QString noticeText = m_config->readEntry("noticeText", QObject::tr(defaultNoticeText) ).replace( QRegExp("\\\\n"), "\n" );
     delete m_config;
     return noticeText;
 }
 
diff --git a/noncore/securityplugins/notice/noticeConfigWidget.h b/noncore/securityplugins/notice/noticeConfigWidget.h
index c90484c..f8847e4 100644
--- a/noncore/securityplugins/notice/noticeConfigWidget.h
+++ b/noncore/securityplugins/notice/noticeConfigWidget.h
@@ -39,16 +39,16 @@
 #include <qpe/config.h>
 
 #include <opie2/multiauthconfigwidget.h>
 
-static char defaultNoticeText [] = "<h2>NOTICE TO USERS</h2>\n"
+static char defaultNoticeText [] = QT_TRANSLATE_NOOP( "QObject", "<h2>NOTICE TO USERS</h2>\n"
         "<p>This is a private computer system and is the property of "
         "the company XXX / Mr or Ms X. It is for authorized "
         "use only. Users have no expectation of privacy.</p>\n"
         "<p><strong>Unauthorized or improper use of this system may result in "
         "disciplinary action and civil and criminal penalties. <em>By continuing to use "
         "this system you indicate your awareness of and consent to these "
-        "terms. LOG OFF IMMEDIATELY if you do not agree to them.</em></strong></p>";
+        "terms. LOG OFF IMMEDIATELY if you do not agree to them.</em></strong></p>");
 
 class NoticeConfigWidget : public Opie::Security::MultiauthConfigWidget {
 
     Q_OBJECT
diff --git a/noncore/securityplugins/notice/noticeplugin.cpp b/noncore/securityplugins/notice/noticeplugin.cpp
index 25a452a..1da260a 100644
--- a/noncore/securityplugins/notice/noticeplugin.cpp
+++ b/noncore/securityplugins/notice/noticeplugin.cpp
@@ -80,7 +80,7 @@ int NoticePlugin::authenticate() {
  * if no text has been defined yet returns defaultNoticeText
  */
 QString NoticePlugin::getNoticeText() {
       // Note: C++ processes '\' character, so we have to type \\\\ to mean \\ to QRegExp
-      return m_config->readEntry("noticeText", defaultNoticeText).replace( QRegExp("\\\\n"), "\n" );
+    return m_config->readEntry("noticeText", QObject::tr(defaultNoticeText)).replace( QRegExp("\\\\n"), "\n" );
 }