Gui: [skip ci] improve whitespaces
This commit is contained in:
@@ -245,9 +245,9 @@ void DocumentRecovery::accept()
|
||||
int index = -1;
|
||||
std::vector<int> indices;
|
||||
std::vector<std::string> filenames, paths, labels, errs;
|
||||
for(auto &info : d->recoveryInfo) {
|
||||
for (auto &info : d->recoveryInfo) {
|
||||
++index;
|
||||
std::string documentName;
|
||||
|
||||
QString errorInfo;
|
||||
QTreeWidgetItem* item = d_ptr->ui.treeWidget->topLevelItem(index);
|
||||
|
||||
@@ -285,13 +285,14 @@ void DocumentRecovery::accept()
|
||||
|
||||
auto docs = App::GetApplication().openDocuments(filenames,&paths,&labels,&errs);
|
||||
|
||||
for(int i=0;i<(int)docs.size();++i) {
|
||||
for (size_t i = 0; i < docs.size(); ++i) {
|
||||
auto &info = d->recoveryInfo[indices[i]];
|
||||
QTreeWidgetItem* item = d_ptr->ui.treeWidget->topLevelItem(indices[i]);
|
||||
if(!docs[i] || errs[i].size()) {
|
||||
if(docs[i])
|
||||
if (!docs[i] || !errs[i].empty()) {
|
||||
if (docs[i])
|
||||
App::GetApplication().closeDocument(docs[i]->getName());
|
||||
info.status = DocumentRecoveryPrivate::Failure;
|
||||
|
||||
if (item) {
|
||||
item->setText(1, tr("Failed to recover"));
|
||||
item->setToolTip(1, QString::fromUtf8(errs[index].c_str()));
|
||||
@@ -299,9 +300,10 @@ void DocumentRecovery::accept()
|
||||
}
|
||||
// write back current status
|
||||
d->writeRecoveryInfo(info);
|
||||
}else{
|
||||
}
|
||||
else {
|
||||
auto gdoc = Application::Instance->getDocument(docs[i]);
|
||||
if(gdoc)
|
||||
if (gdoc)
|
||||
gdoc->setModified(true);
|
||||
|
||||
info.status = DocumentRecoveryPrivate::Success;
|
||||
@@ -315,21 +317,26 @@ void DocumentRecovery::accept()
|
||||
QFileInfo xfi(info.xmlFile);
|
||||
QFileInfo fi(info.projectFile);
|
||||
bool res = false;
|
||||
if(fi.fileName() == QLatin1String("fc_recovery_file.fcstd")) {
|
||||
|
||||
if (fi.fileName() == QLatin1String("fc_recovery_file.fcstd")) {
|
||||
transDir.remove(fi.fileName());
|
||||
res = transDir.rename(fi.absoluteFilePath(),fi.fileName());
|
||||
}else{
|
||||
}
|
||||
else {
|
||||
transDir.rmdir(fi.dir().dirName());
|
||||
res = transDir.rename(fi.absolutePath(),fi.dir().dirName());
|
||||
}
|
||||
if(res) {
|
||||
|
||||
if (res) {
|
||||
transDir.remove(xfi.fileName());
|
||||
res = transDir.rename(xfi.absoluteFilePath(),xfi.fileName());
|
||||
}
|
||||
if(!res) {
|
||||
|
||||
if (!res) {
|
||||
FC_WARN("Failed to move recovery file of document '"
|
||||
<< docs[i]->Label.getValue() << "'");
|
||||
}else{
|
||||
}
|
||||
else {
|
||||
clearDirectory(xfi.absolutePath());
|
||||
QDir().rmdir(xfi.absolutePath());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user