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

clean ups

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-08-08 11:47:21 +02:00
parent 315c0f0fc5
commit 8e2b4050e7
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/partition/DeviceModel.h
View File

@ -40,8 +40,8 @@ public:
*/ */
void init( const QList< Device* >& devices ); void init( const QList< Device* >& devices );
int rowCount( const QModelIndex& parent = QModelIndex() ) const Q_DECL_OVERRIDE; int rowCount( const QModelIndex& parent = QModelIndex() ) const override;
QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE; QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const override;
Device* deviceForIndex( const QModelIndex& index ) const; Device* deviceForIndex( const QModelIndex& index ) const;

2
src/modules/partition/PartitionModel.h
View File

@ -74,7 +74,7 @@ public:
FileSystemColumn, FileSystemColumn,
MountPointColumn, MountPointColumn,
SizeColumn, SizeColumn,
ColumnCount = SizeColumn + 1 ColumnCount // Must remain last
}; };
PartitionModel( QObject* parent = 0 ); PartitionModel( QObject* parent = 0 );

4
src/modules/partition/PartitionPage.h
View File

@ -42,10 +42,6 @@ public:
explicit PartitionPage( PartitionCoreModule* core, QWidget* parent = 0 ); explicit PartitionPage( PartitionCoreModule* core, QWidget* parent = 0 );
~PartitionPage(); ~PartitionPage();
Q_SIGNALS:
public Q_SLOTS:
private: private:
QScopedPointer< Ui_PartitionPage > m_ui; QScopedPointer< Ui_PartitionPage > m_ui;
PartitionCoreModule* m_core; PartitionCoreModule* m_core;

4
src/modules/partition/PartitionViewStep.cpp
View File

@ -31,7 +31,7 @@
PartitionViewStep::PartitionViewStep( QObject* parent ) PartitionViewStep::PartitionViewStep( QObject* parent )
: Calamares::ViewStep( parent ) : Calamares::ViewStep( parent )
, m_core( new PartitionCoreModule( this ) ) , m_core( new PartitionCoreModule( this ) )
, m_widget( new PartitionPage( m_core ) ) , m_page( new PartitionPage( m_core ) )
{ {
connect( m_core, SIGNAL( hasRootMountPointChanged( bool ) ), connect( m_core, SIGNAL( hasRootMountPointChanged( bool ) ),
SIGNAL( nextStatusChanged( bool ) ) ); SIGNAL( nextStatusChanged( bool ) ) );
@ -48,7 +48,7 @@ PartitionViewStep::prettyName() const
QWidget* QWidget*
PartitionViewStep::widget() PartitionViewStep::widget()
{ {
return m_widget; return m_page;
} }

2
src/modules/partition/PartitionViewStep.h
View File

@ -57,7 +57,7 @@ public:
private: private:
PartitionCoreModule* m_core; PartitionCoreModule* m_core;
PartitionPage* m_widget; PartitionPage* m_page;
}; };
#endif // PARTITIONVIEWSTEP_H #endif // PARTITIONVIEWSTEP_H