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

CPaster: Avoid some FilePathAspect::value() uses

Browse Source 
Get in the way of splitting FilePathAspect from StringAspect.

Change-Id: Ie2e55847a9242fa4042f37597321b8d77df7e8ad
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-06-29 15:28:50 +02:00
parent 7e5f7a0e3f
commit 5e86d20fae
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cpaster/fileshareprotocol.cpp
View File

@@ -100,7 +100,7 @@ static bool parse(const QString &fileName,
bool FileShareProtocol::checkConfiguration(QString *errorMessage) bool FileShareProtocol::checkConfiguration(QString *errorMessage)
{ {
if (m_settings.path.value().isEmpty()) { if (m_settings.path().isEmpty()) {
if (errorMessage) if (errorMessage)
*errorMessage = Tr::tr("Please configure a path."); *errorMessage = Tr::tr("Please configure a path.");
return false; return false;
@@ -113,7 +113,7 @@ void FileShareProtocol::fetch(const QString &id)
// Absolute or relative path name. // Absolute or relative path name.
QFileInfo fi(id); QFileInfo fi(id);
if (fi.isRelative()) if (fi.isRelative())
fi = QFileInfo(m_settings.path.value() + '/' + id); fi = m_settings.path().pathAppended(id).toFileInfo();
QString errorMessage; QString errorMessage;
QString text; QString text;
if (parse(fi.absoluteFilePath(), &errorMessage, nullptr, nullptr, &text)) if (parse(fi.absoluteFilePath(), &errorMessage, nullptr, nullptr, &text))
@@ -125,7 +125,7 @@ void FileShareProtocol::fetch(const QString &id)
void FileShareProtocol::list() void FileShareProtocol::list()
{ {
// Read out directory, display by date (latest first) // Read out directory, display by date (latest first)
QDir dir(m_settings.path.value(), tempGlobPatternC, QDir dir(m_settings.path().toFSPathString(), tempGlobPatternC,
QDir::Time, QDir::Files|QDir::NoDotAndDotDot|QDir::Readable); QDir::Time, QDir::Files|QDir::NoDotAndDotDot|QDir::Readable);
QStringList entries; QStringList entries;
QString user; QString user;
@@ -160,7 +160,7 @@ void FileShareProtocol::paste(
) )
{ {
// Write out temp XML file // Write out temp XML file
Utils::TempFileSaver saver(m_settings.path.value() + '/' + tempPatternC); Utils::TempFileSaver saver(m_settings.path().pathAppended(tempPatternC).toFSPathString());
saver.setAutoRemove(false); saver.setAutoRemove(false);
if (!saver.hasError()) { if (!saver.hasError()) {
// Flat text sections embedded into pasterElement // Flat text sections embedded into pasterElement