forked from qt-creator/qt-creator
more cosmetic changes
This commit is contained in:
@@ -30,11 +30,14 @@
|
||||
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
***************************************************************************/
|
||||
|
||||
#include "cmakeproject.h"
|
||||
#include "cmakeprojectconstants.h"
|
||||
#include "cmakeprojectnodes.h"
|
||||
|
||||
#include <extensionsystem/pluginmanager.h>
|
||||
#include <cpptools/cppmodelmanagerinterface.h>
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
using namespace CMakeProjectManager;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/***************************************************************************
|
||||
/***************************************************************************
|
||||
**
|
||||
** This file is part of Qt Creator
|
||||
**
|
||||
@@ -30,17 +30,19 @@
|
||||
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef CMAKEPROJECT_H
|
||||
#define CMAKEPROJECT_H
|
||||
|
||||
#include "cmakeprojectmanager.h"
|
||||
#include "cmakeprojectnodes.h"
|
||||
|
||||
#include <projectexplorer/project.h>
|
||||
#include <projectexplorer/projectnodes.h>
|
||||
#include <projectexplorer/buildstep.h>
|
||||
#include <coreplugin/ifile.h>
|
||||
#include <QtCore/QXmlStreamReader>
|
||||
|
||||
#include "cmakeprojectmanager.h"
|
||||
#include "cmakeprojectnodes.h"
|
||||
#include <QtCore/QXmlStreamReader>
|
||||
|
||||
namespace CMakeProjectManager {
|
||||
namespace Internal{
|
||||
@@ -152,7 +154,7 @@ public:
|
||||
virtual void init(const QString &buildConfiguration);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
} // namespace Internal
|
||||
} // namespace CMakeProjectManager
|
||||
|
||||
#endif // CMAKEPROJECT_H
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef CMAKEPROJECTCONSTANTS_H
|
||||
#define CMAKEPROJECTCONSTANTS_H
|
||||
|
||||
@@ -39,7 +40,7 @@ namespace Constants {
|
||||
const char * const PROJECTCONTEXT = "CMakeProject.ProjectContext";
|
||||
const char * const CMAKEMIMETYPE = "text/x-cmake"; // TOOD check that this is correct
|
||||
|
||||
}
|
||||
}
|
||||
} // namespace Constants
|
||||
} // namespace CMakeProjectManager
|
||||
|
||||
#endif // CMAKEPROJECTCONSTANTS_H
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
***************************************************************************/
|
||||
|
||||
#include "cmakeprojectmanager.h"
|
||||
#include "cmakeprojectconstants.h"
|
||||
#include "cmakeproject.h"
|
||||
@@ -40,7 +41,6 @@
|
||||
#include <coreplugin/uniqueidmanager.h>
|
||||
#include <projectexplorer/projectexplorerconstants.h>
|
||||
|
||||
|
||||
using namespace CMakeProjectManager::Internal;
|
||||
|
||||
CMakeManager::CMakeManager()
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef CMAKEPROJECTMANAGER_H
|
||||
#define CMAKEPROJECTMANAGER_H
|
||||
|
||||
@@ -55,6 +56,8 @@ private:
|
||||
int m_projectContext;
|
||||
int m_projectLanguage;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace CMakeProjectManager
|
||||
|
||||
#endif // CMAKEPROJECTMANAGER_H
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
***************************************************************************/
|
||||
|
||||
#include "cmakeprojectnodes.h"
|
||||
|
||||
using namespace CMakeProjectManager;
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef CMAKEPROJECTNODE_H
|
||||
#define CMAKEPROJECTNODE_H
|
||||
|
||||
@@ -60,7 +61,8 @@ public:
|
||||
using ProjectNode::addFileNodes;
|
||||
using ProjectNode::addFolderNodes;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace CMakeProjectManager
|
||||
|
||||
#endif // CMAKEPROJECTNODE_H
|
||||
|
||||
@@ -30,13 +30,16 @@
|
||||
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
***************************************************************************/
|
||||
|
||||
#include "cmakeprojectplugin.h"
|
||||
#include "cmakeprojectmanager.h"
|
||||
|
||||
#include <coreplugin/icore.h>
|
||||
#include <coreplugin/mimedatabase.h>
|
||||
|
||||
#include <QtCore/qplugin.h>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
#include "cmakeprojectmanager.h"
|
||||
|
||||
using namespace CMakeProjectManager::Internal;
|
||||
|
||||
@@ -59,7 +62,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
|
||||
|
||||
void CMakeProjectPlugin::extensionsInitialized()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(CMakeProjectPlugin)
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef CMAKEPROJECTPLUGIN_H
|
||||
#define CMAKEPROJECTPLUGIN_H
|
||||
|
||||
@@ -52,9 +53,6 @@ public:
|
||||
bool initialize(const QStringList &arguments, QString *error_message);
|
||||
|
||||
void extensionsInitialized();
|
||||
|
||||
|
||||
private:
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
|
||||
Reference in New Issue
Block a user