Skip to content

Commit c91009c

Browse files
MKleusbergMKleusberg
committed
Fix old-style-cast warnings
1 parent f262bf6 commit c91009c

6 files changed

Lines changed: 28 additions & 26 deletions

File tree

‎src/ExportDataDialog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ bool ExportDataDialog::exportQueryCsv(const QString& sQuery, const QString& sFil
149149
for (int i = 0; i < columns; ++i)
150150
{
151151
QString content = QString::fromUtf8(
152-
(const char*)sqlite3_column_blob(stmt, i),
152+
reinterpret_cast<const char*>(sqlite3_column_blob(stmt, i)),
153153
sqlite3_column_bytes(stmt, i));
154154

155155
// If no quote char is set but the content contains a line break, we enforce some quote characters. This probably isn't entirely correct
@@ -243,13 +243,13 @@ bool ExportDataDialog::exportQueryJson(const QString& sQuery, const QString& sFi
243243
}
244244
case SQLITE_TEXT: {
245245
QString content = QString::fromUtf8(
246-
(const char*)sqlite3_column_text(stmt, i),
246+
reinterpret_cast<const char*>(sqlite3_column_text(stmt, i)),
247247
sqlite3_column_bytes(stmt, i));
248248
json_row.insert(column_names[i], content);
249249
break;
250250
}
251251
case SQLITE_BLOB: {
252-
QByteArray content((const char*)sqlite3_column_blob(stmt, i),
252+
QByteArray content(reinterpret_cast<const char*>(sqlite3_column_blob(stmt, i)),
253253
sqlite3_column_bytes(stmt, i));
254254
QTextCodec *codec = QTextCodec::codecForName("UTF-8");
255255
QString string = codec->toUnicode(content.toBase64(QByteArray::Base64Encoding));

‎src/MainWindow.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
#include <QOpenGLWidget>
6161
#endif
6262

63+
const int MainWindow::MaxRecentFiles;
64+
6365
// These are needed for reading and writing object files
6466
QDataStream& operator>>(QDataStream& ds, sqlb::ObjectIdentifier& objid)
6567
{
@@ -1520,7 +1522,7 @@ void MainWindow::executeQuery()
15201522

15211523
// Log the query and the result message.
15221524
// The query takes the last placeholder as it may itself contain the sequence '%' + number.
1523-
statusMessage = QString(tr("-- At line %1:\n%4\n-- Result: %3")).arg(execute_from_line+1).arg(statusMessage).arg(queryPart.trimmed());
1525+
statusMessage = tr("-- At line %1:\n%4\n-- Result: %3").arg(execute_from_line+1).arg(statusMessage).arg(queryPart.trimmed());
15241526
db.logSQL(statusMessage, kLogMsg_User);
15251527

15261528
// Release the database
@@ -1882,7 +1884,7 @@ void MainWindow::updateRecentFileActions()
18821884
// Store updated list
18831885
Settings::setValue("General", "recentFileList", files);
18841886

1885-
int numRecentFiles = qMin(files.size(), (int)MaxRecentFiles);
1887+
int numRecentFiles = qMin(files.size(), MaxRecentFiles);
18861888

18871889
for (int i = 0; i < numRecentFiles; ++i) {
18881890
QString text = tr("&%1 %2").arg(i + 1).arg(QDir::toNativeSeparators(files[i]));
@@ -2908,10 +2910,10 @@ void MainWindow::saveProject()
29082910
{
29092911
while(sqlite3_step(db_vm) == SQLITE_ROW)
29102912
{
2911-
QString schema(QString::fromUtf8((const char*)sqlite3_column_text(db_vm, 1)));
2913+
QString schema(QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(db_vm, 1))));
29122914
if(schema != "main" && schema != "temp")
29132915
{
2914-
QString path(QString::fromUtf8((const char*)sqlite3_column_text(db_vm, 2)));
2916+
QString path(QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(db_vm, 2))));
29152917
xml.writeStartElement("db");
29162918
xml.writeAttribute("schema", schema);
29172919
xml.writeAttribute("path", path);

‎src/MainWindow.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class MainWindow : public QMainWindow
165165

166166
DbStructureModel* dbStructureModel;
167167

168-
enum { MaxRecentFiles = 5 };
168+
static const int MaxRecentFiles = 5;
169169
QAction *recentFileActs[MaxRecentFiles];
170170
QAction *recentSeparatorAct;
171171

‎src/PlotDock.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ void PlotDock::updatePlot(SqliteTableModel* model, BrowseDataTableSettings* sett
393393
plottable = graph;
394394
graph->setData(xdata, ydata, /*alreadySorted*/ true);
395395
// set some graph styles not supported by the abstract plottable
396-
graph->setLineStyle((QCPGraph::LineStyle) ui->comboLineType->currentIndex());
396+
graph->setLineStyle(static_cast<QCPGraph::LineStyle>(ui->comboLineType->currentIndex()));
397397
graph->setScatterStyle(scatterStyle);
398398
} else {
399399
QCPCurve* curve = new QCPCurve(ui->plotWidget->xAxis, ui->plotWidget->yAxis);
@@ -525,7 +525,7 @@ void PlotDock::on_treePlotColumns_itemDoubleClicked(QTreeWidgetItem* item, int c
525525
// On double click open the colordialog
526526
QColorDialog colordialog(this);
527527
QColor curbkcolor = item->backgroundColor(column);
528-
QColor precolor = !curbkcolor.isValid() ? (Qt::GlobalColor)(qrand() % 13 + 5) : curbkcolor;
528+
QColor precolor = !curbkcolor.isValid() ? static_cast<Qt::GlobalColor>(qrand() % 13 + 5) : curbkcolor;
529529
QColor color = colordialog.getColor(precolor, this, tr("Choose an axis color"));
530530
if(color.isValid())
531531
{
@@ -594,7 +594,7 @@ void PlotDock::on_comboLineType_currentIndexChanged(int index)
594594
index <= QCPGraph::lsImpulse);
595595

596596
bool hasCurves = (ui->plotWidget->plottableCount() > ui->plotWidget->graphCount());
597-
QCPGraph::LineStyle lineStyle = (QCPGraph::LineStyle) index;
597+
QCPGraph::LineStyle lineStyle = static_cast<QCPGraph::LineStyle>(index);
598598
if (lineStyle > QCPGraph::lsLine && hasCurves) {
599599
QMessageBox::warning(this, qApp->applicationName(),
600600
tr("There are curves in this plot and the selected line style can only be applied to graphs sorted by X. "
@@ -636,7 +636,7 @@ void PlotDock::on_comboPointShape_currentIndexChanged(int index)
636636
index < QCPScatterStyle::ssPixmap);
637637

638638
bool hasCurves = (ui->plotWidget->plottableCount() > ui->plotWidget->graphCount());
639-
QCPScatterStyle::ScatterShape shape = (QCPScatterStyle::ScatterShape) index;
639+
QCPScatterStyle::ScatterShape shape = static_cast<QCPScatterStyle::ScatterShape>(index);
640640
for (int i = 0, ie = ui->plotWidget->graphCount(); i < ie; ++i)
641641
{
642642
QCPGraph * graph = ui->plotWidget->graph(i);
@@ -832,7 +832,7 @@ void PlotDock::renderPlot(QPrinter* printer)
832832

833833
int plotWidth = ui->plotWidget->viewport().width();
834834
int plotHeight = ui->plotWidget->viewport().height();
835-
double scale = pageRect.width()/(double)plotWidth;
835+
double scale = pageRect.width()/static_cast<double>(plotWidth);
836836

837837
painter.setMode(QCPPainter::pmVectorized);
838838
painter.setMode(QCPPainter::pmNoCaching);

‎src/RowLoader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ int RowLoader::countRows()
101101
status = sqlite3_step(stmt);
102102
if(status == SQLITE_ROW)
103103
{
104-
QString sCount = QString::fromUtf8((const char*)sqlite3_column_text(stmt, 0));
104+
QString sCount = QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(stmt, 0)));
105105
retval = sCount.toInt();
106106
}
107107
sqlite3_finalize(stmt);

‎src/sqlitedb.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ void DBBrowserDB::collationNeeded(void* /*pData*/, sqlite3* /*db*/, int eTextRep
7575
static void regexp(sqlite3_context* ctx, int /*argc*/, sqlite3_value* argv[])
7676
{
7777
// Get arguments and check their values
78-
QRegExp arg1((const char*)sqlite3_value_text(argv[0]));
79-
QString arg2((const char*)sqlite3_value_text(argv[1]));
78+
QRegExp arg1(reinterpret_cast<const char*>(sqlite3_value_text(argv[0])));
79+
QString arg2(reinterpret_cast<const char*>(sqlite3_value_text(argv[1])));
8080
if(!arg1.isValid())
8181
return sqlite3_result_error(ctx, "invalid operand", -1);
8282

@@ -194,10 +194,10 @@ bool DBBrowserDB::attach(const QString& filePath, QString attach_as)
194194
QFileInfo fi(filePath);
195195
while(sqlite3_step(db_vm) == SQLITE_ROW)
196196
{
197-
QFileInfo path(QString::fromUtf8((const char*)sqlite3_column_text(db_vm, 2)));
197+
QFileInfo path(QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(db_vm, 2))));
198198
if(fi == path)
199199
{
200-
QString schema = QString::fromUtf8((const char*)sqlite3_column_text(db_vm, 1));
200+
QString schema = QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(db_vm, 1)));
201201
QMessageBox::information(nullptr, qApp->applicationName(), tr("This database has already been attached. Its schema name is '%1'.").arg(schema));
202202
return false;
203203
}
@@ -748,7 +748,7 @@ bool DBBrowserDB::dump(const QString& filePath,
748748
int fieldsize = sqlite3_column_bytes(stmt, i);
749749
int fieldtype = sqlite3_column_type(stmt, i);
750750
QByteArray bcontent(
751-
(const char*)sqlite3_column_blob(stmt, i),
751+
reinterpret_cast<const char*>(sqlite3_column_blob(stmt, i)),
752752
fieldsize);
753753

754754
if(bcontent.left(2048).contains('\0')) // binary check
@@ -1655,7 +1655,7 @@ void DBBrowserDB::updateSchema()
16551655
while(sqlite3_step(db_vm) == SQLITE_ROW)
16561656
{
16571657
// Get the schema name which is in column 1 (counting starts with 0). 0 contains an ID and 2 the file path.
1658-
QString schema_name = QString::fromUtf8((const char*)sqlite3_column_text(db_vm, 1));
1658+
QString schema_name = QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(db_vm, 1)));
16591659

16601660
// Always add the schema to the map. This makes sure it's even then added when there are no objects in the database
16611661
schemata[schema_name] = objectMap();
@@ -1676,10 +1676,10 @@ void DBBrowserDB::updateSchema()
16761676
{
16771677
while(sqlite3_step(vm) == SQLITE_ROW)
16781678
{
1679-
QString val_type = QString::fromUtf8((const char*)sqlite3_column_text(vm, 0));
1680-
QString val_name = QString::fromUtf8((const char*)sqlite3_column_text(vm, 1));
1681-
QString val_sql = QString::fromUtf8((const char*)sqlite3_column_text(vm, 2));
1682-
QString val_tblname = QString::fromUtf8((const char*)sqlite3_column_text(vm, 3));
1679+
QString val_type = QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(vm, 0)));
1680+
QString val_name = QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(vm, 1)));
1681+
QString val_sql = QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(vm, 2)));
1682+
QString val_tblname = QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(vm, 3)));
16831683
val_sql.replace("\r", "");
16841684

16851685
if(!val_sql.isEmpty())
@@ -1864,8 +1864,8 @@ QVector<QPair<QString, QString>> DBBrowserDB::queryColumnInformation(const QStri
18641864
{
18651865
while(sqlite3_step(vm) == SQLITE_ROW)
18661866
{
1867-
QString name = QString::fromUtf8((const char *)sqlite3_column_text(vm, 1));
1868-
QString type = QString::fromUtf8((const char *)sqlite3_column_text(vm, 2));
1867+
QString name = QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(vm, 1)));
1868+
QString type = QString::fromUtf8(reinterpret_cast<const char*>(sqlite3_column_text(vm, 2)));
18691869

18701870
result.push_back(qMakePair(name, type));
18711871
}

0 commit comments

Comments
 (0)