← Back to branch summary

~ubuntu-branches/ubuntu/precise/kde-workspace/precise-security

« back to all changes in this revision

Viewing changes to libs/solid/control/modemmanager.cpp

Tags: upstream-4.7.2
Import upstream version 4.7.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/solid/control/modemmanager.cpp
158
158
 
159
159
void Solid::Control::ModemManagerPrivate::_k_modemInterfaceRemoved(const QString &udi)
160
160
{
161
 
    QList<QMap<ModemInterface::GsmInterfaceType, ModemInterfaceIfacePair> > list = m_modemInterfaceMap.values(udi);
162
 
    m_modemInterfaceMap.remove(udi);
163
 
 
164
 
    while (!list.isEmpty()) {
165
 
        QMap<ModemInterface::GsmInterfaceType, ModemInterfaceIfacePair> item = list.takeFirst();
166
 
 
167
 
        foreach (const ModemInterfaceIfacePair &pair, item) {
168
 
            if (pair.first!= 0)
169
 
            {
170
 
                delete pair.first;
171
 
                delete pair.second;
172
 
            }
173
 
        }
174
 
    }
175
 
 
176
161
    emit modemInterfaceRemoved(udi);
 
162
 
 
163
    QList<QMap<ModemInterface::GsmInterfaceType, ModemInterfaceIfacePair> > list = m_modemInterfaceMap.values(udi);
 
164
    m_modemInterfaceMap.remove(udi);
 
165
 
 
166
    while (!list.isEmpty()) {
 
167
        QMap<ModemInterface::GsmInterfaceType, ModemInterfaceIfacePair> item = list.takeFirst();
 
168
 
 
169
        foreach (const ModemInterfaceIfacePair &pair, item) {
 
170
            if (pair.first!= 0)
 
171
            {
 
172
                delete pair.first;
 
173
                delete pair.second;
 
174
            }
 
175
        }
 
176
    }
177
177
}
178
178
 
179
179
void Solid::Control::ModemManagerPrivate::_k_destroyed(QObject *object)