From bb099495d6157f9dba65d4e1e025a2ccbc35e65a Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 3 Nov 2009 12:47:32 +0000 Subject: [PATCH] not used now svn path=/branches/work/akonadi-ports/kdepim/; revision=1044323 --- CMakeLists.txt | 1 - accountcombobox.cpp | 115 -------------------------------------------- accountcombobox.h | 63 ------------------------ configuredialog.cpp | 1 - 4 files changed, 180 deletions(-) delete mode 100644 accountcombobox.cpp delete mode 100644 accountcombobox.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d4c6a9519..f88333744 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,6 @@ set(kmailprivate_LIB_SRCS expirejob.cpp compactionjob.cpp jobscheduler.cpp - accountcombobox.cpp redirectdialog.cpp foldershortcutdialog.cpp folderrequester.cpp diff --git a/accountcombobox.cpp b/accountcombobox.cpp deleted file mode 100644 index 22313ec1e..000000000 --- a/accountcombobox.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/** -*- mode: C++ -*- - * Copyright (c) 2004 David Faure - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * In addition, as a special exception, the copyright holders give - * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked - * combinations including the two. You must obey the GNU General - * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to - * your version of the file, but you are not obligated to do so. If - * you do not wish to do so, delete this exception statement from - * your version. - */ - - -#include "accountcombobox.h" -#include "kmfolder.h" -#include "kmfolderdir.h" -#include -#include -using namespace KMail; - -AccountComboBox::AccountComboBox( QWidget* parent ) : KComboBox( parent ) -{ -#if 0 - connect( kmkernel->acctMgr(), SIGNAL( accountAdded( KMAccount* ) ), - this, SLOT( slotRefreshAccounts() ) ); - connect( kmkernel->acctMgr(), SIGNAL( accountRemoved( KMAccount* ) ), - this, SLOT( slotRefreshAccounts() ) ); - slotRefreshAccounts(); -#else - kDebug() << "AKONADI PORT: Disabled code in " << Q_FUNC_INFO; -#endif -} - -void AccountComboBox::slotRefreshAccounts() -{ - KMAccount* curr = currentAccount(); - clear(); - // Note that this won't take into account newly-created-in-configuredialog accounts - // until clicking OK or Apply. This would make this class much more complex - // (this would have to be different depending on whether this combo is in the - // configuration dialog or not...) - QStringList accountNames; - QList lst = applicableAccounts(); - QList::ConstIterator it = lst.constBegin(); - for ( ; it != lst.constEnd() ; ++it ) - accountNames.append( (*it)->name() ); - kDebug() << accountNames; - addItems( accountNames ); - if ( curr ) - setCurrentAccount( curr ); -} - - -void AccountComboBox::setCurrentAccount( KMAccount* account ) -{ - int i = 0; - QList lst = applicableAccounts(); - QList::ConstIterator it = lst.constBegin(); - for ( ; it != lst.constEnd() ; ++it, ++i ) { - if ( (*it) == account ) { - setCurrentIndex( i ); - return; - } - } -} - -KMAccount* AccountComboBox::currentAccount() const -{ - int i = 0; - QList lst = applicableAccounts(); - QList::ConstIterator it = lst.constBegin(); - while ( it != lst.constEnd() && i < currentIndex() ) { - ++it; - ++i; - } - if ( it != lst.constEnd() ) - return *it; - return 0; -} - -QList KMail::AccountComboBox::applicableAccounts() const -{ - QList lst; -#if 0 - QList::iterator accountIt = kmkernel->acctMgr()->begin(); - while ( accountIt != kmkernel->acctMgr()->end() ) { - KMAccount *a = *accountIt; - ++accountIt; - if ( a && a->type() == KAccount::DImap ) { //// ## proko2 hack. Need a list of allowed account types as ctor param - lst.append( a ); - } - } -#else - kDebug() << "AKONADI PORT: Disabled code in " << Q_FUNC_INFO; -#endif - return lst; -} - -#include "accountcombobox.moc" diff --git a/accountcombobox.h b/accountcombobox.h deleted file mode 100644 index 591db9dd8..000000000 --- a/accountcombobox.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- mode: C++ -*- - * Copyright (c) 2004 David Faure - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * In addition, as a special exception, the copyright holders give - * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked - * combinations including the two. You must obey the GNU General - * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to - * your version of the file, but you are not obligated to do so. If - * you do not wish to do so, delete this exception statement from - * your version. - */ -#ifndef KMAIL_ACCOUNTCOMBOBOX_H -#define KMAIL_ACCOUNTCOMBOBOX_H - -#include - -#include - -class KMAccount; - -namespace KMail { - -/** - * A readonly combobox showing the accounts, to select one. - * WARNING: this widget is hardcoded to only display disconnected imap - * accounts, in this branch. - */ -class AccountComboBox : public KComboBox -{ - Q_OBJECT - -public: - AccountComboBox( QWidget* parent ); - - void setCurrentAccount( KMAccount* account ); - KMAccount* currentAccount() const; - -private slots: - void slotRefreshAccounts(); -private: - QList applicableAccounts() const; -}; - - -} // namespace - -#endif diff --git a/configuredialog.cpp b/configuredialog.cpp index ffbcc430b..8d1960027 100644 --- a/configuredialog.cpp +++ b/configuredialog.cpp @@ -45,7 +45,6 @@ using KMail::IdentityListViewItem; #include "messageviewer/kcursorsaver.h" #include "folderrequester.h" using KMail::FolderRequester; -#include "accountcombobox.h" using KMail::ImapAccountBase; #include "folderstorage.h" #include "kmmainwidget.h"