diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index 1627356d8e79388ce8d489168606c9fe5000342f..aa04fb431aa75b05134b15d924ce9be50de38be4 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -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;
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 06cb68d85fe1f9b7493a229224b16d2742f2a4c7..8960422f1109ec6aeca80d182a40170f14119f27 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -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
diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h
index 54cb7473ce42fd5dd81c5218a6cb999d4437bc8f..46f442ecc99822b82e582554e9225d0af9de823e 100644
--- a/src/plugins/genericprojectmanager/genericproject.h
+++ b/src/plugins/genericprojectmanager/genericproject.h
@@ -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
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
index bc189a09e56dab529a5d0c3ebab90fe68d255191..5577176dca134bcd4ae507a8ca4e92138f45356e 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
@@ -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;
}
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.h b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
index 14077aca5b738c244e5c9384c109ab5fa84751cb..18d1d2663605a8bea52bb92597e4f92a8376af56 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.h
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
@@ -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
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.cpp b/src/plugins/genericprojectmanager/genericprojectmanager.cpp
index 7714a8e5b368a5080c7a2bcdb255b17af914f041..5495173f8deda3ad42745fed4508f2eb58644006 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.cpp
@@ -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())
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.h b/src/plugins/genericprojectmanager/genericprojectmanager.h
index 608313e13f028f513caaed7b6c3e4a975644211e..eb963a501283d5af3f41e7492c1c1cc659f56c24 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.h
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.h
@@ -57,9 +57,9 @@ public:
void unregisterProject(GenericProject *project);
private:
- int _projectContext;
- int _projectLanguage;
- QList<GenericProject *> _projects;
+ int m_projectContext;
+ int m_projectLanguage;
+ QList<GenericProject *> m_projects;
};
} // namespace Internal
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
index cdd82f951b19416bcc0d7c1c517a3ba3116e4493..b6bde51ca46987334a4cc31614a15fa12f6d412e 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
@@ -42,18 +42,18 @@ using namespace GenericProjectManager::Internal;
GenericProjectNode::GenericProjectNode(GenericProject *project, Core::IFile *projectFile)
: ProjectExplorer::ProjectNode(QFileInfo(projectFile->fileName()).absolutePath()),
- _project(project),
- _projectFile(projectFile)
+ m_project(project),
+ m_projectFile(projectFile)
{}
GenericProjectNode::~GenericProjectNode()
{ }
Core::IFile *GenericProjectNode::projectFile() const
-{ return _projectFile; }
+{ return m_projectFile; }
QString GenericProjectNode::projectFilePath() const
-{ return _projectFile->fileName(); }
+{ return m_projectFile->fileName(); }
void GenericProjectNode::refresh()
{
@@ -65,22 +65,22 @@ void GenericProjectNode::refresh()
ProjectExplorerPlugin::instance()->setCurrentNode(0); // ### remove me
- FileNode *projectFilesNode = new FileNode(_project->filesFileName(),
+ FileNode *projectFilesNode = new FileNode(m_project->filesFileName(),
ProjectFileType,
/* generated = */ false);
- FileNode *projectIncludesNode = new FileNode(_project->includesFileName(),
+ FileNode *projectIncludesNode = new FileNode(m_project->includesFileName(),
ProjectFileType,
/* generated = */ false);
- FileNode *projectConfigNode = new FileNode(_project->configFileName(),
+ FileNode *projectConfigNode = new FileNode(m_project->configFileName(),
ProjectFileType,
/* generated = */ false);
- QStringList files = _project->files();
- files.removeAll(_project->filesFileName());
- files.removeAll(_project->includesFileName());
- files.removeAll(_project->configFileName());
+ QStringList files = m_project->files();
+ files.removeAll(m_project->filesFileName());
+ files.removeAll(m_project->includesFileName());
+ files.removeAll(m_project->configFileName());
addFileNodes(QList<FileNode *>()
<< projectFilesNode
@@ -119,7 +119,7 @@ void GenericProjectNode::refresh()
addFileNodes(fileNodes, folder);
}
- _folderByName.clear();
+ m_folderByName.clear();
}
ProjectExplorer::FolderNode *GenericProjectNode::findOrCreateFolderByName(const QStringList &components, int end)
@@ -138,11 +138,11 @@ ProjectExplorer::FolderNode *GenericProjectNode::findOrCreateFolderByName(const
if (component.isEmpty())
return this;
- else if (FolderNode *folder = _folderByName.value(folderName))
+ else if (FolderNode *folder = m_folderByName.value(folderName))
return folder;
FolderNode *folder = new FolderNode(component);
- _folderByName.insert(folderName, folder);
+ m_folderByName.insert(folderName, folder);
FolderNode *parent = findOrCreateFolderByName(components, end - 1);
if (! parent)
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.h b/src/plugins/genericprojectmanager/genericprojectnodes.h
index d31a14dbd625364b0d5f0d000b4ce1e2505b2b38..4b647a860e37c2751596387bc0708ed3acd0efe3 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.h
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.h
@@ -76,9 +76,9 @@ private:
FolderNode *findOrCreateFolderByName(const QStringList &components, int end);
private:
- GenericProject *_project;
- Core::IFile *_projectFile;
- QHash<QString, FolderNode *> _folderByName;
+ GenericProject *m_project;
+ Core::IFile *m_projectFile;
+ QHash<QString, FolderNode *> m_folderByName;
};
} // namespace Internal
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
index 2fe1e713910079d402a5ace5f4f4da6c99cbf14d..5d087f081ec5b63f848c8f4f90150d0e2e64a9af 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp
@@ -46,13 +46,13 @@ using namespace GenericProjectManager;
using namespace GenericProjectManager::Internal;
GenericProjectPlugin::GenericProjectPlugin()
- : _projectFilesEditorFactory(0)
+ : m_projectFilesEditorFactory(0)
{ }
GenericProjectPlugin::~GenericProjectPlugin()
{
- removeObject(_projectFilesEditorFactory);
- delete _projectFilesEditorFactory;
+ removeObject(m_projectFilesEditorFactory);
+ delete m_projectFilesEditorFactory;
}
bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage)
@@ -72,8 +72,8 @@ bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage
TextEditor::TextEditorActionHandler *actionHandler =
new TextEditor::TextEditorActionHandler(Constants::C_FILESEDITOR);
- _projectFilesEditorFactory = new ProjectFilesFactory(manager, actionHandler);
- addObject(_projectFilesEditorFactory);
+ m_projectFilesEditorFactory = new ProjectFilesFactory(manager, actionHandler);
+ addObject(m_projectFilesEditorFactory);
addAutoReleasedObject(manager);
addAutoReleasedObject(new MakeBuildStepFactory);
diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.h b/src/plugins/genericprojectmanager/genericprojectplugin.h
index e78d975e21f62db0be487aef6b9bedfd516415cf..4fae2ac4c164dace512601449a2261deeb33e6b6 100644
--- a/src/plugins/genericprojectmanager/genericprojectplugin.h
+++ b/src/plugins/genericprojectmanager/genericprojectplugin.h
@@ -51,7 +51,7 @@ public:
virtual void extensionsInitialized();
private:
- ProjectFilesFactory *_projectFilesEditorFactory;
+ ProjectFilesFactory *m_projectFilesEditorFactory;
};
} // namespace Internal
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 470a7b06c5271bff459978efebb256bf7ffaac27..289cbfd3434012e8b3b05c690d0f68db6e6c7440 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -40,7 +40,7 @@ public:
virtual QVariant data(const QModelIndex &index, int role) const
{
if (index.column() == 0 && role == Qt::CheckStateRole) {
- if (_selectedPaths.contains(index))
+ if (m_selectedPaths.contains(index))
return Qt::Checked;
return Qt::Unchecked;
@@ -53,9 +53,9 @@ public:
{
if (index.column() == 0 && role == Qt::CheckStateRole) {
if (value.toBool())
- _selectedPaths.insert(index);
+ m_selectedPaths.insert(index);
else
- _selectedPaths.remove(index);
+ m_selectedPaths.remove(index);
return true;
}
@@ -64,20 +64,20 @@ public:
}
void clearSelectedPaths()
- { _selectedPaths.clear(); }
+ { m_selectedPaths.clear(); }
QSet<QString> selectedPaths() const
{
QSet<QString> paths;
- foreach (const QModelIndex &index, _selectedPaths)
+ foreach (const QModelIndex &index, m_selectedPaths)
paths.insert(filePath(index));
return paths;
}
private:
- QSet<QModelIndex> _selectedPaths;
+ QSet<QModelIndex> m_selectedPaths;
};
} // end of anonymous namespace
@@ -98,10 +98,10 @@ GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent)
firstPage->setTitle(tr("Project"));
QFormLayout *layout = new QFormLayout(firstPage);
- _pathChooser = new PathChooser;
- layout->addRow(tr("Source Directory:"), _pathChooser);
+ m_pathChooser = new PathChooser;
+ layout->addRow(tr("Source Directory:"), m_pathChooser);
- _firstPageId = addPage(firstPage);
+ m_firstPageId = addPage(firstPage);
#if 0
// second page
@@ -110,9 +110,9 @@ GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent)
QFormLayout *secondPageLayout = new QFormLayout(secondPage);
- _dirView = new QTreeView;
- _dirModel = new DirModel(this);
- _dirView->setModel(_dirModel);
+ m_dirView = new QTreeView;
+ m_dirModel = new DirModel(this);
+ m_dirView->setModel(_dirModel);
Core::ICore *core = Core::ICore::instance();
Core::MimeDatabase *mimeDatabase = core->mimeDatabase();
@@ -127,10 +127,10 @@ GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent)
nameFilters.append(nameFilter);
}
- _filesView = new QListView;
- _filesModel = new QDirModel(this);
- _filesModel->setNameFilters(nameFilters);
- _filesModel->setFilter(QDir::Files);
+ m_filesView = new QListView;
+ m_filesModel = new QDirModel(this);
+ m_filesModel->setNameFilters(nameFilters);
+ m_filesModel->setFilter(QDir::Files);
connect(_dirView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
this, SLOT(updateFilesView(QModelIndex,QModelIndex)));
@@ -138,7 +138,7 @@ GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent)
secondPageLayout->addRow(_dirView);
secondPageLayout->addRow(_filesView);
- _secondPageId = addPage(secondPage);
+ m_secondPageId = addPage(secondPage);
#endif
}
@@ -146,34 +146,34 @@ GenericProjectWizardDialog::~GenericProjectWizardDialog()
{ }
QString GenericProjectWizardDialog::path() const
-{ return _pathChooser->path(); }
+{ return m_pathChooser->path(); }
void GenericProjectWizardDialog::updateFilesView(const QModelIndex ¤t,
const QModelIndex &)
{
if (! current.isValid())
- _filesView->setModel(0);
+ m_filesView->setModel(0);
else {
- const QString selectedPath = _dirModel->filePath(current);
+ const QString selectedPath = m_dirModel->filePath(current);
- if (! _filesView->model())
- _filesView->setModel(_filesModel);
+ if (! m_filesView->model())
+ m_filesView->setModel(m_filesModel);
- _filesView->setRootIndex(_filesModel->index(selectedPath));
+ m_filesView->setRootIndex(m_filesModel->index(selectedPath));
}
}
void GenericProjectWizardDialog::initializePage(int id)
{
#if 0
- if (id == _secondPageId) {
+ if (id == m_secondPageId) {
using namespace Core::Utils;
- const QString projectPath = _pathChooser->path();
+ const QString projectPath = m_pathChooser->path();
QDirModel *dirModel = qobject_cast<QDirModel *>(_dirView->model());
- _dirView->setRootIndex(dirModel->index(projectPath));
+ m_dirView->setRootIndex(dirModel->index(projectPath));
}
#endif
}
@@ -182,10 +182,10 @@ bool GenericProjectWizardDialog::validateCurrentPage()
{
using namespace Core::Utils;
- if (currentId() == _firstPageId) {
- return ! _pathChooser->path().isEmpty();
+ if (currentId() == m_firstPageId) {
+ return ! m_pathChooser->path().isEmpty();
- } else if (currentId() == _secondPageId) {
+ } else if (currentId() == m_secondPageId) {
return true;
}
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.h b/src/plugins/genericprojectmanager/genericprojectwizard.h
index 6c3f87e16a6dd427ece44015689729739e325f32..c268ce5f2aa0feeba75cdd77fbd79ef60959c7e7 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.h
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.h
@@ -37,16 +37,16 @@ protected:
virtual bool validateCurrentPage();
private:
- int _firstPageId;
- int _secondPageId;
+ int m_firstPageId;
+ int m_secondPageId;
- Core::Utils::PathChooser *_pathChooser;
+ Core::Utils::PathChooser *m_pathChooser;
- QTreeView *_dirView;
- QDirModel *_dirModel;
+ QTreeView *m_dirView;
+ QDirModel *m_dirModel;
- QListView *_filesView;
- QDirModel *_filesModel;
+ QListView *m_filesView;
+ QDirModel *m_filesModel;
};
class GenericProjectWizard : public Core::BaseFileWizard
diff --git a/src/plugins/genericprojectmanager/makestep.h b/src/plugins/genericprojectmanager/makestep.h
index 8841c5ebf464777a8e92d2ef2979c8f2e3906231..1697648ecbed61111d987f9d74e744ae8505dd65 100644
--- a/src/plugins/genericprojectmanager/makestep.h
+++ b/src/plugins/genericprojectmanager/makestep.h
@@ -96,7 +96,7 @@ class MakeBuildStepFactory : public ProjectExplorer::IBuildStepFactory
virtual QString displayNameForName(const QString &name) const;
};
-}
-}
+} // namespace Internal
+} // namespace GenericProjectManager
#endif // MAKESTEP_H
diff --git a/src/plugins/genericprojectmanager/pkgconfigtool.cpp b/src/plugins/genericprojectmanager/pkgconfigtool.cpp
index eb4c6ad1f521342389438b740b1040d05dfab4ee..2ee63acf8d84debbc41fa9dad603d5feba1143cd 100644
--- a/src/plugins/genericprojectmanager/pkgconfigtool.cpp
+++ b/src/plugins/genericprojectmanager/pkgconfigtool.cpp
@@ -14,10 +14,10 @@ PkgConfigTool::~PkgConfigTool()
QList<PkgConfigTool::Package> PkgConfigTool::packages() const
{
- if (_packages.isEmpty())
+ if (m_packages.isEmpty())
packages_helper();
- return _packages;
+ return m_packages;
}
void PkgConfigTool::packages_helper() const
@@ -95,7 +95,6 @@ void PkgConfigTool::packages_helper() const
}
}
- _packages.append(package);
+ m_packages.append(package);
}
}
-
diff --git a/src/plugins/genericprojectmanager/pkgconfigtool.h b/src/plugins/genericprojectmanager/pkgconfigtool.h
index ac97d3e8eb0e9fe19313315c6010f0083144655e..cbd474eb58207a88f94ec1accd5a94f3087c64ea 100644
--- a/src/plugins/genericprojectmanager/pkgconfigtool.h
+++ b/src/plugins/genericprojectmanager/pkgconfigtool.h
@@ -30,7 +30,7 @@ private:
void packages_helper() const;
private:
- mutable QList<Package> _packages;
+ mutable QList<Package> m_packages;
};
} // end of namespace Internal