Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes compilation issue on Qt 4.7.4

  • Loading branch information...
commit 58e5c50d548a2a3e00a3c8ba3d6f3543a34d21fa 1 parent 4d33767
Daniel Kabel authored
View
4 mediaCenterPlugins/XbmcXml.cpp
@@ -1908,7 +1908,6 @@ QStringList XbmcXml::extraFanartNames(TvShow *show)
* @brief Loading of movie set posters is not possible with nfos
* @param setName
* @return
- * @todo: Find a solution for loading movie set poster
*/
QImage XbmcXml::movieSetPoster(QString setName)
{
@@ -1925,7 +1924,6 @@ QImage XbmcXml::movieSetPoster(QString setName)
* @brief Loading of movie set backdrops is not possible with nfos
* @param setName
* @return
- * @todo: Find a solution for loading movie set fanart
*/
QImage XbmcXml::movieSetBackdrop(QString setName)
{
@@ -1942,7 +1940,6 @@ QImage XbmcXml::movieSetBackdrop(QString setName)
* @brief Save movie set poster
* @param setName
* @param poster
- * @todo: Find a solution for storing movie set poster
*/
void XbmcXml::saveMovieSetPoster(QString setName, QImage poster)
{
@@ -1955,7 +1952,6 @@ void XbmcXml::saveMovieSetPoster(QString setName, QImage poster)
* @brief Save movie set backdrop
* @param setName
* @param backdrop
- * @todo: Find a solution for storing movie set fanart
*/
void XbmcXml::saveMovieSetBackdrop(QString setName, QImage backdrop)
{
View
10 qjsonrpc/src/json/qjsonparser.cpp
@@ -356,7 +356,17 @@ void Parser::ParsedObject::insert(uint offset) {
if (min < offsets.size() && *entryAt(min) == *newEntry) {
offsets[min] = offset;
} else {
+#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0)
+ QVarLengthArray<uint, 64> offsetsN;
+ for (int i=0, n=offsets.size() ; i<n ; ++i) {
+ if (i == min)
+ offsetsN.append(offsets[i]);
+ offsetsN.append(offsets[i]);
+ }
+ offsets = offsetsN;
+#else
offsets.insert(min, offset);
+#endif
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.