Skip to content

Commit

Permalink
fix rebase errors
Browse files Browse the repository at this point in the history
  • Loading branch information
etiennesky authored and NathanW2 committed May 19, 2014
1 parent fe2435c commit f283040
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 1 addition & 3 deletions src/app/qgsidentifyresultsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,6 @@ QgsIdentifyResultsDialog::QgsIdentifyResultsDialog( QgsMapCanvas *canvas, QWidge
mPlot->setSizePolicy( sizePolicy );
mPlot->updateGeometry();

connect( buttonBox, SIGNAL( rejected() ), this, SLOT( close() ) );

connect( lstResults, SIGNAL( itemExpanded( QTreeWidgetItem* ) ),
this, SLOT( itemExpanded( QTreeWidgetItem* ) ) );

Expand Down Expand Up @@ -653,6 +651,7 @@ QgsIdentifyPlotCurve::~QgsIdentifyPlotCurve()
delete mPlotCurve;
}
}
#endif

void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
QString label,
Expand Down Expand Up @@ -1030,7 +1029,6 @@ void QgsIdentifyResultsDialog::contextMenuEvent( QContextMenuEvent* event )
void QgsIdentifyResultsDialog::saveWindowLocation()
{
QSettings settings;
settings.setValue( "/Windows/Identify/geometry", saveGeometry() );
// first column width
settings.setValue( "/Windows/Identify/columnWidth", lstResults->columnWidth( 0 ) );
settings.setValue( "/Windows/Identify/columnWidthTable", tblResults->columnWidth( 0 ) );
Expand Down
2 changes: 2 additions & 0 deletions src/app/qgsidentifyresultsdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdenti
void layerProperties( QTreeWidgetItem *object );
void disconnectLayer( QObject *object );

void saveWindowLocation();

void setColumnText( int column, const QString & label );
void expandColumnsToFit();

Expand Down

0 comments on commit f283040

Please sign in to comment.