From 27211de08356cc0f99ccfc1488a64a911acacf84 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 30 Nov 2011 15:54:22 +0100
Subject: [PATCH] Minor Krazy cleanup in autotools.
Change-Id: I1d955f2b2d6f6f2668156e0f211df37616cfc3e7
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/autotoolsprojectmanager/autogenstep.cpp | 2 +-
src/plugins/autotoolsprojectmanager/autoreconfstep.cpp | 2 +-
.../autotoolsprojectmanager/autotoolsbuildconfiguration.cpp | 1 -
src/plugins/autotoolsprojectmanager/configurestep.cpp | 2 +-
src/plugins/autotoolsprojectmanager/makefileparser.cpp | 2 +-
src/plugins/autotoolsprojectmanager/makefileparserthread.h | 2 +-
6 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
index 876318c3f7e..b4ae6775d52 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
@@ -179,7 +179,7 @@ void AutogenStep::run(QFutureInterface<bool> &interface)
{
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration();
- // Check wether we need to run autogen.sh
+ // Check whether we need to run autogen.sh
const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure"));
const QFileInfo configureAcInfo(bc->buildDirectory() + QLatin1String("/configure.ac"));
const QFileInfo makefileAmInfo(bc->buildDirectory() + QLatin1String("/Makefile.am"));
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
index 1525ff8ef61..0785dff77e1 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
@@ -178,7 +178,7 @@ void AutoreconfStep::run(QFutureInterface<bool> &interface)
{
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration();
- // Check wether we need to run autoreconf
+ // Check whether we need to run autoreconf
const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure"));
if (!configureInfo.exists())
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
index a194354f9b1..e82adc0ccbb 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
@@ -37,7 +37,6 @@
#include "autotoolsproject.h"
#include "autotoolstarget.h"
#include "autotoolsprojectconstants.h"
-#include "makestep.h"
#include "autogenstep.h"
#include "autoreconfstep.h"
#include "configurestep.h"
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp
index 7098e9aec65..c75c14bbe5e 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp
@@ -179,7 +179,7 @@ void ConfigureStep::run(QFutureInterface<bool>& interface)
{
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration();
- //Check wether we need to run configure
+ //Check whether we need to run configure
const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure"));
const QFileInfo configStatusInfo(bc->buildDirectory() + QLatin1String("/config.status"));
diff --git a/src/plugins/autotoolsprojectmanager/makefileparser.cpp b/src/plugins/autotoolsprojectmanager/makefileparser.cpp
index 71cf9cce4a9..c86f402b6c7 100644
--- a/src/plugins/autotoolsprojectmanager/makefileparser.cpp
+++ b/src/plugins/autotoolsprojectmanager/makefileparser.cpp
@@ -136,7 +136,7 @@ MakefileParser::TopTarget MakefileParser::topTarget() const
const QString line = m_line.simplified();
if (!line.isEmpty() && !line.startsWith(QChar('#'))) {
// TODO: Check how many fixed strings like AM_DEFAULT_SOURCE_EXT will
- // be needed vs. variable strings like _SOURCES. Dependend on this a
+ // be needed vs. variable strings like _SOURCES. Dependent on this a
// more clever way than this (expensive) if-cascading might be done.
if (line.startsWith(QLatin1String("AM_DEFAULT_SOURCE_EXT =")))
topTarget = AmDefaultSourceExt;
diff --git a/src/plugins/autotoolsprojectmanager/makefileparserthread.h b/src/plugins/autotoolsprojectmanager/makefileparserthread.h
index b9d80a393a4..a8f03b8e107 100644
--- a/src/plugins/autotoolsprojectmanager/makefileparserthread.h
+++ b/src/plugins/autotoolsprojectmanager/makefileparserthread.h
@@ -90,7 +90,7 @@ public:
QStringList includePaths() const;
/**
- * @return True, if an error occured during the parsing. Should be invoked,
+ * @return True, if an error occurred during the parsing. Should be invoked,
* after the signal finished() has been emitted.
*/
bool hasError() const;
--
GitLab