Skip to content

Commit 69d6495

Browse files
dev: correct folder and file names in QMLAdapter
1 parent 6229ca6 commit 69d6495

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

src/IAdapter.cpp

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,36 +32,28 @@ void IAdapter::createPDFThreadSafe()
3232

3333
void IAdapter::processColorIDFolderThreadSafe(const QString &folderName)
3434
{
35-
QString fileName_cutted(folderName);
36-
#ifdef WINDOWS
37-
fileName_cutted.remove(0, 1);
38-
#endif
3935
if (thread() == QThread::currentThread())
4036
{
41-
processColorIDFolder(fileName_cutted);
37+
processColorIDFolder(folderName);
4238
}
4339
else
4440
{
4541
QMetaObject::invokeMethod(this, "processColorIDFolder", Qt::QueuedConnection,
46-
Q_ARG(QString, fileName_cutted));
42+
Q_ARG(QString, folderName));
4743
}
4844
}
4945

5046
void IAdapter::processColorIDThreadSafe(const QString &fileName)
5147
{
52-
QString fileName_cutted(fileName);
53-
#ifdef WINDOWS
54-
fileName_cutted.remove(0, 1);
55-
#endif
5648
if (thread() == QThread::currentThread())
5749
{
5850

59-
processColorID(fileName_cutted);
51+
processColorID(fileName);
6052
}
6153
else
6254
{
6355
QMetaObject::invokeMethod(this, "processColorID", Qt::QueuedConnection,
64-
Q_ARG(QString, fileName_cutted));
56+
Q_ARG(QString, fileName));
6557
}
6658
}
6759

src/QMLAdapter.cpp

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,31 @@ void QMLAdapter::setChooseMeControlEnabled(const bool &chooseMeControlEnabled)
2323

2424
QString QMLAdapter::folderName(){return _folderName;}
2525

26-
void QMLAdapter::setFolderName(const QString &urlFolderName){auto folderName = QUrl(urlFolderName).path(); if (_folderName == folderName) return; _folderName = folderName; _settings->setValue("folderName", _folderName); emit folderNameChanged(_folderName);}
26+
void QMLAdapter::setFolderName(const QString &urlFolderName)
27+
{
28+
auto folderName = QUrl(urlFolderName).path();
29+
#ifdef WINDOWS
30+
folderName.remove(0, 1);
31+
#endif
32+
if (_folderName == folderName) return;
33+
_folderName = folderName;
34+
_settings->setValue("folderName", _folderName);
35+
emit folderNameChanged(_folderName);
36+
}
2737

2838
QString QMLAdapter::fileName(){return _fileName;}
2939

30-
void QMLAdapter::setFileName(const QString &urlFileName){auto fileName = QUrl(urlFileName).path(); if (_fileName == fileName) return; _fileName = fileName; _settings->setValue("fileName", _fileName); emit fileNameChanged(_fileName);}
40+
void QMLAdapter::setFileName(const QString &urlFileName)
41+
{
42+
auto fileName = QUrl(urlFileName).path();
43+
#ifdef WINDOWS
44+
fileName.remove(0, 1);
45+
#endif
46+
if (_fileName == fileName) return;
47+
_fileName = fileName;
48+
_settings->setValue("fileName", _fileName);
49+
emit fileNameChanged(_fileName);
50+
}
3151

3252
void QMLAdapter::loadSettings()
3353
{

0 commit comments

Comments
 (0)