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
93b3dda6
Commit
93b3dda6
authored
Mar 18, 2009
by
Thorbjørn Lindeijer
Browse files
Fixed member variable prefix to be in line with coding standards
parent
1a775dd8
Changes
16
Hide whitespace changes
Inline
Side-by-side
src/plugins/cmakeprojectmanager/cmakeproject.h
View file @
93b3dda6
...
...
@@ -114,7 +114,7 @@ private:
QString
m_projectName
;
// TODO probably need a CMake specific node structure
CMakeProjectNode
*
m_rootNode
;
CMakeProjectNode
*
m_rootNode
;
QStringList
m_files
;
QList
<
CMakeTarget
>
m_targets
;
ProjectExplorer
::
ToolChain
*
m_toolChain
;
...
...
src/plugins/genericprojectmanager/genericproject.cpp
View file @
93b3dda6
...
...
@@ -105,40 +105,40 @@ public:
}
// end of anonymous namespace
GenericProject
::
GenericProject
(
Manager
*
manager
,
const
QString
&
fileName
)
:
_manager
(
manager
),
_fileName
(
fileName
),
_toolChain
(
0
)
:
m
_manager
(
manager
),
m
_fileName
(
fileName
),
m
_toolChain
(
0
)
{
QFileInfo
fileInfo
(
_fileName
);
QFileInfo
fileInfo
(
m
_fileName
);
const
QString
projectBaseName
=
fileInfo
.
baseName
();
QDir
dir
=
fileInfo
.
dir
();
_filesFileName
=
QFileInfo
(
dir
,
projectBaseName
+
QLatin1String
(
".files"
)).
absoluteFilePath
();
_includesFileName
=
QFileInfo
(
dir
,
projectBaseName
+
QLatin1String
(
".includes"
)).
absoluteFilePath
();
_configFileName
=
QFileInfo
(
dir
,
projectBaseName
+
QLatin1String
(
".config"
)).
absoluteFilePath
();
m
_filesFileName
=
QFileInfo
(
dir
,
projectBaseName
+
QLatin1String
(
".files"
)).
absoluteFilePath
();
m
_includesFileName
=
QFileInfo
(
dir
,
projectBaseName
+
QLatin1String
(
".includes"
)).
absoluteFilePath
();
m
_configFileName
=
QFileInfo
(
dir
,
projectBaseName
+
QLatin1String
(
".config"
)).
absoluteFilePath
();
_file
=
new
GenericProjectFile
(
this
,
fileName
);
_rootNode
=
new
GenericProjectNode
(
this
,
_file
);
m
_file
=
new
GenericProjectFile
(
this
,
fileName
);
m
_rootNode
=
new
GenericProjectNode
(
this
,
m
_file
);
_manager
->
registerProject
(
this
);
m
_manager
->
registerProject
(
this
);
}
GenericProject
::~
GenericProject
()
{
_manager
->
unregisterProject
(
this
);
m
_manager
->
unregisterProject
(
this
);
delete
_rootNode
;
delete
_toolChain
;
delete
m
_rootNode
;
delete
m
_toolChain
;
}
QString
GenericProject
::
filesFileName
()
const
{
return
_filesFileName
;
}
{
return
m
_filesFileName
;
}
QString
GenericProject
::
includesFileName
()
const
{
return
_includesFileName
;
}
{
return
m
_includesFileName
;
}
QString
GenericProject
::
configFileName
()
const
{
return
_configFileName
;
}
{
return
m
_configFileName
;
}
QStringList
GenericProject
::
readLines
(
const
QString
&
absoluteFileName
)
const
{
...
...
@@ -167,23 +167,23 @@ QStringList GenericProject::readLines(const QString &absoluteFileName) const
void
GenericProject
::
parseProject
()
{
const
QFileInfo
projectFileInfo
(
_fileName
);
const
QFileInfo
projectFileInfo
(
m
_fileName
);
QSettings
projectInfo
(
_fileName
,
QSettings
::
IniFormat
);
QSettings
projectInfo
(
m
_fileName
,
QSettings
::
IniFormat
);
_files
=
convertToAbsoluteFiles
(
readLines
(
filesFileName
()));
_files
.
removeDuplicates
();
m
_files
=
convertToAbsoluteFiles
(
readLines
(
filesFileName
()));
m
_files
.
removeDuplicates
();
_projectIncludePaths
=
readLines
(
includesFileName
());
_projectIncludePaths
.
removeDuplicates
();
m
_projectIncludePaths
=
readLines
(
includesFileName
());
m
_projectIncludePaths
.
removeDuplicates
();
_generated
=
convertToAbsoluteFiles
(
projectInfo
.
value
(
QLatin1String
(
"generated"
)).
toStringList
());
m
_generated
=
convertToAbsoluteFiles
(
projectInfo
.
value
(
QLatin1String
(
"generated"
)).
toStringList
());
_defines
.
clear
();
m
_defines
.
clear
();
QFile
configFile
(
configFileName
());
if
(
configFile
.
open
(
QFile
::
ReadOnly
))
_defines
=
configFile
.
readAll
();
m
_defines
=
configFile
.
readAll
();
emit
fileListChanged
();
}
...
...
@@ -192,23 +192,23 @@ void GenericProject::refresh()
{
parseProject
();
_rootNode
->
refresh
();
m
_rootNode
->
refresh
();
CppTools
::
CppModelManagerInterface
*
modelManager
=
ExtensionSystem
::
PluginManager
::
instance
()
->
getObject
<
CppTools
::
CppModelManagerInterface
>
();
if
(
_toolChain
&&
modelManager
)
{
const
QByteArray
predefinedMacros
=
_toolChain
->
predefinedMacros
();
const
QList
<
ProjectExplorer
::
HeaderPath
>
systemHeaderPaths
=
_toolChain
->
systemHeaderPaths
();
if
(
m
_toolChain
&&
modelManager
)
{
const
QByteArray
predefinedMacros
=
m
_toolChain
->
predefinedMacros
();
const
QList
<
ProjectExplorer
::
HeaderPath
>
systemHeaderPaths
=
m
_toolChain
->
systemHeaderPaths
();
CppTools
::
CppModelManagerInterface
::
ProjectInfo
pinfo
=
modelManager
->
projectInfo
(
this
);
pinfo
.
defines
=
predefinedMacros
;
pinfo
.
defines
+=
'\n'
;
pinfo
.
defines
+=
_defines
;
pinfo
.
defines
+=
m
_defines
;
QStringList
allIncludePaths
,
allFrameworkPaths
;
foreach
(
const
ProjectExplorer
::
HeaderPath
&
headerPath
,
_toolChain
->
systemHeaderPaths
())
{
foreach
(
const
ProjectExplorer
::
HeaderPath
&
headerPath
,
m
_toolChain
->
systemHeaderPaths
())
{
if
(
headerPath
.
kind
()
==
ProjectExplorer
::
HeaderPath
::
FrameworkHeaderPath
)
allFrameworkPaths
.
append
(
headerPath
.
path
());
...
...
@@ -235,7 +235,7 @@ void GenericProject::refresh()
QStringList
GenericProject
::
convertToAbsoluteFiles
(
const
QStringList
&
paths
)
const
{
const
QDir
projectDir
(
QFileInfo
(
_fileName
).
dir
());
const
QDir
projectDir
(
QFileInfo
(
m
_fileName
).
dir
());
QStringList
absolutePaths
;
foreach
(
const
QString
&
file
,
paths
)
{
QFileInfo
fileInfo
(
projectDir
,
file
);
...
...
@@ -248,63 +248,63 @@ QStringList GenericProject::convertToAbsoluteFiles(const QStringList &paths) con
QStringList
GenericProject
::
allIncludePaths
()
const
{
QStringList
paths
;
paths
+=
_includePaths
;
paths
+=
_projectIncludePaths
;
paths
+=
m
_includePaths
;
paths
+=
m
_projectIncludePaths
;
paths
.
removeDuplicates
();
return
paths
;
}
QStringList
GenericProject
::
projectIncludePaths
()
const
{
return
_projectIncludePaths
;
}
{
return
m
_projectIncludePaths
;
}
QStringList
GenericProject
::
files
()
const
{
return
_files
;
}
{
return
m
_files
;
}
QStringList
GenericProject
::
generated
()
const
{
return
_generated
;
}
{
return
m
_generated
;
}
QStringList
GenericProject
::
includePaths
()
const
{
return
_includePaths
;
}
{
return
m
_includePaths
;
}
void
GenericProject
::
setIncludePaths
(
const
QStringList
&
includePaths
)
{
_includePaths
=
includePaths
;
}
{
m
_includePaths
=
includePaths
;
}
QByteArray
GenericProject
::
defines
()
const
{
return
_defines
;
}
{
return
m
_defines
;
}
void
GenericProject
::
setToolChainId
(
const
QString
&
toolChainId
)
{
using
namespace
ProjectExplorer
;
_toolChainId
=
toolChainId
;
m
_toolChainId
=
toolChainId
;
delete
_toolChain
;
_toolChain
=
0
;
delete
m
_toolChain
;
m
_toolChain
=
0
;
if
(
toolChainId
==
QLatin1String
(
"mingw"
))
{
const
QLatin1String
qmake_cxx
(
"g++"
);
// ### FIXME
const
QString
mingwDirectory
;
// ### FIXME
_toolChain
=
ToolChain
::
createMinGWToolChain
(
qmake_cxx
,
mingwDirectory
);
m
_toolChain
=
ToolChain
::
createMinGWToolChain
(
qmake_cxx
,
mingwDirectory
);
}
else
if
(
toolChainId
==
QLatin1String
(
"msvc"
))
{
const
QString
msvcVersion
;
// ### FIXME
_toolChain
=
ToolChain
::
createMSVCToolChain
(
msvcVersion
);
m
_toolChain
=
ToolChain
::
createMSVCToolChain
(
msvcVersion
);
}
else
if
(
toolChainId
==
QLatin1String
(
"wince"
))
{
const
QString
msvcVersion
,
wincePlatform
;
// ### FIXME
_toolChain
=
ToolChain
::
createWinCEToolChain
(
msvcVersion
,
wincePlatform
);
m
_toolChain
=
ToolChain
::
createWinCEToolChain
(
msvcVersion
,
wincePlatform
);
}
else
if
(
toolChainId
==
QLatin1String
(
"gcc"
)
||
toolChainId
==
QLatin1String
(
"icc"
))
{
const
QLatin1String
qmake_cxx
(
"g++"
);
// ### FIXME
_toolChain
=
ToolChain
::
createGccToolChain
(
qmake_cxx
);
m
_toolChain
=
ToolChain
::
createGccToolChain
(
qmake_cxx
);
}
}
QString
GenericProject
::
buildParser
(
const
QString
&
buildConfiguration
)
const
{
if
(
_toolChain
)
{
switch
(
_toolChain
->
type
())
{
if
(
m
_toolChain
)
{
switch
(
m
_toolChain
->
type
())
{
case
ProjectExplorer
::
ToolChain
::
GCC
:
case
ProjectExplorer
::
ToolChain
::
LinuxICC
:
case
ProjectExplorer
::
ToolChain
::
MinGW
:
...
...
@@ -323,21 +323,21 @@ QString GenericProject::buildParser(const QString &buildConfiguration) const
}
QString
GenericProject
::
toolChainId
()
const
{
return
_toolChainId
;
}
{
return
m
_toolChainId
;
}
QString
GenericProject
::
name
()
const
{
return
_projectName
;
return
m
_projectName
;
}
Core
::
IFile
*
GenericProject
::
file
()
const
{
return
_file
;
return
m
_file
;
}
ProjectExplorer
::
IProjectManager
*
GenericProject
::
projectManager
()
const
{
return
_manager
;
return
m
_manager
;
}
QList
<
ProjectExplorer
::
Project
*>
GenericProject
::
dependsOn
()
...
...
@@ -360,7 +360,7 @@ QString GenericProject::buildDirectory(const QString &buildConfiguration) const
QString
buildDirectory
=
value
(
buildConfiguration
,
"buildDirectory"
).
toString
();
if
(
buildDirectory
.
isEmpty
())
{
QFileInfo
fileInfo
(
_fileName
);
QFileInfo
fileInfo
(
m
_fileName
);
buildDirectory
=
fileInfo
.
absolutePath
();
}
...
...
@@ -385,12 +385,12 @@ QList<ProjectExplorer::BuildStepConfigWidget*> GenericProject::subConfigWidgets(
GenericProjectNode
*
GenericProject
::
rootProjectNode
()
const
{
return
_rootNode
;
return
m
_rootNode
;
}
QStringList
GenericProject
::
files
(
FilesMode
fileMode
)
const
{
return
_files
;
// ### TODO: handle generated files here.
return
m
_files
;
// ### TODO: handle generated files here.
}
QStringList
GenericProject
::
targets
()
const
...
...
@@ -450,30 +450,30 @@ void GenericProject::saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter
{
Project
::
saveSettingsImpl
(
writer
);
writer
.
saveValue
(
QLatin1String
(
"toolChain"
),
_toolChainId
);
writer
.
saveValue
(
QLatin1String
(
"includePaths"
),
_includePaths
);
writer
.
saveValue
(
QLatin1String
(
"toolChain"
),
m
_toolChainId
);
writer
.
saveValue
(
QLatin1String
(
"includePaths"
),
m
_includePaths
);
}
////////////////////////////////////////////////////////////////////////////////////
// GenericBuildSettingsWidget
////////////////////////////////////////////////////////////////////////////////////
GenericBuildSettingsWidget
::
GenericBuildSettingsWidget
(
GenericProject
*
project
)
:
_project
(
project
)
:
m
_project
(
project
)
{
QFormLayout
*
fl
=
new
QFormLayout
(
this
);
// build directory
_pathChooser
=
new
Core
::
Utils
::
PathChooser
(
this
);
_pathChooser
->
setEnabled
(
true
);
fl
->
addRow
(
tr
(
"Build directory:"
),
_pathChooser
);
connect
(
_pathChooser
,
SIGNAL
(
changed
()),
this
,
SLOT
(
buildDirectoryChanged
()));
m
_pathChooser
=
new
Core
::
Utils
::
PathChooser
(
this
);
m
_pathChooser
->
setEnabled
(
true
);
fl
->
addRow
(
tr
(
"Build directory:"
),
m
_pathChooser
);
connect
(
m
_pathChooser
,
SIGNAL
(
changed
()),
this
,
SLOT
(
buildDirectoryChanged
()));
// tool chain
QComboBox
*
toolChainChooser
=
new
QComboBox
;
toolChainChooser
->
addItems
(
ProjectExplorer
::
ToolChain
::
supportedToolChains
());
toolChainChooser
->
setCurrentIndex
(
toolChainChooser
->
findText
(
_project
->
toolChainId
()));
toolChainChooser
->
setCurrentIndex
(
toolChainChooser
->
findText
(
m
_project
->
toolChainId
()));
fl
->
addRow
(
tr
(
"Tool chain:"
),
toolChainChooser
);
connect
(
toolChainChooser
,
SIGNAL
(
activated
(
QString
)),
_project
,
SLOT
(
setToolChainId
(
QString
)));
connect
(
toolChainChooser
,
SIGNAL
(
activated
(
QString
)),
m
_project
,
SLOT
(
setToolChainId
(
QString
)));
}
GenericBuildSettingsWidget
::~
GenericBuildSettingsWidget
()
...
...
@@ -484,13 +484,13 @@ QString GenericBuildSettingsWidget::displayName() const
void
GenericBuildSettingsWidget
::
init
(
const
QString
&
buildConfiguration
)
{
_buildConfiguration
=
buildConfiguration
;
_pathChooser
->
setPath
(
_project
->
buildDirectory
(
buildConfiguration
));
m
_buildConfiguration
=
buildConfiguration
;
m
_pathChooser
->
setPath
(
m
_project
->
buildDirectory
(
buildConfiguration
));
}
void
GenericBuildSettingsWidget
::
buildDirectoryChanged
()
{
_project
->
setValue
(
_buildConfiguration
,
"buildDirectory"
,
_pathChooser
->
path
());
m
_project
->
setValue
(
m
_buildConfiguration
,
"buildDirectory"
,
m
_pathChooser
->
path
());
}
////////////////////////////////////////////////////////////////////////////////////
...
...
@@ -498,8 +498,8 @@ void GenericBuildSettingsWidget::buildDirectoryChanged()
////////////////////////////////////////////////////////////////////////////////////
GenericProjectFile
::
GenericProjectFile
(
GenericProject
*
parent
,
QString
fileName
)
:
Core
::
IFile
(
parent
),
_project
(
parent
),
_fileName
(
fileName
)
m
_project
(
parent
),
m
_fileName
(
fileName
)
{
}
GenericProjectFile
::~
GenericProjectFile
()
...
...
@@ -512,7 +512,7 @@ bool GenericProjectFile::save(const QString &)
QString
GenericProjectFile
::
fileName
()
const
{
return
_fileName
;
return
m
_fileName
;
}
QString
GenericProjectFile
::
defaultPath
()
const
...
...
src/plugins/genericprojectmanager/genericproject.h
View file @
93b3dda6
...
...
@@ -110,23 +110,23 @@ private:
QStringList
readLines
(
const
QString
&
absoluteFileName
)
const
;
Manager
*
_manager
;
QString
_fileName
;
QString
_filesFileName
;
QString
_includesFileName
;
QString
_configFileName
;
GenericProjectFile
*
_file
;
QString
_projectName
;
QStringList
_files
;
QStringList
_generated
;
QStringList
_includePaths
;
QStringList
_projectIncludePaths
;
QByteArray
_defines
;
GenericProjectNode
*
_rootNode
;
ProjectExplorer
::
ToolChain
*
_toolChain
;
QString
_toolChainId
;
Manager
*
m
_manager
;
QString
m
_fileName
;
QString
m
_filesFileName
;
QString
m
_includesFileName
;
QString
m
_configFileName
;
GenericProjectFile
*
m
_file
;
QString
m
_projectName
;
QStringList
m
_files
;
QStringList
m
_generated
;
QStringList
m
_includePaths
;
QStringList
m
_projectIncludePaths
;
QByteArray
m
_defines
;
GenericProjectNode
*
m
_rootNode
;
ProjectExplorer
::
ToolChain
*
m
_toolChain
;
QString
m
_toolChainId
;
};
class
GenericProjectFile
:
public
Core
::
IFile
...
...
@@ -151,8 +151,8 @@ public:
virtual
void
modified
(
ReloadBehavior
*
behavior
);
private:
GenericProject
*
_project
;
QString
_fileName
;
GenericProject
*
m
_project
;
QString
m
_fileName
;
};
class
GenericBuildSettingsWidget
:
public
ProjectExplorer
::
BuildStepConfigWidget
...
...
@@ -171,9 +171,9 @@ private Q_SLOTS:
void
buildDirectoryChanged
();
private:
GenericProject
*
_project
;
Core
::
Utils
::
PathChooser
*
_pathChooser
;
QString
_buildConfiguration
;
GenericProject
*
m
_project
;
Core
::
Utils
::
PathChooser
*
m
_pathChooser
;
QString
m
_buildConfiguration
;
};
}
// namespace Internal
...
...
src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
View file @
93b3dda6
...
...
@@ -19,12 +19,12 @@ using namespace GenericProjectManager::Internal;
ProjectFilesFactory
::
ProjectFilesFactory
(
Manager
*
manager
,
TextEditor
::
TextEditorActionHandler
*
handler
)
:
Core
::
IEditorFactory
(
manager
),
_manager
(
manager
),
_actionHandler
(
handler
)
m
_manager
(
manager
),
m
_actionHandler
(
handler
)
{
_mimeTypes
.
append
(
QLatin1String
(
Constants
::
FILES_MIMETYPE
));
_mimeTypes
.
append
(
QLatin1String
(
Constants
::
INCLUDES_MIMETYPE
));
_mimeTypes
.
append
(
QLatin1String
(
Constants
::
CONFIG_MIMETYPE
));
m
_mimeTypes
.
append
(
QLatin1String
(
Constants
::
FILES_MIMETYPE
));
m
_mimeTypes
.
append
(
QLatin1String
(
Constants
::
INCLUDES_MIMETYPE
));
m
_mimeTypes
.
append
(
QLatin1String
(
Constants
::
CONFIG_MIMETYPE
));
}
ProjectFilesFactory
::~
ProjectFilesFactory
()
...
...
@@ -33,19 +33,19 @@ ProjectFilesFactory::~ProjectFilesFactory()
Manager
*
ProjectFilesFactory
::
manager
()
const
{
return
_manager
;
return
m
_manager
;
}
Core
::
IEditor
*
ProjectFilesFactory
::
createEditor
(
QWidget
*
parent
)
{
ProjectFilesEditor
*
ed
=
new
ProjectFilesEditor
(
parent
,
this
,
_actionHandler
);
ProjectFilesEditor
*
ed
=
new
ProjectFilesEditor
(
parent
,
this
,
m
_actionHandler
);
TextEditor
::
TextEditorSettings
::
instance
()
->
initializeEditor
(
ed
);
return
ed
->
editableInterface
();
}
QStringList
ProjectFilesFactory
::
mimeTypes
()
const
{
return
_mimeTypes
;
return
m
_mimeTypes
;
}
QString
ProjectFilesFactory
::
kind
()
const
...
...
@@ -71,7 +71,7 @@ ProjectFilesEditable::ProjectFilesEditable(ProjectFilesEditor *editor)
:
TextEditor
::
BaseTextEditorEditable
(
editor
)
{
Core
::
UniqueIDManager
*
uidm
=
Core
::
UniqueIDManager
::
instance
();
_context
<<
uidm
->
uniqueIdentifier
(
Constants
::
C_FILESEDITOR
);
m
_context
<<
uidm
->
uniqueIdentifier
(
Constants
::
C_FILESEDITOR
);
}
ProjectFilesEditable
::~
ProjectFilesEditable
()
...
...
@@ -79,7 +79,7 @@ ProjectFilesEditable::~ProjectFilesEditable()
QList
<
int
>
ProjectFilesEditable
::
context
()
const
{
return
_context
;
return
m
_context
;
}
const
char
*
ProjectFilesEditable
::
kind
()
const
...
...
@@ -109,8 +109,8 @@ Core::IEditor *ProjectFilesEditable::duplicate(QWidget *parent)
ProjectFilesEditor
::
ProjectFilesEditor
(
QWidget
*
parent
,
ProjectFilesFactory
*
factory
,
TextEditor
::
TextEditorActionHandler
*
handler
)
:
TextEditor
::
BaseTextEditor
(
parent
),
_factory
(
factory
),
_actionHandler
(
handler
)
m
_factory
(
factory
),
m
_actionHandler
(
handler
)
{
Manager
*
manager
=
factory
->
manager
();
ProjectFilesDocument
*
doc
=
new
ProjectFilesDocument
(
manager
);
...
...
@@ -124,12 +124,12 @@ ProjectFilesEditor::~ProjectFilesEditor()
ProjectFilesFactory
*
ProjectFilesEditor
::
factory
()
const
{
return
_factory
;
return
m
_factory
;
}
TextEditor
::
TextEditorActionHandler
*
ProjectFilesEditor
::
actionHandler
()
const
{
return
_actionHandler
;
return
m
_actionHandler
;
}
TextEditor
::
BaseTextEditorEditable
*
ProjectFilesEditor
::
createEditableInterface
()
...
...
@@ -142,7 +142,7 @@ TextEditor::BaseTextEditorEditable *ProjectFilesEditor::createEditableInterface(
////////////////////////////////////////////////////////////////////////////////////////
ProjectFilesDocument
::
ProjectFilesDocument
(
Manager
*
manager
)
:
_manager
(
manager
)
:
m
_manager
(
manager
)
{
setMimeType
(
QLatin1String
(
Constants
::
FILES_MIMETYPE
));
}
...
...
@@ -155,6 +155,6 @@ bool ProjectFilesDocument::save(const QString &name)
if
(
!
BaseTextDocument
::
save
(
name
))
return
false
;
_manager
->
notifyChanged
(
name
);
m
_manager
->
notifyChanged
(
name
);
return
true
;
}
src/plugins/genericprojectmanager/genericprojectfileseditor.h
View file @
93b3dda6
...
...
@@ -32,9 +32,9 @@ public:
virtual
Core
::
IFile
*
open
(
const
QString
&
fileName
);
private:
Manager
*
_manager
;
TextEditor
::
TextEditorActionHandler
*
_actionHandler
;
QStringList
_mimeTypes
;
Manager
*
m
_manager
;
TextEditor
::
TextEditorActionHandler
*
m
_actionHandler
;
QStringList
m
_mimeTypes
;
};
class
ProjectFilesEditable
:
public
TextEditor
::
BaseTextEditorEditable
...
...
@@ -52,7 +52,7 @@ public:
virtual
Core
::
IEditor
*
duplicate
(
QWidget
*
parent
);
private:
QList
<
int
>
_context
;
QList
<
int
>
m
_context
;
};
class
ProjectFilesEditor
:
public
TextEditor
::
BaseTextEditor
...
...
@@ -70,8 +70,8 @@ public:
virtual
TextEditor
::
BaseTextEditorEditable
*
createEditableInterface
();
private:
ProjectFilesFactory
*
_factory
;
TextEditor
::
TextEditorActionHandler
*
_actionHandler
;
ProjectFilesFactory
*
m
_factory
;
TextEditor
::
TextEditorActionHandler
*
m
_actionHandler
;
};
class
ProjectFilesDocument
:
public
TextEditor
::
BaseTextDocument
...
...
@@ -85,7 +85,7 @@ public:
virtual
bool
save
(
const
QString
&
name
);
private:
Manager
*
_manager
;
Manager
*
m
_manager
;
};
}
// end of namespace Internal
...
...
src/plugins/genericprojectmanager/genericprojectmanager.cpp
View file @
93b3dda6
...
...
@@ -42,18 +42,18 @@ using namespace GenericProjectManager::Internal;
Manager
::
Manager
()
{
Core
::
UniqueIDManager
*
uidm
=
Core
::
UniqueIDManager
::
instance
();
_projectContext
=
uidm
->
uniqueIdentifier
(
GenericProjectManager
::
Constants
::
PROJECTCONTEXT
);
_projectLanguage
=
uidm
->
uniqueIdentifier
(
ProjectExplorer
::
Constants
::
LANG_CXX
);
m
_projectContext
=
uidm
->
uniqueIdentifier
(
GenericProjectManager
::
Constants
::
PROJECTCONTEXT
);
m
_projectLanguage
=
uidm
->
uniqueIdentifier
(
ProjectExplorer
::
Constants
::
LANG_CXX
);
}
Manager
::~
Manager
()
{
}
int
Manager
::
projectContext
()
const
{
return
_projectContext
;
}
{
return
m
_projectContext
;
}
int
Manager
::
projectLanguage
()
const
{
return
_projectLanguage
;
}
{
return
m
_projectLanguage
;
}
QString
Manager
::
mimeType
()
const
{
return
QLatin1String
(
Constants
::
GENERICMIMETYPE
);
}
...
...
@@ -71,14 +71,14 @@ ProjectExplorer::Project *Manager::openProject(const QString &fileName)
}
void
Manager
::
registerProject
(
GenericProject
*
project
)
{
_projects
.
append
(
project
);
}
{
m
_projects
.
append
(
project
);
}
void
Manager
::
unregisterProject
(
GenericProject
*
project
)
{
_projects
.
removeAll
(
project
);
}
{
m
_projects
.
removeAll
(
project
);
}
void
Manager
::
notifyChanged
(
const
QString
&
fileName
)
{
foreach
(
GenericProject
*
project
,
_projects
)
{
foreach
(
GenericProject
*
project
,
m
_projects
)
{
if
(
fileName
==
project
->
filesFileName
()
||
fileName
==
project
->
includesFileName
()
||
fileName
==
project
->
configFileName
())
...
...
src/plugins/genericprojectmanager/genericprojectmanager.h
View file @
93b3dda6
...
...
@@ -57,9 +57,9 @@ public:
void
unregisterProject
(
GenericProject
*
project
);
private: