From 0d334c694016fbbf847e95b20ad6cb37bbdae7d5 Mon Sep 17 00:00:00 2001 From: APTX Date: Sun, 25 Jan 2015 18:12:24 +0100 Subject: [PATCH] Fix Qt4 build. Signals are protected in Qt4. --- localmylist/dynamicmodel/datamodel.cpp | 5 +++++ localmylist/dynamicmodel/datamodel.h | 1 + localmylist/dynamicmodel/types.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/localmylist/dynamicmodel/datamodel.cpp b/localmylist/dynamicmodel/datamodel.cpp index f3ad417..a7bc4e0 100644 --- a/localmylist/dynamicmodel/datamodel.cpp +++ b/localmylist/dynamicmodel/datamodel.cpp @@ -102,5 +102,10 @@ bool DataModel::hasTypeRelation(const QString &source, const QString &destiantio return inner != it.value().constEnd(); } +void DataModel::notifyEntryAdded(DataType *dataType, int id) +{ + emit entryAdded(dataType, id); +} + } // namespace DynamicModel } // namespace LocalMyList diff --git a/localmylist/dynamicmodel/datamodel.h b/localmylist/dynamicmodel/datamodel.h index 6d907d8..7148a2f 100644 --- a/localmylist/dynamicmodel/datamodel.h +++ b/localmylist/dynamicmodel/datamodel.h @@ -32,6 +32,7 @@ public: TypeRelation *typeRelation(const QString &source, const QString &destiantion); bool hasTypeRelation(const QString &source, const QString &destiantion) const; + void notifyEntryAdded(DataType *dataType, int id); signals: void entryAdded(DataType *dataType, int id); diff --git a/localmylist/dynamicmodel/types.cpp b/localmylist/dynamicmodel/types.cpp index 0b82fae..2c4ea38 100644 --- a/localmylist/dynamicmodel/types.cpp +++ b/localmylist/dynamicmodel/types.cpp @@ -170,7 +170,7 @@ Data *AnimeType::readEntry(const SqlResultIteratorInterface &it) void AnimeType::animeAdded(int aid) { - emit model()->entryAdded(this, aid); + model()->notifyEntryAdded(this, aid); } void AnimeType::animeUpdated(int aid) @@ -344,7 +344,7 @@ Data *EpisodeType::readEntry(const SqlResultIteratorInterface &it) void EpisodeType::episodeAdded(int eid, int aid) { Q_UNUSED(aid); - emit model()->entryAdded(this, eid); + model()->notifyEntryAdded(this, eid); } void EpisodeType::episodeUpdated(int eid, int aid) @@ -450,7 +450,7 @@ void FileType::fileAdded(int fid, int eid, int aid) { Q_UNUSED(aid); Q_UNUSED(eid); - emit model()->entryAdded(this, fid); + model()->notifyEntryAdded(this, fid); } void FileType::fileUpdated(int fid, int eid, int aid) @@ -532,7 +532,7 @@ Data *FileLocationType::readEntry(const SqlResultIteratorInterface &it) void FileLocationType::fileLocationAdded(int locationId, int fid) { Q_UNUSED(fid); - emit model()->entryAdded(this, locationId); + model()->notifyEntryAdded(this, locationId); } void FileLocationType::fileLocationUpdated(int locationId, int fid) -- 2.52.0