Reduce warnings about extra ;
- Trailing ; after Q_UNUSED - Trailing ; after CALAMARES_RETRANSLATE
This commit is contained in:
parent
c83395ff6d
commit
cef2f50510
@ -98,9 +98,9 @@ ProgressTreeModel::data( const QModelIndex& index, int role ) const
|
||||
QVariant
|
||||
ProgressTreeModel::headerData( int section, Qt::Orientation orientation, int role ) const
|
||||
{
|
||||
Q_UNUSED( section );
|
||||
Q_UNUSED( orientation );
|
||||
Q_UNUSED( role );
|
||||
Q_UNUSED( section )
|
||||
Q_UNUSED( orientation )
|
||||
Q_UNUSED( role )
|
||||
|
||||
return QVariant();
|
||||
}
|
||||
|
@ -46,7 +46,7 @@ void
|
||||
ViewStepItem::appendChild( ProgressTreeItem* item )
|
||||
{
|
||||
Q_ASSERT( false );
|
||||
Q_UNUSED( item );
|
||||
Q_UNUSED( item )
|
||||
}
|
||||
|
||||
|
||||
|
@ -92,7 +92,7 @@ BOOST_PYTHON_MODULE( libcalamares )
|
||||
bp::object utilsModule( bp::handle<>( bp::borrowed( PyImport_AddModule( "libcalamares.utils" ) ) ) );
|
||||
bp::scope().attr( "utils" ) = utilsModule;
|
||||
bp::scope utilsScope = utilsModule;
|
||||
Q_UNUSED( utilsScope );
|
||||
Q_UNUSED( utilsScope )
|
||||
|
||||
bp::def(
|
||||
"debug",
|
||||
|
@ -40,7 +40,7 @@ static int s_defaultFontHeight = 0;
|
||||
QPixmap
|
||||
defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
|
||||
{
|
||||
Q_UNUSED( mode );
|
||||
Q_UNUSED( mode )
|
||||
QPixmap pixmap;
|
||||
|
||||
switch ( type )
|
||||
|
@ -71,7 +71,7 @@ ViewStep::setModuleInstanceKey( const QString& instanceKey )
|
||||
void
|
||||
ViewStep::setConfigurationMap( const QVariantMap& configurationMap )
|
||||
{
|
||||
Q_UNUSED( configurationMap );
|
||||
Q_UNUSED( configurationMap )
|
||||
}
|
||||
|
||||
|
||||
|
@ -43,7 +43,7 @@ FixedAspectRatioLabel::setPixmap( const QPixmap& pixmap )
|
||||
void
|
||||
FixedAspectRatioLabel::resizeEvent( QResizeEvent* event )
|
||||
{
|
||||
Q_UNUSED( event );
|
||||
Q_UNUSED( event )
|
||||
QLabel::setPixmap( m_pixmap.scaled(
|
||||
contentsRect().size(),
|
||||
Qt::KeepAspectRatio,
|
||||
|
@ -125,7 +125,7 @@ FinishedPage::focusInEvent( QFocusEvent* e )
|
||||
void
|
||||
FinishedPage::onInstallationFailed( const QString& message, const QString& details )
|
||||
{
|
||||
Q_UNUSED( details );
|
||||
Q_UNUSED( details )
|
||||
if ( Calamares::Settings::instance()->isSetupMode() )
|
||||
ui->mainText->setText( tr( "<h1>Setup Failed</h1><br/>"
|
||||
"%1 has not been set up on your computer.<br/>"
|
||||
|
@ -148,8 +148,8 @@ FinishedViewStep::jobs() const
|
||||
void
|
||||
FinishedViewStep::onInstallationFailed( const QString& message, const QString& details )
|
||||
{
|
||||
Q_UNUSED( message );
|
||||
Q_UNUSED( details );
|
||||
Q_UNUSED( message )
|
||||
Q_UNUSED( details )
|
||||
installFailed = true;
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,7 @@ KeyboardLayoutModel::KeyboardLayoutModel( QObject* parent )
|
||||
int
|
||||
KeyboardLayoutModel::rowCount( const QModelIndex& parent ) const
|
||||
{
|
||||
Q_UNUSED( parent );
|
||||
Q_UNUSED( parent )
|
||||
return m_layouts.count();
|
||||
}
|
||||
|
||||
|
@ -436,7 +436,7 @@ void
|
||||
KeyboardPage::onListLayoutCurrentItemChanged( const QModelIndex& current,
|
||||
const QModelIndex& previous )
|
||||
{
|
||||
Q_UNUSED( previous );
|
||||
Q_UNUSED( previous )
|
||||
if ( !current.isValid() )
|
||||
return;
|
||||
|
||||
@ -457,7 +457,7 @@ static inline QStringList xkbmap_args( QStringList&& r, const QString& layout, c
|
||||
void
|
||||
KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous )
|
||||
{
|
||||
Q_UNUSED( previous );
|
||||
Q_UNUSED( previous )
|
||||
|
||||
QPersistentModelIndex layoutIndex = ui->listLayout->currentIndex();
|
||||
LayoutItem* variantItem = dynamic_cast< LayoutItem* >( current );
|
||||
|
@ -87,8 +87,7 @@ LicensePage::LicensePage(QWidget *parent)
|
||||
|
||||
CALAMARES_RETRANSLATE(
|
||||
ui->acceptCheckBox->setText( tr( "I accept the terms and conditions above." ) );
|
||||
);
|
||||
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
|
@ -101,7 +101,7 @@ LocalePage::LocalePage( QWidget* parent )
|
||||
static_cast< void ( QComboBox::* )( int ) >( &QComboBox::currentIndexChanged ),
|
||||
[this]( int currentIndex )
|
||||
{
|
||||
Q_UNUSED( currentIndex );
|
||||
Q_UNUSED( currentIndex )
|
||||
QHash< QString, QList< LocaleGlobal::Location > > regions = LocaleGlobal::getLocations();
|
||||
if ( !regions.contains( m_regionCombo->currentData().toString() ) )
|
||||
return;
|
||||
|
@ -127,7 +127,7 @@ bool
|
||||
PackageModel::setHeaderData( int section, Qt::Orientation orientation,
|
||||
const QVariant& value, int role )
|
||||
{
|
||||
Q_UNUSED( role );
|
||||
Q_UNUSED( role )
|
||||
|
||||
if ( orientation == Qt::Horizontal )
|
||||
{
|
||||
|
@ -540,7 +540,7 @@ void
|
||||
ChoicePage::doAlongsideSetupSplitter( const QModelIndex& current,
|
||||
const QModelIndex& previous )
|
||||
{
|
||||
Q_UNUSED( previous );
|
||||
Q_UNUSED( previous )
|
||||
if ( !current.isValid() )
|
||||
return;
|
||||
|
||||
@ -718,7 +718,7 @@ void
|
||||
ChoicePage::onPartitionToReplaceSelected( const QModelIndex& current,
|
||||
const QModelIndex& previous )
|
||||
{
|
||||
Q_UNUSED( previous );
|
||||
Q_UNUSED( previous )
|
||||
if ( !current.isValid() )
|
||||
return;
|
||||
|
||||
|
@ -100,7 +100,7 @@ PartitionLabelsView::sizeHint() const
|
||||
void
|
||||
PartitionLabelsView::paintEvent( QPaintEvent* event )
|
||||
{
|
||||
Q_UNUSED( event );
|
||||
Q_UNUSED( event )
|
||||
|
||||
QPainter painter( viewport() );
|
||||
painter.fillRect( rect(), palette().window() );
|
||||
@ -478,7 +478,7 @@ PartitionLabelsView::visualRect( const QModelIndex& idx ) const
|
||||
QRegion
|
||||
PartitionLabelsView::visualRegionForSelection( const QItemSelection& selection ) const
|
||||
{
|
||||
Q_UNUSED( selection );
|
||||
Q_UNUSED( selection )
|
||||
|
||||
return QRegion();
|
||||
}
|
||||
@ -543,8 +543,8 @@ PartitionLabelsView::setExtendedPartitionHidden( bool hidden )
|
||||
QModelIndex
|
||||
PartitionLabelsView::moveCursor( CursorAction cursorAction, Qt::KeyboardModifiers modifiers )
|
||||
{
|
||||
Q_UNUSED( cursorAction );
|
||||
Q_UNUSED( modifiers );
|
||||
Q_UNUSED( cursorAction )
|
||||
Q_UNUSED( modifiers )
|
||||
|
||||
return QModelIndex();
|
||||
}
|
||||
@ -553,7 +553,7 @@ PartitionLabelsView::moveCursor( CursorAction cursorAction, Qt::KeyboardModifier
|
||||
bool
|
||||
PartitionLabelsView::isIndexHidden( const QModelIndex& index ) const
|
||||
{
|
||||
Q_UNUSED( index );
|
||||
Q_UNUSED( index )
|
||||
|
||||
return false;
|
||||
}
|
||||
@ -598,7 +598,7 @@ PartitionLabelsView::mouseMoveEvent( QMouseEvent* event )
|
||||
void
|
||||
PartitionLabelsView::leaveEvent( QEvent* event )
|
||||
{
|
||||
Q_UNUSED( event );
|
||||
Q_UNUSED( event )
|
||||
|
||||
QGuiApplication::restoreOverrideCursor();
|
||||
if ( m_hoveredIndex.isValid() )
|
||||
|
@ -286,7 +286,7 @@ PartitionSplitterWidget::minimumSizeHint() const
|
||||
void
|
||||
PartitionSplitterWidget::paintEvent( QPaintEvent* event )
|
||||
{
|
||||
Q_UNUSED( event );
|
||||
Q_UNUSED( event )
|
||||
|
||||
QPainter painter( this );
|
||||
painter.fillRect( rect(), palette().window() );
|
||||
@ -401,7 +401,7 @@ PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event )
|
||||
void
|
||||
PartitionSplitterWidget::mouseReleaseEvent( QMouseEvent* event )
|
||||
{
|
||||
Q_UNUSED( event );
|
||||
Q_UNUSED( event )
|
||||
|
||||
m_resizing = false;
|
||||
}
|
||||
|
@ -41,7 +41,7 @@ SummaryPage::SummaryPage( const SummaryViewStep* thisViewStep, QWidget* parent )
|
||||
, m_contentWidget( nullptr )
|
||||
, m_scrollArea( new QScrollArea( this ) )
|
||||
{
|
||||
Q_UNUSED( parent );
|
||||
Q_UNUSED( parent )
|
||||
Q_ASSERT( m_thisViewStep );
|
||||
QVBoxLayout* layout = new QVBoxLayout( this );
|
||||
layout->setContentsMargins( 0, 0, 0, 0 );
|
||||
|
@ -278,7 +278,7 @@ bool
|
||||
GeneralRequirements::checkEnoughStorage( qint64 requiredSpace )
|
||||
{
|
||||
#ifdef WITHOUT_LIBPARTED
|
||||
Q_UNUSED( requiredSpace );
|
||||
Q_UNUSED( requiredSpace )
|
||||
cWarning() << "GeneralRequirements is configured without libparted.";
|
||||
return false;
|
||||
#else
|
||||
|
Loading…
Reference in New Issue
Block a user