Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
14a79dad
Commit
14a79dad
authored
May 26, 2009
by
dt
Browse files
Simplfy API of CMakeOpenProjectWizard remove some left over QStringList
We don't call it with a list anymore, so make it just a QString
parent
0bda19a0
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View file @
14a79dad
...
...
@@ -80,14 +80,14 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
}
CMakeOpenProjectWizard
::
CMakeOpenProjectWizard
(
CMakeManager
*
cmakeManager
,
const
QString
&
sourceDirectory
,
const
QString
List
&
needToCreate
,
const
QStringList
&
needToUpdat
e
)
const
QString
&
buildDirectory
,
CMakeOpenProjectWizard
::
Mode
mod
e
)
:
m_cmakeManager
(
cmakeManager
),
m_sourceDirectory
(
sourceDirectory
),
m_creatingCbpFiles
(
true
)
{
foreach
(
const
QString
&
buildDirectory
,
n
eedToCreate
)
if
(
mode
==
CMakeOpenProjectWizard
::
N
eedToCreate
)
addPage
(
new
CMakeRunPage
(
this
,
CMakeRunPage
::
Recreate
,
buildDirectory
));
foreach
(
const
QString
&
buildDirectory
,
needToUpdate
)
else
addPage
(
new
CMakeRunPage
(
this
,
CMakeRunPage
::
Update
,
buildDirectory
));
setOption
(
QWizard
::
NoCancelButton
);
setOption
(
QWizard
::
NoBackButtonOnStartPage
);
...
...
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
View file @
14a79dad
...
...
@@ -59,10 +59,16 @@ public:
CMakeRunPageId
};
enum
Mode
{
Nothing
,
NeedToCreate
,
NeedToUpdate
};
// used at importing a project without a .user file
CMakeOpenProjectWizard
(
CMakeManager
*
cmakeManager
,
const
QString
&
sourceDirectory
);
// used to update if we have already a .user file
CMakeOpenProjectWizard
(
CMakeManager
*
cmakeManager
,
const
QString
&
sourceDirectory
,
const
QString
List
&
needToCreate
,
const
QStringList
&
needToUpdat
e
);
CMakeOpenProjectWizard
(
CMakeManager
*
cmakeManager
,
const
QString
&
sourceDirectory
,
const
QString
&
buildDirectory
,
Mode
mod
e
);
// used to change the build directory of one buildconfiguration
CMakeOpenProjectWizard
(
CMakeManager
*
cmakeManager
,
const
QString
&
sourceDirectory
,
const
QString
&
oldBuildDirectory
);
...
...
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View file @
14a79dad
...
...
@@ -95,13 +95,16 @@ void CMakeProject::slotActiveBuildConfiguration()
QString
cbpFile
=
CMakeManager
::
findCbpFile
(
QDir
(
buildDirectory
(
activeBuildConfiguration
())));
QFileInfo
cbpFileFi
(
cbpFile
);
CMakeOpenProjectWizard
::
Mode
mode
;
if
(
!
cbpFileFi
.
exists
())
needToCreate
<<
buildDirectory
(
activeBuildConfiguration
())
;
mode
=
CMakeOpenProjectWizard
::
NeedToCreate
;
else
if
(
cbpFileFi
.
lastModified
()
<
sourceFileInfo
.
lastModified
())
needToUpdate
<<
buildDirectory
(
activeBuildConfiguration
());
mode
=
CMakeOpenProjectWizard
::
NeedToUpdate
;
else
mode
=
CMakeOpenProjectWizard
::
Nothing
;
if
(
!
needToCreate
.
isEmpty
()
||
!
needToUpdate
.
isEmpty
()
)
{
CMakeOpenProjectWizard
copw
(
m_manager
,
sourceFileInfo
.
absolutePath
(),
needToCreate
,
needToUpdat
e
);
if
(
mode
!=
CMakeOpenProjectWizard
::
Nothing
)
{
CMakeOpenProjectWizard
copw
(
m_manager
,
sourceFileInfo
.
absolutePath
(),
buildDirectory
(
activeBuildConfiguration
()),
mod
e
);
copw
.
exec
();
}
// reparse
...
...
@@ -570,13 +573,15 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
QStringList
needToUpdate
;
QString
cbpFile
=
CMakeManager
::
findCbpFile
(
QDir
(
buildDirectory
(
activeBuildConfiguration
())));
QFileInfo
cbpFileFi
(
cbpFile
);
CMakeOpenProjectWizard
::
Mode
mode
=
CMakeOpenProjectWizard
::
Nothing
;
if
(
!
cbpFileFi
.
exists
())
needToCreate
<<
buildDirectory
(
activeBuildConfiguration
())
;
mode
=
CMakeOpenProjectWizard
::
NeedToCreate
;
else
if
(
cbpFileFi
.
lastModified
()
<
sourceFileInfo
.
lastModified
())
needToUpdate
<<
buildDirectory
(
activeBuildConfiguration
())
;
mode
=
CMakeOpenProjectWizard
::
NeedToUpdate
;
if
(
!
needToCreate
.
isEmpty
()
||
!
needToUpdate
.
isEmpty
()
)
{
CMakeOpenProjectWizard
copw
(
m_manager
,
sourceFileInfo
.
absolutePath
(),
needToCreate
,
needToUpdat
e
);
if
(
mode
!=
CMakeOpenProjectWizard
::
Nothing
)
{
CMakeOpenProjectWizard
copw
(
m_manager
,
sourceFileInfo
.
absolutePath
(),
buildDirectory
(
activeBuildConfiguration
()),
mod
e
);
copw
.
exec
();
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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