|
34 | 34 | #include <QAbstractTableModel>
|
35 | 35 |
|
36 | 36 |
|
37 |
| -QgsBookmarks::QgsBookmarks( QWidget *parent ) : QDockWidget( parent ) |
| 37 | +QgsBookmarks::QgsBookmarks( QWidget *parent ) |
| 38 | + : QDockWidget( parent ) |
38 | 39 | {
|
39 | 40 | setupUi( this );
|
40 | 41 | restorePosition();
|
@@ -490,10 +491,11 @@ bool QgsProjectBookmarksTableModel::removeRows( int row, int count, const QModel
|
490 | 491 | return true;
|
491 | 492 | }
|
492 | 493 |
|
493 |
| -QgsMergedBookmarksTableModel::QgsMergedBookmarksTableModel( QAbstractTableModel& qgisTableModel, QAbstractTableModel& projectTableModel, QTreeView* treeView ): |
494 |
| - mQgisTableModel( qgisTableModel ), |
495 |
| - mProjectTableModel( projectTableModel ), |
496 |
| - mTreeView( treeView ) |
| 494 | +QgsMergedBookmarksTableModel::QgsMergedBookmarksTableModel( QAbstractTableModel& qgisTableModel, QAbstractTableModel& projectTableModel, QTreeView* treeView ) |
| 495 | + : mQgisTableModel( qgisTableModel ) |
| 496 | + , mProjectTableModel( projectTableModel ) |
| 497 | + , mTreeView( treeView ) |
| 498 | + , mProjectOpen( false ) |
497 | 499 | {
|
498 | 500 | connect(
|
499 | 501 | QgisApp::instance(), SIGNAL( projectRead() ),
|
@@ -674,7 +676,12 @@ void QgsMergedBookmarksTableModel::moveBookmark( QAbstractTableModel& modelFrom,
|
674 | 676 | query.bindValue( ":ymax", modelFrom.data( modelFrom.index( row, 6 ) ).toDouble() );
|
675 | 677 | query.bindValue( ":projection_srid", modelFrom.data( modelFrom.index( row, 7 ) ).toInt() );
|
676 | 678 |
|
677 |
| - query.exec(); |
| 679 | + if ( !query.exec() ) |
| 680 | + { |
| 681 | + QgsDebugMsg( QString( "Could not move bookmark: %1" ) |
| 682 | + .arg( query.lastError().text() ) ); |
| 683 | + return; |
| 684 | + } |
678 | 685 | qgisModel->setSort( 0, Qt::AscendingOrder );
|
679 | 686 | qgisModel->select();
|
680 | 687 | }
|
|
0 commit comments