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
a1680635
Commit
a1680635
authored
Sep 25, 2009
by
con
Browse files
Remove string identifier from setDisplayNameFor and setUserEnvChanges.
parent
382750c8
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp
View file @
a1680635
...
...
@@ -85,7 +85,8 @@ void CMakeBuildEnvironmentWidget::init(const QString &buildConfigurationName)
void
CMakeBuildEnvironmentWidget
::
environmentModelUserChangesUpdated
()
{
m_pro
->
setUserEnvironmentChanges
(
m_buildConfiguration
,
m_buildEnvironmentWidget
->
userChanges
());
m_pro
->
setUserEnvironmentChanges
(
m_pro
->
buildConfiguration
(
m_buildConfiguration
),
m_buildEnvironmentWidget
->
userChanges
());
}
void
CMakeBuildEnvironmentWidget
::
clearSystemEnvironmentCheckBoxClicked
(
bool
checked
)
...
...
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View file @
a1680635
...
...
@@ -584,14 +584,13 @@ QList<ProjectExplorer::EnvironmentItem> CMakeProject::userEnvironmentChanges(Bui
return
EnvironmentItem
::
fromStringList
(
configuration
->
value
(
"userEnvironmentChanges"
).
toStringList
());
}
void
CMakeProject
::
setUserEnvironmentChanges
(
const
QString
&
buildConfig
,
const
QList
<
ProjectExplorer
::
EnvironmentItem
>
&
diff
)
void
CMakeProject
::
setUserEnvironmentChanges
(
BuildConfiguration
*
configuration
,
const
QList
<
ProjectExplorer
::
EnvironmentItem
>
&
diff
)
{
ProjectExplorer
::
BuildConfiguration
*
bc
=
buildConfiguration
(
buildConfig
);
QStringList
list
=
EnvironmentItem
::
toStringList
(
diff
);
if
(
list
==
b
c
->
value
(
"userEnvironmentChanges"
))
if
(
list
==
c
onfiguration
->
value
(
"userEnvironmentChanges"
))
return
;
b
c
->
setValue
(
"userEnvironmentChanges"
,
list
);
emit
environmentChanged
(
buildConfig
);
c
onfiguration
->
setValue
(
"userEnvironmentChanges"
,
list
);
emit
environmentChanged
(
configuration
->
name
()
);
}
QString
CMakeProject
::
buildDirectory
(
BuildConfiguration
*
configuration
)
const
...
...
src/plugins/cmakeprojectmanager/cmakeproject.h
View file @
a1680635
...
...
@@ -101,7 +101,7 @@ public:
//building environment
ProjectExplorer
::
Environment
environment
(
ProjectExplorer
::
BuildConfiguration
*
configuration
)
const
;
ProjectExplorer
::
Environment
baseEnvironment
(
ProjectExplorer
::
BuildConfiguration
*
configuration
)
const
;
void
setUserEnvironmentChanges
(
const
QString
&
buildConfig
,
const
QList
<
ProjectExplorer
::
EnvironmentItem
>
&
diff
);
void
setUserEnvironmentChanges
(
ProjectExplorer
::
BuildConfiguration
*
configuration
,
const
QList
<
ProjectExplorer
::
EnvironmentItem
>
&
diff
);
QList
<
ProjectExplorer
::
EnvironmentItem
>
userEnvironmentChanges
(
ProjectExplorer
::
BuildConfiguration
*
configuration
)
const
;
bool
useSystemEnvironment
(
ProjectExplorer
::
BuildConfiguration
*
configuration
)
const
;
void
setUseSystemEnvironment
(
ProjectExplorer
::
BuildConfiguration
*
configuration
,
bool
b
);
...
...
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View file @
a1680635
...
...
@@ -323,20 +323,8 @@ void BuildSettingsWidget::cloneConfiguration(const QString &sourceConfiguration)
newBuildConfiguration
+=
QString
::
number
(
i
);
}
// Check that we don't have a configuration with the same displayName
QStringList
displayNames
;
foreach
(
const
BuildConfiguration
*
bc
,
m_project
->
buildConfigurations
())
displayNames
<<
bc
->
displayName
();
if
(
displayNames
.
contains
(
newDisplayName
))
{
int
i
=
2
;
while
(
displayNames
.
contains
(
newDisplayName
+
QString
::
number
(
i
)))
++
i
;
newDisplayName
+=
QString
::
number
(
i
);
}
m_project
->
copyBuildConfiguration
(
sourceConfiguration
,
newBuildConfiguration
);
m_project
->
setDisplayNameFor
(
newBuildConfiguration
,
newDisplayName
);
m_project
->
setDisplayNameFor
(
m_project
->
buildConfiguration
(
newBuildConfiguration
)
,
newDisplayName
);
m_buildConfiguration
=
newBuildConfiguration
;
updateBuildSettings
();
...
...
src/plugins/projectexplorer/project.cpp
View file @
a1680635
...
...
@@ -509,22 +509,22 @@ EditorConfiguration *Project::editorConfiguration() const
return
m_editorConfiguration
;
}
void
Project
::
setDisplayNameFor
(
const
QString
&
b
uildConfiguration
Name
,
const
QString
&
displayName
)
void
Project
::
setDisplayNameFor
(
B
uildConfiguration
*
configuration
,
const
QString
&
displayName
)
{
QStringList
displayNames
;
foreach
(
BuildConfiguration
*
bc
,
m_buildConfigurationValues
)
{
if
(
bc
->
name
()
!=
buildC
onfiguration
Name
)
if
(
bc
!=
c
onfiguration
)
displayNames
<<
bc
->
displayName
();
}
if
(
displayNames
.
contains
(
displayName
))
{
int
i
=
2
;
while
(
displayNames
.
contains
(
displayName
+
QString
::
number
(
i
)))
++
i
;
buildC
onfiguration
(
buildConfigurationName
)
->
setDisplayName
(
displayName
+
QString
::
number
(
i
));
c
onfiguration
->
setDisplayName
(
displayName
+
QString
::
number
(
i
));
}
else
{
buildC
onfiguration
(
buildConfigurationName
)
->
setDisplayName
(
displayName
);
c
onfiguration
->
setDisplayName
(
displayName
);
}
emit
buildConfigurationDisplayNameChanged
(
buildC
onfiguration
N
ame
);
emit
buildConfigurationDisplayNameChanged
(
c
onfiguration
->
n
ame
()
);
}
QByteArray
Project
::
predefinedMacros
(
const
QString
&
)
const
...
...
src/plugins/projectexplorer/project.h
View file @
a1680635
...
...
@@ -101,7 +101,7 @@ public:
void
copyBuildConfiguration
(
const
QString
&
source
,
const
QString
&
dest
);
BuildConfiguration
*
buildConfiguration
(
const
QString
&
name
)
const
;
QList
<
BuildConfiguration
*>
buildConfigurations
()
const
;
void
setDisplayNameFor
(
const
QString
&
buildC
onfiguration
,
const
QString
&
displayName
);
void
setDisplayNameFor
(
BuildConfiguration
*
c
onfiguration
,
const
QString
&
displayName
);
BuildConfiguration
*
activeBuildConfiguration
()
const
;
void
setActiveBuildConfiguration
(
BuildConfiguration
*
configuration
);
...
...
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View file @
a1680635
...
...
@@ -190,7 +190,8 @@ void Qt4ProjectConfigWidget::init(const QString &buildConfiguration)
void
Qt4ProjectConfigWidget
::
changeConfigName
(
const
QString
&
newName
)
{
m_pro
->
setDisplayNameFor
(
m_buildConfiguration
,
newName
);
m_pro
->
setDisplayNameFor
(
m_pro
->
buildConfiguration
(
m_buildConfiguration
),
newName
);
}
void
Qt4ProjectConfigWidget
::
setupQtVersionsComboBox
()
...
...
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