Commit ddf4b613 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Krazy fixes (spelling, single char strings, char constants).

parent bda50da7
......@@ -60,9 +60,9 @@
enum { OptionIndent = 4, DescriptionIndent = 34 };
static const char *appNameC = "Qt Creator";
static const char *corePluginNameC = "Core";
static const char *fixedOptionsC =
static const char appNameC[] = "Qt Creator";
static const char corePluginNameC[] = "Core";
static const char fixedOptionsC[] =
" [OPTION]... [FILE]...\n"
"Options:\n"
" -help Display this help\n"
......@@ -70,13 +70,13 @@ static const char *fixedOptionsC =
" -client Attempt to connect to already running instance\n"
" -settingspath <path> Override the default path where user settings are stored.\n";
static const char *HELP_OPTION1 = "-h";
static const char *HELP_OPTION2 = "-help";
static const char *HELP_OPTION3 = "/h";
static const char *HELP_OPTION4 = "--help";
static const char *VERSION_OPTION = "-version";
static const char *CLIENT_OPTION = "-client";
static const char *SETTINGS_OPTION = "-settingspath";
static const char HELP_OPTION1[] = "-h";
static const char HELP_OPTION2[] = "-help";
static const char HELP_OPTION3[] = "/h";
static const char HELP_OPTION4[] = "--help";
static const char VERSION_OPTION[] = "-version";
static const char CLIENT_OPTION[] = "-client";
static const char SETTINGS_OPTION[] = "-settingspath";
typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet;
......
......@@ -53,8 +53,8 @@
#include <QTest>
#endif
static const char * const C_IGNORED_PLUGINS = "Plugins/Ignored";
static const char * const C_FORCEENABLED_PLUGINS = "Plugins/ForceEnabled";
static const char C_IGNORED_PLUGINS[] = "Plugins/Ignored";
static const char C_FORCEENABLED_PLUGINS[] = "Plugins/ForceEnabled";
typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet;
......
......@@ -75,7 +75,7 @@ private:
void populateImportedTypes(Interpreter::TypeEnvironment *typeEnv, Document::Ptr doc);
Interpreter::ObjectValue *importFileOrDirectory(Document::Ptr doc, const Interpreter::ImportInfo &importInfo);
Interpreter::ObjectValue *importNonFile(Document::Ptr doc, const Interpreter::ImportInfo &importInfo, const QString &forcedPackageName = QString::null);
Interpreter::ObjectValue *importNonFile(Document::Ptr doc, const Interpreter::ImportInfo &importInfo, const QString &forcedPackageName = QString());
void importObject(Bind *bind, const QString &name, Interpreter::ObjectValue *object, NameId *targetNamespace);
bool importLibrary(Document::Ptr doc,
......
......@@ -148,7 +148,7 @@ Rewriter::Range Rewriter::addBinding(AST::UiObjectInitializer *ast,
UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *members,
const QStringList &propertyOrder)
{
const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString::null);
const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString());
UiObjectMemberList *lastObjectDef = 0;
UiObjectMemberList *lastNonObjectDef = 0;
......@@ -181,7 +181,7 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb
UiArrayMemberList *Rewriter::searchMemberToInsertAfter(UiArrayMemberList *members,
const QStringList &propertyOrder)
{
const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString::null);
const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString());
UiArrayMemberList *lastObjectDef = 0;
UiArrayMemberList *lastNonObjectDef = 0;
......
......@@ -763,7 +763,7 @@ std::string gdbmiBreakpoints(CIDebugControl *ctrl,
str << '[';
if (humanReadable)
str << '\n';
for (ULONG i = 0; i < breakPointCount; i++) {
for (ULONG i = 0; i < breakPointCount; ++i) {
str << "{number=\"" << i << '"';
IDebugBreakpoint *bp = 0;
hr = ctrl->GetBreakpointByIndex(i, &bp);
......
......@@ -2197,7 +2197,7 @@ static inline std::vector<AbstractSymbolGroupNode *>
const std::string charType = "unsigned char";
std::string errorMessage;
SymbolGroup *sg = n->symbolGroup();
for (int i = 0; i < size; i++, address++) {
for (int i = 0; i < size; ++i, ++address) {
SymbolGroupNode *en = sg->addSymbol(std::string(), SymbolGroupValue::pointedToSymbolName(address, charType),
std::string(), &errorMessage);
if (!en) {
......@@ -2244,7 +2244,7 @@ std::vector<AbstractSymbolGroupNode *>
if (SymbolGroupValue::verbose) {
DebugPrint dp;
dp << "<dumpComplexType" << rc.size() << ' ';
for (VectorIndexType i = 0; i < rc.size() ; i++)
for (VectorIndexType i = 0; i < rc.size() ; ++i)
dp << i << ' ' << rc.at(i)->name();
}
return rc;
......
......@@ -147,7 +147,7 @@ void CallgrindController::processError(QProcess::ProcessError)
{
QTC_ASSERT(m_process, return)
const QString error = m_process->errorString();
emit statusMessage(QString("An error occured while trying to run %1: %2").arg(CALLGRIND_CONTROL_BINARY).arg(error));
emit statusMessage(QString("An error occurred while trying to run %1: %2").arg(CALLGRIND_CONTROL_BINARY).arg(error));
m_process->deleteLater();
m_process = 0;
......@@ -169,7 +169,7 @@ void CallgrindController::processFinished(int rc, QProcess::ExitStatus status)
// this call went fine, we might run another task after this
switch(m_lastOption) {
case ResetEventCounters:
// lets dump the new resetted profiling info
// lets dump the new reset profiling info
run(Dump);
return;
case Pause:
......@@ -264,7 +264,7 @@ void CallgrindController::cleanupTempFile()
if (!m_tempDataFile.isEmpty() && QFile::exists(m_tempDataFile))
QFile::remove(m_tempDataFile);
m_tempDataFile = QString();
m_tempDataFile.clear();
}
}
......
......@@ -322,7 +322,7 @@ void Function::finalize()
}
}
}
/// now substract self cost (see @c inclusiveCost() implementation)
// now subtract self cost (see @c inclusiveCost() implementation)
for(int i = 0, c = d->m_inclusiveCost.size(); i < c; ++i) {
if (d->m_inclusiveCost.at(i) < d->m_selfCost.at(i))
d->m_inclusiveCost[i] = 0;
......
......@@ -99,8 +99,8 @@ void FunctionCycle::setFunctions(const QVector<const Function *> functions)
}
}
}
// now substract self from incl. cost (see implementation of inclusiveCost())
/// now substract self cost (see @c inclusiveCost() implementation)
// now subtract self from incl. cost (see implementation of inclusiveCost())
// now subtract self cost (see @c inclusiveCost() implementation)
for(int i = 0, c = d->m_inclusiveCost.size(); i < c; ++i) {
if (d->m_inclusiveCost.at(i) < d->m_selfCost.at(i))
d->m_inclusiveCost[i] = 0;
......
......@@ -334,7 +334,7 @@ void Parser::Private::parseHeader(QIODevice *device)
} else if (line.startsWith("summary: ")) {
QString values = getValue(line, 9);
uint i = 0;
foreach(const QString value, values.split(QLatin1Char(' '), QString::SkipEmptyParts))
foreach (const QString &value, values.split(QLatin1Char(' '), QString::SkipEmptyParts))
data->setTotalCost(i++, value.toULongLong());
} else if (!line.trimmed().isEmpty()) {
// handle line and exit parseHeader
......
......@@ -55,7 +55,7 @@
using namespace Analyzer;
using namespace Analyzer::Internal;
static const QLatin1String lastActiveToolC("Analyzer.Plugin.LastActiveTool");
static const char lastActiveToolC[] = "Analyzer.Plugin.LastActiveTool";
AnalyzerPlugin *AnalyzerPlugin::m_instance = 0;
......
......@@ -182,7 +182,7 @@ void CallgrindTool::initializeDockWidgets()
Qt::BottomDockWidgetArea);
QDockWidget *visDock =
am->createDockWidget(this, tr("Visualisation"),
am->createDockWidget(this, tr("Visualization"),
m_callgrindWidgetHandler->visualisation(), Qt::LeftDockWidgetArea);
am->mainWindow()->tabifyDockWidget(callersDock, calleesDock);
......
......@@ -216,7 +216,7 @@ bool CMakeProject::parseCMakeLists()
if (file != cbpFile)
m_watcher->removePath(file);
// how can we ensure that it is completly written?
// how can we ensure that it is completely written?
m_watcher->addPath(cbpFile);
// ToolChain
......
......@@ -87,13 +87,13 @@
(see addToRecentFiles() and recentFiles()).
*/
static const char * const settingsGroupC = "RecentFiles";
static const char * const filesKeyC = "Files";
static const char * const editorsKeyC = "EditorIds";
static const char settingsGroupC[] = "RecentFiles";
static const char filesKeyC[] = "Files";
static const char editorsKeyC[] = "EditorIds";
static const char * const directoryGroupC = "Directories";
static const char * const projectDirectoryKeyC = "Projects";
static const char * const useProjectDirectoryKeyC = "UseProjectsDirectory";
static const char directoryGroupC[] = "Directories";
static const char projectDirectoryKeyC[] = "Projects";
static const char useProjectDirectoryKeyC[] = "UseProjectsDirectory";
namespace Core {
namespace Internal {
......
......@@ -1184,15 +1184,15 @@ void MainWindow::aboutToShutdown()
hide();
}
static const char *settingsGroup = "MainWindow";
static const char *colorKey = "Color";
static const char *windowGeometryKey = "WindowGeometry";
static const char *windowStateKey = "WindowState";
static const char settingsGroup[] = "MainWindow";
static const char colorKey[] = "Color";
static const char windowGeometryKey[] = "WindowGeometry";
static const char windowStateKey[] = "WindowState";
// TODO compat for <= 2.1, remove later
static const char *geometryKey = "Geometry";
static const char *maxKey = "Maximized";
static const char *fullScreenKey = "FullScreen";
static const char geometryKey[] = "Geometry";
static const char maxKey[] = "Maximized";
static const char fullScreenKey[] = "FullScreen";
void MainWindow::readSettings()
{
......
......@@ -61,29 +61,29 @@
enum { debugMimeDB = 0 };
// XML tags in mime files
static const char *mimeInfoTagC = "mime-info";
static const char *mimeTypeTagC = "mime-type";
static const char *mimeTypeAttributeC = "type";
static const char *subClassTagC = "sub-class-of";
static const char *commentTagC = "comment";
static const char *globTagC = "glob";
static const char *aliasTagC = "alias";
static const char *patternAttributeC = "pattern";
static const char *weightAttributeC = "weight";
static const char *localeAttributeC = "xml:lang";
static const char *magicTagC = "magic";
static const char *priorityAttributeC = "priority";
static const char *matchTagC = "match";
static const char *matchValueAttributeC = "value";
static const char *matchTypeAttributeC = "type";
static const char *matchStringTypeValueC = "string";
static const char *matchByteTypeValueC = "byte";
static const char *matchOffsetAttributeC = "offset";
static const char mimeInfoTagC[] = "mime-info";
static const char mimeTypeTagC[] = "mime-type";
static const char mimeTypeAttributeC[] = "type";
static const char subClassTagC[] = "sub-class-of";
static const char commentTagC[] = "comment";
static const char globTagC[] = "glob";
static const char aliasTagC[] = "alias";
static const char patternAttributeC[] = "pattern";
static const char weightAttributeC[] = "weight";
static const char localeAttributeC[] = "xml:lang";
static const char magicTagC[] = "magic";
static const char priorityAttributeC[] = "priority";
static const char matchTagC[] = "match";
static const char matchValueAttributeC[] = "value";
static const char matchTypeAttributeC[] = "type";
static const char matchStringTypeValueC[] = "string";
static const char matchByteTypeValueC[] = "byte";
static const char matchOffsetAttributeC[] = "offset";
// Types
static const char *textTypeC = "text/plain";
static const char *binaryTypeC = "application/octet-stream";
static const char textTypeC[] = "text/plain";
static const char binaryTypeC[] = "application/octet-stream";
// UTF16 byte order marks
static const char bigEndianByteOrderMarkC[] = "\xFE\xFF";
......
......@@ -56,9 +56,9 @@
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
static const char *headerSuffixKeyC = "HeaderSuffix";
static const char *sourceSuffixKeyC = "SourceSuffix";
static const char *licenseTemplatePathKeyC = "LicenseTemplate";
static const char headerSuffixKeyC[] = "HeaderSuffix";
static const char sourceSuffixKeyC[] = "SourceSuffix";
static const char licenseTemplatePathKeyC[] = "LicenseTemplate";
const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("CppTools::Internal::CppFileSettingsWidget",
"/**************************************************************************\n"
......
......@@ -35,14 +35,14 @@
#include <QtCore/QSettings>
#include <QtCore/QTextStream>
static const char *groupC = "CVS";
static const char *commandKeyC = "Command";
static const char *rootC = "Root";
static const char *promptToSubmitKeyC = "PromptForSubmit";
static const char *diffOptionsKeyC = "DiffOptions";
static const char *describeByCommitIdKeyC = "DescribeByCommitId";
static const char *defaultDiffOptions = "-du";
static const char *timeOutKeyC = "TimeOut";
static const char groupC[] = "CVS";
static const char commandKeyC[] = "Command";
static const char rootC[] = "Root";
static const char promptToSubmitKeyC[] = "PromptForSubmit";
static const char diffOptionsKeyC[] = "DiffOptions";
static const char describeByCommitIdKeyC[] = "DescribeByCommitId";
static const char defaultDiffOptions[] = "-du";
static const char timeOutKeyC[] = "TimeOut";
enum { defaultTimeOutS = 30 };
......
......@@ -296,7 +296,7 @@ QDataStream &operator>>(QDataStream& stream, DisassemblerLines &o)
DisassemblerLines r;
quint64 count;
stream >> count;
for (quint64 i = 0; i < count; i++)
for (quint64 i = 0; i < count; ++i)
{
DisassemblerLine line;
stream >> line;
......
......@@ -506,7 +506,7 @@ void Snapshot::syncThreads(ThreadsHandler *handler) const
// Take advantage of direct access to cached register values.
Threads threads;
const unsigned count = threadInfo.size();
for (unsigned t = 0; t < count; t++) {
for (unsigned t = 0; t < count; ++t) {
ThreadData thread(t + 1); // Fake gdb thread ids starting from 1
thread.targetId = QString::number(threadInfo.at(t).id);
thread.state = threadInfo.at(t).state;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment