Debugger: Change BreakpointOnSignalHandler to BreakpointOnQMLSignalHandler

Change-Id: Ic71299c38863cdb55862ced7348b2bdc9cf39555
Reviewed-on: http://codereview.qt-project.org/5743
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

src/plugins/debugger/breakhandler.cpp

@@ -122,8 +122,8 @@ static QString typeToString(BreakpointType type)
             return BreakHandler::tr("Watchpoint at Address");
         case WatchpointAtExpression:
             return BreakHandler::tr("Watchpoint at Expression");
-        case BreakpointOnSignalHandler:
+        case BreakpointOnQmlSignalHandler:
-            return BreakHandler::tr("Breakpoint on Signal Handler");
+            return BreakHandler::tr("Breakpoint on QML Signal Handler");
         case UnknownType:
             break;
     }

src/plugins/debugger/breakpoint.cpp

@@ -260,7 +260,7 @@ QString BreakpointParameters::toString() const
            << " PathUsage: " << pathUsage;
         break;
     case BreakpointByFunction:
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         ts << " FunctionName: " << functionName;
         break;
     case BreakpointByAddress:

src/plugins/debugger/breakpoint.h

@@ -140,7 +140,7 @@ enum BreakpointType
     BreakpointAtSysCall,
     WatchpointAtAddress,
     WatchpointAtExpression,
-    BreakpointOnSignalHandler
+    BreakpointOnQmlSignalHandler
 };
 
 //! \enum Debugger::Internal::BreakpointState

src/plugins/debugger/breakwindow.cpp

@@ -122,7 +122,7 @@ BreakpointDialog::BreakpointDialog(unsigned engineCapabilities, QWidget *parent)
           << tr("Break on data access at address given by expression")
           << tr("Break on QML signal handler");
 
-    QTC_ASSERT(types.size() == BreakpointOnSignalHandler, return; )
+    QTC_ASSERT(types.size() == BreakpointOnQmlSignalHandler, return; )
     m_ui.comboBoxType->addItems(types);
     m_ui.pathChooserFileName->setExpectedKind(Utils::PathChooser::File);
     connect(m_ui.comboBoxType, SIGNAL(activated(int)), SLOT(typeChanged(int)));
@@ -360,7 +360,7 @@ void BreakpointDialog::typeChanged(int)
     case WatchpointAtExpression:
         getParts(ExpressionPart|AllConditionParts|TracePointPart, &m_savedParameters);
         break;
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         getParts(FunctionPart, &m_savedParameters);
     }
 
@@ -403,7 +403,7 @@ void BreakpointDialog::typeChanged(int)
         setPartsEnabled(ExpressionPart|AllConditionParts|TracePointPart|TracePointPart);
         clearOtherParts(ExpressionPart|AllConditionParts|TracePointPart);
         break;
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         setParts(FunctionPart, m_savedParameters);
         setPartsEnabled(FunctionPart);
         clearOtherParts(FunctionPart);

src/plugins/debugger/cdb/cdbengine.cpp

@@ -2552,7 +2552,7 @@ bool CdbEngine::acceptsBreakpoint(BreakpointModelId id) const
     case BreakpointAtFork:
     case WatchpointAtExpression:
     case BreakpointAtSysCall:
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         return false;
     case WatchpointAtAddress:
     case BreakpointByFileAndLine:

src/plugins/debugger/cdb/cdbparsehelpers.cpp

@@ -107,7 +107,7 @@ static BreakpointParameters fixWinMSVCBreakpoint(const BreakpointParameters &p)
     case WatchpointAtExpression:
     case BreakpointAtSysCall:
     case WatchpointAtAddress:
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         break;
     case BreakpointAtExec: { // Emulate by breaking on CreateProcessW().
         BreakpointParameters rc(BreakpointByFunction);
@@ -164,7 +164,7 @@ QByteArray cdbAddBreakpointCommand(const BreakpointParameters &bpIn,
     case BreakpointAtCatch:
     case BreakpointAtThrow:
     case BreakpointAtMain:
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         QTC_ASSERT(false, return QByteArray(); )
         break;
     case BreakpointByAddress:

src/plugins/debugger/qml/qmlengine.cpp

@@ -639,7 +639,7 @@ bool QmlEngine::acceptsBreakpoint(BreakpointModelId id) const
     //If it is a Cpp Breakpoint query if the type can be also handled by the debugger client
     //TODO: enable setting of breakpoints before start of debug session
     //For now, the event breakpoint can be set after the activeDebuggerClient is known
-    //This is because the older client does not support BreakpointOnSignalHandler
+    //This is because the older client does not support BreakpointOnQmlSignalHandler
     bool acceptBreakpoint = false;
     if (d->m_adapter.activeDebuggerClient()) {
         acceptBreakpoint = d->m_adapter.activeDebuggerClient()->acceptsBreakpoint(id);

src/plugins/debugger/qml/qmlv8debuggerclient.cpp

@@ -315,7 +315,7 @@ void QmlV8DebuggerClient::activateFrame(int index)
 bool QmlV8DebuggerClient::acceptsBreakpoint(const BreakpointModelId &id)
 {
     BreakpointType type = d->engine->breakHandler()->breakpointData(id).type;
-    return ((type == BreakpointOnSignalHandler) || (type == BreakpointByFunction));
+    return (type == BreakpointOnQmlSignalHandler || type == BreakpointByFunction);
 }
 
 void QmlV8DebuggerClient::insertBreakpoint(const BreakpointModelId &id)
@@ -333,7 +333,7 @@ void QmlV8DebuggerClient::insertBreakpoint(const BreakpointModelId &id)
     } else if (handler->breakpointData(id).type == BreakpointByFunction) {
         JsonInputStream(request) << "type" << ':' << "function";
         JsonInputStream(request) << ',' << "target" << ':' << handler->functionName(id).toUtf8();
-    } else if (handler->breakpointData(id).type == BreakpointOnSignalHandler) {
+    } else if (handler->breakpointData(id).type == BreakpointOnQmlSignalHandler) {
         JsonInputStream(request) << "type" << ':' << "event";
         JsonInputStream(request) << ',' << "target" << ':' << handler->functionName(id).toUtf8();
     }