Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
ea567171
Commit
ea567171
authored
Oct 07, 2009
by
dt
Browse files
Make a function out of duplicated code.
parent
2fdc1cf0
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/projectexplorer/buildconfiguration.h
View file @
ea567171
...
...
@@ -59,6 +59,7 @@ public:
QMap
<
QString
,
QVariant
>
toMap
()
const
;
void
setValuesFromMap
(
QMap
<
QString
,
QVariant
>
map
);
private:
void
setName
(
const
QString
&
name
);
...
...
src/plugins/projectexplorer/project.cpp
View file @
ea567171
...
...
@@ -104,6 +104,18 @@ void Project::moveCleanStepUp(int position)
m_cleanSteps
.
insert
(
position
-
1
,
bs
);
}
QString
Project
::
makeUnique
(
const
QString
&
preferedName
,
const
QStringList
&
usedNames
)
{
if
(
!
usedNames
.
contains
(
preferedName
))
return
preferedName
;
int
i
=
2
;
QString
tryName
=
preferedName
+
QString
::
number
(
i
);
while
(
usedNames
.
contains
(
tryName
))
tryName
=
preferedName
+
QString
::
number
(
++
i
);
return
tryName
;
}
void
Project
::
addBuildConfiguration
(
BuildConfiguration
*
configuration
)
{
QStringList
buildConfigurationNames
;
...
...
@@ -112,12 +124,7 @@ void Project::addBuildConfiguration(BuildConfiguration *configuration)
// Check that the internal name is not taken and use a different one otherwise
QString
configurationName
=
configuration
->
name
();
if
(
buildConfigurationNames
.
contains
(
configurationName
))
{
int
i
=
2
;
while
(
buildConfigurationNames
.
contains
(
configurationName
+
QString
::
number
(
i
)))
++
i
;
configurationName
+=
QString
::
number
(
i
);
}
configurationName
=
makeUnique
(
configurationName
,
buildConfigurationNames
);
configuration
->
setName
(
configurationName
);
// Check that we don't have a configuration with the same displayName
...
...
@@ -125,12 +132,7 @@ void Project::addBuildConfiguration(BuildConfiguration *configuration)
QStringList
displayNames
;
foreach
(
const
BuildConfiguration
*
bc
,
m_buildConfigurationValues
)
displayNames
<<
bc
->
displayName
();
if
(
displayNames
.
contains
(
configurationDisplayName
))
{
int
i
=
2
;
while
(
displayNames
.
contains
(
configurationDisplayName
+
QString
::
number
(
i
)))
++
i
;
configurationDisplayName
+=
QString
::
number
(
i
);
}
configurationDisplayName
=
makeUnique
(
configurationDisplayName
,
displayNames
);
configuration
->
setDisplayName
(
configurationDisplayName
);
// add it
...
...
@@ -511,19 +513,18 @@ EditorConfiguration *Project::editorConfiguration() const
void
Project
::
setDisplayNameFor
(
BuildConfiguration
*
configuration
,
const
QString
&
displayName
)
{
if
(
configuration
->
displayName
()
==
displayName
)
return
;
QString
dn
=
displayName
;
QStringList
displayNames
;
foreach
(
BuildConfiguration
*
bc
,
m_buildConfigurationValues
)
{
if
(
bc
!=
configuration
)
displayNames
<<
bc
->
displayName
();
}
if
(
displayNames
.
contains
(
displayName
))
{
int
i
=
2
;
while
(
displayNames
.
contains
(
displayName
+
QString
::
number
(
i
)))
++
i
;
configuration
->
setDisplayName
(
displayName
+
QString
::
number
(
i
));
}
else
{
configuration
->
setDisplayName
(
displayName
);
}
dn
=
makeUnique
(
displayName
,
displayNames
);
configuration
->
setDisplayName
(
displayName
);
emit
buildConfigurationDisplayNameChanged
(
configuration
->
name
());
}
...
...
src/plugins/projectexplorer/project.h
View file @
ea567171
...
...
@@ -183,6 +183,7 @@ protected:
virtual
bool
restoreSettingsImpl
(
PersistentSettingsReader
&
reader
);
private:
static
QString
makeUnique
(
const
QString
&
preferedName
,
const
QStringList
&
usedNames
);
QList
<
BuildStep
*>
m_buildSteps
;
QList
<
BuildStep
*>
m_cleanSteps
;
QMap
<
QString
,
QVariant
>
m_values
;
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment