empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some warnings.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2019-11-06 22:41:19 +00:00
parent fe63225065
commit 730e35150a
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/frontends/qapple/memorycontainer.cpp
View file

@ -8,13 +8,13 @@ MemoryContainer::MemoryContainer(QWidget *parent) :
{
setupUi(this);
const char * mainBase = (const char *)MemGetMainPtr(0);
const char * mainBase = reinterpret_cast<const char *>(MemGetMainPtr(0));
QByteArray mainMemory = QByteArray::fromRawData(mainBase, 0x10000);
main->setReadOnly(true);
main->setData(mainMemory);
const char * auxBase = (const char *)MemGetAuxPtr(0);
const char * auxBase = reinterpret_cast<const char *>(MemGetAuxPtr(0));
QByteArray auxMemory = QByteArray::fromRawData(auxBase, 0x10000);
aux->setReadOnly(true);

10
source/frontends/qapple/preferences.cpp
View file

@ -223,15 +223,15 @@ Preferences::Data Preferences::getData() const
return data;
}
void Preferences::browseDisk(const std::vector<QComboBox *> & disks, const size_t id)
void Preferences::browseDisk(const std::vector<QComboBox *> & vdisks, const size_t id)
{
QFileDialog diskFileDialog(this);
diskFileDialog.setFileMode(QFileDialog::AnyFile);
// because index = 0 is None
if (disks[id]->currentIndex() >= 1)
if (vdisks[id]->currentIndex() >= 1)
{
diskFileDialog.selectFile(disks[id]->currentText());
diskFileDialog.selectFile(vdisks[id]->currentText());
}
if (diskFileDialog.exec())
@ -240,9 +240,9 @@ void Preferences::browseDisk(const std::vector<QComboBox *> & disks, const size_
if (files.size() == 1)
{
const QString & filename = files[0];
const int selection = addDiskItem(disks[id], filename);
const int selection = addDiskItem(vdisks[id], filename);
// and now make sure there are no duplicates
checkDuplicates(disks, id, selection);
checkDuplicates(vdisks, id, selection);
}
}
}

2
source/frontends/qapple/preferences.h
View file

@ -61,7 +61,7 @@ private:
void setSettings(QSettings & settings);
void setData(const Data & data);
void populateJoysticks();
void browseDisk(const std::vector<QComboBox *> & disks, const size_t id);
void browseDisk(const std::vector<QComboBox *> & vdisks, const size_t id);
};

8
source/frontends/qapple/qapple.cpp
View file

@ -34,7 +34,7 @@ namespace
void initialiseEmulator()
{
g_fh = fopen("/tmp/applewin.txt", "w");
setbuf(g_fh, NULL);
setbuf(g_fh, nullptr);
LogFileOutput("Initialisation\n");
@ -104,7 +104,7 @@ namespace
sg_Disk2Card.Destroy();
ImageDestroy();
fclose(g_fh);
g_fh = NULL;
g_fh = nullptr;
}
qint64 emulatorTimeInMS()
@ -238,9 +238,9 @@ void QApple::on_timer()
const qint64 full_speed_ms = 5;
const double fUsecPerSec = 1.e6;
const UINT nExecutionPeriodUsec = 1000 * elapsed;
const qint64 nExecutionPeriodUsec = 1000 * elapsed;
const double fExecutionPeriodClks = g_fCurrentCLK6502 * ((double)nExecutionPeriodUsec / fUsecPerSec);
const double fExecutionPeriodClks = g_fCurrentCLK6502 * (double(nExecutionPeriodUsec) / fUsecPerSec);
const DWORD uCyclesToExecute = fExecutionPeriodClks;
const bool bVideoUpdate = false;