mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-20 04:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename DocumentDiff -> DocDiff

Browse Source
This commit is contained in:
David Capello 2018-07-14 22:52:34 -03:00
parent 8d3da46ac9
commit cf8eee60b0
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/CMakeLists.txt
View File

@ -498,11 +498,11 @@ add_library(app-lib
context_flags.cpp
doc.cpp
doc_api.cpp
doc_diff.cpp
doc_range.cpp
doc_range_ops.cpp
doc_undo.cpp
docs.cpp
document_diff.cpp
document_exporter.cpp
extensions.cpp
extra_cel.cpp

4
src/app/crash/backup_observer.cpp
View File

@ -22,7 +22,7 @@
#include "app/crash/session.h"
#include "app/doc.h"
#include "app/doc_access.h"
#include "app/document_diff.h"
#include "app/doc_diff.h"
#include "app/pref/preferences.h"
#include "base/bind.h"
#include "base/chrono.h"
@ -131,7 +131,7 @@ void BackupObserver::backgroundThread()
DocReader reader(doc, 500);
std::unique_ptr<Doc> copy(
m_session->restoreBackupDocById(doc->id()));
DocumentDiff diff = compare_docs(doc, copy.get());
DocDiff diff = compare_docs(doc, copy.get());
if (diff.anything) {
TRACE("RECO: Differences (%s/%s/%s/%s/%s/%s/%s)\n",
diff.canvas ? "canvas": "",

8
src/app/document_diff.cpp → src/app/doc_diff.cpp
View File

@ -8,7 +8,7 @@
#include "config.h"
#endif
#include "app/document_diff.h"
#include "app/doc_diff.h"
#include "app/doc.h"
#include "doc/cel.h"
@ -21,10 +21,10 @@
namespace app {
DocumentDiff compare_docs(const Document* a,
const Document* b)
DocDiff compare_docs(const Doc* a,
const Doc* b)
{
DocumentDiff diff;
DocDiff diff;
// Don't compare filenames
//if (a->filename() != b->filename())...

12
src/app/document_diff.h → src/app/doc_diff.h
View File

@ -4,14 +4,14 @@
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
#ifndef APP_DOCUMENT_DIFF_H_INCLUDED
#define APP_DOCUMENT_DIFF_H_INCLUDED
#ifndef APP_DOC_DIFF_H_INCLUDED
#define APP_DOC_DIFF_H_INCLUDED
#pragma once
namespace app {
class Doc;
struct DocumentDiff {
struct DocDiff {
bool anything : 1;
bool canvas : 1;
bool totalFrames : 1;
@ -22,7 +22,7 @@ namespace app {
bool cels : 1;
bool images : 1;
DocumentDiff() :
DocDiff() :
anything(false),
canvas(false),
totalFrames(false),
@ -37,8 +37,8 @@ namespace app {
// Useful for testing purposes to detect if two documents (after
// some kind of operation) are equivalent.
DocumentDiff compare_docs(const Doc* a,
const Doc* b);
DocDiff compare_docs(const Doc* a,
const Doc* b);
} // namespace app