kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: Apply clang format (part 1)

Browse Source
This commit is contained in:
wmayer
2024-11-15 17:43:49 +01:00
committed by wwmayer
parent 463cc08f3f
commit 6f5259af26
124 changed files with 6733 additions and 4886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/App/MergeDocuments.cpp
View File

@@ -22,7 +22,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <stack>
#include <stack>
#endif
#include <QCoreApplication>
@@ -36,13 +36,17 @@
using namespace App;
namespace sp = std::placeholders;
namespace App {
namespace App
{
class XMLMergeReader : public Base::XMLReader
class XMLMergeReader: public Base::XMLReader
{
public:
XMLMergeReader(std::map<std::string, std::string>& name, const char* FileName, std::istream& str)
: Base::XMLReader(FileName, str), nameMap(name)
XMLMergeReader(std::map<std::string, std::string>& name,
const char* FileName,
std::istream& str)
: Base::XMLReader(FileName, str)
, nameMap(name)
{}
void addName(const char* s1, const char* s2) override
@@ -52,34 +56,35 @@ public:
const char* getName(const char* name) const override
{
std::map<std::string, std::string>::const_iterator it = nameMap.find(name);
if (it != nameMap.end())
if (it != nameMap.end()) {
return it->second.c_str();
else
}
else {
return name;
}
}
bool doNameMapping() const override
{
return true;
}
protected:
private:
std::map<std::string, std::string>& nameMap;
using PropertyTag = std::pair<std::string, std::string>;
std::stack<PropertyTag> propertyStack;
};
}
} // namespace App
MergeDocuments::MergeDocuments(App::Document* doc)
: appdoc(doc)
{
//NOLINTBEGIN
connectExport = doc->signalExportObjects.connect
(std::bind(&MergeDocuments::exportObject, this, sp::_1, sp::_2));
connectImport = doc->signalImportObjects.connect
(std::bind(&MergeDocuments::importObject, this, sp::_1, sp::_2));
//NOLINTEND
// NOLINTBEGIN
connectExport = doc->signalExportObjects.connect(
std::bind(&MergeDocuments::exportObject, this, sp::_1, sp::_2));
connectImport = doc->signalImportObjects.connect(
std::bind(&MergeDocuments::importObject, this, sp::_1, sp::_2));
// NOLINTEND
QCoreApplication* app = QCoreApplication::instance();
if (app && app->inherits("QApplication")) {
@@ -93,17 +98,16 @@ MergeDocuments::~MergeDocuments()
connectImport.disconnect();
}
unsigned int MergeDocuments::getMemSize () const
unsigned int MergeDocuments::getMemSize() const
{
return 0;
}
std::vector<App::DocumentObject*>
MergeDocuments::importObjects(std::istream& input)
std::vector<App::DocumentObject*> MergeDocuments::importObjects(std::istream& input)
{
this->nameMap.clear();
this->stream = new zipios::ZipInputStream(input);
XMLMergeReader reader(this->nameMap,"<memory>", *stream);
XMLMergeReader reader(this->nameMap, "<memory>", *stream);
reader.setVerbose(isVerbose());
std::vector<App::DocumentObject*> objs = appdoc->importObjects(reader);
@@ -113,20 +117,20 @@ MergeDocuments::importObjects(std::istream& input)
return objs;
}
void MergeDocuments::importObject(const std::vector<App::DocumentObject*>& o, Base::XMLReader & r)
void MergeDocuments::importObject(const std::vector<App::DocumentObject*>& o, Base::XMLReader& r)
{
objects = o;
Restore(r);
r.readFiles(*this->stream);
}
void MergeDocuments::exportObject(const std::vector<App::DocumentObject*>& o, Base::Writer & w)
void MergeDocuments::exportObject(const std::vector<App::DocumentObject*>& o, Base::Writer& w)
{
objects = o;
Save(w);
}
void MergeDocuments::Save (Base::Writer & w) const
void MergeDocuments::Save(Base::Writer& w) const
{
// Save view provider stuff
if (guiup) {
@@ -134,7 +138,7 @@ void MergeDocuments::Save (Base::Writer & w) const
}
}
void MergeDocuments::Restore(Base::XMLReader &r)
void MergeDocuments::Restore(Base::XMLReader& r)
{
// Restore view provider stuff
if (guiup) {
@@ -142,13 +146,13 @@ void MergeDocuments::Restore(Base::XMLReader &r)
}
}
void MergeDocuments::SaveDocFile (Base::Writer & w) const
void MergeDocuments::SaveDocFile(Base::Writer& w) const
{
// Save view provider stuff
appdoc->signalExportViewObjects(this->objects, w);
}
void MergeDocuments::RestoreDocFile(Base::Reader & r)
void MergeDocuments::RestoreDocFile(Base::Reader& r)
{
// Restore view provider stuff
appdoc->signalImportViewObjects(this->objects, r, this->nameMap);