Skip to content
Permalink
Browse files

Merge pull request #3069 from sbrunner/connect

Directly use function connect, remove no more existing signals
  • Loading branch information
m-kuhn committed May 13, 2016
2 parents b1f59f3 + d038218 commit f48d0431a83eb6a971b1dc5e7e26d4e5af6ccc19
Showing with 6 additions and 15 deletions.
  1. +6 −15 src/app/qgsbookmarks.cpp
@@ -495,35 +495,26 @@ QgsMergedBookmarksTableModel::QgsMergedBookmarksTableModel( QAbstractTableModel&
mProjectTableModel( projectTableModel ),
mTreeView( treeView )
{
QObject::connect(
connect(
QgisApp::instance(), SIGNAL( projectRead() ),
this, SLOT( projectRead() ) );

QObject::connect(
connect(
&mQgisTableModel, SIGNAL( layoutChanged() ),
this, SLOT( allLayoutChanged() ) );
QObject::connect(
connect(
&mQgisTableModel, SIGNAL( dataChanged( const QModelIndex&, const QModelIndex& ) ),
this, SLOT( qgisDataChanged( const QModelIndex&, const QModelIndex& ) ) );
QObject::connect(
connect(
&mQgisTableModel, SIGNAL( rowsInserted( const QModelIndex&, int, int ) ),
this, SLOT( allLayoutChanged() ) );
QObject::connect(
connect(
&mQgisTableModel, SIGNAL( rowsRemoved( const QModelIndex&, int, int ) ),
this, SLOT( allLayoutChanged() ) );

QObject::connect(
connect(
&projectTableModel, SIGNAL( layoutChanged() ),
this, SLOT( allLayoutChanged() ) );
QObject::connect(
&projectTableModel, SIGNAL( projectDataChanged( const QModelIndex&, const QModelIndex& ) ),
this, SLOT( dataChanged( const QModelIndex&, const QModelIndex& ) ) );
QObject::connect(
&projectTableModel, SIGNAL( projectRowsInserted( const QModelIndex&, int, int ) ),
this, SLOT( allLayoutChanged() ) );
QObject::connect(
&projectTableModel, SIGNAL( ProjectRowsRemoved( const QModelIndex&, int, int ) ),
this, SLOT( allLayoutChanged() ) );
}

int QgsMergedBookmarksTableModel::rowCount( const QModelIndex& parent ) const

0 comments on commit f48d043

Please sign in to comment.
You can’t perform that action at this time.