napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamaresui] Use new convenience logging methods

Browse Source 
- Remove a few confusing Q_FUNCINFO
This commit is contained in:
Adriaan de Groot 2018-02-12 10:46:57 -05:00
parent df0d9dcb88
commit 60f440f72b
6 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libcalamaresui/Branding.cpp
View File

@ -166,7 +166,7 @@ Branding::Branding( const QString& brandingFilePath,
}
else
bail( "Syntax error in slideshow sequence." );
if ( !doc[ "style" ].IsMap() )
bail( "Syntax error in style map." );
@ -179,12 +179,12 @@ Branding::Branding( const QString& brandingFilePath,
}
catch ( YAML::Exception& e )
{
cDebug() << "WARNING: YAML parser error " << e.what() << "in" << file.fileName();
cWarning() << "YAML parser error " << e.what() << "in" << file.fileName();
}
QDir translationsDir( componentDir.filePath( "lang" ) );
if ( !translationsDir.exists() )
cDebug() << "WARNING: the selected branding component does not ship translations.";
cWarning() << "the selected branding component does not ship translations.";
m_translationsPathPrefix = translationsDir.absolutePath();
m_translationsPathPrefix.append( QString( "%1calamares-%2" )
.arg( QDir::separator() )
@ -192,13 +192,13 @@ Branding::Branding( const QString& brandingFilePath,
}
else
{
cDebug() << "WARNING: Cannot read " << file.fileName();
cWarning() << "Cannot read " << file.fileName();
}
s_instance = this;
if ( m_componentName.isEmpty() )
{
cDebug() << "WARNING: failed to load component from" << brandingFilePath;
cWarning() << "Failed to load component from" << brandingFilePath;
}
else
{

4
src/libcalamaresui/Settings.cpp
View File

@ -156,12 +156,12 @@ Settings::Settings( const QString& settingsFilePath,
}
catch ( YAML::Exception& e )
{
cDebug() << "WARNING: YAML parser error " << e.what() << "in" << file.fileName();
cWarning() << "YAML parser error " << e.what() << "in" << file.fileName();
}
}
else
{
cDebug() << "WARNING: Cannot read " << file.fileName();
cWarning() << "Cannot read " << file.fileName();
}
s_instance = this;

5
src/libcalamaresui/modulesystem/Module.cpp
View File

@ -145,7 +145,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
}
catch ( YAML::Exception& e )
{
cDebug() << "WARNING: YAML parser error " << e.what();
cWarning() << "YAML parser error " << e.what();
delete m;
return nullptr;
}
@ -197,8 +197,7 @@ Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::Ex
}
if ( !doc.IsMap() )
{
cLog() << Q_FUNC_INFO << "bad module configuration format"
<< path;
cWarning() << "Bad module configuration format" << path;
return;
}

16
src/libcalamaresui/modulesystem/ModuleManager.cpp
View File

@ -116,7 +116,7 @@ ModuleManager::doInit()
}
catch ( YAML::Exception& e )
{
cDebug() << "WARNING: YAML parser error " << e.what();
cWarning() << "YAML parser error " << e.what();
continue;
}
}
@ -140,7 +140,7 @@ ModuleManager::doInit()
}
else
{
cDebug() << Q_FUNC_INFO << "cannot cd into module directory "
cWarning() << "Cannot cd into module directory "
<< path << "/" << subdir;
}
}
@ -200,7 +200,7 @@ ModuleManager::loadModules()
if ( moduleEntrySplit.length() < 1 ||
moduleEntrySplit.length() > 2 )
{
cDebug() << "Wrong module entry format for module" << moduleEntry << "."
cError() << "Wrong module entry format for module" << moduleEntry << "."
<< "\nCalamares will now quit.";
qApp->exit( 1 );
return;
@ -212,7 +212,7 @@ ModuleManager::loadModules()
if ( !m_availableDescriptorsByModuleName.contains( moduleName ) ||
m_availableDescriptorsByModuleName.value( moduleName ).isEmpty() )
{
cDebug() << "Module" << moduleName << "not found in module search paths."
cError() << "Module" << moduleName << "not found in module search paths."
<< "\nCalamares will now quit.";
qApp->exit( 1 );
return;
@ -240,7 +240,7 @@ ModuleManager::loadModules()
}
else //ought to be a custom instance, but cannot find instance entry
{
cDebug() << "Custom instance" << moduleEntry << "not found in custom instances section."
cError() << "Custom instance" << moduleEntry << "not found in custom instances section."
<< "\nCalamares will now quit.";
qApp->exit( 1 );
return;
@ -263,7 +263,7 @@ ModuleManager::loadModules()
m_loadedModulesByInstanceKey.value( instanceKey, nullptr );
if ( thisModule && !thisModule->isLoaded() )
{
cDebug() << "Module" << instanceKey << "exists but not loaded."
cError() << "Module" << instanceKey << "exists but not loaded."
<< "\nCalamares will now quit.";
qApp->exit( 1 );
return;
@ -282,7 +282,7 @@ ModuleManager::loadModules()
m_moduleDirectoriesByModuleName.value( moduleName ) );
if ( !thisModule )
{
cDebug() << "Module" << instanceKey << "cannot be created from descriptor.";
cWarning() << "Module" << instanceKey << "cannot be created from descriptor.";
Q_ASSERT( thisModule );
continue;
}
@ -292,7 +292,7 @@ ModuleManager::loadModules()
Q_ASSERT( thisModule->isLoaded() );
if ( !thisModule->isLoaded() )
{
cDebug() << "Module" << moduleName << "loading FAILED";
cWarning() << "Module" << moduleName << "loading FAILED";
continue;
}
}

4
src/libcalamaresui/utils/YamlUtils.cpp
View File

@ -111,7 +111,7 @@ yamlMapToVariant( const YAML::Node& mapNode )
void
explainYamlException( const YAML::Exception& e, const QByteArray& yamlData, const char *label )
{
cDebug() << "WARNING: YAML error " << e.what() << "in" << label << '.';
cWarning() << "YAML error " << e.what() << "in" << label << '.';
if ( ( e.mark.line >= 0 ) && ( e.mark.column >= 0 ) )
{
// Try to show the line where it happened.
@ -141,7 +141,7 @@ explainYamlException( const YAML::Exception& e, const QByteArray& yamlData, cons
rangeend = rangestart + 40;
if ( linestart >= 0 )
cDebug() << "WARNING: offending YAML data:" << yamlData.mid( rangestart, rangeend-rangestart ).constData();
cWarning() << "offending YAML data:" << yamlData.mid( rangestart, rangeend-rangestart ).constData();
}
}

2
src/libcalamaresui/viewpages/PythonQtViewStep.cpp
View File

@ -80,7 +80,7 @@ QWidget*
PythonQtViewStep::widget()
{
if ( m_widget->layout()->count() > 1 )
cDebug() << "WARNING: PythonQtViewStep wrapper widget has more than 1 child. "
cWarning() << "PythonQtViewStep wrapper widget has more than 1 child. "
"This should never happen.";
bool nothingChanged = m_cxt.evalScript(