summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2021-05-27 14:24:23 +0200
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2021-06-13 15:05:32 +0200
commitb548c321d75e217e736da3a031412f708825baf1 (patch)
treef12aea900ccd18406943de25f252fde8ba008aba
parent4059af81d33bb1f6a7773b77d3039f2fc53fcd23 (diff)
Port some fallthrough comments to Q_FALLTHROUGH
Change-Id: I70dd492d5c8d198589bfd642db63182cf17b133f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/plugins/platforms/xcb/qxcbsessionmanager.cpp2
-rw-r--r--src/plugins/sqldrivers/mysql/qsql_mysql.cpp2
-rw-r--r--src/plugins/sqldrivers/odbc/qsql_odbc.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
index 002fccba07..3e0756b0e4 100644
--- a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
+++ b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
@@ -242,7 +242,7 @@ static void sm_performSaveYourself(QXcbSessionManager *sm)
sm->appCommitData();
if (sm_isshutdown && sm_cancel)
break; // we cancelled the shutdown, no need to save state
- // fall through
+ Q_FALLTHROUGH();
case SmSaveLocal:
sm->appSaveState();
break;
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index 554f4d91a4..12e15bfc47 100644
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -1451,7 +1451,7 @@ QString QMYSQLDriver::formatValue(const QSqlField &field, bool trimStrings) cons
} else {
qWarning("QMYSQLDriver::formatValue: Database not open");
}
- // fall through
+ Q_FALLTHROUGH();
default:
r = QSqlDriver::formatValue(field, trimStrings);
}
diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
index 5a77c26b62..1b3a55d096 100644
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -1676,7 +1676,7 @@ bool QODBCResult::exec()
ind);
break;
}
- // fall through
+ Q_FALLTHROUGH();
default: {
QByteArray &ba = tmpStorage[i];
if (*ind != SQL_NULL_DATA)
@@ -1769,7 +1769,7 @@ bool QODBCResult::exec()
}
break;
}
- // fall through
+ Q_FALLTHROUGH();
default: {
if (bindValueType(i) & QSql::Out)
values[i] = tmpStorage.at(i);