Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
1c99d158
Commit
1c99d158
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
privatize
parent
04f689c0
No related branches found
No related tags found
1 merge request
!2367
InstrumentsSet use OwningVector instead of PolyVector
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
GUI/Model/Device/InstrumentsSet.h
+2
-2
2 additions, 2 deletions
GUI/Model/Device/InstrumentsSet.h
with
2 additions
and
2 deletions
GUI/Model/Device/InstrumentsSet.h
+
2
−
2
View file @
1c99d158
...
@@ -43,8 +43,6 @@ public:
...
@@ -43,8 +43,6 @@ public:
void
writeTo
(
QXmlStreamWriter
*
w
)
const
;
void
writeTo
(
QXmlStreamWriter
*
w
)
const
;
void
readFrom
(
QXmlStreamReader
*
r
);
void
readFrom
(
QXmlStreamReader
*
r
);
void
emplace_back
(
InstrumentItem
*
item
);
// TODO Qt6 emplace
//! Inserts a deep copy (also of any non XML data in a pointwise axis)
//! Inserts a deep copy (also of any non XML data in a pointwise axis)
//! The id will not be copied, but a new unique one will be created
//! The id will not be copied, but a new unique one will be created
//! Returns the newly created instrument.
//! Returns the newly created instrument.
...
@@ -78,6 +76,8 @@ signals:
...
@@ -78,6 +76,8 @@ signals:
void
instrumentNameChanged
(
const
InstrumentItem
*
instrument
)
const
;
void
instrumentNameChanged
(
const
InstrumentItem
*
instrument
)
const
;
private
:
private
:
void
emplace_back
(
InstrumentItem
*
item
);
PolyVector
<
InstrumentsCatalog
>
m_instruments
;
PolyVector
<
InstrumentsCatalog
>
m_instruments
;
int
m_current_index
=
-
1
;
int
m_current_index
=
-
1
;
};
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment