elB4RTO/LogDoctor
elB4RTO/LogDoctor
2
2
Fork 0
Code Issues 6 Pull requests Projects 1 Releases 8 Wiki Activity

Version upgrade 4.00 #45

Merged
elB4RTO merged 113 commits from devel into main 2024-02-17 16:13:26 +01:00
Conversation 0 Commits 113 Files changed 546 +11 -11
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0a7e46bc5d - Show all commits

4
logdoctor/modules/craplog/modules/hash.cpp
View file

@ -106,14 +106,14 @@ void HashOps::digestFile( const std::string& file_path, std::string& hash )
} catch ( const GenericException& ) {
// failed closing gzip file pointer
throw GenericException( QString("%1:\n%2").arg(
DialogSec::tr("An error accured while reading the gzipped file"),
DialogSec::tr("An error occured while reading the gzipped file"),
QString::fromStdString( file_path )
).toStdString() );
} catch ( const std::ios_base::failure& ) {
// failed reading as text
throw GenericException( QString("%1:\n%2").arg(
DialogSec::tr("An error accured while reading the file"),
DialogSec::tr("An error occured while reading the file"),
QString::fromStdString( file_path )
).toStdString() );

4
logdoctor/modules/craplog/modules/workers/parser.cpp
View file

@ -160,14 +160,14 @@ void CraplogParser::joinLogLines()
} catch ( const GenericException& ) {
// failed closing gzip file pointer
throw GenericException( QString("%1:\n%2").arg(
DialogSec::tr("An error accured while reading the gzipped file"),
DialogSec::tr("An error occured while reading the gzipped file"),
QString::fromStdString( file_path )
).toStdString() );
} catch ( const std::ios_base::failure& ) {
// failed reading as text
throw GenericException( QString("%1:\n%2").arg(
DialogSec::tr("An error accured while reading the file"),
DialogSec::tr("An error occured while reading the file"),
QString::fromStdString( file_path )
).toStdString() );

10
logdoctor/modules/dialogs.cpp
View file

@ -242,7 +242,7 @@ bool DialogSec::choiceDatabaseRenew( const QString& title, const QString& msg, Q
title,
QString("%1\n\n%2").arg(
msg,
DialogSec::tr("This database will renamed with a trailing '.copy' and a new one will be created.\nContinue?") ),
DialogSec::tr("This database will be renamed with a trailing '.copy' and a new one will be created.\nContinue?") ),
parent };
return dialog.exec();
}
@ -492,7 +492,7 @@ void DialogSec::errFailedReadFile( const QString& file , const bool skipping, QW
DialogMsg dialog{
DialogSec::tr("Failed reading"),
QString("%1:\n%2").arg(
DialogSec::tr("An error accured while reading the file"),
DialogSec::tr("An error occured while reading the file"),
file + ((skipping) ? DialogSec::tr("Skipping") : "") ),
"", MsgType::Error, parent };
std::ignore = dialog.exec();
@ -503,7 +503,7 @@ void DialogSec::errFailedReadFile( const QString& file , const bool skipping, QW
DialogMsg dialog{
DialogSec::tr("Failed writing"),
QString("%1:\n%2%3").arg(
DialogSec::tr("An error accured while writing the file"),
DialogSec::tr("An error occured while writing the file"),
file,
(skipping) ? QString("\n\n%1").arg(DialogSec::tr("Skipping")) : "" ),
"", MsgType::Error, parent };
@ -667,7 +667,7 @@ bool DialogSec::choiceDirNotDir( const QString& path, QWidget* parent )
QString("%1:\n%2\n\n%3").arg(
DialogSec::tr("The path was supposed to point to a folder, but it doesn't"),
path,
DialogSec::tr("The entry will renamed with a trailing '.copy' and a new one will be created.\nContinue?") ),
DialogSec::tr("The entry will be renamed with a trailing '.copy' and a new one will be created.\nContinue?") ),
parent };
return dialog.exec();
}
@ -678,7 +678,7 @@ bool DialogSec::choiceFileNotFile( const QString& path, QWidget* parent )
QString("%1:\n%2\n\n%3").arg(
DialogSec::tr("The path was supposed to point to a file, but it doesn't"),
path,
DialogSec::tr("The entry will renamed with a trailing '.copy' and a new one will be created.\nContinue?") ),
DialogSec::tr("The entry will be renamed with a trailing '.copy' and a new one will be created.\nContinue?") ),
parent };
return dialog.exec();
}

4
logdoctor/utilities/io.cpp
View file

@ -228,12 +228,12 @@ void randomLines( const std::string& path, std::vector<std::string>& lines, cons
} catch ( const GenericException& ) {
// failed closing gzip file pointer
lines.clear();
throw GenericException( "An error accured while reading the gzipped file" );
throw GenericException( "An error occured while reading the gzipped file" );
} catch ( const std::ios_base::failure& ) {
// failed reading
lines.clear();
throw GenericException( "An error accured while reading the file" );
throw GenericException( "An error occured while reading the file" );
} catch (...) {
lines.clear();