feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Get rid of MSVC compiler warning.

Browse Source
This commit is contained in:
ck
2010-01-12 14:58:48 +01:00
parent 58f8f7b725
commit 1b1b76ee70
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qt4projectmanager/qt-maemo/maemosshconnection.cpp
View File

@@ -159,16 +159,25 @@ MaemoSftpConnection::~MaemoSftpConnection()
} }
class FileManager
{
public:
FileManager(const QString &filePath)
: m_file(fopen(filePath.toLatin1().data(), "rb")) {}
~FileManager() { if (m_file) fclose(m_file); }
FILE *file() const { return m_file; }
private:
FILE * const m_file;
};
void MaemoSftpConnection::transferFiles(const QList<SshDeploySpec> &deploySpecs) void MaemoSftpConnection::transferFiles(const QList<SshDeploySpec> &deploySpecs)
{ {
for (int i = 0; i < deploySpecs.count(); ++i) { for (int i = 0; i < deploySpecs.count(); ++i) {
const SshDeploySpec &deploySpec = deploySpecs.at(i); const SshDeploySpec &deploySpec = deploySpecs.at(i);
const QString &curSrcFile = deploySpec.srcFilePath(); const QString &curSrcFile = deploySpec.srcFilePath();
QSharedPointer<FILE> filePtr(fopen(curSrcFile.toLatin1().data(), "rb"), FileManager fileMgr(curSrcFile);
&std::fclose); if (!fileMgr.file())
if (filePtr.isNull())
throw MaemoSshException(tr("Could not open file '%1'").arg(curSrcFile)); throw MaemoSshException(tr("Could not open file '%1'").arg(curSrcFile));
const QString &curTgtFile = deploySpec.tgtFilePath(); const QString &curTgtFile = deploySpec.tgtFilePath();
// TODO: Is the mkdir() method recursive? If not, we have to // TODO: Is the mkdir() method recursive? If not, we have to
@@ -180,7 +189,7 @@ void MaemoSftpConnection::transferFiles(const QList<SshDeploySpec> &deploySpecs)
qDebug("Deploying file %s to %s.", qPrintable(curSrcFile), qPrintable(curTgtFile)); qDebug("Deploying file %s to %s.", qPrintable(curSrcFile), qPrintable(curTgtFile));
if (!sftp->put(filePtr.data(), curTgtFile.toLatin1().data())) { if (!sftp->put(fileMgr.file(), curTgtFile.toLatin1().data())) {
const QString &error = tr("Could not copy local file '%1' " const QString &error = tr("Could not copy local file '%1' "
"to remote file '%2': %3").arg(curSrcFile, curTgtFile) "to remote file '%2': %3").arg(curSrcFile, curTgtFile)
.arg(lastError()); .arg(lastError());