Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit ab92bbd

Browse files
scunzscunz
committed
Fix some Compat-Event compile issues
1 parent 05ff85f commit ab92bbd

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

‎Libs/libMacGitverCore/Widgets/RepoStateWidget.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ RepoStateWidget::RepoStateWidget()
4848
this, &RepoStateWidget::repositoryDeactivated);
4949
}
5050

51-
void RepoStateWidget::repositoryActivated(const RM::Frontend::Repo& info)
51+
void RepoStateWidget::repositoryActivated(const RM::Frontend::Repo& repo)
5252
{
53-
if (repo != info) {
54-
repo = info;
53+
if (mRepo != repo) {
54+
mRepo = repo;
5555
setRepoState();
5656
}
5757
}
5858

59-
void RepoStateWidget::repositoryDeactivated(const RM::Frontend::Repo& info)
59+
void RepoStateWidget::repositoryDeactivated(const RM::Frontend::Repo& repo)
6060
{
61-
if (repo == info) {
62-
repo = RM::Frontend::Repo();
61+
if (mRepo == repo) {
62+
mRepo = RM::Frontend::Repo();
6363
setRepoState();
6464
}
6565
}
@@ -68,15 +68,16 @@ void RepoStateWidget::setRepoState()
6868
{
6969
txtState->hide();
7070

71-
txtRepo->setText(repo ? repo.displayAlias() : QString());
72-
onUpdateHEAD(repo, RM::Frontend::Reference());
71+
txtRepo->setText(mRepo ? mRepo.displayAlias() : QString());
72+
onUpdateHEAD(RM::Frontend::Reference());
7373
}
7474

7575
void RepoStateWidget::onUpdateHEAD(
76-
const RM::Frontend::Repo& ownerRepo,
7776
const RM::Frontend::Reference& ref)
7877
{
79-
if (ownerRepo != repo) {
78+
RM::Frontend::Repo repo = ref.repository();
79+
80+
if (repo != mRepo) {
8081
return;
8182
}
8283

‎Libs/libMacGitverCore/Widgets/RepoStateWidget.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ private slots:
4040
void setRepoState();
4141

4242
public slots:
43-
void onUpdateHEAD(const RM::Frontend::Repo& ownerRepo, const RM::Frontend::Reference& ref);
43+
void onUpdateHEAD(const RM::Frontend::Reference& ref);
4444

4545
private:
46-
RM::Frontend::Repo repo;
46+
RM::Frontend::Repo mRepo;
4747
QLabel* txtRepo;
4848
QLabel* txtState;
4949
QLabel* txtBranch;

‎Libs/libRepoMan/RepoMan.hpp

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "libRepoMan/Frontend/Repo.hpp"
2323

2424
#include "libRepoMan/Events/Event.hpp"
25+
#include "libRepoMan/Events/Compat.hpp"
2526

2627
#include <QObject>
2728

@@ -39,7 +40,7 @@ namespace RM
3940

4041
class REPOMAN_API RepoMan
4142
: public QObject
42-
//, private EventsInterface
43+
, private CompatEventsInterface
4344
{
4445
Q_OBJECT
4546
private:
@@ -71,42 +72,40 @@ namespace RM
7172
void repositoryClosed();
7273
void hasActiveRepositoryChanged(bool hasActiveRepo);
7374

74-
#ifndef REPOMAN_NO_COMPAT
7575
signals:
7676
void repositoryOpened(const RM::Frontend::Repo& repo);
7777
void repositoryAboutToClose(const RM::Frontend::Repo& repo);
7878
void repositoryActivated(const RM::Frontend::Repo& repo);
7979
void repositoryDeactivated(const RM::Frontend::Repo& repo);
80-
void objectCreated(const RM::Frontend::Repo& repo, const RM::Frontend::Base& object);
81-
void objectAboutToBeDeleted(const RM::Frontend::Repo& repo, const RM::Frontend::Base& object);
82-
void refTreeNodeCreated(const RM::Frontend::Repo& repo, const RM::Frontend::RefTreeNode& node);
83-
void refTreeNodeAboutToBeDeleted(const RM::Frontend::Repo& repo, const RM::Frontend::RefTreeNode& node);
84-
void refCreated(const RM::Frontend::Repo& repo, const RM::Frontend::Reference& ref);
85-
void refAboutToBeDeleted(const RM::Frontend::Repo& repo, const RM::Frontend::Reference& ref);
86-
void refMoved(const RM::Frontend::Repo& repo, const RM::Frontend::Reference& ref);
87-
void refHeadDetached(const RM::Frontend::Repo& repo, const RM::Frontend::Reference& ref);
88-
void tagCreated(const RM::Frontend::Repo& repo, const RM::Frontend::Tag& tag);
89-
void tagAboutToBeDeleted(const RM::Frontend::Repo& repo, const RM::Frontend::Tag& tag);
90-
void branchCreated(const RM::Frontend::Repo& repo, const RM::Frontend::Branch& branch);
91-
void branchAboutToBeDeleted(const RM::Frontend::Repo& repo, const RM::Frontend::Branch& branch);
92-
void branchMoved(const RM::Frontend::Repo& repo, const RM::Frontend::Branch& branch);
93-
void branchUpstreamChanged(const RM::Frontend::Repo& repo, const RM::Frontend::Branch& branch);
94-
void namespaceCreated(const RM::Frontend::Repo& repo, const RM::Frontend::Namespace& nameSpace);
95-
void namespaceAboutToBeDeleted(const RM::Frontend::Repo& repo, const RM::Frontend::Namespace& nameSpace);
96-
void refLogChanged(const RM::Frontend::Repo& repo, const RM::Frontend::RefLog& reflog);
97-
void refLogNewEntry(const RM::Frontend::Repo& repo, const RM::Frontend::RefLog& reflog);
98-
void stageCreated(const RM::Frontend::Repo& repo, const RM::Frontend::Reference& ref);
99-
void stageAboutToBeDeleted(const RM::Frontend::Repo& repo, const RM::Frontend::Reference& ref);
100-
void remoteCreated(const RM::Frontend::Repo& repo, const RM::Frontend::Remote& remote);
101-
void remoteAboutToBeDeleted(const RM::Frontend::Repo& repo, const RM::Frontend::Remote& remote);
102-
void remoteModified(const RM::Frontend::Repo& repo, const RM::Frontend::Remote& remote);
103-
void submoduleCreated(const RM::Frontend::Repo& repo, const RM::Frontend::Submodule& submodule);
104-
void submoduleAboutToBeDeleted(const RM::Frontend::Repo& repo, const RM::Frontend::Submodule& submodule);
105-
void submoduleMoved(const RM::Frontend::Repo& repo, const RM::Frontend::Submodule& submodule);
80+
void objectCreated(const RM::Frontend::Base& object);
81+
void objectAboutToBeDeleted(const RM::Frontend::Base& object);
82+
void refTreeNodeCreated(const RM::Frontend::RefTreeNode& node);
83+
void refTreeNodeAboutToBeDeleted(const RM::Frontend::RefTreeNode& node);
84+
void refCreated(const RM::Frontend::Reference& ref);
85+
void refAboutToBeDeleted(const RM::Frontend::Reference& ref);
86+
void refMoved(const RM::Frontend::Reference& ref);
87+
void refHeadDetached(const RM::Frontend::Reference& ref);
88+
void tagCreated(const RM::Frontend::Tag& tag);
89+
void tagAboutToBeDeleted(const RM::Frontend::Tag& tag);
90+
void branchCreated(const RM::Frontend::Branch& branch);
91+
void branchAboutToBeDeleted(const RM::Frontend::Branch& branch);
92+
void branchMoved(const RM::Frontend::Branch& branch);
93+
void branchUpstreamChanged(const RM::Frontend::Branch& branch);
94+
void namespaceCreated(const RM::Frontend::Namespace& nameSpace);
95+
void namespaceAboutToBeDeleted(const RM::Frontend::Namespace& nameSpace);
96+
void refLogChanged(const RM::Frontend::RefLog& reflog);
97+
void refLogNewEntry(const RM::Frontend::RefLog& reflog);
98+
void stageCreated(const RM::Frontend::Reference& ref);
99+
void stageAboutToBeDeleted(const RM::Frontend::Reference& ref);
100+
void remoteCreated(const RM::Frontend::Remote& remote);
101+
void remoteAboutToBeDeleted(const RM::Frontend::Remote& remote);
102+
void remoteModified(const RM::Frontend::Remote& remote);
103+
void submoduleCreated(const RM::Frontend::Submodule& submodule);
104+
void submoduleAboutToBeDeleted(const RM::Frontend::Submodule& submodule);
105+
void submoduleMoved(const RM::Frontend::Submodule& submodule);
106106
void repositoryStateChanged(const RM::Frontend::Repo& repo);
107-
void indexUpdated(const RM::Frontend::Repo& repo);
108-
void workTreeUpdated(const RM::Frontend::Repo& repo);
109-
#endif
107+
void indexUpdated();
108+
void workTreeUpdated();
110109
};
111110

112111
}

0 commit comments

Comments
 (0)