mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-30 21:24:14 +00:00
e30f3d76d2
This commit does a bulk fix of incorrect annotations (comments) at the end of namespaces. The commit was generated by initially running clang-format, and then from the diff of the result extracting the hunks corresponding to fixes of namespace comments. The changes being applied and all the results have been manually reviewed. The source code successfully builds on macOS. Further details on the steps below, in case they're of interest to someone else in the future. 1. Checkout a fresh and up to date version of src/ git pull && git checkout -- src && git status src 2. Ensure there's a suitable .clang-format in place, i.e. with options to fix the comment at the end of namespaces, including: FixNamespaceComments: true SpacesBeforeTrailingComments: 1 and that clang-format is >= 5.0.0, by doing e.g.: clang-format -dump-config | grep Comments: clang-format --version 3. Apply clang-format to the source: clang-format -i $(find src -name "*.cpp" -or -name "*.h") 4. Create and filter out hunks related to fixing the namespace git diff -U0 src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch 5. Filter out hunks corresponding to simple fixes into to a separate patch: pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \ -e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \ fix_namespace.patch > fix_namespace_simple.patch 6. Manually review the simple patch and then apply it, after first restoring the source. git checkout -- src patch -p1 < fix_namespace_simple.path 7. Manually review the (simple) changes and then stage the changes git diff src git add src 8. Again apply clang-format and filter out hunks related to any remaining fixes to the namespace, this time filter with more context. There will be fewer hunks as all the simple cases have already been handled: clang-format -i $(find src -name "*.cpp" -or -name "*.h") git diff src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch 9. Manually review/edit the resulting patch file to remove hunks for files which need to be dealt with manually, noting the file names and line numbers. Then restore files to as before applying clang-format and apply the patch: git checkout src patch -p1 < fix_namespace2.patch 10. Manually fix the files noted in the previous step. Stage files, review changes and commit.
155 lines
3.9 KiB
C++
155 lines
3.9 KiB
C++
// -*- C++ -*-
|
|
/**
|
|
* \file BufferList.h
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Lars Gullik Bjønnes
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#ifndef BUFFER_LIST_H
|
|
#define BUFFER_LIST_H
|
|
|
|
#include "support/docstring.h"
|
|
|
|
#include <vector>
|
|
|
|
|
|
namespace lyx {
|
|
|
|
class Author;
|
|
class Buffer;
|
|
class OutputParams;
|
|
|
|
namespace support {
|
|
class FileName;
|
|
class FileNameList;
|
|
} // namespace support
|
|
|
|
/**
|
|
* The class holds all all open buffers, and handles construction
|
|
* and deletions of new ones.
|
|
*/
|
|
class BufferList {
|
|
public:
|
|
typedef std::vector<Buffer *>::iterator iterator;
|
|
typedef std::vector<Buffer *>::const_iterator const_iterator;
|
|
|
|
public:
|
|
BufferList();
|
|
~BufferList();
|
|
|
|
iterator begin();
|
|
const_iterator begin() const;
|
|
|
|
iterator end();
|
|
const_iterator end() const;
|
|
|
|
/// create a new buffer and add it to the buffer list
|
|
/// \return 0 if the Buffer creation is not possible for whatever reason.
|
|
Buffer * newBuffer(std::string const & s);
|
|
|
|
/// create an internal buffer and add it to the internal buffer list
|
|
/// \return 0 if the Buffer creation is not possible for whatever reason.
|
|
Buffer * newInternalBuffer(std::string const & s);
|
|
|
|
/// Is child a child of some Buffer other than parent?
|
|
/// NOTE: child must be a child of parent, and both must be non-null.
|
|
/// Otherwise we assert.
|
|
bool isOthersChild(Buffer * parent, Buffer * child);
|
|
|
|
/// delete a buffer
|
|
void release(Buffer * b);
|
|
|
|
/// Close all open buffers.
|
|
void closeAll();
|
|
|
|
/// returns a vector with all the buffers filenames
|
|
support::FileNameList fileNames() const;
|
|
|
|
/// return true if no buffers loaded
|
|
bool empty() const;
|
|
|
|
/// return head of buffer list if any
|
|
Buffer * first();
|
|
|
|
/// return back of buffer list if any
|
|
Buffer * last();
|
|
|
|
/// returns true if the buffer exists already
|
|
bool exists(support::FileName const &) const;
|
|
|
|
/// returns true if the buffer is loaded
|
|
bool isLoaded(Buffer const * b) const;
|
|
|
|
/// \return index of named buffer in buffer list
|
|
int bufferNum(support::FileName const & name) const;
|
|
|
|
/** returns a pointer to the buffer with the given name
|
|
*
|
|
* \param internal
|
|
* If true, the buffer is searched also among internal buffers
|
|
*/
|
|
Buffer * getBuffer(support::FileName const & name, bool internal = false) const;
|
|
|
|
/// \return a pointer to the buffer with the given number
|
|
Buffer * getBuffer(unsigned int);
|
|
|
|
/// \return a pointer to the buffer whose temppath matches the given path
|
|
Buffer * getBufferFromTmp(std::string const & path);
|
|
|
|
/** returns a pointer to the buffer that follows argument in
|
|
* buffer list. The buffer following the last in list is the
|
|
* first one.
|
|
*/
|
|
Buffer * next(Buffer const *) const;
|
|
|
|
/** returns a pointer to the buffer that precedes argument in
|
|
* buffer list. The buffer preceding the first in list is the
|
|
* last one.
|
|
*/
|
|
Buffer * previous(Buffer const *) const;
|
|
|
|
/// \name Functions that just operate on all buffers
|
|
//@{
|
|
/// reset current author for all buffers
|
|
void recordCurrentAuthor(Author const & author);
|
|
/// update previews for all buffers, e.g. for Prefs update
|
|
void updatePreviews();
|
|
/// Call changed() on all buffers, internal or not
|
|
void changed(bool update_metrics) const;
|
|
/// emergency save for all buffers
|
|
void emergencyWriteAll();
|
|
/// FIXME
|
|
void updateIncludedTeXfiles(std::string const &, OutputParams const &);
|
|
///
|
|
void invalidateConverterCache() const;
|
|
//@}
|
|
|
|
private:
|
|
/// create a new buffer
|
|
/// \return 0 if the Buffer creation is not possible for whatever reason.
|
|
Buffer * createNewBuffer(std::string const & s);
|
|
|
|
/// noncopiable
|
|
BufferList(BufferList const &);
|
|
void operator=(BufferList const &);
|
|
|
|
typedef std::vector<Buffer *> BufferStorage;
|
|
|
|
/// storage of all buffers
|
|
BufferStorage bstore;
|
|
/// storage of all internal buffers used for cut&paste, etc.
|
|
BufferStorage binternal;
|
|
};
|
|
|
|
/// Implementation is in LyX.cpp
|
|
extern BufferList & theBufferList();
|
|
|
|
|
|
} // namespace lyx
|
|
|
|
#endif // BUFFERLIST_H
|