[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam/development/6.0.0] utilities/imageeditor/editor: polish
From:       Maik Qualmann <null () kde ! org>
Date:       2018-01-14 6:31:51
Message-ID: E1eabpf-0000f2-RB () code ! kde ! org
[Download RAW message or body]

Git commit 143fce60d0f56e20ceb338d0fbd5443b644a66f9 by Maik Qualmann.
Committed on 14/01/2018 at 06:31.
Pushed by mqualmann into branch 'development/6.0.0'.

polish

M  +12   -4    utilities/imageeditor/editor/editorwindow.cpp

https://commits.kde.org/digikam/143fce60d0f56e20ceb338d0fbd5443b644a66f9

diff --git a/utilities/imageeditor/editor/editorwindow.cpp \
b/utilities/imageeditor/editor/editorwindow.cpp index 0d6554e19f..fda71bc5de 100644
--- a/utilities/imageeditor/editor/editorwindow.cpp
+++ b/utilities/imageeditor/editor/editorwindow.cpp
@@ -2551,7 +2551,9 @@ VersionFileOperation \
                EditorWindow::saveVersionFileOperation(const QUrl& url, boo
     DImageHistory resolvedHistory = \
m_canvas->interface()->getResolvedInitialHistory();  DImageHistory history = \
m_canvas->interface()->getImageHistory();  
-    VersionFileInfo \
currentName(url.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).toLocalFile(), \
url.fileName(), m_canvas->currentImageFileFormat()); +    VersionFileInfo \
currentName(url.adjusted(QUrl::RemoveFilename | \
QUrl::StripTrailingSlash).toLocalFile(), +                                \
url.fileName(), m_canvas->currentImageFileFormat()); +
     return versionManager()->operation(fork ? VersionManager::NewVersionName : \
                VersionManager::CurrentVersionName,
                                        currentName, resolvedHistory, history);
 }
@@ -2561,8 +2563,12 @@ VersionFileOperation \
                EditorWindow::saveAsVersionFileOperation(const QUrl& url, c
     DImageHistory resolvedHistory = \
                m_canvas->interface()->getResolvedInitialHistory();
     DImageHistory history         = m_canvas->interface()->getImageHistory();
 
-    VersionFileInfo \
currentName(url.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).toLocalFile(), \
                url.fileName(), m_canvas->currentImageFileFormat());
-    VersionFileInfo \
saveLocation(saveUrl.adjusted(QUrl::RemoveFilename).toLocalFile(), \
saveUrl.fileName(), format); +    VersionFileInfo \
currentName(url.adjusted(QUrl::RemoveFilename | \
QUrl::StripTrailingSlash).toLocalFile(), +                                \
url.fileName(), m_canvas->currentImageFileFormat()); +
+    VersionFileInfo \
saveLocation(saveUrl.adjusted(QUrl::RemoveFilename).toLocalFile(), +                  \
saveUrl.fileName(), format); +
     return versionManager()->operationNewVersionAs(currentName, saveLocation, \
resolvedHistory, history);  }
 
@@ -2571,7 +2577,9 @@ VersionFileOperation \
                EditorWindow::saveInFormatVersionFileOperation(const QUrl&
     DImageHistory resolvedHistory = \
                m_canvas->interface()->getResolvedInitialHistory();
     DImageHistory history         = m_canvas->interface()->getImageHistory();
 
-    VersionFileInfo \
currentName(url.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).toLocalFile(), \
url.fileName(), m_canvas->currentImageFileFormat()); +    VersionFileInfo \
currentName(url.adjusted(QUrl::RemoveFilename | \
QUrl::StripTrailingSlash).toLocalFile(), +                                \
url.fileName(), m_canvas->currentImageFileFormat()); +
     return versionManager()->operationNewVersionInFormat(currentName, format, \
resolvedHistory, history);  }
 


[prev in list] [next in list] [prev in thread] [next in thread]