Create the 'Config' instance on the Stack to avoid

that we revert changes done in between of our creation
and deletion

5 files changed, 17 insertions, 23 deletions

diff --git a/noncore/securityplugins/blueping/bluepingConfigWidget.cpp b/noncore/securityplugins/blueping/bluepingConfigWidget.cpp
index 876ccda..17168f9 100644
--- a/noncore/securityplugins/blueping/bluepingConfigWidget.cpp
+++ b/noncore/securityplugins/blueping/bluepingConfigWidget.cpp
@@ -14,4 +14,4 @@ BluepingConfigWidget::BluepingConfigWidget(QWidget* parent = 0, const char* name
 {
-    m_config = new Config("Security");
-    m_config->setGroup("BluepingPlugin");
+    Config config("Security");
+    config.setGroup("BluepingPlugin");
     QVBoxLayout * baseLayout = new QVBoxLayout( this);
@@ -29,3 +29,3 @@ BluepingConfigWidget::BluepingConfigWidget(QWidget* parent = 0, const char* name
 
-    QString mac = m_config->readEntry("mac");
+    QString mac = config.readEntry("mac");
     if ( mac.isEmpty() )
@@ -53,3 +53,5 @@ void BluepingConfigWidget::changeMAC() {
     {
-        m_config->writeEntry("mac", mac);
+        Config config("Security");
+        config.setGroup("BluepingPlugin");
+        config.writeEntry("mac", mac);
         QMessageBox success( tr("MAC address saved!"), "<p>" + tr("Make sure that Bluetooth is turned on on the corresponding device when the Blueping plugin needs it.") + "</p>",
@@ -66,5 +68,3 @@ void BluepingConfigWidget::changeMAC() {
 BluepingConfigWidget::~BluepingConfigWidget()
-{
-    delete m_config;
-}
+{}
 
diff --git a/noncore/securityplugins/blueping/bluepingConfigWidget.h b/noncore/securityplugins/blueping/bluepingConfigWidget.h
index bd1bec9..643c97f 100644
--- a/noncore/securityplugins/blueping/bluepingConfigWidget.h
+++ b/noncore/securityplugins/blueping/bluepingConfigWidget.h
@@ -52,3 +52,2 @@ private:
     QPushButton *setMAC;
-    Config *m_config;
 private slots:
diff --git a/noncore/securityplugins/notice/noticeConfigWidget.cpp b/noncore/securityplugins/notice/noticeConfigWidget.cpp
index e0468a7..02084f8 100644
--- a/noncore/securityplugins/notice/noticeConfigWidget.cpp
+++ b/noncore/securityplugins/notice/noticeConfigWidget.cpp
@@ -67,7 +67,6 @@ void NoticeConfigWidget::resetNotice()
 QString NoticeConfigWidget::getNoticeText() {
-    m_config = new Config("Security");
-    m_config->setGroup("NoticePlugin");
+    Config config("Security");
+    config.setGroup("NoticePlugin");
     // Note: C++ processes '\' character, so we have to type \\\\ to mean \\ to QRegExp
-    QString noticeText = m_config->readEntry("noticeText", QObject::tr(defaultNoticeText) ).replace( QRegExp("\\\\n"), "\n" );
-    delete m_config;
+    QString noticeText = config.readEntry("noticeText", QObject::tr(defaultNoticeText) ).replace( QRegExp("\\\\n"), "\n" );
     return noticeText;
@@ -77,7 +76,6 @@ QString NoticeConfigWidget::getNoticeText() {
 void NoticeConfigWidget::setNoticeText(QString noticeText) {
-    m_config = new Config("Security");
-    m_config->setGroup("NoticePlugin");
+    Config config("Security");
+    config.setGroup("NoticePlugin");
     // since Config files do not allow true newlines, we replace them with litteral "\n"
-    m_config->writeEntry("noticeText", noticeText.replace( QRegExp("\n"), "\\n" ));
-    delete m_config;
+    config.writeEntry("noticeText", noticeText.replace( QRegExp("\n"), "\\n" ));
 }
diff --git a/noncore/securityplugins/notice/noticeplugin.cpp b/noncore/securityplugins/notice/noticeplugin.cpp
index 5617855..d3dc7a4 100644
--- a/noncore/securityplugins/notice/noticeplugin.cpp
+++ b/noncore/securityplugins/notice/noticeplugin.cpp
@@ -12,4 +12,2 @@ using Opie::Security::MultiauthConfigWidget;
 NoticePlugin::NoticePlugin() : MultiauthPluginObject(), m_noticeW(0) {
-    m_config = new Config("Security");
-    m_config->setGroup("NoticePlugin");
 }
@@ -18,5 +16,3 @@ NoticePlugin::NoticePlugin() : MultiauthPluginObject(), m_noticeW(0) {
 NoticePlugin::~NoticePlugin() {
-    delete m_config;
-    if (m_noticeW != 0)
-        delete m_noticeW;
+    delete m_noticeW;
 }
@@ -83,3 +79,5 @@ QString NoticePlugin::getNoticeText() {
       // Note: C++ processes '\' character, so we have to type \\\\ to mean \\ to QRegExp
-    return m_config->readEntry("noticeText", QObject::tr(defaultNoticeText)).replace( QRegExp("\\\\n"), "\n" );
+    Config config("Security");
+    config.setGroup("NoticePlugin");
+    return config.readEntry("noticeText", QObject::tr(defaultNoticeText)).replace( QRegExp("\\\\n"), "\n" );
 }
diff --git a/noncore/securityplugins/notice/noticeplugin.h b/noncore/securityplugins/notice/noticeplugin.h
index 2828f58..22b2322 100644
--- a/noncore/securityplugins/notice/noticeplugin.h
+++ b/noncore/securityplugins/notice/noticeplugin.h
@@ -59,3 +59,2 @@ private:
     NoticeConfigWidget * m_noticeW;
-    Config * m_config;
     QString getNoticeText();