atticabasejob.h   atticabasejob.h 
skipping to change at line 30 skipping to change at line 30
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
*/ */
#ifndef ATTICA_ATTICABASEJOB_H #ifndef ATTICA_ATTICABASEJOB_H
#define ATTICA_ATTICABASEJOB_H #define ATTICA_ATTICABASEJOB_H
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
#include <QtCore/QUrl> #include <QtCore/QUrl>
#include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkRequest>
#include "atticaclient_export.h" #include "atticaclient_export.h"
#include "metadata.h" #include "metadata.h"
class QNetworkReply; class QNetworkReply;
namespace Attica { namespace Attica {
class PlatformDependent; class PlatformDependent;
class ATTICA_EXPORT BaseJob : public QObject class ATTICA_EXPORT BaseJob : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
virtual ~BaseJob(); virtual ~BaseJob();
Metadata metadata() const; Metadata metadata() const;
enum NetworkRequestCustomAttributes {
UserAttribute = QNetworkRequest::User + 1,
PasswordAttribute
};
public Q_SLOTS: public Q_SLOTS:
void start(); void start();
void abort(); void abort();
Q_SIGNALS: Q_SIGNALS:
void finished(Attica::BaseJob* job); void finished(Attica::BaseJob* job);
protected Q_SLOTS: protected Q_SLOTS:
void dataFinished(); void dataFinished();
skipping to change at line 71 skipping to change at line 77
void setMetadata(const Metadata& data) const; void setMetadata(const Metadata& data) const;
virtual QNetworkReply* executeRequest() = 0; virtual QNetworkReply* executeRequest() = 0;
virtual void parse(const QString& xml) = 0; virtual void parse(const QString& xml) = 0;
PlatformDependent* internals(); PlatformDependent* internals();
void setError(int errorCode); void setError(int errorCode);
void setErrorString(const QString& errorString); void setErrorString(const QString& errorString);
private Q_SLOTS: private Q_SLOTS:
void doWork(); void doWork();
void authenticationRequired(QNetworkReply*, QAuthenticator*);
private: private:
BaseJob(const BaseJob& other); BaseJob(const BaseJob& other);
BaseJob& operator=(const BaseJob& other); BaseJob& operator=(const BaseJob& other);
class Private; class Private;
Private* d; Private* d;
}; };
} }
 End of changes. 3 change blocks. 
0 lines changed or deleted 7 lines changed or added


 provider.h   provider.h 
skipping to change at line 661 skipping to change at line 661
// Fan part of OCS // Fan part of OCS
PostJob* becomeFan(const QString& contentId); PostJob* becomeFan(const QString& contentId);
ListJob<Person>* requestFans(const QString& contentId, uint page = 0, u int pageSize = 10); ListJob<Person>* requestFans(const QString& contentId, uint page = 0, u int pageSize = 10);
// Forum part of OCS // Forum part of OCS
ListJob<Forum>* requestForums(uint page = 0, uint pageSize = 10); ListJob<Forum>* requestForums(uint page = 0, uint pageSize = 10);
ListJob<Topic>* requestTopics(const QString& forum, const QString& sear ch, const QString& description, SortMode mode, int page, int pageSize); ListJob<Topic>* requestTopics(const QString& forum, const QString& sear ch, const QString& description, SortMode mode, int page, int pageSize);
PostJob* postTopic(const QString& forumId, const QString& subject, cons t QString& content); PostJob* postTopic(const QString& forumId, const QString& subject, cons t QString& content);
const QString& getRegisterAccountUrl() const;
protected: protected:
QUrl createUrl(const QString& path); QUrl createUrl(const QString& path);
QNetworkRequest createRequest(const QUrl& url); QNetworkRequest createRequest(const QUrl& url);
// Convenience overload // Convenience overload
QNetworkRequest createRequest(const QString& path); QNetworkRequest createRequest(const QString& path);
ItemJob<Person>* doRequestPerson(const QUrl& url); ItemJob<Person>* doRequestPerson(const QUrl& url);
ItemJob<AccountBalance>* doRequestAccountBalance(const QUrl& url); ItemJob<AccountBalance>* doRequestAccountBalance(const QUrl& url);
ListJob<Person>* doRequestPersonList(const QUrl& url); ListJob<Person>* doRequestPersonList(const QUrl& url);
ListJob<Achievement>* doRequestAchievementList(const QUrl& url); ListJob<Achievement>* doRequestAchievementList(const QUrl& url);
skipping to change at line 686 skipping to change at line 688
private: private:
class Private; class Private;
QExplicitlySharedDataPointer<Private> d; QExplicitlySharedDataPointer<Private> d;
Provider(PlatformDependent* internals, const QUrl& baseUrl, const QStri ng& name, const QUrl& icon = QUrl()); Provider(PlatformDependent* internals, const QUrl& baseUrl, const QStri ng& name, const QUrl& icon = QUrl());
Provider(PlatformDependent* internals, const QUrl& baseUrl, const QStri ng& name, const QUrl& icon, Provider(PlatformDependent* internals, const QUrl& baseUrl, const QStri ng& name, const QUrl& icon,
const QString& person, const QString& friendV, const QString& message, const QString& achievements, const QString& person, const QString& friendV, const QString& message, const QString& achievements,
const QString& activity, const QString& content, const QString & fan, const QString& forum, const QString& activity, const QString& content, const QString & fan, const QString& forum,
const QString& knowledgebase, const QString& event, const QStr ing& comment); const QString& knowledgebase, const QString& event, const QStr ing& comment);
// kde-SC5: merge with the constructor above (i.e. remove the above one
)
Provider(PlatformDependent* internals, const QUrl& baseUrl, const QStri
ng& name, const QUrl& icon,
const QString& person, const QString& friendV, const QString&
message, const QString& achievements,
const QString& activity, const QString& content, const QString
& fan, const QString& forum,
const QString& knowledgebase, const QString& event, const QStr
ing& comment, const QString& registerUrl);
friend class ProviderManager; friend class ProviderManager;
}; };
} }
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 12 lines changed or added


 version.h   version.h 
skipping to change at line 27 skipping to change at line 27
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef _ATTICA_VERSION_H_ #ifndef _ATTICA_VERSION_H_
#define _ATTICA_VERSION_H_ #define _ATTICA_VERSION_H_
#include "atticaclient_export.h" #include "atticaclient_export.h"
/// @brief Attica version as string at compile time. /// @brief Attica version as string at compile time.
#define LIBATTICA_VERSION_STRING "0.4.1" #define LIBATTICA_VERSION_STRING "0.4.2"
/// @brief The major Attica version number at compile time /// @brief The major Attica version number at compile time
#define LIBATTICA_VERSION_MAJOR 0 #define LIBATTICA_VERSION_MAJOR 0
/// @brief The minor Attica version number at compile time /// @brief The minor Attica version number at compile time
#define LIBATTICA_VERSION_MINOR 4 #define LIBATTICA_VERSION_MINOR 4
/// @brief The Attica release version number at compile time /// @brief The Attica release version number at compile time
#define LIBATTICA_VERSION_RELEASE #define LIBATTICA_VERSION_RELEASE 2
/** /**
* \brief Create a unique number from the major, minor and release number o f a %Attica version * \brief Create a unique number from the major, minor and release number o f a %Attica version
* *
* This function can be used for preprocessing. For version information at runtime * This function can be used for preprocessing. For version information at runtime
* use the version methods in the Attica namespace. * use the version methods in the Attica namespace.
*/ */
#define LIBATTICA_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define LIBATTICA_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
/** /**
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/