Martchus
/
tageditor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't mix signed with unsigned types

This commit is contained in:
Martchus 2017-03-29 00:55:30 +02:00
parent fe23039fc3
commit 8f7f0dceb4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -12,7 +12,7 @@ set(META_GUI_OPTIONAL true)
set(META_JS_SRC_DIR renamingutility)
set(META_VERSION_MAJOR 2)
set(META_VERSION_MINOR 2)
set(META_VERSION_PATCH 1)
set(META_VERSION_PATCH 2)
# add project files
set(HEADER_FILES

2
dbquery/dbquery.cpp
View File

@ -68,7 +68,7 @@ TagValue QueryResultsModel::fieldValue(int row, KnownField knownField) const
return TagValue(res.totalTracks);
case KnownField::Cover:
if(!res.cover.isEmpty()) {
TagValue tagValue(res.cover.data(), res.cover.size(), TagDataType::Picture);
TagValue tagValue(res.cover.data(), static_cast<size_t>(res.cover.size()), TagDataType::Picture);
tagValue.setMimeType(containerMimeType(parseSignature(res.cover.data(), res.cover.size())));
return tagValue;
}

6
dbquery/lyricswikia.cpp
View File

@ -77,7 +77,7 @@ void LyricsWikiaResultsModel::parseInitialResults(const QByteArray &data)
iftag("item") {
songs << SongDescription();
songs.back().title = text;
songs.back().track = static_cast<unsigned int>(songs.size());
songs.back().track = songs.size();
} else_skip
}
} else_skip
@ -85,13 +85,13 @@ void LyricsWikiaResultsModel::parseInitialResults(const QByteArray &data)
// need to filter results manually because the filtering provided by Lyrica Wiki API doesn't work
if((m_initialDescription.album.isEmpty() || m_initialDescription.album == album)
&& (m_initialDescription.year.isEmpty() || m_initialDescription.year == year)
&& (!m_initialDescription.totalTracks || m_initialDescription.totalTracks == static_cast<unsigned int>(songs.size()))) {
&& (!m_initialDescription.totalTracks || m_initialDescription.totalTracks == songs.size())) {
for(SongDescription &song : songs) {
if((m_initialDescription.title.isEmpty() || m_initialDescription.title == song.title)
&& (!m_initialDescription.track || m_initialDescription.track == song.track)) {
song.album = album;
song.year = year;
song.totalTracks = static_cast<unsigned int>(songs.size());
song.totalTracks = songs.size();
m_results << move(song);
}
}

6
gui/picturepreviewselection.cpp
View File

@ -97,7 +97,7 @@ void PicturePreviewSelection::setValue(const TagValue &value, PreviousValueHandl
template<class TagType>
bool fieldPredicate(int i, const std::pair<typename TagType::fieldType::identifierType, typename TagType::fieldType> &pair)
{
return pair.second.isTypeInfoAssigned() ? (pair.second.typeInfo() == i) : (i == 0);
return pair.second.isTypeInfoAssigned() ? (pair.second.typeInfo() == static_cast<unsigned int>(i)) : (i == 0);
}
/*!
@ -252,7 +252,7 @@ void pushId3v2CoverValues(TagType *tag, KnownField field, const QList<Media::Tag
}
} else if(!values[index].isEmpty()) {
typename TagType::fieldType field(id, values[index]);
field.setTypeInfo(index);
field.setTypeInfo(static_cast<decltype(field.typeInfo())>(index));
fields.insert(std::make_pair(id, field));
}
}
@ -348,7 +348,7 @@ void PicturePreviewSelection::addOfSelectedType(const QString &path)
*/
void PicturePreviewSelection::removeSelected()
{
if(m_currentTypeIndex < static_cast<unsigned int>(m_values.size())) {
if(m_currentTypeIndex < m_values.size()) {
if(m_values[m_currentTypeIndex].isEmpty()) {
QMessageBox::information(this, QApplication::applicationName(), tr("There is no cover to remove."));
} else {