diff --git a/3rdparty/o2/src/o1requestor.cpp b/3rdparty/o2/src/o1requestor.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..196eb1a9b8e3245c04c47819c6528f56b7ad516a
--- /dev/null
+++ b/3rdparty/o2/src/o1requestor.cpp
@@ -0,0 +1,78 @@
+#include <QDebug>
+#include <QTimer>
+#include <QDateTime>
+#include <QNetworkReply>
+#include <QNetworkAccessManager>
+
+#include "o1requestor.h"
+#include "o2globals.h"
+
+/// A timer connected to a network reply.
+class TimedReply: public QTimer {
+    Q_OBJECT
+
+public:
+    explicit TimedReply(QNetworkReply *parent): QTimer(parent) {
+        setSingleShot(true);
+        setInterval(60 * 1000); // FIXME: Expose me
+        connect(this, SIGNAL(error(QNetworkReply::NetworkError)), parent, SIGNAL(error(QNetworkReply::NetworkError)));
+        connect(this, SIGNAL(timeout()), this, SLOT(onTimeout()));
+    }
+
+signals:
+    void error(QNetworkReply::NetworkError);
+
+public slots:
+    void onTimeout() {emit error(QNetworkReply::TimeoutError);}
+};
+
+O1Requestor::O1Requestor(QNetworkAccessManager *manager, O1 *authenticator, QObject *parent): QObject(parent) {
+    manager_ = manager;
+    authenticator_ = authenticator;
+}
+
+QNetworkReply *O1Requestor::get(const QNetworkRequest &req, const QList<O1RequestParameter> &signingParameters) {
+    QNetworkRequest request = setup(req, signingParameters, QNetworkAccessManager::GetOperation);
+    return addTimer(manager_->get(request));
+}
+
+QNetworkReply *O1Requestor::post(const QNetworkRequest &req, const QList<O1RequestParameter> &signingParameters, const QByteArray &data) {
+    QNetworkRequest request = setup(req, signingParameters, QNetworkAccessManager::PostOperation);
+    return addTimer(manager_->post(request, data));
+}
+
+QNetworkReply *O1Requestor::post(const QNetworkRequest &req, const QList<O1RequestParameter> &signingParameters, QHttpMultiPart * multiPart) {
+    QNetworkRequest request = setup(req, signingParameters, QNetworkAccessManager::PostOperation);
+    return addTimer(manager_->post(request, multiPart));
+}
+
+QNetworkReply *O1Requestor::put(const QNetworkRequest &req, const QList<O1RequestParameter> &signingParameters, const QByteArray &data) {
+    QNetworkRequest request = setup(req, signingParameters, QNetworkAccessManager::PutOperation);
+    return addTimer(manager_->put(request, data));
+}
+
+QNetworkReply *O1Requestor::addTimer(QNetworkReply *reply) {
+    (void)new TimedReply(reply);
+    return reply;
+}
+
+QNetworkRequest O1Requestor::setup(const QNetworkRequest &req, const QList<O1RequestParameter> &signingParameters, QNetworkAccessManager::Operation operation) {
+    // Collect OAuth parameters
+    QList<O1RequestParameter> oauthParams;
+    oauthParams.append(O1RequestParameter(O2_OAUTH_CONSUMER_KEY, authenticator_->clientId().toLatin1()));
+    oauthParams.append(O1RequestParameter(O2_OAUTH_VERSION, "1.0"));
+    oauthParams.append(O1RequestParameter(O2_OAUTH_TOKEN, authenticator_->token().toLatin1()));
+    oauthParams.append(O1RequestParameter(O2_OAUTH_SIGNATURE_METHOD, authenticator_->signatureMethod().toLatin1()));
+    oauthParams.append(O1RequestParameter(O2_OAUTH_NONCE, O1::nonce()));
+    oauthParams.append(O1RequestParameter(O2_OAUTH_TIMESTAMP, QString::number(QDateTime::currentDateTimeUtc().toTime_t()).toLatin1()));
+
+    // Add signature parameter
+    oauthParams.append(O1RequestParameter(O2_OAUTH_SIGNATURE, authenticator_->generateSignature(oauthParams, req, signingParameters, operation)));
+
+    // Return a copy of the original request with authorization header set
+    QNetworkRequest request(req);
+    request.setRawHeader(O2_HTTP_AUTHORIZATION_HEADER, O1::buildAuthorizationHeader(oauthParams));
+    return request;
+}
+
+#include "o1requestor.moc"