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

Android: Remove unneeded casts.

Browse Source 
Change-Id: Ib3db0e830aeddbfbcf72d76f8f48eb8c7bb9933b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Eike Ziller
2013-12-19 09:37:32 +01:00
parent 18ac68adb3
commit e793e2d830
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidmanifesteditorwidget.cpp
View File

@@ -470,7 +470,7 @@ bool AndroidManifestEditorWidget::eventFilter(QObject *obj, QEvent *event)
void AndroidManifestEditorWidget::updateTargetComboBox() void AndroidManifestEditorWidget::updateTargetComboBox()
{ {
const QString docPath(static_cast<AndroidManifestDocument *>(editor()->document())->filePath()); const QString docPath(baseTextDocument()->filePath());
ProjectExplorer::Project *project = androidProject(docPath); ProjectExplorer::Project *project = androidProject(docPath);
QStringList items; QStringList items;
if (project) { if (project) {
@@ -587,7 +587,7 @@ void AndroidManifestEditorWidget::preSave()
syncToEditor(); syncToEditor();
if (m_setAppName && m_appNameInStringsXml) { if (m_setAppName && m_appNameInStringsXml) {
QString baseDir = QFileInfo(static_cast<AndroidManifestDocument *>(editor()->document())->filePath()).absolutePath(); QString baseDir = QFileInfo(baseTextDocument()->filePath()).absolutePath();
QString fileName = baseDir + QLatin1String("/res/values/strings.xml"); QString fileName = baseDir + QLatin1String("/res/values/strings.xml");
QFile f(fileName); QFile f(fileName);
if (f.open(QIODevice::ReadOnly)) { if (f.open(QIODevice::ReadOnly)) {
@@ -611,7 +611,7 @@ void AndroidManifestEditorWidget::preSave()
m_setAppName = false; m_setAppName = false;
} }
QString baseDir = QFileInfo(static_cast<AndroidManifestDocument *>(editor()->document())->filePath()).absolutePath(); QString baseDir = QFileInfo(baseTextDocument()->filePath()).absolutePath();
if (!m_lIconPath.isEmpty()) { if (!m_lIconPath.isEmpty()) {
copyIcon(LowDPI, baseDir, m_lIconPath); copyIcon(LowDPI, baseDir, m_lIconPath);
m_lIconPath.clear(); m_lIconPath.clear();
@@ -695,7 +695,7 @@ void AndroidManifestEditorWidget::updateInfoBar()
void AndroidManifestEditorWidget::updateSdkVersions() void AndroidManifestEditorWidget::updateSdkVersions()
{ {
const QString docPath(static_cast<AndroidManifestDocument *>(editor()->document())->filePath()); const QString docPath(baseTextDocument()->filePath());
Project *project = androidProject(docPath); Project *project = androidProject(docPath);
QPair<int, int> apiLevels = AndroidManager::apiLevelRange(project ? project->activeTarget() : 0); QPair<int, int> apiLevels = AndroidManager::apiLevelRange(project ? project->activeTarget() : 0);
for (int i = apiLevels.first; i < apiLevels.second + 1; ++i) for (int i = apiLevels.first; i < apiLevels.second + 1; ++i)
@@ -770,7 +770,7 @@ void AndroidManifestEditorWidget::syncToWidgets(const QDomDocument &doc)
setApiLevel(m_androidMinSdkVersion, usesSdkElement, QLatin1String("android:minSdkVersion")); setApiLevel(m_androidMinSdkVersion, usesSdkElement, QLatin1String("android:minSdkVersion"));
setApiLevel(m_androidTargetSdkVersion, usesSdkElement, QLatin1String("android:targetSdkVersion")); setApiLevel(m_androidTargetSdkVersion, usesSdkElement, QLatin1String("android:targetSdkVersion"));
QString baseDir = QFileInfo(static_cast<AndroidManifestDocument *>(editor()->document())->filePath()).absolutePath(); QString baseDir = QFileInfo(baseTextDocument()->filePath()).absolutePath();
QString fileName = baseDir + QLatin1String("/res/values/strings.xml"); QString fileName = baseDir + QLatin1String("/res/values/strings.xml");
QDomElement applicationElement = manifest.firstChildElement(QLatin1String("application")); QDomElement applicationElement = manifest.firstChildElement(QLatin1String("application"));