Hello community, here is the log from the commit of package libmygpo-qt for openSUSE:Factory checked in at Mon Sep 19 17:48:02 CEST 2011.
-------- --- libmygpo-qt/libmygpo-qt.changes 2011-05-23 10:49:37.000000000 +0200 +++ libmygpo-qt/libmygpo-qt.changes 2011-09-19 10:37:41.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Sep 19 08:35:03 UTC 2011 - [email protected] + +- Update to 1.0.4 + * fixed a bug with an invalid timestamp when uploading EpisodeActions + * fixed a bug with a wrong url when retrieving EpisodeActions by Podcast + * fixed a crash happening on MeeGo because of the deletion of QNetworkReply Pointers + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libmygpo-qt-1.0.3.tar.bz2 New: ---- libmygpo-qt-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmygpo-qt.spec ++++++ --- /var/tmp/diff_new_pack.vRpU6r/_old 2011-09-19 17:47:58.000000000 +0200 +++ /var/tmp/diff_new_pack.vRpU6r/_new 2011-09-19 17:47:58.000000000 +0200 @@ -18,7 +18,7 @@ Name: libmygpo-qt -Version: 1.0.3 +Version: 1.0.4 Release: 1 License: LGPLv2+ Summary: Qt Library that wraps the gpodder.net Web API ++++++ libmygpo-qt-1.0.3.tar.bz2 -> libmygpo-qt-1.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/.kdev4/libmygpo-qt.kdev4 new/libmygpo-qt-1.0.4/.kdev4/libmygpo-qt.kdev4 --- old/libmygpo-qt-1.0.3/.kdev4/libmygpo-qt.kdev4 1970-01-01 01:00:00.000000000 +0100 +++ new/libmygpo-qt-1.0.4/.kdev4/libmygpo-qt.kdev4 2011-05-22 16:11:20.000000000 +0200 @@ -0,0 +1,15 @@ +[Buildset] +BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x16\x00l\x00i\x00b\x00m\x00y\x00g\x00p\x00o\x00-\x00q\x00t) + +[CMake] +BuildDirs=/home/t95012/src/libmygpo-qt/build +CMakeDir=/usr/share/cmake-2.8/Modules +Current CMake Binary=file:///usr/bin/cmake +CurrentBuildDir=file:///home/t95012/src/libmygpo-qt/build +CurrentBuildType=Debug +CurrentInstallDir= +Extra Arguments= +ProjectRootRelative=./ + +[Project] +VersionControlSupport=kdevgit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/CMakeLists.txt new/libmygpo-qt-1.0.4/CMakeLists.txt --- old/libmygpo-qt-1.0.3/CMakeLists.txt 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/CMakeLists.txt 2011-09-09 13:59:50.000000000 +0200 @@ -1,6 +1,6 @@ -project( libmygpo-qt ) +cmake_minimum_required( VERSION 2.6 FATAL_ERROR ) -cmake_minimum_required( VERSION 2.6 ) +project( libmygpo-qt ) set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) @@ -14,7 +14,7 @@ set( MYGPO_LIB_MAJOR_VERSION "1" ) set( MYGPO_LIB_MINOR_VERSION "0" ) -set( MYGPO_LIB_PATCH_VERSION "3" ) +set( MYGPO_LIB_PATCH_VERSION "4" ) set( MYGPO_LIB_VERSION "${MYGPO_LIB_MAJOR_VERSION}.${MYGPO_LIB_MINOR_VERSION}.${MYGPO_LIB_PATCH_VERSION}" ) set( MYGPO_LIB_VERSION_SONAME "${MYGPO_LIB_MAJOR_VERSION}") @@ -33,7 +33,8 @@ option(MYGPO_BUILD_TESTS "Build all unit tests" ON) if(MYGPO_BUILD_TESTS) - enable_testing() + INCLUDE(CTest) + enable_testing() endif(MYGPO_BUILD_TESTS) set( CPACK_GENERATOR "TBZ2" "DEB" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/CTestConfig.cmake new/libmygpo-qt-1.0.4/CTestConfig.cmake --- old/libmygpo-qt-1.0.3/CTestConfig.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/libmygpo-qt-1.0.4/CTestConfig.cmake 2011-08-10 14:23:38.000000000 +0200 @@ -0,0 +1,13 @@ +## This file should be placed in the root directory of your project. +## Then modify the CMakeLists.txt file in the root directory of your +## project to incorporate the testing dashboard. +## # The following are required to uses Dart and the Cdash dashboard +## ENABLE_TESTING() +## INCLUDE(CTest) +set(CTEST_PROJECT_NAME "libmygpo-qt") +set(CTEST_NIGHTLY_START_TIME "00:00:00 EST") + +set(CTEST_DROP_METHOD "http") +set(CTEST_DROP_SITE "my.cdash.org") +set(CTEST_DROP_LOCATION "/submit.php?project=libmygpo-qt") +set(CTEST_DROP_SITE_CDASH TRUE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/cmake/modules/FindLibmygpo-qt.cmake new/libmygpo-qt-1.0.4/cmake/modules/FindLibmygpo-qt.cmake --- old/libmygpo-qt-1.0.3/cmake/modules/FindLibmygpo-qt.cmake 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/cmake/modules/FindLibmygpo-qt.cmake 2011-08-10 13:31:46.000000000 +0200 @@ -2,8 +2,8 @@ # - Find libmygpo-qt # Find the libmygpo-qt includes and the libmygpo-qt libraries # This module defines -# LIBMYGPO_QT_INCLUDE_DIR, root mygpo-qt include dir -# LIBMYGPO_QT_LIBRARY, the path to libmygpo-qt +# LIBMYGPO_QT_INCLUDE_DIRS, root mygpo-qt include dir +# LIBMYGPO_QT_LIBRARIES, the path to libmygpo-qt # LIBMYGPO_QT_FOUND, whether libmygpo-qt was found @@ -18,7 +18,7 @@ PATH_SUFFIXES mygpo-qt ) -find_library( LIBMYGPO_QT_LIBRARY NAMES mygpo-qt +find_library(LIBMYGPO_QT_LIBRARY NAMES mygpo-qt PATHS ~/usr/lib ~/usr/lib64 @@ -34,10 +34,12 @@ ~/kde/lib64 ) +set(LIBMYGPO_QT_INCLUDE_DIRS ${LIBMYGPO_QT_INCLUDE_DIR}) +set(LIBMYGPO_QT_LIBRARIES ${LIBMYGPO_QT_LIBRARY}) if(LIBMYGPO_QT_INCLUDE_DIR AND LIBMYGPO_QT_LIBRARY) set(LIBMYGPO_QT_FOUND TRUE) - message(STATUS "Found libmygpo-qt: ${LIBMYGPO_QT_INCLUDE_DIR}, ${LIBMYGPO_QT_LIBRARY}") + message(STATUS "Found libmygpo-qt: ${LIBMYGPO_QT_INCLUDE_DIRS}, ${LIBMYGPO_QT_LIBRARIES}") else(LIBMYGPO_QT_INCLUDE_DIR AND LIBMYGPO_QT_LIBRARY) set(LIBMYGPO_QT_FOUND FALSE) if (LIBMYGPO_QT_FIND_REQUIRED) @@ -45,4 +47,4 @@ endif(LIBMYGPO_QT_FIND_REQUIRED) endif(LIBMYGPO_QT_INCLUDE_DIR AND LIBMYGPO_QT_LIBRARY) -mark_as_advanced(LIBMYGPO_QT_INCLUDE_DIR LIBMYGPO_QT_LIBRARY) +mark_as_advanced(LIBMYGPO_QT_INCLUDE_DIRS LIBMYGPO_QT_LIBRARIES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/example/.kdev4/example.kdev4 new/libmygpo-qt-1.0.4/example/.kdev4/example.kdev4 --- old/libmygpo-qt-1.0.3/example/.kdev4/example.kdev4 1970-01-01 01:00:00.000000000 +0100 +++ new/libmygpo-qt-1.0.4/example/.kdev4/example.kdev4 2011-05-23 21:08:51.000000000 +0200 @@ -0,0 +1,5 @@ +[Buildset] +BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x0e\x00e\x00x\x00a\x00m\x00p\x00l\x00e) + +[Project] +VersionControlSupport=kdevgit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/example/example.kdev4 new/libmygpo-qt-1.0.4/example/example.kdev4 --- old/libmygpo-qt-1.0.3/example/example.kdev4 1970-01-01 01:00:00.000000000 +0100 +++ new/libmygpo-qt-1.0.4/example/example.kdev4 2011-05-23 21:08:46.000000000 +0200 @@ -0,0 +1,3 @@ +[Project] +Manager=KDevCustomMakeManager +Name=example diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/example/src/.kdev_include_paths new/libmygpo-qt-1.0.4/example/src/.kdev_include_paths --- old/libmygpo-qt-1.0.3/example/src/.kdev_include_paths 1970-01-01 01:00:00.000000000 +0100 +++ new/libmygpo-qt-1.0.4/example/src/.kdev_include_paths 2011-05-23 23:05:15.000000000 +0200 @@ -0,0 +1,4 @@ +~/kde/include/mygpo-qt/ +/usr/include/qt4/QtCore/ +/usr/include/qt4/QtGui/ +/usr/include/qt4/QtNetwork/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/example/src/main.cpp new/libmygpo-qt-1.0.4/example/src/main.cpp --- old/libmygpo-qt-1.0.3/example/src/main.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/example/src/main.cpp 2011-08-18 18:21:07.000000000 +0200 @@ -144,6 +144,25 @@ qDebug() << reply->readAll(); qDebug() << ""; + reply = req.downloadSubscriptionsTxt( "ase23", "dev0" ); + + loop.connect(reply, SIGNAL(finished()), SLOT(quit())); + loop.connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),SLOT(quit())); + loop.exec(); + + printTitle(QLatin1String("Downloading podcast subscriptions (Txt) [subscriptionsTxt(\"ase23\",\"dev0\"]")); + qDebug() << reply->readAll(); + qDebug() << ""; + + reply = req.downloadSubscriptionsOpml( "ase23", "dev0" ); + + loop.connect(reply, SIGNAL(finished()), SLOT(quit())); + loop.connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),SLOT(quit())); + loop.exec(); + + printTitle(QLatin1String("Downloading podcast subscriptions (OPML) [subscriptionsOpml(\"ase23\",\"dev0\"]")); + qDebug() << reply->readAll(); + qDebug() << ""; // // QNetworkReply* searchOpml(const QString& query); // @@ -223,6 +242,15 @@ printTitle(QLatin1String("Downloading podcast toplists [toplist(1)]")); printPodcastList(topList); + reply = req.downloadSubscriptionsJson( "ase23", "dev0" ); + + loop.connect(reply, SIGNAL(finished()), SLOT(quit())); + loop.connect(reply, SIGNAL(requestError(QNetworkReply::NetworkError)), SLOT(quit())); + loop.exec(); + + printTitle(QLatin1String("Downloading subscriptions (JSON) [subscriptionsJson(\"ase23\",\"dev0\")]")); + qDebug() << reply->readAll(); + qDebug(); // // PodcastListPtr search(const QString& query); // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/AddRemoveResult.cpp new/libmygpo-qt-1.0.4/src/AddRemoveResult.cpp --- old/libmygpo-qt-1.0.3/src/AddRemoveResult.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/AddRemoveResult.cpp 2011-09-09 13:23:30.000000000 +0200 @@ -35,7 +35,6 @@ AddRemoveResultPrivate::~AddRemoveResultPrivate() { - delete m_reply; } @@ -104,6 +103,7 @@ emit q->parseError(); } } + m_reply->deleteLater(); } void AddRemoveResultPrivate::error( QNetworkReply::NetworkError error ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/ApiRequest.cpp new/libmygpo-qt-1.0.4/src/ApiRequest.cpp --- old/libmygpo-qt-1.0.3/src/ApiRequest.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/ApiRequest.cpp 2011-09-09 13:12:00.000000000 +0200 @@ -62,6 +62,12 @@ return m_requestHandler.authGetRequest( requestUrl ); } +QNetworkReply* ApiRequestPrivate::downloadSubscriptionsOpml( const QString& username, const QString& device ) +{ + QString requestUrl = UrlBuilder::getSubscriptionsUrl( username, device, UrlBuilder::OPML ); + return m_requestHandler.authGetRequest( requestUrl ); +} + QNetworkReply* ApiRequestPrivate::toplistTxt( uint count ) { QString requestUrl = UrlBuilder::getToplistUrl( count, UrlBuilder::TEXT ); @@ -80,6 +86,12 @@ return m_requestHandler.authGetRequest( requestUrl ); } +QNetworkReply* ApiRequestPrivate::downloadSubscriptionsTxt(const QString& username, const QString& device) +{ + QString requestUrl = UrlBuilder::getSubscriptionsUrl( username, device, UrlBuilder::TEXT ); + return m_requestHandler.authGetRequest( requestUrl ); +} + PodcastListPtr ApiRequestPrivate::toplist( uint count ) { QString requestUrl = UrlBuilder::getToplistUrl( count ); @@ -108,6 +120,12 @@ return podcastList; } +QNetworkReply* ApiRequestPrivate::downloadSubscriptionsJson(const QString& username, const QString& device) +{ + QString requestUrl = UrlBuilder::getSubscriptionsUrl( username, device ); + return m_requestHandler.getRequest( requestUrl ); +} + EpisodePtr ApiRequestPrivate::episodeData( const QUrl& podcasturl, const QUrl& episodeurl ) { QString requestUrl = UrlBuilder::getEpisodeDataUrl( podcasturl.toString(), episodeurl.toString() ); @@ -381,6 +399,11 @@ return d->suggestionsOpml( count ); } +QNetworkReply* ApiRequest::downloadSubscriptionsOpml( const QString& username, const QString& device ) +{ + return d->downloadSubscriptionsOpml( username, device ); +} + QNetworkReply* ApiRequest::toplistTxt( uint count ) { return d->toplistTxt( count ); @@ -396,6 +419,11 @@ return d->suggestionsTxt( count ); } +QNetworkReply* ApiRequest::downloadSubscriptionsTxt(const QString& username, const QString& device) +{ + return d->downloadSubscriptionsTxt( username, device ); +} + PodcastListPtr ApiRequest::toplist( uint count ) { return d->toplist( count ); @@ -411,6 +439,11 @@ return d->suggestions( count ); } +QNetworkReply* ApiRequest::downloadSubscriptionsJson(const QString& username, const QString& device) +{ + return d->downloadSubscriptionsJson( username, device ); +} + PodcastListPtr ApiRequest::podcastsOfTag( uint count, const QString& tag ) { return d->podcastsOfTag( count, tag ); @@ -493,7 +526,7 @@ EpisodeActionListPtr ApiRequest::episodeActionsByPodcast( const QString& username, const QString& podcastUrl, const bool aggregated ) { - return d->episodeActionsByDevice( username, podcastUrl, aggregated ); + return d->episodeActionsByPodcast( username, podcastUrl, aggregated ); } EpisodeActionListPtr ApiRequest::episodeActionsByDevice( const QString& username, const QString& deviceId, const bool aggregated ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/ApiRequest.h new/libmygpo-qt-1.0.4/src/ApiRequest.h --- old/libmygpo-qt-1.0.3/src/ApiRequest.h 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/ApiRequest.h 2011-09-09 14:05:18.000000000 +0200 @@ -25,7 +25,7 @@ #define MYGPO_MAJOR_VERSION 1 #define MYGPO_MINOR_VERSION 0 -#define MYGPO_PATCH_VERSION 0 +#define MYGPO_PATCH_VERSION 4 #include "mygpo_export.h" #include "AddRemoveResult.h" @@ -60,6 +60,8 @@ ApiRequest( QNetworkAccessManager* nam ); ~ApiRequest( ); + //SIMPLE API + /** * Returns the OPML Result for the Simple API Call "Downloading Podcast Toplists" * @param count The number of Podcasts that should be returned - will be set to to 100 if > 100 or < 1 @@ -84,6 +86,8 @@ * */ QNetworkReply* suggestionsOpml( uint count ); + + QNetworkReply* downloadSubscriptionsOpml( const QString& username, const QString& device ); /** * Returns the TXT Result for the Simple API Call "Downloading Podcast Toplists" @@ -109,6 +113,8 @@ * */ QNetworkReply* suggestionsTxt( uint count ); + + QNetworkReply* downloadSubscriptionsTxt( const QString& username, const QString& device ); /** * Returns the Result for the Simple API Call "Downloading Podcast Toplists" @@ -134,6 +140,10 @@ * */ PodcastListPtr suggestions( uint count ); + + QNetworkReply* downloadSubscriptionsJson( const QString& username, const QString& device ); + + //ADVANCED API /** * Returns the Result for the Advanced API Call "Retrieving Podcasts of a Tag" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/ApiRequest_p.h new/libmygpo-qt-1.0.4/src/ApiRequest_p.h --- old/libmygpo-qt-1.0.3/src/ApiRequest_p.h 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/ApiRequest_p.h 2011-09-09 13:12:00.000000000 +0200 @@ -40,12 +40,15 @@ QNetworkReply* toplistOpml( uint count ); QNetworkReply* searchOpml( const QString& query ); QNetworkReply* suggestionsOpml( uint count ); + QNetworkReply* downloadSubscriptionsOpml( const QString& username, const QString& device ); QNetworkReply* toplistTxt( uint count ); QNetworkReply* searchTxt( const QString& query ); QNetworkReply* suggestionsTxt( uint count ); + QNetworkReply* downloadSubscriptionsTxt ( const QString& username, const QString& device ); PodcastListPtr toplist( uint count ); PodcastListPtr search( const QString& query ); PodcastListPtr suggestions( uint count ); + QNetworkReply* downloadSubscriptionsJson( const QString& username, const QString& device ); PodcastListPtr podcastsOfTag( uint count, const QString& tag ); PodcastPtr podcastData( const QUrl& podcasturl ); EpisodePtr episodeData( const QUrl& podcasturl, const QUrl& episodeurl ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/DeviceList.cpp new/libmygpo-qt-1.0.4/src/DeviceList.cpp --- old/libmygpo-qt-1.0.3/src/DeviceList.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/DeviceList.cpp 2011-09-09 13:24:31.000000000 +0200 @@ -34,7 +34,6 @@ DeviceListPrivate::~DeviceListPrivate() { - delete m_reply; } QVariant DeviceListPrivate::devices() const @@ -98,6 +97,7 @@ emit q->parseError(); } } + m_reply->deleteLater(); } DeviceList::DeviceList( QNetworkReply* reply, QObject* parent ) : QObject( parent ), d( new DeviceListPrivate( this, reply ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/DeviceUpdates.cpp new/libmygpo-qt-1.0.4/src/DeviceUpdates.cpp --- old/libmygpo-qt-1.0.3/src/DeviceUpdates.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/DeviceUpdates.cpp 2011-09-09 13:24:31.000000000 +0200 @@ -35,7 +35,6 @@ DeviceUpdatesPrivate::~DeviceUpdatesPrivate() { - delete m_reply; } @@ -126,6 +125,7 @@ emit q->parseError(); } } + m_reply->deleteLater(); } void DeviceUpdatesPrivate::error( QNetworkReply::NetworkError error ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/Episode.cpp new/libmygpo-qt-1.0.4/src/Episode.cpp --- old/libmygpo-qt-1.0.3/src/Episode.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/Episode.cpp 2011-09-09 13:26:01.000000000 +0200 @@ -28,7 +28,6 @@ EpisodePrivate::~EpisodePrivate() { - delete m_reply; } EpisodePrivate::EpisodePrivate ( Episode* qq, QNetworkReply* reply, QObject* parent ) : QObject ( parent ), m_reply ( reply ), q ( qq ), m_error ( QNetworkReply::NoError ) @@ -144,6 +143,7 @@ emit q->parseError(); } } + m_reply->deleteLater(); } void EpisodePrivate::error ( QNetworkReply::NetworkError error ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/EpisodeActionList.cpp new/libmygpo-qt-1.0.4/src/EpisodeActionList.cpp --- old/libmygpo-qt-1.0.3/src/EpisodeActionList.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/EpisodeActionList.cpp 2011-09-09 13:26:01.000000000 +0200 @@ -34,7 +34,6 @@ EpisodeActionListPrivate::~EpisodeActionListPrivate() { - delete m_reply; } QList<EpisodeActionPtr> EpisodeActionListPrivate::list() const @@ -106,6 +105,7 @@ emit q->parseError(); } } + m_reply->deleteLater(); } qulonglong EpisodeActionListPrivate::timestamp() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/EpisodeList.cpp new/libmygpo-qt-1.0.4/src/EpisodeList.cpp --- old/libmygpo-qt-1.0.3/src/EpisodeList.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/EpisodeList.cpp 2011-09-09 13:26:01.000000000 +0200 @@ -34,7 +34,6 @@ EpisodeListPrivate::~EpisodeListPrivate() { - delete m_reply; } QList<EpisodePtr> EpisodeListPrivate::list() const @@ -95,6 +94,7 @@ emit q->parseError(); } } + m_reply->deleteLater(); } void EpisodeListPrivate::error( QNetworkReply::NetworkError error ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/JsonCreator.cpp new/libmygpo-qt-1.0.4/src/JsonCreator.cpp --- old/libmygpo-qt-1.0.3/src/JsonCreator.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/JsonCreator.cpp 2011-07-13 22:33:28.000000000 +0200 @@ -24,6 +24,7 @@ #include <QList> #include <QUrl> #include <QString> +#include <QDateTime> #include <serializer.h> @@ -133,8 +134,10 @@ else if( actionType == EpisodeAction::Download ) map.insert( QLatin1String( "action" ), QLatin1String( "download" ) ); - if( episodeAction->timestamp() != 0 ) - map.insert( QLatin1String( "timestamp" ), episodeAction->timestamp() ); + if( episodeAction->timestamp() != 0 ) { + QDateTime dateTime = QDateTime::fromMSecsSinceEpoch(episodeAction->timestamp() ); + map.insert( QLatin1String( "timestamp" ), dateTime.toString(Qt::ISODate) ); + } if( episodeAction->started() != 0 ) map.insert( QLatin1String( "started" ), episodeAction->started() ); if( episodeAction->position() != 0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/Podcast.cpp new/libmygpo-qt-1.0.4/src/Podcast.cpp --- old/libmygpo-qt-1.0.3/src/Podcast.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/Podcast.cpp 2011-09-09 13:26:01.000000000 +0200 @@ -39,7 +39,6 @@ PodcastPrivate::~PodcastPrivate() { - delete m_reply; } @@ -208,6 +207,7 @@ { emit q->parseError(); } + m_reply->deleteLater(); } void PodcastPrivate::error( QNetworkReply::NetworkError error ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/PodcastList.cpp new/libmygpo-qt-1.0.4/src/PodcastList.cpp --- old/libmygpo-qt-1.0.3/src/PodcastList.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/PodcastList.cpp 2011-09-09 13:26:01.000000000 +0200 @@ -34,7 +34,6 @@ PodcastListPrivate::~PodcastListPrivate() { - delete m_reply; } @@ -95,6 +94,7 @@ emit q->parseError(); } } + m_reply->deleteLater(); } void PodcastListPrivate::error( QNetworkReply::NetworkError error ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/Settings.cpp new/libmygpo-qt-1.0.4/src/Settings.cpp --- old/libmygpo-qt-1.0.3/src/Settings.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/Settings.cpp 2011-09-09 13:26:01.000000000 +0200 @@ -34,7 +34,6 @@ SettingsPrivate::~SettingsPrivate() { - delete m_reply; } QVariant SettingsPrivate::settings() const @@ -74,6 +73,7 @@ emit q->parseError(); } } + m_reply->deleteLater(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/TagList.cpp new/libmygpo-qt-1.0.4/src/TagList.cpp --- old/libmygpo-qt-1.0.3/src/TagList.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/TagList.cpp 2011-09-09 13:26:01.000000000 +0200 @@ -34,7 +34,6 @@ TagListPrivate::~TagListPrivate() { - delete m_reply; } QList<TagPtr> TagListPrivate::list() const @@ -95,6 +94,7 @@ emit q->parseError(); } } + m_reply->deleteLater(); } void TagListPrivate::error( QNetworkReply::NetworkError error ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/UrlBuilder.cpp new/libmygpo-qt-1.0.4/src/UrlBuilder.cpp --- old/libmygpo-qt-1.0.3/src/UrlBuilder.cpp 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/UrlBuilder.cpp 2011-08-10 11:55:54.000000000 +0200 @@ -47,6 +47,9 @@ case UrlBuilder::TEXT: ret = QString( QLatin1String( ".txt" ) ); break; + case UrlBuilder::XML: + ret = QString( QLatin1String( ".xml" ) ); + break; } return ret; } @@ -68,6 +71,11 @@ return s_server % QLatin1String( "/search" ) % getFormatExtension( f ) % QLatin1String( "?q=" ) % query; } +QString UrlBuilder::getSubscriptionsUrl( const QString& username, const QString& device, UrlBuilder::Format f) +{ + return s_server % QLatin1String( "/subscriptions/" ) % username % QLatin1String( "/" ) % device % getFormatExtension( f ); +} + QString UrlBuilder::getTopTagsUrl( uint i ) { QString numString = QString::number(( i == 0 ) ? 1 : i ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/src/UrlBuilder.h new/libmygpo-qt-1.0.4/src/UrlBuilder.h --- old/libmygpo-qt-1.0.3/src/UrlBuilder.h 2011-05-22 15:49:54.000000000 +0200 +++ new/libmygpo-qt-1.0.4/src/UrlBuilder.h 2011-08-10 11:52:25.000000000 +0200 @@ -43,7 +43,8 @@ { JSON, OPML, - TEXT + TEXT, + XML }; /** @@ -64,6 +65,7 @@ */ static QString getPodcastSearchUrl( const QString& query, Format f = JSON ); + static QString getSubscriptionsUrl( const QString& username, const QString& device, Format f = JSON ); /** * @param i Amount of tags. If i == 0 it will be set to 1. * @return Request URL to retrieve the 'i' most used tags. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/templates/Template.cpp new/libmygpo-qt-1.0.4/templates/Template.cpp --- old/libmygpo-qt-1.0.3/templates/Template.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libmygpo-qt-1.0.4/templates/Template.cpp 2011-05-22 15:49:54.000000000 +0200 @@ -0,0 +1,22 @@ +/*************************************************************************** +* This file is part of libmygpo-qt * +* Copyright (c) 2010 - 2011 Stefan Derkits <[email protected]> * +* Copyright (c) 2010 - 2011 Christian Wagner <[email protected]> * +* Copyright (c) 2010 - 2011 Felix Winter <[email protected]> * +* * +* This library is free software; you can redistribute it and/or * +* modify it under the terms of the GNU Lesser General Public * +* License as published by the Free Software Foundation; either * +* version 2.1 of the License, or (at your option) any later version. * +* * +* This library is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * +* Lesser General Public License for more details. * +* * +* You should have received a copy of the GNU Lesser General Public * +* License along with this library; if not, write to the Free Software * +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * +* USA * +***************************************************************************/ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmygpo-qt-1.0.3/templates/Template.h new/libmygpo-qt-1.0.4/templates/Template.h --- old/libmygpo-qt-1.0.3/templates/Template.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libmygpo-qt-1.0.4/templates/Template.h 2011-05-22 15:49:54.000000000 +0200 @@ -0,0 +1,26 @@ +/*************************************************************************** +* This file is part of libmygpo-qt * +* Copyright (c) 2010 - 2011 Stefan Derkits <[email protected]> * +* Copyright (c) 2010 - 2011 Christian Wagner <[email protected]> * +* Copyright (c) 2010 - 2011 Felix Winter <[email protected]> * +* * +* This library is free software; you can redistribute it and/or * +* modify it under the terms of the GNU Lesser General Public * +* License as published by the Free Software Foundation; either * +* version 2.1 of the License, or (at your option) any later version. * +* * +* This library is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * +* Lesser General Public License for more details. * +* * +* You should have received a copy of the GNU Lesser General Public * +* License along with this library; if not, write to the Free Software * +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * +* USA * +***************************************************************************/ + +#ifndef TEMPLATE_H +#define TEMPLATE_H + +#endif // TEMPLATE_H \ No newline at end of file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
