Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Use auto to reduce some verbosity.

Browse Source
This commit is contained in:
Jim Evins
2017-12-30 21:41:02 -05:00
parent c7a6ed4917
commit 9a135f8971
34 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/BarcodeMenu.cpp
+2 -2
View File
@@ -39,7 +39,7 @@ namespace glabels
{
if ( bcStyle.backendId() == "" )
{
BarcodeMenuItem* bcMenuItem = new BarcodeMenuItem( bcStyle );
auto* bcMenuItem = new BarcodeMenuItem( bcStyle );
connect( bcMenuItem, SIGNAL(activated(const barcode::Style&)),
this, SLOT(onMenuItemActivated(const barcode::Style&)) );
@@ -55,7 +55,7 @@ namespace glabels
{
if ( bcStyle.backendId() == backendId )
{
BarcodeMenuItem* bcMenuItem = new BarcodeMenuItem( bcStyle );
auto* bcMenuItem = new BarcodeMenuItem( bcStyle );
connect( bcMenuItem, SIGNAL(activated(const barcode::Style&)),
this, SLOT(onMenuItemActivated(const barcode::Style&)) );
glabels/ColorPaletteDialog.cpp
+5 -5
View File
@@ -95,11 +95,11 @@ namespace glabels
setStyleSheet( ".glabels--ColorPaletteDialog {background: white; border: 1px solid black}" );
setWindowFlags( Qt::Popup | Qt::FramelessWindowHint );
QVBoxLayout* vLayout = new QVBoxLayout();
auto* vLayout = new QVBoxLayout();
vLayout->setContentsMargins( 0, 0, 0, 0 );
vLayout->setSpacing( 0 );
ColorPaletteButtonItem* defaultButton = new ColorPaletteButtonItem( defaultLabel );
auto* defaultButton = new ColorPaletteButtonItem( defaultLabel );
connect( defaultButton, SIGNAL(activated()), this, SLOT(onDefaultItemActivated()) );
vLayout->addWidget( defaultButton );
@@ -108,7 +108,7 @@ namespace glabels
hline1->setLineWidth( 1 );
vLayout->addWidget( hline1 );
QGridLayout* mainPaletteLayout = new QGridLayout();
auto* mainPaletteLayout = new QGridLayout();
mainPaletteLayout->setSpacing( 0 );
for ( int iRow = 0; iRow < PALETTE_ROWS; iRow++ )
{
@@ -131,7 +131,7 @@ namespace glabels
hline2->setLineWidth( 1 );
vLayout->addWidget( hline2 );
QHBoxLayout* customPaletteLayout = new QHBoxLayout();
auto* customPaletteLayout = new QHBoxLayout();
customPaletteLayout->setSpacing( 0 );
for ( int iCol = 0; iCol < PALETTE_COLS; iCol++ )
{
@@ -167,7 +167,7 @@ namespace glabels
vLayout->addWidget( mMergeFieldCombo );
// Item 0 is the ComboBox title, not an item intended for selection. So disable it.
const QStandardItemModel* model = qobject_cast<const QStandardItemModel*>(mMergeFieldCombo->model());
const auto* model = qobject_cast<const QStandardItemModel*>(mMergeFieldCombo->model());
QStandardItem* item = model->item(0);
item->setFlags( item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled) );
glabels/FieldButton.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ namespace glabels
}
// Item 0 is the ComboBox title, not an item intended for selection. So disable it.
const QStandardItemModel* itemModel = qobject_cast<const QStandardItemModel*>(model());
const auto* itemModel = qobject_cast<const QStandardItemModel*>(model());
QStandardItem* item = itemModel->item(0);
item->setFlags( item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled) );
}
@@ -65,7 +65,7 @@ namespace glabels
addItem( mName );
// Item 0 is the ComboBox title, not an item intended for selection. So disable it.
const QStandardItemModel* itemModel = qobject_cast<const QStandardItemModel*>(model());
const auto* itemModel = qobject_cast<const QStandardItemModel*>(model());
QStandardItem* item = itemModel->item(0);
item->setFlags( item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled) );
glabels/File.cpp
+4 -4
View File
@@ -53,7 +53,7 @@ namespace glabels
const model::Template* tmplate = dialog.tmplate();
if ( tmplate )
{
model::Model* model = new model::Model();
auto* model = new model::Model();
model->setTmplate( tmplate );
model->clearModified();
@@ -68,7 +68,7 @@ namespace glabels
}
else
{
MainWindow *newWindow = new MainWindow();
auto *newWindow = new MainWindow();
newWindow->setModel( model );
newWindow->show();
}
@@ -118,7 +118,7 @@ namespace glabels
}
else
{
MainWindow *newWindow = new MainWindow();
auto *newWindow = new MainWindow();
newWindow->setModel( model );
newWindow->show();
}
@@ -237,7 +237,7 @@ namespace glabels
{
foreach ( QWidget* qwidget, QApplication::topLevelWidgets() )
{
if ( MainWindow* window = qobject_cast<MainWindow*>(qwidget) )
if ( auto* window = qobject_cast<MainWindow*>(qwidget) )
{
window->close();
}
glabels/MainWindow.cpp
+3 -3
View File
@@ -113,7 +113,7 @@ namespace glabels
// Create central widget
QWidget *centralWidget = new QWidget();
QHBoxLayout *hLayout = new QHBoxLayout();
auto *hLayout = new QHBoxLayout();
hLayout->setContentsMargins( 0, 0, 0, 0 );
hLayout->addWidget( mContents );
hLayout->addWidget( mPages );
@@ -698,12 +698,12 @@ namespace glabels
mLabelEditorScrollArea->setWidget( mLabelEditor );
QVBoxLayout* editorVLayout = new QVBoxLayout;
auto* editorVLayout = new QVBoxLayout;
editorVLayout->setContentsMargins( 0, 0, 0, 0 );
editorVLayout->addWidget( editorToolBar );
editorVLayout->addWidget( mLabelEditorScrollArea );
QHBoxLayout* editorHLayout = new QHBoxLayout;
auto* editorHLayout = new QHBoxLayout;
editorHLayout->setContentsMargins( 0, 0, 0, 0 );
editorHLayout->addLayout( editorVLayout );
editorHLayout->addWidget( mObjectEditor );
glabels/MergeView.cpp
+6 -6
View File
@@ -246,7 +246,7 @@ namespace glabels
recordsTable->setColumnCount( mKeys.size() + 1 ); // Include extra column
// First column = primay Key
QTableWidgetItem* item = new QTableWidgetItem( mPrimaryKey );
auto* item = new QTableWidgetItem( mPrimaryKey );
item->setFlags( Qt::ItemIsEnabled );
recordsTable->setHorizontalHeaderItem( 0, item );
@@ -256,7 +256,7 @@ namespace glabels
{
if ( key != mPrimaryKey )
{
QTableWidgetItem* item = new QTableWidgetItem( key );
auto* item = new QTableWidgetItem( key );
item->setFlags( Qt::ItemIsEnabled );
recordsTable->setHorizontalHeaderItem( iCol, item );
@@ -266,7 +266,7 @@ namespace glabels
}
// Extra dummy column to fill any extra horizontal space
QTableWidgetItem* fillItem = new QTableWidgetItem();
auto* fillItem = new QTableWidgetItem();
fillItem->setFlags( Qt::NoItemFlags );
recordsTable->setHorizontalHeaderItem( iCol, fillItem );
recordsTable->horizontalHeader()->setStretchLastSection( true );
@@ -288,7 +288,7 @@ namespace glabels
foreach ( merge::Record* record, records )
{
// First column for primay field
QTableWidgetItem* item = new QTableWidgetItem();
auto* item = new QTableWidgetItem();
if ( record->contains( mPrimaryKey ) )
{
item->setText( (*record)[mPrimaryKey] );
@@ -306,7 +306,7 @@ namespace glabels
{
if ( record->contains( key ) )
{
QTableWidgetItem* item = new QTableWidgetItem( (*record)[key] );
auto* item = new QTableWidgetItem( (*record)[key] );
item->setFlags( Qt::ItemIsEnabled );
recordsTable->setItem( iRow, iCol, item );
recordsTable->resizeColumnToContents( iCol );
@@ -317,7 +317,7 @@ namespace glabels
}
// Extra dummy column to fill any extra horizontal space
QTableWidgetItem* fillItem = new QTableWidgetItem();
auto* fillItem = new QTableWidgetItem();
fillItem->setFlags( Qt::NoItemFlags );
recordsTable->setItem( iRow, iCol, fillItem );
glabels/Preview.cpp
+4 -4
View File
@@ -132,7 +132,7 @@ namespace glabels
///
void Preview::drawPaper( const model::Distance& pw, const model::Distance& ph )
{
QGraphicsDropShadowEffect *shadowEffect = new QGraphicsDropShadowEffect();
auto *shadowEffect = new QGraphicsDropShadowEffect();
shadowEffect->setColor( shadowColor );
shadowEffect->setOffset( shadowOffsetPixels );
shadowEffect->setBlurRadius( shadowRadiusPixels );
@@ -142,7 +142,7 @@ namespace glabels
pen.setCosmetic( true );
pen.setWidthF( paperOutlineWidthPixels );
QGraphicsRectItem *pageItem = new QGraphicsRectItem( 0, 0, pw.pt(), ph.pt() );
auto *pageItem = new QGraphicsRectItem( 0, 0, pw.pt(), ph.pt() );
pageItem->setBrush( brush );
pageItem->setPen( pen );
pageItem->setGraphicsEffect( shadowEffect );
@@ -176,7 +176,7 @@ namespace glabels
pen.setCosmetic( true );
pen.setWidthF( labelOutlineWidthPixels );
QGraphicsPathItem *labelOutlineItem = new QGraphicsPathItem( path );
auto *labelOutlineItem = new QGraphicsPathItem( path );
labelOutlineItem->setBrush( brush );
labelOutlineItem->setPen( pen );
labelOutlineItem->setPos( x.pt(), y.pt() );
@@ -192,7 +192,7 @@ namespace glabels
{
if ( mRenderer )
{
PreviewOverlayItem* overlayItem = new PreviewOverlayItem( mRenderer );
auto* overlayItem = new PreviewOverlayItem( mRenderer );
mScene->addItem( overlayItem );
}
}
glabels/PropertiesView.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ namespace glabels
titleLabel->setText( QString( "<span style='font-size:18pt;'>%1</span>" ).arg( tr("Properties") ) );
// Hack to get orientationCombo item height to follow icon size plus padding
QStyledItemDelegate* itemDelegate = new QStyledItemDelegate();
auto* itemDelegate = new QStyledItemDelegate();
orientationCombo->setItemDelegate( itemDelegate );
orientationCombo->setStyleSheet( "* QAbstractItemView::item { padding: 8px; }" );
glabels/SimplePreview.cpp
+4 -4
View File
@@ -143,7 +143,7 @@ namespace glabels
///
void SimplePreview::drawPaper( const model::Distance& pw, const model::Distance& ph )
{
QGraphicsDropShadowEffect *shadowEffect = new QGraphicsDropShadowEffect();
auto *shadowEffect = new QGraphicsDropShadowEffect();
shadowEffect->setColor( shadowColor );
shadowEffect->setOffset( shadowOffsetPixels );
shadowEffect->setBlurRadius( shadowRadiusPixels );
@@ -153,7 +153,7 @@ namespace glabels
pen.setCosmetic( true );
pen.setWidthF( paperOutlineWidthPixels );
QGraphicsRectItem *pageItem = new QGraphicsRectItem( 0, 0, pw.pt(), ph.pt() );
auto *pageItem = new QGraphicsRectItem( 0, 0, pw.pt(), ph.pt() );
pageItem->setBrush( brush );
pageItem->setPen( pen );
pageItem->setGraphicsEffect( shadowEffect );
@@ -188,7 +188,7 @@ namespace glabels
pen.setCosmetic( true );
pen.setWidthF( labelOutlineWidthPixels );
QGraphicsPathItem *labelItem = new QGraphicsPathItem( path );
auto *labelItem = new QGraphicsPathItem( path );
labelItem->setBrush( brush );
labelItem->setPen( pen );
labelItem->setPos( x.pt(), y.pt() );
@@ -227,7 +227,7 @@ namespace glabels
path.lineTo( 0, -minWH.pt()*arrowScale );
path.lineTo( minWH.pt()*arrowScale/2, -minWH.pt()*arrowScale/2 );
QGraphicsPathItem *arrowItem = new QGraphicsPathItem( path );
auto *arrowItem = new QGraphicsPathItem( path );
arrowItem->setPen( pen );
arrowItem->setPos( (x0+w/2).pt(), (y0+h/2).pt() );
if ( mRotateFlag )
glabels/TemplatePicker.cpp
+3 -3
View File
@@ -63,7 +63,7 @@ namespace glabels
{
foreach ( QListWidgetItem *item, findItems( "*", Qt::MatchWildcard ) )
{
TemplatePickerItem *tItem = dynamic_cast<TemplatePickerItem *>(item);
auto *tItem = dynamic_cast<TemplatePickerItem *>(item);
bool nameMask = tItem->tmplate()->name().contains( searchString, Qt::CaseInsensitive );
@@ -107,7 +107,7 @@ namespace glabels
{
foreach ( QListWidgetItem *item, findItems( "*", Qt::MatchWildcard ) )
{
TemplatePickerItem *tItem = dynamic_cast<TemplatePickerItem *>(item);
auto *tItem = dynamic_cast<TemplatePickerItem *>(item);
bool match = false;
foreach ( QString name, names )
@@ -144,7 +144,7 @@ namespace glabels
}
else
{
TemplatePickerItem *tItem = dynamic_cast<TemplatePickerItem*>(items.first());
auto *tItem = dynamic_cast<TemplatePickerItem*>(items.first());
return tItem->tmplate();
}
}
glabels/UndoRedoModel.cpp
+3 -3
View File
@@ -66,7 +66,7 @@ namespace glabels
mRedoStack.clear();
/* Save state onto undo stack. */
State* stateNow = new State( mModel, description );
auto* stateNow = new State( mModel, description );
mUndoStack.push( stateNow );
/* Track consecutive checkpoints. */
@@ -84,7 +84,7 @@ namespace glabels
void UndoRedoModel::undo()
{
State* oldState = mUndoStack.pop();
State* stateNow = new State( mModel, oldState->description );
auto* stateNow = new State( mModel, oldState->description );
mRedoStack.push( stateNow );
@@ -103,7 +103,7 @@ namespace glabels
void UndoRedoModel::redo()
{
State* oldState = mRedoStack.pop();
State* stateNow = new State( mModel, oldState->description );
auto* stateNow = new State( mModel, oldState->description );
mUndoStack.push( stateNow );
glabels/main.cpp
+2 -2
View File
@@ -104,7 +104,7 @@ int main( int argc, char **argv )
if ( model )
{
model->setFileName( filename );
glabels::MainWindow *newWindow = new glabels::MainWindow();
auto *newWindow = new glabels::MainWindow();
newWindow->setModel( model );
newWindow->show();
openedFiles = true;
@@ -117,7 +117,7 @@ int main( int argc, char **argv )
//
if ( !openedFiles )
{
glabels::MainWindow *mainWindow = new glabels::MainWindow();
auto *mainWindow = new glabels::MainWindow();
mainWindow->show();
}