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

[libcalamaresui] Code-formatting, remove dead code

Browse Source
This commit is contained in:
Adriaan de Groot 2018-12-14 11:33:13 +01:00
parent 3dda9ab860
commit 8790985fca
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcalamaresui/utils/CalamaresUtilsGui.cpp
View File

@ -170,11 +170,7 @@ createRoundedImage( const QPixmap& pixmap, const QSize& size, float frameWidthPc
painter.setBrush( brush ); painter.setBrush( brush );
painter.setPen( pen ); painter.setPen( pen );
painter.drawRoundedRect( outerRect, qreal(frameWidthPct) * 100.0, qreal(frameWidthPct) * 100.0, Qt::RelativeSize ); painter.drawRoundedRect( outerRect, qreal( frameWidthPct ) * 100.0, qreal( frameWidthPct ) * 100.0, Qt::RelativeSize );
/* painter.setBrush( Qt::transparent );
painter.setPen( Qt::white );
painter.drawRoundedRect( outerRect, frameWidthPct, frameWidthPct, Qt::RelativeSize ); */
return frame; return frame;
} }
@ -246,7 +242,7 @@ setDefaultFontSize( int points )
QSize QSize
defaultIconSize() defaultIconSize()
{ {
const int w = int(defaultFontHeight() * 1.6); const int w = int( defaultFontHeight() * 1.6 );
return QSize( w, w ); return QSize( w, w );
} }

14
src/libcalamaresui/utils/CalamaresUtilsGui.h
View File

@ -147,7 +147,7 @@ public:
* *
* English (@see isEnglish() -- it means en_US) is sorted at the top. * English (@see isEnglish() -- it means en_US) is sorted at the top.
*/ */
bool operator <(const LocaleLabel& other) const bool operator <( const LocaleLabel& other ) const
{ {
if ( isEnglish() ) if ( isEnglish() )
return !other.isEnglish(); return !other.isEnglish();
@ -163,13 +163,19 @@ public:
*/ */
bool isEnglish() const bool isEnglish() const
{ {
return m_localeId == QLatin1Literal( "en_US" ) || m_localeId == QLatin1Literal( "en" ); return m_localeId == QLatin1Literal( "en_US" ) || m_localeId == QLatin1Literal( "en" );
} }
/** @brief Get the human-readable name for this locale. */ /** @brief Get the human-readable name for this locale. */
QString label() const { return m_label; } QString label() const
{
return m_label;
}
/** @brief Get the Qt locale. */ /** @brief Get the Qt locale. */
QLocale locale() const { return m_locale; } QLocale locale() const
{
return m_locale;
}
/** @brief Get a Qt locale for the given @p localeName /** @brief Get a Qt locale for the given @p localeName
* *