Remove dependancy against KernelIf when not necessary

wilder
Montel Laurent 10 years ago
parent 6e805c29c1
commit cffc0030d3
  1. 7
      src/filter/dialog/filteractionmissingaccountdialog.cpp
  2. 6
      src/filter/dialog/filteractionmissingidentitydialog.cpp
  3. 6
      src/filter/dialog/filteractionmissingsoundurldialog.cpp
  4. 6
      src/filter/dialog/filteractionmissingtagdialog.cpp
  5. 7
      src/filter/dialog/filteractionmissingtemplatedialog.cpp
  6. 6
      src/filter/dialog/filteractionmissingtransportdialog.cpp
  7. 6
      src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp

@ -20,11 +20,12 @@
#include "filteractionmissingaccountdialog.h" #include "filteractionmissingaccountdialog.h"
#include "filter/kmfilteraccountlist.h" #include "filter/kmfilteraccountlist.h"
#include "kernel/mailkernel.h"
#include "util/mailutil.h" #include "util/mailutil.h"
#include <KLocalizedString> #include <KLocalizedString>
#include <KSharedConfig>
#include <KConfigGroup>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel> #include <QLabel>
@ -71,7 +72,7 @@ FilterActionMissingAccountDialog::~FilterActionMissingAccountDialog()
void FilterActionMissingAccountDialog::readConfig() void FilterActionMissingAccountDialog::readConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingAccountDialog"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingAccountDialog");
const QSize size = group.readEntry("Size", QSize(500, 300)); const QSize size = group.readEntry("Size", QSize(500, 300));
if (size.isValid()) { if (size.isValid()) {
@ -81,7 +82,7 @@ void FilterActionMissingAccountDialog::readConfig()
void FilterActionMissingAccountDialog::writeConfig() void FilterActionMissingAccountDialog::writeConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingAccountDialog"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingAccountDialog");
group.writeEntry("Size", size()); group.writeEntry("Size", size());
} }

@ -21,7 +21,7 @@
#include "filteractionmissingidentitydialog.h" #include "filteractionmissingidentitydialog.h"
#include "kernel/mailkernel.h" #include "kernel/mailkernel.h"
#include <KSharedConfig>
#include <KConfigGroup> #include <KConfigGroup>
#include <KLocalizedString> #include <KLocalizedString>
@ -72,7 +72,7 @@ FilterActionMissingIdentityDialog::~FilterActionMissingIdentityDialog()
void FilterActionMissingIdentityDialog::readConfig() void FilterActionMissingIdentityDialog::readConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingMissingIdentity"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingMissingIdentity");
const QSize size = group.readEntry("Size", QSize(500, 300)); const QSize size = group.readEntry("Size", QSize(500, 300));
if (size.isValid()) { if (size.isValid()) {
@ -82,7 +82,7 @@ void FilterActionMissingIdentityDialog::readConfig()
void FilterActionMissingIdentityDialog::writeConfig() void FilterActionMissingIdentityDialog::writeConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingMissingIdentity"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingMissingIdentity");
group.writeEntry("Size", size()); group.writeEntry("Size", size());
} }

@ -18,11 +18,11 @@
*/ */
#include "filteractionmissingsoundurldialog.h" #include "filteractionmissingsoundurldialog.h"
#include "kernel/mailkernel.h"
#include <KConfigGroup> #include <KConfigGroup>
#include <KLocalizedString> #include <KLocalizedString>
#include <KUrlRequester> #include <KUrlRequester>
#include <KSharedConfig>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
@ -78,7 +78,7 @@ QString FilterActionMissingSoundUrlDialog::soundUrl() const
void FilterActionMissingSoundUrlDialog::readConfig() void FilterActionMissingSoundUrlDialog::readConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingSoundUrlDialog"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingSoundUrlDialog");
const QSize size = group.readEntry("Size", QSize(500, 300)); const QSize size = group.readEntry("Size", QSize(500, 300));
if (size.isValid()) { if (size.isValid()) {
@ -88,7 +88,7 @@ void FilterActionMissingSoundUrlDialog::readConfig()
void FilterActionMissingSoundUrlDialog::writeConfig() void FilterActionMissingSoundUrlDialog::writeConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingSoundUrlDialog"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingSoundUrlDialog");
group.writeEntry("Size", size()); group.writeEntry("Size", size());
} }

@ -20,9 +20,9 @@
#include "filteractionmissingtagdialog.h" #include "filteractionmissingtagdialog.h"
#include <KLocalizedString> #include <KLocalizedString>
#include <KSharedConfig>
#include "tag/addtagdialog.h" #include "tag/addtagdialog.h"
#include "kernel/mailkernel.h"
#include <KConfigGroup> #include <KConfigGroup>
#include <QDialogButtonBox> #include <QDialogButtonBox>
@ -89,7 +89,7 @@ FilterActionMissingTagDialog::~FilterActionMissingTagDialog()
void FilterActionMissingTagDialog::readConfig() void FilterActionMissingTagDialog::readConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingTagDialog"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTagDialog");
const QSize size = group.readEntry("Size", QSize(500, 300)); const QSize size = group.readEntry("Size", QSize(500, 300));
if (size.isValid()) { if (size.isValid()) {
@ -99,7 +99,7 @@ void FilterActionMissingTagDialog::readConfig()
void FilterActionMissingTagDialog::writeConfig() void FilterActionMissingTagDialog::writeConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingTagDialog"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTagDialog");
group.writeEntry("Size", size()); group.writeEntry("Size", size());
} }

@ -18,7 +18,8 @@
*/ */
#include "filteractionmissingtemplatedialog.h" #include "filteractionmissingtemplatedialog.h"
#include "kernel/mailkernel.h"
#include <KSharedConfig>
#include <KComboBox> #include <KComboBox>
#include <KConfigGroup> #include <KConfigGroup>
@ -69,7 +70,7 @@ FilterActionMissingTemplateDialog::~FilterActionMissingTemplateDialog()
void FilterActionMissingTemplateDialog::readConfig() void FilterActionMissingTemplateDialog::readConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingTemplateDialog"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTemplateDialog");
const QSize size = group.readEntry("Size", QSize(500, 300)); const QSize size = group.readEntry("Size", QSize(500, 300));
if (size.isValid()) { if (size.isValid()) {
@ -79,7 +80,7 @@ void FilterActionMissingTemplateDialog::readConfig()
void FilterActionMissingTemplateDialog::writeConfig() void FilterActionMissingTemplateDialog::writeConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingTemplateDialog"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTemplateDialog");
group.writeEntry("Size", size()); group.writeEntry("Size", size());
} }

@ -18,8 +18,8 @@
*/ */
#include "filteractionmissingtransportdialog.h" #include "filteractionmissingtransportdialog.h"
#include "kernel/mailkernel.h"
#include <KSharedConfig>
#include <KLocalizedString> #include <KLocalizedString>
#include <QDialogButtonBox> #include <QDialogButtonBox>
@ -68,7 +68,7 @@ FilterActionMissingTransportDialog::~FilterActionMissingTransportDialog()
void FilterActionMissingTransportDialog::readConfig() void FilterActionMissingTransportDialog::readConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingTransportDialog"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTransportDialog");
const QSize size = group.readEntry("Size", QSize(500, 300)); const QSize size = group.readEntry("Size", QSize(500, 300));
if (size.isValid()) { if (size.isValid()) {
@ -78,7 +78,7 @@ void FilterActionMissingTransportDialog::readConfig()
void FilterActionMissingTransportDialog::writeConfig() void FilterActionMissingTransportDialog::writeConfig()
{ {
KConfigGroup group(KernelIf->config(), "FilterActionMissingTransportDialog"); KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTransportDialog");
group.writeEntry("Size", size()); group.writeEntry("Size", size());
} }

@ -17,7 +17,7 @@
#include "selectthunderbirdfilterfilesdialog.h" #include "selectthunderbirdfilterfilesdialog.h"
#include "selectthunderbirdfilterfileswidget.h" #include "selectthunderbirdfilterfileswidget.h"
#include "kernel/mailkernel.h" #include <KSharedConfig>
#include <KLocalizedString> #include <KLocalizedString>
#include <QHBoxLayout> #include <QHBoxLayout>
@ -67,7 +67,7 @@ void SelectThunderbirdFilterFilesDialog::setStartDir(const QUrl &url)
void SelectThunderbirdFilterFilesDialog::readConfig() void SelectThunderbirdFilterFilesDialog::readConfig()
{ {
KConfigGroup group(KernelIf->config(), "SelectThunderbirdFilterFilesDialog"); KConfigGroup group(KSharedConfig::openConfig(), "SelectThunderbirdFilterFilesDialog");
const QSize size = group.readEntry("Size", QSize(500, 300)); const QSize size = group.readEntry("Size", QSize(500, 300));
if (size.isValid()) { if (size.isValid()) {
@ -77,6 +77,6 @@ void SelectThunderbirdFilterFilesDialog::readConfig()
void SelectThunderbirdFilterFilesDialog::writeConfig() void SelectThunderbirdFilterFilesDialog::writeConfig()
{ {
KConfigGroup group(KernelIf->config(), "SelectThunderbirdFilterFilesDialog"); KConfigGroup group(KSharedConfig::openConfig(), "SelectThunderbirdFilterFilesDialog");
group.writeEntry("Size", size()); group.writeEntry("Size", size());
} }

Loading…
Cancel
Save