File tree Expand file tree Collapse file tree 2 files changed +26
-14
lines changed Expand file tree Collapse file tree 2 files changed +26
-14
lines changed Original file line number Diff line number Diff line change @@ -32,36 +32,28 @@ void IAdapter::createPDFThreadSafe()
32
32
33
33
void IAdapter::processColorIDFolderThreadSafe (const QString &folderName)
34
34
{
35
- QString fileName_cutted (folderName);
36
- #ifdef WINDOWS
37
- fileName_cutted.remove (0 , 1 );
38
- #endif
39
35
if (thread () == QThread::currentThread ())
40
36
{
41
- processColorIDFolder (fileName_cutted );
37
+ processColorIDFolder (folderName );
42
38
}
43
39
else
44
40
{
45
41
QMetaObject::invokeMethod (this , " processColorIDFolder" , Qt::QueuedConnection,
46
- Q_ARG (QString, fileName_cutted ));
42
+ Q_ARG (QString, folderName ));
47
43
}
48
44
}
49
45
50
46
void IAdapter::processColorIDThreadSafe (const QString &fileName)
51
47
{
52
- QString fileName_cutted (fileName);
53
- #ifdef WINDOWS
54
- fileName_cutted.remove (0 , 1 );
55
- #endif
56
48
if (thread () == QThread::currentThread ())
57
49
{
58
50
59
- processColorID (fileName_cutted );
51
+ processColorID (fileName );
60
52
}
61
53
else
62
54
{
63
55
QMetaObject::invokeMethod (this , " processColorID" , Qt::QueuedConnection,
64
- Q_ARG (QString, fileName_cutted ));
56
+ Q_ARG (QString, fileName ));
65
57
}
66
58
}
67
59
Original file line number Diff line number Diff line change @@ -23,11 +23,31 @@ void QMLAdapter::setChooseMeControlEnabled(const bool &chooseMeControlEnabled)
23
23
24
24
QString QMLAdapter::folderName (){return _folderName;}
25
25
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
+ }
27
37
28
38
QString QMLAdapter::fileName (){return _fileName;}
29
39
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
+ }
31
51
32
52
void QMLAdapter::loadSettings ()
33
53
{
You can’t perform that action at this time.
0 commit comments