diff --git a/src/kmailtransport/widgets/transportcombobox.cpp b/src/kmailtransport/widgets/transportcombobox.cpp index b538f98..f198c4e 100644 --- a/src/kmailtransport/widgets/transportcombobox.cpp +++ b/src/kmailtransport/widgets/transportcombobox.cpp @@ -1,97 +1,97 @@ /* Copyright (c) 2006 - 2007 Volker Krause This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "transportcombobox.h" #include "transport.h" #include "transportmanager.h" using namespace MailTransport; /** * Private class that helps to provide binary compatibility between releases. * @internal */ class TransportComboBoxPrivate { public: QVector transports; }; TransportComboBox::TransportComboBox(QWidget *parent) : QComboBox(parent) , d(new TransportComboBoxPrivate) { - QMetaObject::invokeMethod(this, "updateComboboxList"); + updateComboboxList(); connect(TransportManager::self(), &TransportManager::transportsChanged, this, &TransportComboBox::updateComboboxList); connect(TransportManager::self(), &TransportManager::transportRemoved, this, &TransportComboBox::transportRemoved); } TransportComboBox::~TransportComboBox() { delete d; } int TransportComboBox::currentTransportId() const { if (currentIndex() >= 0 && currentIndex() < d->transports.count()) { return d->transports.at(currentIndex()); } return -1; } bool TransportComboBox::setCurrentTransport(int transportId) { const int i = d->transports.indexOf(transportId); if (i >= 0 && i < count()) { setCurrentIndex(i); return true; } return false; } QString TransportComboBox::transportType() const { return TransportManager::self()->transportById(currentTransportId())->identifier(); } void TransportComboBox::updateComboboxList() { const int oldTransport = currentTransportId(); clear(); int defaultId = 0; if (!TransportManager::self()->isEmpty()) { const QStringList listNames = TransportManager::self()->transportNames(); const QVector listIds = TransportManager::self()->transportIds(); addItems(listNames); setTransportList(listIds); defaultId = TransportManager::self()->defaultTransportId(); } if (oldTransport != -1) { setCurrentTransport(oldTransport); } else { setCurrentTransport(defaultId); } } void TransportComboBox::setTransportList(const QVector &transportList) { d->transports = transportList; }