Commit b75afd52 authored by Laurent Montel's avatar Laurent Montel 😁

Use singleton

parent 3991daa4
...@@ -164,8 +164,7 @@ SetupServer::SetupServer(ImapResourceBase *parentResource, WId parent) ...@@ -164,8 +164,7 @@ SetupServer::SetupServer(ImapResourceBase *parentResource, WId parent)
QStringList() << KMime::Message::mimeType()); QStringList() << KMime::Message::mimeType());
m_ui->folderRequester->setAccessRightsFilter(Akonadi::Collection::CanChangeItem | Akonadi::Collection::CanCreateItem | Akonadi::Collection::CanDeleteItem); m_ui->folderRequester->setAccessRightsFilter(Akonadi::Collection::CanChangeItem | Akonadi::Collection::CanCreateItem | Akonadi::Collection::CanDeleteItem);
m_ui->folderRequester->changeCollectionDialogOptions(Akonadi::CollectionDialog::AllowToCreateNewChildCollection); m_ui->folderRequester->changeCollectionDialogOptions(Akonadi::CollectionDialog::AllowToCreateNewChildCollection);
m_identityManager = new KIdentityManagement::IdentityManager(false, this, "mIdentityManager"); m_identityCombobox = new KIdentityManagement::IdentityCombo(KIdentityManagement::IdentityManager::self(), this);
m_identityCombobox = new KIdentityManagement::IdentityCombo(m_identityManager, this);
m_ui->identityLabel->setBuddy(m_identityCombobox); m_ui->identityLabel->setBuddy(m_identityCombobox);
m_ui->identityLayout->addWidget(m_identityCombobox, 1); m_ui->identityLayout->addWidget(m_identityCombobox, 1);
m_ui->identityLabel->setBuddy(m_identityCombobox); m_ui->identityLabel->setBuddy(m_identityCombobox);
......
...@@ -41,7 +41,6 @@ class ServerTest; ...@@ -41,7 +41,6 @@ class ServerTest;
namespace KIdentityManagement namespace KIdentityManagement
{ {
class IdentityCombo; class IdentityCombo;
class IdentityManager;
} }
class FolderArchiveSettingPage; class FolderArchiveSettingPage;
class ImapResourceBase; class ImapResourceBase;
...@@ -90,7 +89,6 @@ private: ...@@ -90,7 +89,6 @@ private:
bool m_subscriptionsChanged; bool m_subscriptionsChanged;
bool m_shouldClearCache; bool m_shouldClearCache;
QString m_vacationFileName; QString m_vacationFileName;
KIdentityManagement::IdentityManager *m_identityManager;
KIdentityManagement::IdentityCombo *m_identityCombobox; KIdentityManagement::IdentityCombo *m_identityCombobox;
QString m_oldResourceName; QString m_oldResourceName;
QRegExpValidator mValidator; QRegExpValidator mValidator;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment