Skip to content

Commit 8506830

Browse files
committed
use C++ style casts
1 parent ab3be6f commit 8506830

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

QtPMbrowser/pmbrowserwindow.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ void PMbrowserWindow::exportSubTree(QTreeWidgetItem* item, const QString& path,
437437
PackedFileRecordHeader pfrh{ kDataFolderStartRecord,0,32 };
438438
char buf[32]{};
439439
item->text(0).toStdString().copy(buf, 31);
440-
poutfile->write((char*)&pfrh, sizeof(PackedFileRecordHeader));
440+
poutfile->write(reinterpret_cast<char*>(&pfrh), sizeof(PackedFileRecordHeader));
441441
poutfile->write(buf, 32);
442442
}
443443
}
@@ -446,7 +446,7 @@ void PMbrowserWindow::exportSubTree(QTreeWidgetItem* item, const QString& path,
446446
}
447447
if (export_type == ExportType::Igor && new_datafolder) {
448448
PackedFileRecordHeader pfrh{ kDataFolderEndRecord,0,0 };
449-
poutfile->write((char*)&pfrh, sizeof(PackedFileRecordHeader));
449+
poutfile->write(reinterpret_cast<char*>(&pfrh), sizeof(PackedFileRecordHeader));
450450
}
451451
}
452452
else {
@@ -482,12 +482,12 @@ void PMbrowserWindow::exportSubTree(QTreeWidgetItem* item, const QString& path,
482482
PackedFileRecordHeader pfrh{};
483483
pfrh.recordType = kWaveRecord;
484484
size_t offset_record = poutfile->tellp();
485-
poutfile->write((char*)&pfrh, sizeof(PackedFileRecordHeader));
485+
poutfile->write(reinterpret_cast<char*>(&pfrh), sizeof(PackedFileRecordHeader));
486486
ExportTrace(infile, *traceentry, *poutfile, wavename.toStdString());
487487
size_t offset_end = poutfile->tellp();
488488
pfrh.numDataBytes = int32_t(offset_end - offset_record - sizeof(PackedFileRecordHeader));
489489
poutfile->seekp(offset_record);
490-
poutfile->write((char*)&pfrh, sizeof(PackedFileRecordHeader));
490+
poutfile->write(reinterpret_cast<char*>(&pfrh), sizeof(PackedFileRecordHeader));
491491
poutfile->seekp(offset_end);
492492
}
493493
}

hekatoolslib/DatFile.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ namespace hkLib {
134134

135135
auto source = std::make_unique<T[]>(trdatapoints);
136136
if (interleavesize == 0) {
137-
datafile.read((char*)source.get(), sizeof(T) * trdatapoints);
137+
datafile.read(reinterpret_cast<char*>(source.get()), sizeof(T) * trdatapoints);
138138
}
139139
else { // it's interleaved data
140140
assert(interleaveskip >= interleavesize);
141141
std::size_t bytesremaining = sizeof(T) * trdatapoints;
142142
int bytestoskip = interleaveskip - interleavesize; // interleaveskip is from block-start to block-start!
143-
char* p = (char*)source.get();
143+
char* p = reinterpret_cast<char*>(source.get());
144144
while (bytesremaining > 0) {
145145
auto bytestoread = std::min(bytesremaining, std::size_t(interleavesize));
146146
datafile.read(p, bytestoread);

hekatoolslib/exportIBW.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ namespace hkLib {
136136
cksum = Checksum(reinterpret_cast<char*>(&wh), cksum, numbytes_wh);
137137
bh.checksum = -cksum;
138138

139-
outfile.write((char*)&bh, sizeof(bh));
140-
outfile.write((char*)&wh, numbytes_wh);
141-
outfile.write((char*)target.get(), sizeof(double) * trdatapoints);
139+
outfile.write(reinterpret_cast<char*>(&bh), sizeof(bh));
140+
outfile.write(reinterpret_cast<char*>(&wh), numbytes_wh);
141+
outfile.write(reinterpret_cast<char*>(target.get()), sizeof(double) * trdatapoints);
142142
outfile.write(note.data(), note.size());
143143
}
144144

@@ -149,8 +149,8 @@ namespace hkLib {
149149
PlatformInfo pli{ 2, 2, {0}, {0} };
150150
//double igorVersion = 5.00;
151151
//std::memcpy(pli.igorVersion, &igorVersion, sizeof(double));
152-
outfile.write((char*)&pfrh, sizeof(PackedFileRecordHeader));
153-
outfile.write((char*)&pli, sizeof(PlatformInfo));
152+
outfile.write(reinterpret_cast<char*>(&pfrh), sizeof(PackedFileRecordHeader));
153+
outfile.write(reinterpret_cast<char*>(&pli), sizeof(PlatformInfo));
154154
}
155155

156156
void WriteIgorProcedureRecord(std::ostream& outfile)
@@ -159,13 +159,13 @@ namespace hkLib {
159159
constexpr auto history_txt = "// pxp file created by PMbrowser\r"
160160
"// Use \"Macros\" --> \"Display Waves\" to create graphs\r"sv;
161161
PackedFileRecordHeader pfhr{ kHistoryRecord,0, int32_t(history_txt.size()) };
162-
outfile.write((char*)&pfhr, sizeof(PackedFileRecordHeader));
162+
outfile.write(reinterpret_cast<char*>(&pfhr), sizeof(PackedFileRecordHeader));
163163
outfile.write(history_txt.data(), history_txt.size());
164164
pfhr = { kProcedureRecord,0, int32_t(Igor_ipf.size()) };
165-
outfile.write((char*)&pfhr, sizeof(PackedFileRecordHeader));
165+
outfile.write(reinterpret_cast<char*>(&pfhr), sizeof(PackedFileRecordHeader));
166166
outfile.write(Igor_ipf.data(), Igor_ipf.size());
167167
pfhr = { kGetHistoryRecord,0,0 };
168-
outfile.write((char*)&pfhr, sizeof(PackedFileRecordHeader));
168+
outfile.write(reinterpret_cast<char*>(&pfhr), sizeof(PackedFileRecordHeader));
169169
}
170170

171171
void ExportAllTraces(std::istream& datafile, DatFile& datf, const std::string& path, const std::string& prefix)

0 commit comments

Comments
 (0)