Use Qt5-Style connects for RepoMan

scunz · scunz · commit dcb842b92727 · 2015-03-22T01:40:17.000Z
diff --git a/Libs/libMacGitverCore/App/MgvPrimaryWindow.cpp b/Libs/libMacGitverCore/App/MgvPrimaryWindow.cpp
@@ -64,11 +64,11 @@ MgvPrimaryWindow::MgvPrimaryWindow()
     w->show();
     #endif
 
-    connect(&MacGitver::repoMan(), SIGNAL(firstRepositoryOpened()),
-            this, SLOT(activateModeForRepo()));
+    connect(&MacGitver::repoMan(), &RM::RepoMan::firstRepositoryOpened,
+            this, &MgvPrimaryWindow::activateModeForRepo);
 
-    connect(&MacGitver::repoMan(), SIGNAL(lastRepositoryClosed()),
-            this, SLOT(activateModeForRepo()));
+    connect(&MacGitver::repoMan(), &RM::RepoMan::lastRepositoryClosed,
+            this, &MgvPrimaryWindow::activateModeForRepo);
 
     setupFonts();
 
diff --git a/Libs/libMacGitverCore/Widgets/RepoStateWidget.cpp b/Libs/libMacGitverCore/Widgets/RepoStateWidget.cpp
@@ -35,14 +35,14 @@ RepoStateWidget::RepoStateWidget()
 
     RM::RepoMan& rm = MacGitver::repoMan();
 
-    connect(&rm,    SIGNAL(refMoved(RM::Repo*,RM::Ref*)),
-            this,   SLOT(onUpdateHEAD(RM::Repo*,RM::Ref*)));
+    connect(&rm,    &RM::RepoMan::refMoved,
+            this,   &RepoStateWidget::onUpdateHEAD);
 
-    connect(&rm,    SIGNAL(repositoryActivated(RM::Repo*)),
-            this,   SLOT(repositoryActivated(RM::Repo*)) );
+    connect(&rm,    &RM::RepoMan::repositoryActivated,
+            this,   &RepoStateWidget::repositoryActivated);
 
-    connect(&rm,    SIGNAL(repositoryDeactivated(RM::Repo*)),
-            this,   SLOT(repositoryDeactivated(RM::Repo*)) );
+    connect(&rm,    &RM::RepoMan::repositoryDeactivated,
+            this,   &RepoStateWidget::repositoryDeactivated);
 }
 
 void RepoStateWidget::repositoryActivated(RM::Repo* info)
diff --git a/Modules/History/HistoryMode.cpp b/Modules/History/HistoryMode.cpp
@@ -31,8 +31,8 @@ HistoryMode::HistoryMode(QObject *parent)
     setEnabled(false);
     setDisplayOrder(5);
 
-    connect(&MacGitver::self().repoMan(), SIGNAL(hasActiveRepositoryChanged(bool)),
-            this, SLOT(setEnabled(bool)));
+    connect(&MacGitver::self().repoMan(), &RM::RepoMan::hasActiveRepositoryChanged,
+            this, &HistoryMode::setEnabled);
 }
 
 QString HistoryMode::createDefaultState() const {
diff --git a/Modules/History/HistoryModel.cpp b/Modules/History/HistoryModel.cpp
@@ -41,9 +41,9 @@ HistoryModel::HistoryModel( const Git::Repository& repo, QObject* parent )
     mDisplays = 0;
 
     RM::RepoMan &rm = MacGitver::repoMan();
-    connect( &rm, SIGNAL(refCreated(RM::Repo*,RM::Ref*)), this, SLOT(onRefCreated(RM::Repo*,RM::Ref*)) );
-    connect( &rm, SIGNAL(refAboutToBeDeleted(RM::Repo*,RM::Ref*)), this, SLOT(onRefDestroyed(RM::Repo*,RM::Ref*)) );
-    connect( &rm, SIGNAL(refMoved(RM::Repo*,RM::Ref*)), this, SLOT(onRefMoved(RM::Repo*,RM::Ref*)) );
+    connect(&rm, &RM::RepoMan::refCreated,          this, &HistoryModel::onRefCreated);
+    connect(&rm, &RM::RepoMan::refAboutToBeDeleted, this, &HistoryModel::onRefDestroyed);
+    connect(&rm, &RM::RepoMan::refMoved,            this, &HistoryModel::onRefMoved);
 }
 
 HistoryModel::~HistoryModel()
diff --git a/Modules/History/HistoryView.cpp b/Modules/History/HistoryView.cpp
@@ -69,8 +69,8 @@ HistoryView::HistoryView()
 
     initSplitters();
 
-    connect( &MacGitver::repoMan(), SIGNAL(repositoryActivated(RM::Repo*)),
-             this,                  SLOT(repoActivated(RM::Repo*)));
+    connect( &MacGitver::repoMan(), &RM::RepoMan::repositoryActivated,
+             this,                  &HistoryView::repoActivated);
 
     #if 0 // Missing feature in libHeaven:
 
diff --git a/Modules/Logging/LoggingMode.cpp b/Modules/Logging/LoggingMode.cpp
@@ -31,8 +31,9 @@ LoggingMode::LoggingMode(QObject *parent)
     setEnabled(false);
     setDisplayOrder(100);
 
-    connect(&MacGitver::self().repoMan(), SIGNAL(hasActiveRepositoryChanged(bool)),
-            this, SLOT(setEnabled(bool)));
+    connect(&MacGitver::self().repoMan(),
+            &RM::RepoMan::hasActiveRepositoryChanged,
+            this, &LoggingMode::setEnabled);
 }
 
 QString LoggingMode::createDefaultState() const {
diff --git a/Modules/RefsViews/Branches/BranchesModel.cpp b/Modules/RefsViews/Branches/BranchesModel.cpp
@@ -42,17 +42,17 @@ BranchesModel::BranchesModel( BranchesViewData* parent )
 {
     RM::RepoMan& rm = MacGitver::repoMan();
 
-    connect(&rm,  SIGNAL(refCreated(RM::Repo*,RM::Ref*)),
-            this, SLOT(onRefCreated(RM::Repo*,RM::Ref*)));
+    connect(&rm,  &RM::RepoMan::refCreated,
+            this, &BranchesModel::onRefCreated);
 
-    connect(&rm,  SIGNAL(refAboutToBeDeleted(RM::Repo*,RM::Ref*)),
-            this, SLOT(onRefDestroyed(RM::Repo*,RM::Ref*)));
+    connect(&rm,  &RM::RepoMan::refAboutToBeDeleted,
+            this, &BranchesModel::onRefDestroyed);
 
-    connect(&rm,  SIGNAL(refMoved(RM::Repo*,RM::Ref*)),
-            this, SLOT(onRefMoved(RM::Repo*,RM::Ref*)));
+    connect(&rm,  &RM::RepoMan::refMoved,
+            this, &BranchesModel::onRefMoved);
 
-    connect(&rm,  SIGNAL(refTreeNodeAboutToBeDeleted(RM::Repo*,RM::RefTreeNode*)),
-            this, SLOT(onRefTreeNodeAboutToBeDeleted(RM::Repo*,RM::RefTreeNode*)));
+    connect(&rm,  &RM::RepoMan::refTreeNodeAboutToBeDeleted,
+            this, &BranchesModel::onRefTreeNodeAboutToBeDeleted);
 }
 
 BranchesModel::~BranchesModel()
diff --git a/Modules/Repository/RepoInfoModel.cpp b/Modules/Repository/RepoInfoModel.cpp
@@ -27,14 +27,14 @@ RepoInfoModel::RepoInfoModel()
 {
     mRepoMan = &MacGitver::repoMan();
 
-    connect( mRepoMan, SIGNAL(repositoryDeactivated(RM::Repo*)),
-             this,     SLOT(invalidateRepository(RM::Repo*)) );
+    connect( mRepoMan, &RM::RepoMan::repositoryDeactivated,
+             this,     &RepoInfoModel::invalidateRepository);
 
-    connect( mRepoMan, SIGNAL(repositoryActivated(RM::Repo*)),
-             this,     SLOT(invalidateRepository(RM::Repo*)) );
+    connect( mRepoMan, &RM::RepoMan::repositoryActivated,
+             this,     &RepoInfoModel::invalidateRepository);
 
-    connect( mRepoMan, SIGNAL(repositoryOpened(RM::Repo*)),
-             this,     SLOT(repositoryOpened(RM::Repo*)));
+    connect( mRepoMan, &RM::RepoMan::repositoryOpened,
+             this,     &RepoInfoModel::invalidateRepository);
 }
 
 int RepoInfoModel::rowCount( const QModelIndex& parent ) const
@@ -197,8 +197,11 @@ void RepoInfoModel::repositoryOpened(RM::Repo *info)
         return;
     }
 
-    connect(info, SIGNAL(childAdded(RM::Repo*,RM::Repo*)),
-            this, SLOT(repositoryChildAdded(RM::Repo*,RM::Repo*)));
+    // This connection is wrong. There could be any children added below the repository (i.e.
+    // HEAD, SubModule, CollectionNode). But the slot will unconditionally reserve a new space
+    // for a submodule...
+    connect(info, &RM::Repo::childAdded,
+            this, &RepoInfoModel::repositoryChildAdded);
 
     // we add a row just at the end of the root. This is stupid. But that's the way it works when
     // a model actually isn't a model...
diff --git a/Modules/Repository/RepoTreeView.cpp b/Modules/Repository/RepoTreeView.cpp
@@ -56,11 +56,11 @@ RepoTreeView::RepoTreeView()
     connect( mRepos,    SIGNAL(contextMenu(QModelIndex,QPoint)),
              this,      SLOT(contextMenu(QModelIndex,QPoint)) );
 
-    connect( &MacGitver::repoMan(), SIGNAL(repositoryActivated(RM::Repo*)),
-             this,                  SLOT(onRepoActivated(RM::Repo*)) );
+    connect( &MacGitver::repoMan(), &RM::RepoMan::repositoryActivated,
+             this,                  &RepoTreeView::onRepoActivated);
 
-    connect( &MacGitver::repoMan(), SIGNAL(repositoryDeactivated(RM::Repo*)),
-             this,                  SLOT(onRepoDeactivated(RM::Repo*)) );
+    connect( &MacGitver::repoMan(), &RM::RepoMan::repositoryDeactivated,
+             this,                  &RepoTreeView::onRepoDeactivated);
 }
 
 QModelIndex RepoTreeView::deeplyMapToSource( QModelIndex current ) const

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ HistoryMode::HistoryMode(QObject *parent)`
`31`	`31`	`setEnabled(false);`
`32`	`32`	`setDisplayOrder(5);`
`33`	`33`
`34`		`- connect(&MacGitver::self().repoMan(), SIGNAL(hasActiveRepositoryChanged(bool)),`
`35`		`- this, SLOT(setEnabled(bool)));`
	`34`	`+ connect(&MacGitver::self().repoMan(), &RM::RepoMan::hasActiveRepositoryChanged,`
	`35`	`+ this, &HistoryMode::setEnabled);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`QString HistoryMode::createDefaultState() const {`