From 423f26f669db865b41de3fdb10da79a639b254fd Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 13 Mar 2014 15:26:02 -0700 Subject: [PATCH] Review comments --- interface/src/Application.cpp | 2 +- libraries/shared/src/AccountManager.cpp | 1 - libraries/shared/src/FstReader.cpp | 8 +------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 0bc8b0f22d..aed212c692 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3462,7 +3462,7 @@ void Application::reloadAllScripts() { void Application::uploadFST() { FstReader reader; - if(reader.zip()) { + if (reader.zip()) { reader.send(); } } diff --git a/libraries/shared/src/AccountManager.cpp b/libraries/shared/src/AccountManager.cpp index 6517d080ed..bb32896ca0 100644 --- a/libraries/shared/src/AccountManager.cpp +++ b/libraries/shared/src/AccountManager.cpp @@ -31,7 +31,6 @@ Q_DECLARE_METATYPE(OAuthAccessToken) Q_DECLARE_METATYPE(DataServerAccountInfo) Q_DECLARE_METATYPE(QNetworkAccessManager::Operation) Q_DECLARE_METATYPE(JSONCallbackParameters) -Q_DECLARE_METATYPE(QHttpMultiPart) const QString ACCOUNTS_GROUP = "accounts"; diff --git a/libraries/shared/src/FstReader.cpp b/libraries/shared/src/FstReader.cpp index 0e99a7b2f4..d82ddf68a3 100644 --- a/libraries/shared/src/FstReader.cpp +++ b/libraries/shared/src/FstReader.cpp @@ -38,9 +38,7 @@ FstReader::FstReader() : } FstReader::~FstReader() { - if (_dataMultiPart) { - delete _dataMultiPart; - } + delete _dataMultiPart; } bool FstReader::zip() { @@ -87,7 +85,6 @@ bool FstReader::zip() { QHttpPart textPart; textPart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data;" " name=\"model_name\""); - //textPart.setRawHeader("name", "\"model_name\""); textPart.setBody(line[1].toUtf8()); _dataMultiPart->append(textPart); } else if (line.first() == FILENAME_FIELD) { @@ -141,7 +138,6 @@ bool FstReader::send() { AccountManager::getInstance().authenticatedRequest(MODEL_URL, QNetworkAccessManager::PostOperation, JSONCallbackParameters(), QByteArray(), _dataMultiPart); - _dataMultiPart = NULL; return true; } @@ -213,8 +209,6 @@ bool FstReader::addPart(const QString &path, const QString& name) { _dataMultiPart->append(part); file->setParent(_dataMultiPart); - qDebug() << QFileInfo(*file).fileName().toUtf8(); - return true; }