← Back to branch summary

~timo-jyrinki/ubuntu/saucy/qtcreator/add_workaround_back

« back to all changes in this revision

Viewing changes to src/plugins/debugger/breakhandler.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2011-11-18 16:18:49 UTC
  • mfrom: (1.1.16)
  • Revision ID: package-import@ubuntu.com-20111118161849-5t8jugl6egvs4iev
Tags: 2.4.0~rc-0ubuntu1
* New upstream release candidate.
* Drop 04_fix_ftbfs_arm_qreal.diff, merged upstream.
* Refresh 01_fix_installation_paths.diff.
* Compress binary packages with xz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/debugger/breakhandler.cpp
4
4
**
5
5
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
6
6
**
7
 
** Contact: Nokia Corporation (info@qt.nokia.com)
 
7
** Contact: Nokia Corporation (qt-info@nokia.com)
8
8
**
9
9
**
10
10
** GNU Lesser General Public License Usage
26
26
** conditions contained in a signed written agreement between you and Nokia.
27
27
**
28
28
** If you have questions regarding the use of this file, please contact
29
 
** Nokia at info@qt.nokia.com.
 
29
** Nokia at qt-info@nokia.com.
30
30
**
31
31
**************************************************************************/
32
32
 
396
396
        v = map.value(_("message"));
397
397
        if (v.isValid())
398
398
            data.message = v.toString();
399
 
        appendBreakpoint(data);
 
399
        if (data.isValid()) {
 
400
            appendBreakpoint(data);
 
401
        } else {
 
402
            qWarning("Not restoring invalid breakpoint: %s", qPrintable(data.toString()));
 
403
        }
400
404
    }
401
405
    //qDebug() << "LOADED BREAKPOINTS" << this << list.size();
402
406
}
1036
1040
 
1037
1041
void BreakHandler::appendBreakpoint(const BreakpointParameters &data)
1038
1042
{
1039
 
    QTC_ASSERT(data.type != UnknownType, return);
 
1043
    if (!data.isValid()) {
 
1044
        qWarning("Not adding invalid breakpoint: %s", qPrintable(data.toString()));
 
1045
        return;
 
1046
    }
 
1047
 
1040
1048
    BreakpointModelId id(++currentId);
1041
1049
    const int row = m_storage.size();
1042
1050
    beginInsertRows(QModelIndex(), row, row);