Fixed up a bunch of compiler warnings.
There should be no functional difference, just less noise when compiling
This commit is contained in:
@@ -118,8 +118,8 @@ void FileComparatorWindow::calculateDetails()
|
||||
{
|
||||
QMap<int, FrameData> interestedIDs;
|
||||
QMap<int, FrameData> referenceIDs;
|
||||
QTreeWidgetItem *interestedOnlyBase, *referenceOnlyBase = NULL, *sharedBase, *bitmapBaseInterested, *bitmapBaseReference = NULL;
|
||||
QTreeWidgetItem *valuesBase, *detail, *sharedItem, *valuesInterested, *valuesReference = NULL;
|
||||
QTreeWidgetItem *interestedOnlyBase, *referenceOnlyBase = nullptr, *sharedBase, *bitmapBaseInterested, *bitmapBaseReference = nullptr;
|
||||
QTreeWidgetItem *valuesBase, *detail, *sharedItem, *valuesInterested, *valuesReference = nullptr;
|
||||
uint64_t tmp;
|
||||
|
||||
bool uniqueInterested = ui->ckUniqueToInterested->isChecked();
|
||||
|
||||
@@ -186,7 +186,7 @@ void FrameInfoWindow::updatedFrames(int numFrames)
|
||||
|
||||
unsigned int currID = 0;
|
||||
if (ui->listFrameID->currentItem())
|
||||
currID = (unsigned int)ui->listFrameID->currentItem()->text().toInt(NULL, 16);
|
||||
currID = (unsigned int)ui->listFrameID->currentItem()->text().toInt(nullptr, 16);
|
||||
bool thisID = false;
|
||||
for (int x = modelFrames->count() - numFrames; x < modelFrames->count(); x++)
|
||||
{
|
||||
|
||||
@@ -1186,7 +1186,7 @@ void GraphingWindow::createGraph(GraphParams ¶ms, bool createGraphParam)
|
||||
selDecorator->setPen(selectedPen);
|
||||
ui->graphingView->graph()->setSelectionDecorator(selDecorator);
|
||||
|
||||
if (params.graphName == NULL || params.graphName.length() == 0)
|
||||
if (params.graphName == nullptr || params.graphName.length() == 0)
|
||||
{
|
||||
params.graphName = QString("0x") + QString::number(params.ID, 16) + ":" + QString::number(params.startBit);
|
||||
params.graphName += "-" + QString::number(params.numBits);
|
||||
|
||||
@@ -115,14 +115,14 @@ void ISOTP_InterpreterWindow::writeSettings()
|
||||
void ISOTP_InterpreterWindow::interpretCapturedFrames()
|
||||
{
|
||||
clearList();
|
||||
decoder->rapidFrames(NULL, *modelFrames);
|
||||
decoder->rapidFrames(nullptr, *modelFrames);
|
||||
}
|
||||
|
||||
void ISOTP_InterpreterWindow::listFilterItemChanged(QListWidgetItem *item)
|
||||
{
|
||||
if (item)
|
||||
{
|
||||
int id = item->text().toInt(NULL, 16);
|
||||
int id = item->text().toInt(nullptr, 16);
|
||||
bool state = item->checkState();
|
||||
//qDebug() << id << "*" << state;
|
||||
idFilters[id] = state;
|
||||
@@ -134,7 +134,7 @@ void ISOTP_InterpreterWindow::filterAll()
|
||||
for (int i = 0 ; i < ui->listFilter->count(); i++)
|
||||
{
|
||||
ui->listFilter->item(i)->setCheckState(Qt::Checked);
|
||||
idFilters[ui->listFilter->item(1)->text().toInt(NULL, 16)] = true;
|
||||
idFilters[ui->listFilter->item(1)->text().toInt(nullptr, 16)] = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@ void ISOTP_InterpreterWindow::filterNone()
|
||||
for (int i = 0 ; i < ui->listFilter->count(); i++)
|
||||
{
|
||||
ui->listFilter->item(i)->setCheckState(Qt::Unchecked);
|
||||
idFilters[ui->listFilter->item(1)->text().toInt(NULL, 16)] = false;
|
||||
idFilters[ui->listFilter->item(1)->text().toInt(nullptr, 16)] = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -212,7 +212,7 @@ void NewGraphDialog::loadMessages()
|
||||
{
|
||||
DBC_MESSAGE *msg;
|
||||
ui->cbMessages->clear();
|
||||
if (dbcHandler == NULL) return;
|
||||
if (dbcHandler == nullptr) return;
|
||||
if (dbcHandler->getFileCount() == 0) return;
|
||||
for (int y = 0; y < dbcHandler->getFileCount(); y++)
|
||||
{
|
||||
@@ -240,7 +240,7 @@ void NewGraphDialog::loadSignals(int idx)
|
||||
DBC_MESSAGE *msg = dbcHandler->findMessage(ui->cbMessages->currentText());
|
||||
DBC_SIGNAL *sig;
|
||||
|
||||
if (msg == NULL) return;
|
||||
if (msg == nullptr) return;
|
||||
|
||||
ui->cbSignals->clear();
|
||||
for (int x = 0; x < msg->sigHandler->getCount(); x++)
|
||||
|
||||
@@ -61,7 +61,7 @@ SnifferWindow::SnifferWindow(QWidget *parent) :
|
||||
|
||||
SnifferWindow::~SnifferWindow()
|
||||
{
|
||||
closeEvent(NULL);
|
||||
closeEvent(nullptr);
|
||||
delete sniffDel;
|
||||
delete ui;
|
||||
}
|
||||
|
||||
@@ -218,9 +218,9 @@ void UDSScanWindow::scanUDS()
|
||||
|
||||
ui->treeResults->clear();
|
||||
sendingFrames.clear();
|
||||
nodeService = NULL;
|
||||
nodeID = NULL;
|
||||
nodeSubFunc = NULL;
|
||||
nodeService = nullptr;
|
||||
nodeID = nullptr;
|
||||
nodeSubFunc = nullptr;
|
||||
|
||||
UDS_MESSAGE test;
|
||||
int typ, id;
|
||||
|
||||
Reference in New Issue
Block a user