mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix rebase of branch

Browse source
This commit is contained in:
Roeland Jago Douma 2014-12-19 16:56:17 +01:00
parent bd7f45e398
commit b7d4c997a3
5 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/sharedialog.cpp
View file

@ -5,14 +5,13 @@
#include "json.h"
#include "folderman.h"
#include <QBuffer>
#include <QUrlQuery>
#include <QMovie>
namespace {
int SHARETYPE_PUBLIC = 3;
}
namespace Mirall {
namespace OCC {
ShareDialog::ShareDialog(QWidget *parent) :
QDialog(parent),
@ -278,7 +277,18 @@ void OcsShareJob::start()
req.setRawHeader("Content-Type", "application/x-www-form-urlencoded");
qDebug() << ">>>>>>>>" << _url;
QBuffer *buffer = new QBuffer;
buffer->setData(_postData.query().toAscii());
//buffer->setData(_postData.query().toAscii());
QString tmp;
auto tmp2 = _postData.queryItems();
for (int i = 0; i < tmp2.size(); i++) {
if (i != 0) {
tmp.append("=");
}
tmp.append(tmp2[i].first + "=" + tmp2[i].second);
}
buffer->setData(tmp.toAscii());
setReply(davRequest(_verb, _url, req, buffer));
//setReply(davRequest("GET", url, req));
setupConnections(reply());

2
src/gui/sharedialog.h
View file

@ -4,7 +4,7 @@
#include "networkjobs.h"
#include <QDialog>
namespace Mirall {
namespace OCC {
class OcsShareJob : public AbstractNetworkJob {
Q_OBJECT

4
src/gui/sharedialog.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Mirall::ShareDialog</class>
<widget class="QDialog" name="Mirall::ShareDialog">
<class>OCC::ShareDialog</class>
<widget class="QDialog" name="OCC::ShareDialog">
<property name="geometry">
<rect>
<x>0</x>

2
src/gui/socketapi.cpp
View file

@ -402,7 +402,7 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, SocketType
sendMessage(socket, message);
}
void SocketApi::command_SHARE(const QString& argument, QTcpSocket* socket)
void SocketApi::command_SHARE(const QString& argument, SocketType* socket)
{
sendMessage(socket, QString("Openening sharing dialog >").append(argument));
QString folderForPath = FolderMan::instance()->folderForPath(argument)->path();

2
src/gui/socketapi.h
View file

@ -78,7 +78,7 @@ private:
Q_INVOKABLE void command_RETRIEVE_FOLDER_STATUS(const QString& argument, SocketType* socket);
Q_INVOKABLE void command_RETRIEVE_FILE_STATUS(const QString& argument, SocketType* socket);
Q_INVOKABLE void command_SHARE(const QString& argument, QTcpSocket* socket);
Q_INVOKABLE void command_SHARE(const QString& argument, SocketType* socket);
Q_INVOKABLE void command_VERSION(const QString& argument, SocketType* socket);