OSDN Git Service

Fix missing breaks which lead to invalid fallthroughs.
authorBill King <bill.king@nokia.com>
Fri, 11 Jun 2010 03:39:47 +0000 (13:39 +1000)
committerBill King <bill.king@nokia.com>
Fri, 11 Jun 2010 03:39:47 +0000 (13:39 +1000)
src/libs/extensionsystem/pluginerrorview.cpp
src/plugins/debugger/breakhandler.cpp
src/plugins/debugger/watchutils.cpp
src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
src/plugins/texteditor/colorschemeedit.cpp

index 3512fe8..ab85767 100644 (file)
@@ -102,10 +102,13 @@ void PluginErrorView::update(PluginSpec *spec)
     case PluginSpec::Stopped:
         text = tr("Stopped");
         tooltip = tr("Plugin was shut down");
+        break;
     case PluginSpec::Deleted:
         text = tr("Deleted");
         tooltip = tr("Plugin ended its life cycle and was deleted");
+        break;
     }
+
     m_ui->state->setText(text);
     m_ui->state->setToolTip(tooltip);
     m_ui->errorString->setText(spec->errorString());
index 007544e..78be9bb 100644 (file)
@@ -626,6 +626,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
                 return tr("Breakpoint will only be hit after being ignored so many times.");
             if (role == Qt::UserRole + 1)
                 return data->ignoreCount;
+            break;
         case 6:
             if (role == Qt::DisplayRole) {
                 if (data->pending)
@@ -637,6 +638,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
                 return tr("Breakpoint will only be hit in the specified thread(s).");
             if (role == Qt::UserRole + 1)
                 return data->threadSpec;
+            break;
         case 7:
             if (role == Qt::DisplayRole) {
                 if (data->type == BreakpointData::WatchpointType)
index 3b625d5..2db73df 100644 (file)
@@ -1219,6 +1219,7 @@ void QtDumperHelper::evaluationParameters(const WatchData &data,
         break;
     case StdDequeType:
         extraArgs[1] = zero;
+        break;
     case StdStackType:
         // remove 'std::allocator<...>':
         extraArgs[1] = zero;
index 8b73e36..7f0966b 100644 (file)
@@ -129,6 +129,7 @@ void GCCEToolChain::addToEnvironment(ProjectExplorer::Environment &env)
     switch (m_type) {
     case ProjectExplorer::ToolChain::GCCE:
         m_mixin.addEpocToEnvironment(&env);
+        break;
     case ProjectExplorer::ToolChain::GCCE_GNUPOC:
         m_mixin.addGnuPocToEnvironment(&env);
         break;
index 232a241..03141bd 100644 (file)
@@ -107,6 +107,8 @@ public:
             QColor background = m_scheme->formatFor(description.id()).background();
             if (background.isValid())
                 return background;
+            else
+                break;
         }
         case Qt::FontRole: {
             QFont font = m_baseFont;