Skip to content

Commit

Permalink
Remove obsolete FIXMEs and/or convert some FIXMEs to TODOs.
Browse files Browse the repository at this point in the history
[win32] CMakeLists.txt: We can't build both Win32 and Win64 DLLs in
the same CMake build. The package.cmd script handles this for us by
building both separately, then combining them into one package.

[gtk, kde] RomDataView: assert() if RomData::fields() returns nullptr.

[libromdata] SPC::loadMetaData() Return -ENOENT if there's no tags
instead of -EIO.
  • Loading branch information
GerbilSoft committed Mar 10, 2020
1 parent 44072ba commit 5aa6a3d
Show file tree
Hide file tree
Showing 13 changed files with 12 additions and 16 deletions.
1 change: 1 addition & 0 deletions src/gtk/RomDataView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1494,6 +1494,7 @@ rom_data_view_update_display(RomDataView *page)

// Get the fields.
const RomFields *const pFields = page->romData->fields();
assert(pFields != nullptr);
if (!pFields) {
// No fields.
// TODO: Show an error?
Expand Down
1 change: 1 addition & 0 deletions src/kde/RomDataView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,7 @@ void RomDataViewPrivate::initDisplayWidgets(void)

// Get the fields.
const RomFields *const pFields = romData->fields();
assert(pFields != nullptr);
if (!pFields) {
// No fields.
// TODO: Show an error?
Expand Down
3 changes: 2 additions & 1 deletion src/kde/config/ConfigDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ ConfigDialog::ConfigDialog(QWidget *parent)
d->btnReset->setEnabled(false);

// Connect the modification signals.
// FIXME: Should be doable in Qt Designer...
// NOTE: Qt Designer doesn't want to let us connect
// signals from the QTabWidget child widgets.
connect(d->ui.tabImageTypes, SIGNAL(modified()), this, SLOT(tabModified()));
connect(d->ui.tabOptions, SIGNAL(modified()), this, SLOT(tabModified()));
#ifdef ENABLE_DECRYPTION
Expand Down
4 changes: 0 additions & 4 deletions src/kde/config/ImageTypesTab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,6 @@ void ImageTypesTabPrivate::cboImageType_setPriorityValue(unsigned int cbid, unsi
}
}

/** Other ImageTypesTabPrivate functions. **/

// TODO

/** ImageTypesTab **/

ImageTypesTab::ImageTypesTab(QWidget *parent)
Expand Down
2 changes: 1 addition & 1 deletion src/kde/config/KeyStoreModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ QVariant KeyStoreModel::data(const QModelIndex& index, int role) const

case Qt::DecorationRole:
// Images must use Qt::DecorationRole.
// FIXME: Add a QStyledItemDelegate to center-align the icon.
// TODO: Add a QStyledItemDelegate to center-align the icon.
switch (index.column()) {
case COL_ISVALID:
switch (key->status) {
Expand Down
6 changes: 3 additions & 3 deletions src/libromdata/Audio/SPC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -454,13 +454,13 @@ SPCPrivate::TagData SPCPrivate::parseTags(void)
}

// Get the integer value.
// TODO: Use le32_to_cpu()?
if (data[i] == SPC_xID6_ITEM_DUMP_DATE) {
// Convert from BCD to Unix time.
kv.insertTimestamp(static_cast<SPC_xID6_Item_e>(data[i]),
bcd_to_unix_time(&data[i+4], 4));
} else {
// Regular integer.
// TODO: Use le32_to_cpu()?
const unsigned int uival = data[i+4] |
(data[i+5] << 8) |
(data[i+6] << 16) |
Expand Down Expand Up @@ -840,8 +840,8 @@ int SPC::loadMetaData(void)
auto kv = d->parseTags();
if (kv.empty()) {
// No tags.
// TODO: Return 0 instead of -EIO?
return -EIO;
// TODO: Return 0 instead of -ENOENT?
return -ENOENT;
}

// Create the metadata object.
Expand Down
2 changes: 1 addition & 1 deletion src/libromdata/Console/GameCubeSave.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ const rp_image *GameCubeSavePrivate::loadIcon(void)
// Set up the icon animation sequence.
// FIXME: This isn't done correctly if blank frames are present
// and the icon uses the "bounce" animation.
// 'rpcli -a' fails at a result.
// 'rpcli -a' fails as a result.
int idx = 0;
for (int i = 0; i < iconAnimData->count; i++, idx++) {
iconAnimData->seq_index[idx] = i;
Expand Down
2 changes: 1 addition & 1 deletion src/libromdata/Console/SegaSaturn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ SegaSaturn::SegaSaturn(IRpFile *file)
break;
case SegaSaturnPrivate::DISC_ISO_2352:
// 2352-byte sectors.
// FIXME: Assuming Mode 1.
// Assuming Mode 1. (TODO: Check for Mode 2.)
memcpy(&d->discHeader, &sector.m1.data, sizeof(d->discHeader));
break;
default:
Expand Down
2 changes: 1 addition & 1 deletion src/libromdata/Handheld/DMG.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ void DMGPrivate::getTitleAndGameID(string &s_title, string &s_gameID) const
s_gameID[5] = romHeader.new_publisher_code[1];
} else {
// Old publisher code.
// FIXME: This probably won't ever happen,
// NOTE: This probably won't ever happen,
// since Game ID was added *after* CGB.
static const char hex_lookup[16] = {
'0','1','2','3','4','5','6','7',
Expand Down
1 change: 0 additions & 1 deletion src/libromdata/Other/NintendoBadge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ NintendoBadgePrivate::NintendoBadgePrivate(NintendoBadge *q, IRpFile *file)
memset(&badgeHeader, 0, sizeof(badgeHeader));

// Clear the decoded images.
// FIXME: This may be slower than memset()...
img.fill(nullptr);
}

Expand Down
1 change: 0 additions & 1 deletion src/svrplus/svrplus.c
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,6 @@ static void InitDialog(HWND hDlg)
MapWindowPoints(HWND_DESKTOP, hDlg, (LPPOINT)&rectStatus1_noIcon, 2);

// Adjust the left boundary for the icon.
// FIXME: Assuming 16x16 icons. May need larger for HiDPI.
rectStatus1_icon = rectStatus1_noIcon;
rectStatus1_icon.left += szIcon.cx + (szIcon.cx / 5);

Expand Down
1 change: 0 additions & 1 deletion src/win32/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ ADD_SUBDIRECTORY(config)
INCLUDE(../libwin32common/DelayLoadHelper.cmake)
SET_DELAYLOAD_EXTLIB_FLAGS()

# FIXME: Build both Win32 and Win64 DLLs?
# NOTE: MODULE results in the .dll being placed in
# the 'lib' directory. Use SHARED instead.
# TODO: Disable building of import libraries.
Expand Down
2 changes: 1 addition & 1 deletion src/win32/config/CacheTab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ int CacheTabPrivate::recursiveScan(const TCHAR *path, list<pair<tstring, DWORD>
}

// Add the filename and attributes.
// FIXME: Test emplace_back on MSVC 2010.
// NOTE: emplace_back() doesn't support implicit std::make_pair on MSVC 2010.
rlist.emplace_back(std::make_pair(std::move(fullFileName), findFileData.dwFileAttributes));
} while (FindNextFile(hFindFile, &findFileData));
FindClose(hFindFile);
Expand Down

0 comments on commit 5aa6a3d

Please sign in to comment.