NetworkAccessManager.h   NetworkAccessManager.h 
skipping to change at line 37 skipping to change at line 37
class QNetworkReply; class QNetworkReply;
namespace lastfm { namespace lastfm {
/** Sets useragent and proxy. Auto detecting the proxy where possible. */ /** Sets useragent and proxy. Auto detecting the proxy where possible. */
class LASTFM_DLLEXPORT NetworkAccessManager : public QNetworkAccessManager class LASTFM_DLLEXPORT NetworkAccessManager : public QNetworkAccessManager
{ {
Q_OBJECT Q_OBJECT
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
class InternetConnectionMonitor* m_monitor; class InternetConnectionMonitor* m_monitor;
#endif #endif
public: public:
NetworkAccessManager( QObject *parent = 0 ); NetworkAccessManager( QObject *parent = 0 );
~NetworkAccessManager(); ~NetworkAccessManager();
void setUserProxy( const QNetworkProxy& proxy ); void setUserProxy( const QNetworkProxy& proxy );
/** PAC allows different proxy configurations depending on the request /** PAC allows different proxy configurations depending on the request
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Track.h   Track.h 
skipping to change at line 120 skipping to change at line 120
ExceededMaxDailyScrobbles = 118, ExceededMaxDailyScrobbles = 118,
InvalidStreamAuth = 119, InvalidStreamAuth = 119,
Invalid = 300 Invalid = 300
}; };
Track(); Track();
explicit Track( const QDomElement& ); explicit Track( const QDomElement& );
Track( const Track& that ); Track( const Track& that );
~Track(); ~Track();
Track clone() const;
/** this track and that track point to the same object, so they are the same /** this track and that track point to the same object, so they are the same
* in fact. This doesn't do a deep data comparison. So even if all the * in fact. This doesn't do a deep data comparison. So even if all the
* fields are the same it will return false if they aren't in fact spa wned * fields are the same it will return false if they aren't in fact spa wned
* from the same initial Track object */ * from the same initial Track object */
bool sameObject( const Track& that ); bool sameObject( const Track& that );
bool operator==( const Track& that ) const; bool operator==( const Track& that ) const;
bool operator!=( const Track& that ) const; bool operator!=( const Track& that ) const;
Track& operator=( const Track& that ); Track& operator=( const Track& that );
/** /**
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 global.h   global.h 
skipping to change at line 24 skipping to change at line 24
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with liblastfm. If not, see <http://www.gnu.org/licenses/>. along with liblastfm. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LASTFM_GLOBAL_H #ifndef LASTFM_GLOBAL_H
#define LASTFM_GLOBAL_H #define LASTFM_GLOBAL_H
#define LASTFM_VERSION 0x00010006 #define LASTFM_VERSION 0x00010007
#define LASTFM_VERSION_STRING "1.0.6" #define LASTFM_VERSION_STRING "1.0.8"
#define LASTFM_MAJOR_VERSION 1 #define LASTFM_MAJOR_VERSION 1
#define LASTFM_MINOR_VERSION 0 #define LASTFM_MINOR_VERSION 0
#define LASTFM_PATCH_VERSION 6 #define LASTFM_PATCH_VERSION 8
#ifndef LASTFM_LIB_STATIC #ifndef LASTFM_LIB_STATIC
#ifdef LASTFM_LIB #ifdef LASTFM_LIB
#define LASTFM_DLLEXPORT Q_DECL_EXPORT #define LASTFM_DLLEXPORT Q_DECL_EXPORT
#else #else
#define LASTFM_DLLEXPORT Q_DECL_IMPORT #define LASTFM_DLLEXPORT Q_DECL_IMPORT
#endif #endif
#ifdef LASTFM_FINGERPRINT_LIB #ifdef LASTFM_FINGERPRINT_LIB
#define LASTFM_FINGERPRINT_DLLEXPORT Q_DECL_EXPORT #define LASTFM_FINGERPRINT_DLLEXPORT Q_DECL_EXPORT
#else #else
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 misc.h   misc.h 
skipping to change at line 26 skipping to change at line 26
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with liblastfm. If not, see <http://www.gnu.org/licenses/>. along with liblastfm. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LASTFM_MISC_H #ifndef LASTFM_MISC_H
#define LASTFM_MISC_H #define LASTFM_MISC_H
#include "global.h" #include "global.h"
#include <QDir> #include <QDir>
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
typedef const struct __CFString* CFStringRef; typedef const struct __CFString* CFStringRef;
#endif #endif
namespace lastfm namespace lastfm
{ {
namespace dir namespace dir
{ {
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
LASTFM_DLLEXPORT QDir programFiles(); LASTFM_DLLEXPORT QDir programFiles();
#endif #endif
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
LASTFM_DLLEXPORT QDir bundle(); LASTFM_DLLEXPORT QDir bundle();
#endif #endif
LASTFM_DLLEXPORT QDir runtimeData(); LASTFM_DLLEXPORT QDir runtimeData();
LASTFM_DLLEXPORT QDir cache(); LASTFM_DLLEXPORT QDir cache();
LASTFM_DLLEXPORT QDir logs(); LASTFM_DLLEXPORT QDir logs();
} }
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
LASTFM_DLLEXPORT QByteArray CFStringToUtf8( CFStringRef ); LASTFM_DLLEXPORT QByteArray CFStringToUtf8( CFStringRef );
LASTFM_DLLEXPORT CFStringRef QStringToCFString( const QString& ); LASTFM_DLLEXPORT CFStringRef QStringToCFString( const QString& );
LASTFM_DLLEXPORT QString CFStringToQString( CFStringRef s ); LASTFM_DLLEXPORT QString CFStringToQString( CFStringRef s );
#endif #endif
LASTFM_DLLEXPORT const char* platform(); LASTFM_DLLEXPORT const char* platform();
LASTFM_DLLEXPORT QString md5( const QByteArray& src ); LASTFM_DLLEXPORT QString md5( const QByteArray& src );
} }
#endif //LASTFM_MISC_H #endif //LASTFM_MISC_H
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/