mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-02 23:25:53 +08:00
During #475 found issue with deleter
* changed / improved deleter * formatting in related class soundgenerator
This commit is contained in:
committed by
Mathew Sutcliffe
parent
84b06c51d9
commit
68d0b8cc98
@@ -7,28 +7,57 @@
|
||||
* contained in the LICENSE file.
|
||||
*/
|
||||
|
||||
#include <QFile>
|
||||
#include "filedeleter.h"
|
||||
#include <QFile>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
void CFileDeleter::addFile(const QString &file)
|
||||
void CFileDeleter::addFileForDeletion(const QString &file)
|
||||
{
|
||||
if (file.isEmpty()) return;
|
||||
if (file.isEmpty()) { return; }
|
||||
if (!this->m_fileNames.contains(file)) this->m_fileNames.append(file);
|
||||
}
|
||||
|
||||
void CFileDeleter::addFileForDeletion(const QString &file)
|
||||
void CFileDeleter::addFilesForDeletion(const QStringList &files)
|
||||
{
|
||||
CFileDeleter::fileDeleter().addFile(file);
|
||||
if (files.isEmpty()) { return; }
|
||||
this->m_fileNames.append(files);
|
||||
}
|
||||
|
||||
CFileDeleter::~CFileDeleter()
|
||||
{
|
||||
foreach(const QString fn, this->m_fileNames)
|
||||
this->deleteFiles();
|
||||
}
|
||||
|
||||
void CFileDeleter::deleteFiles()
|
||||
{
|
||||
const QStringList files(m_fileNames);
|
||||
m_fileNames.clear();
|
||||
|
||||
for (const QString &fn : files)
|
||||
{
|
||||
if (fn.isEmpty()) { continue; }
|
||||
QFile f(fn);
|
||||
f.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CTimedFileDeleter::CTimedFileDeleter(const QString &file, int deleteAfterMs, QObject *parent) :
|
||||
QObject(parent)
|
||||
{
|
||||
Q_ASSERT_X(!file.isEmpty(), Q_FUNC_INFO, "No file name");
|
||||
if (deleteAfterMs < 100) { deleteAfterMs = 100; } // makes sure timer is started properly
|
||||
this->m_fileDeleter.addFileForDeletion(file);
|
||||
m_timerId = startTimer(deleteAfterMs);
|
||||
}
|
||||
|
||||
void CTimedFileDeleter::timerEvent(QTimerEvent *event)
|
||||
{
|
||||
Q_UNUSED(event);
|
||||
if (m_timerId > 0) { this->killTimer(m_timerId); }
|
||||
m_timerId = -1;
|
||||
m_fileDeleter.deleteFiles();
|
||||
this->deleteLater();
|
||||
}
|
||||
|
||||
} // ns
|
||||
|
||||
Reference in New Issue
Block a user