feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove target from AndroidManager::openXmlFile()

Browse Source 
It's no longer used.

Change-Id: I0256b76c2b007dd841aad51dae12602d9d7b3eb8
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-11-06 16:22:53 +01:00
parent e0c9d9dd51
commit 120b923edb
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/android/androidmanager.cpp
View File

@@ -106,7 +106,7 @@ bool AndroidManager::setPackageName(ProjectExplorer::Target *target, const QStri
QString AndroidManager::applicationName(ProjectExplorer::Target *target) QString AndroidManager::applicationName(ProjectExplorer::Target *target)
{ {
QDomDocument doc; QDomDocument doc;
if (!openXmlFile(target, doc, stringsPath(target))) if (!openXmlFile(doc, stringsPath(target)))
return QString(); return QString();
QDomElement metadataElem = doc.documentElement().firstChildElement(QLatin1String("string")); QDomElement metadataElem = doc.documentElement().firstChildElement(QLatin1String("string"));
while (!metadataElem.isNull()) { while (!metadataElem.isNull()) {
@@ -121,7 +121,7 @@ bool AndroidManager::setApplicationName(ProjectExplorer::Target *target, const Q
{ {
QDomDocument doc; QDomDocument doc;
Utils::FileName path = stringsPath(target); Utils::FileName path = stringsPath(target);
if (!openXmlFile(target, doc, path)) if (!openXmlFile(doc, path))
return false; return false;
QDomElement metadataElem = doc.documentElement().firstChildElement(QLatin1String("string")); QDomElement metadataElem = doc.documentElement().firstChildElement(QLatin1String("string"));
while (!metadataElem.isNull()) { while (!metadataElem.isNull()) {
@@ -403,11 +403,11 @@ bool AndroidManager::createAndroidTemplatesIfNecessary(ProjectExplorer::Target *
QDomDocument srcVersionDoc; QDomDocument srcVersionDoc;
Utils::FileName srcVersionPath = javaSrcPath; Utils::FileName srcVersionPath = javaSrcPath;
srcVersionPath.appendPath(QLatin1String("version.xml")); srcVersionPath.appendPath(QLatin1String("version.xml"));
if (openXmlFile(target, srcVersionDoc, srcVersionPath)) { if (openXmlFile(srcVersionDoc, srcVersionPath)) {
QDomDocument dstVersionDoc; QDomDocument dstVersionDoc;
Utils::FileName dstVersionPath=androidPath; Utils::FileName dstVersionPath=androidPath;
dstVersionPath.appendPath(QLatin1String("version.xml")); dstVersionPath.appendPath(QLatin1String("version.xml"));
if (openXmlFile(target, dstVersionDoc, dstVersionPath)) if (openXmlFile(dstVersionDoc, dstVersionPath))
forceUpdate = (srcVersionDoc.documentElement().attribute(QLatin1String("value")).toDouble() forceUpdate = (srcVersionDoc.documentElement().attribute(QLatin1String("value")).toDouble()
> dstVersionDoc.documentElement().attribute(QLatin1String("value")).toDouble()); > dstVersionDoc.documentElement().attribute(QLatin1String("value")).toDouble());
else else
@@ -674,7 +674,7 @@ bool AndroidManager::setPrebundledLibs(ProjectExplorer::Target *target, const QS
bool AndroidManager::openLibsXml(ProjectExplorer::Target *target, QDomDocument &doc) bool AndroidManager::openLibsXml(ProjectExplorer::Target *target, QDomDocument &doc)
{ {
return openXmlFile(target, doc, libsPath(target)); return openXmlFile(doc, libsPath(target));
} }
bool AndroidManager::saveLibsXml(ProjectExplorer::Target *target, QDomDocument &doc) bool AndroidManager::saveLibsXml(ProjectExplorer::Target *target, QDomDocument &doc)
@@ -698,7 +698,7 @@ QString AndroidManager::loadLocal(ProjectExplorer::Target *target, int apiLevel,
QString localLibs; QString localLibs;
QDomDocument doc; QDomDocument doc;
if (!openXmlFile(target, doc, localLibsRulesFilePath(target))) if (!openXmlFile(doc, localLibsRulesFilePath(target)))
return localLibs; return localLibs;
QStringList libs; QStringList libs;
@@ -733,8 +733,7 @@ QString AndroidManager::loadLocal(ProjectExplorer::Target *target, int apiLevel,
return localLibs; return localLibs;
} }
bool AndroidManager::openXmlFile(ProjectExplorer::Target *target, QDomDocument &doc, bool AndroidManager::openXmlFile(QDomDocument &doc, const Utils::FileName &fileName)
const Utils::FileName &fileName)
{ {
QFile f(fileName.toString()); QFile f(fileName.toString());
if (!f.open(QIODevice::ReadOnly)) if (!f.open(QIODevice::ReadOnly))
@@ -762,7 +761,7 @@ bool AndroidManager::saveXmlFile(ProjectExplorer::Target *target, QDomDocument &
bool AndroidManager::openManifest(ProjectExplorer::Target *target, QDomDocument &doc) bool AndroidManager::openManifest(ProjectExplorer::Target *target, QDomDocument &doc)
{ {
return openXmlFile(target, doc, manifestPath(target)); return openXmlFile(doc, manifestPath(target));
} }
bool AndroidManager::saveManifest(ProjectExplorer::Target *target, QDomDocument &doc) bool AndroidManager::saveManifest(ProjectExplorer::Target *target, QDomDocument &doc)

3
src/plugins/android/androidmanager.h
View File

@@ -113,8 +113,7 @@ public:
private: private:
static void raiseError(const QString &reason); static void raiseError(const QString &reason);
static bool openXmlFile(ProjectExplorer::Target *target, QDomDocument &doc, static bool openXmlFile(QDomDocument &doc, const Utils::FileName &fileName);
const Utils::FileName &fileName);
static bool saveXmlFile(ProjectExplorer::Target *target, QDomDocument &doc, const Utils::FileName &fileName); static bool saveXmlFile(ProjectExplorer::Target *target, QDomDocument &doc, const Utils::FileName &fileName);
static bool openManifest(ProjectExplorer::Target *target, QDomDocument &doc); static bool openManifest(ProjectExplorer::Target *target, QDomDocument &doc);
static bool saveManifest(ProjectExplorer::Target *target, QDomDocument &doc); static bool saveManifest(ProjectExplorer::Target *target, QDomDocument &doc);