[libcalamares] Log Q_FUNC_INFO as part of debug
- Warnings, errors, don't get funcinfo, but regular cDebug() calls do. Other special-cases, like calling Logger::CDebug() constructor explicitly, don't get funcinfo either. FIXES #1328
This commit is contained in:
parent
3456aabfce
commit
f818d4b446
@ -99,8 +99,8 @@ CalamaresApplication::init()
|
||||
|
||||
CalamaresApplication::~CalamaresApplication()
|
||||
{
|
||||
cDebug( Logger::LOGVERBOSE ) << "Shutting down Calamares...";
|
||||
cDebug( Logger::LOGVERBOSE ) << Logger::SubEntry << "Finished shutdown.";
|
||||
Logger::CDebug( Logger::LOGVERBOSE ) << "Shutting down Calamares...";
|
||||
Logger::CDebug( Logger::LOGVERBOSE ) << Logger::SubEntry << "Finished shutdown.";
|
||||
}
|
||||
|
||||
|
||||
@ -266,22 +266,22 @@ CalamaresApplication::initModuleManager()
|
||||
}
|
||||
|
||||
/** @brief centers the widget @p w on (a) screen
|
||||
*
|
||||
*
|
||||
* This tries to duplicate the (deprecated) qApp->desktop()->availableGeometry()
|
||||
* placement by iterating over screens and putting Calamares in the first
|
||||
* one where it fits; this is *generally* the primary screen.
|
||||
*
|
||||
*
|
||||
* With debugging, it would look something like this (2 screens attached,
|
||||
* primary at +1080+240 because I have a very strange X setup). Before
|
||||
* being mapped, the Calamares window is at +0+0 but does have a size.
|
||||
* The first screen's geometry includes the offset from the origin in
|
||||
* screen coordinates.
|
||||
*
|
||||
* Proposed window size: 1024 520
|
||||
* Window QRect(0,0 1024x520)
|
||||
* Screen QRect(1080,240 2560x1440)
|
||||
* Moving QPoint(1848,700)
|
||||
* Screen QRect(0,0 1080x1920)
|
||||
*
|
||||
* Proposed window size: 1024 520
|
||||
* Window QRect(0,0 1024x520)
|
||||
* Screen QRect(1080,240 2560x1440)
|
||||
* Moving QPoint(1848,700)
|
||||
* Screen QRect(0,0 1080x1920)
|
||||
*
|
||||
*/
|
||||
static void
|
||||
|
@ -125,9 +125,9 @@ private:
|
||||
|
||||
if ( m_jobIndex < jobCount )
|
||||
{
|
||||
cDebug( Logger::LOGVERBOSE ) << "[JOBQUEUE]: Progress for Job[" << m_jobIndex
|
||||
Logger::CDebug( Logger::LOGVERBOSE ) << "[JOBQUEUE]: Progress for Job[" << m_jobIndex
|
||||
<< "]: " << ( jobPercent * 100 ) << "% completed";
|
||||
cDebug( Logger::LOGVERBOSE ) << "[JOBQUEUE]: Progress Overall: " << ( cumulativeProgress * 100 )
|
||||
Logger::CDebug( Logger::LOGVERBOSE ) << "[JOBQUEUE]: Progress Overall: " << ( cumulativeProgress * 100 )
|
||||
<< "% (accumulated) + "
|
||||
<< ( ( ( m_jobWeights.at( m_jobIndex ) ) * jobPercent ) * 100 )
|
||||
<< "% (this job) = " << ( percent * 100 ) << "% (total)";
|
||||
|
@ -219,7 +219,7 @@ operator<<( QDebug& s, const DebugMap& t )
|
||||
}
|
||||
} // namespace Logger
|
||||
|
||||
#define cDebug Logger::CDebug
|
||||
#define cDebug() (Logger::CDebug( Logger::LOGDEBUG ) << Q_FUNC_INFO << Logger::Continuation)
|
||||
#define cWarning() Logger::CDebug( Logger::LOGWARNING )
|
||||
#define cError() Logger::CDebug( Logger::LOGERROR )
|
||||
|
||||
|
@ -69,7 +69,7 @@ CreatePartitionTableJob::prettyStatusMessage() const
|
||||
|
||||
|
||||
static inline QDebug&
|
||||
operator <<( QDebug&& s, PartitionIterator& it )
|
||||
operator <<( QDebug& s, PartitionIterator& it )
|
||||
{
|
||||
s << ( ( *it ) ? ( *it )->deviceNode() : QString( "<null device>" ) );
|
||||
return s;
|
||||
|
Loading…
Reference in New Issue
Block a user