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

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

Browse Source
This commit is contained in:
Friedemann Kleint
2011-05-10 15:19:38 +02:00
parent bda50da7cd
commit ddf4b613f3
61 changed files with 232 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/main.cpp
View File

@@ -60,9 +60,9 @@
enum { OptionIndent = 4, DescriptionIndent = 34 }; enum { OptionIndent = 4, DescriptionIndent = 34 };
static const char *appNameC = "Qt Creator"; static const char appNameC[] = "Qt Creator";
static const char *corePluginNameC = "Core"; static const char corePluginNameC[] = "Core";
static const char *fixedOptionsC = static const char fixedOptionsC[] =
" [OPTION]... [FILE]...\n" " [OPTION]... [FILE]...\n"
"Options:\n" "Options:\n"
" -help Display this help\n" " -help Display this help\n"
@@ -70,13 +70,13 @@ static const char *fixedOptionsC =
" -client Attempt to connect to already running instance\n" " -client Attempt to connect to already running instance\n"
" -settingspath <path> Override the default path where user settings are stored.\n"; " -settingspath <path> Override the default path where user settings are stored.\n";
static const char *HELP_OPTION1 = "-h"; static const char HELP_OPTION1[] = "-h";
static const char *HELP_OPTION2 = "-help"; static const char HELP_OPTION2[] = "-help";
static const char *HELP_OPTION3 = "/h"; static const char HELP_OPTION3[] = "/h";
static const char *HELP_OPTION4 = "--help"; static const char HELP_OPTION4[] = "--help";
static const char *VERSION_OPTION = "-version"; static const char VERSION_OPTION[] = "-version";
static const char *CLIENT_OPTION = "-client"; static const char CLIENT_OPTION[] = "-client";
static const char *SETTINGS_OPTION = "-settingspath"; static const char SETTINGS_OPTION[] = "-settingspath";
typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet; typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet;

4
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -53,8 +53,8 @@
#include <QTest> #include <QTest>
#endif #endif
static const char * const C_IGNORED_PLUGINS = "Plugins/Ignored"; static const char C_IGNORED_PLUGINS[] = "Plugins/Ignored";
static const char * const C_FORCEENABLED_PLUGINS = "Plugins/ForceEnabled"; static const char C_FORCEENABLED_PLUGINS[] = "Plugins/ForceEnabled";
typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet; typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet;

2
src/libs/qmljs/qmljslink.h
View File

@@ -75,7 +75,7 @@ private:
void populateImportedTypes(Interpreter::TypeEnvironment *typeEnv, Document::Ptr doc); void populateImportedTypes(Interpreter::TypeEnvironment *typeEnv, Document::Ptr doc);
Interpreter::ObjectValue *importFileOrDirectory(Document::Ptr doc, const Interpreter::ImportInfo &importInfo); 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); void importObject(Bind *bind, const QString &name, Interpreter::ObjectValue *object, NameId *targetNamespace);
bool importLibrary(Document::Ptr doc, bool importLibrary(Document::Ptr doc,

4
src/libs/qmljs/qmljsrewriter.cpp
View File

@@ -148,7 +148,7 @@ Rewriter::Range Rewriter::addBinding(AST::UiObjectInitializer *ast,
UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *members, UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *members,
const QStringList &propertyOrder) const QStringList &propertyOrder)
{ {
const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString::null); const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString());
UiObjectMemberList *lastObjectDef = 0; UiObjectMemberList *lastObjectDef = 0;
UiObjectMemberList *lastNonObjectDef = 0; UiObjectMemberList *lastNonObjectDef = 0;
@@ -181,7 +181,7 @@ UiObjectMemberList *Rewriter::searchMemberToInsertAfter(UiObjectMemberList *memb
UiArrayMemberList *Rewriter::searchMemberToInsertAfter(UiArrayMemberList *members, UiArrayMemberList *Rewriter::searchMemberToInsertAfter(UiArrayMemberList *members,
const QStringList &propertyOrder) const QStringList &propertyOrder)
{ {
const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString::null); const int objectDefinitionInsertionPoint = propertyOrder.indexOf(QString());
UiArrayMemberList *lastObjectDef = 0; UiArrayMemberList *lastObjectDef = 0;
UiArrayMemberList *lastNonObjectDef = 0; UiArrayMemberList *lastNonObjectDef = 0;

2
src/libs/qtcreatorcdbext/gdbmihelpers.cpp
View File

@@ -763,7 +763,7 @@ std::string gdbmiBreakpoints(CIDebugControl *ctrl,
str << '['; str << '[';
if (humanReadable) if (humanReadable)
str << '\n'; str << '\n';
for (ULONG i = 0; i < breakPointCount; i++) { for (ULONG i = 0; i < breakPointCount; ++i) {
str << "{number=\"" << i << '"'; str << "{number=\"" << i << '"';
IDebugBreakpoint *bp = 0; IDebugBreakpoint *bp = 0;
hr = ctrl->GetBreakpointByIndex(i, &bp); hr = ctrl->GetBreakpointByIndex(i, &bp);

4
src/libs/qtcreatorcdbext/symbolgroupvalue.cpp
View File

@@ -2197,7 +2197,7 @@ static inline std::vector<AbstractSymbolGroupNode *>
const std::string charType = "unsigned char"; const std::string charType = "unsigned char";
std::string errorMessage; std::string errorMessage;
SymbolGroup *sg = n->symbolGroup(); 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), SymbolGroupNode *en = sg->addSymbol(std::string(), SymbolGroupValue::pointedToSymbolName(address, charType),
std::string(), &errorMessage); std::string(), &errorMessage);
if (!en) { if (!en) {
@@ -2244,7 +2244,7 @@ std::vector<AbstractSymbolGroupNode *>
if (SymbolGroupValue::verbose) { if (SymbolGroupValue::verbose) {
DebugPrint dp; DebugPrint dp;
dp << "<dumpComplexType" << rc.size() << ' '; 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(); dp << i << ' ' << rc.at(i)->name();
} }
return rc; return rc;

6
src/libs/valgrind/callgrind/callgrindcontroller.cpp
View File

@@ -147,7 +147,7 @@ void CallgrindController::processError(QProcess::ProcessError)
{ {
QTC_ASSERT(m_process, return) QTC_ASSERT(m_process, return)
const QString error = m_process->errorString(); 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->deleteLater();
m_process = 0; 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 // this call went fine, we might run another task after this
switch(m_lastOption) { switch(m_lastOption) {
case ResetEventCounters: case ResetEventCounters:
// lets dump the new resetted profiling info // lets dump the new reset profiling info
run(Dump); run(Dump);
return; return;
case Pause: case Pause:
@@ -264,7 +264,7 @@ void CallgrindController::cleanupTempFile()
if (!m_tempDataFile.isEmpty() && QFile::exists(m_tempDataFile)) if (!m_tempDataFile.isEmpty() && QFile::exists(m_tempDataFile))
QFile::remove(m_tempDataFile); QFile::remove(m_tempDataFile);
m_tempDataFile = QString(); m_tempDataFile.clear();
} }
} }

2
src/libs/valgrind/callgrind/callgrindfunction.cpp
View File

@@ -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) { for(int i = 0, c = d->m_inclusiveCost.size(); i < c; ++i) {
if (d->m_inclusiveCost.at(i) < d->m_selfCost.at(i)) if (d->m_inclusiveCost.at(i) < d->m_selfCost.at(i))
d->m_inclusiveCost[i] = 0; d->m_inclusiveCost[i] = 0;

4
src/libs/valgrind/callgrind/callgrindfunctioncycle.cpp
View File

@@ -99,8 +99,8 @@ void FunctionCycle::setFunctions(const QVector<const Function *> functions)
} }
} }
} }
// now substract self from incl. cost (see implementation of inclusiveCost()) // now subtract self from incl. cost (see implementation of inclusiveCost())
/// 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) { for(int i = 0, c = d->m_inclusiveCost.size(); i < c; ++i) {
if (d->m_inclusiveCost.at(i) < d->m_selfCost.at(i)) if (d->m_inclusiveCost.at(i) < d->m_selfCost.at(i))
d->m_inclusiveCost[i] = 0; d->m_inclusiveCost[i] = 0;

2
src/libs/valgrind/callgrind/callgrindparser.cpp
View File

@@ -334,7 +334,7 @@ void Parser::Private::parseHeader(QIODevice *device)
} else if (line.startsWith("summary: ")) { } else if (line.startsWith("summary: ")) {
QString values = getValue(line, 9); QString values = getValue(line, 9);
uint i = 0; 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()); data->setTotalCost(i++, value.toULongLong());
} else if (!line.trimmed().isEmpty()) { } else if (!line.trimmed().isEmpty()) {
// handle line and exit parseHeader // handle line and exit parseHeader

2
src/plugins/analyzerbase/analyzerplugin.cpp
View File

@@ -55,7 +55,7 @@
using namespace Analyzer; using namespace Analyzer;
using namespace Analyzer::Internal; using namespace Analyzer::Internal;
static const QLatin1String lastActiveToolC("Analyzer.Plugin.LastActiveTool"); static const char lastActiveToolC[] = "Analyzer.Plugin.LastActiveTool";
AnalyzerPlugin *AnalyzerPlugin::m_instance = 0; AnalyzerPlugin *AnalyzerPlugin::m_instance = 0;

2
src/plugins/callgrind/callgrindtool.cpp
View File

@@ -182,7 +182,7 @@ void CallgrindTool::initializeDockWidgets()
Qt::BottomDockWidgetArea); Qt::BottomDockWidgetArea);
QDockWidget *visDock = QDockWidget *visDock =
am->createDockWidget(this, tr("Visualisation"), am->createDockWidget(this, tr("Visualization"),
m_callgrindWidgetHandler->visualisation(), Qt::LeftDockWidgetArea); m_callgrindWidgetHandler->visualisation(), Qt::LeftDockWidgetArea);
am->mainWindow()->tabifyDockWidget(callersDock, calleesDock); am->mainWindow()->tabifyDockWidget(callersDock, calleesDock);

2
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -216,7 +216,7 @@ bool CMakeProject::parseCMakeLists()
if (file != cbpFile) if (file != cbpFile)
m_watcher->removePath(file); 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); m_watcher->addPath(cbpFile);
// ToolChain // ToolChain

12
src/plugins/coreplugin/filemanager.cpp
View File

@@ -87,13 +87,13 @@
(see addToRecentFiles() and recentFiles()). (see addToRecentFiles() and recentFiles()).
*/ */
static const char * const settingsGroupC = "RecentFiles"; static const char settingsGroupC[] = "RecentFiles";
static const char * const filesKeyC = "Files"; static const char filesKeyC[] = "Files";
static const char * const editorsKeyC = "EditorIds"; static const char editorsKeyC[] = "EditorIds";
static const char * const directoryGroupC = "Directories"; static const char directoryGroupC[] = "Directories";
static const char * const projectDirectoryKeyC = "Projects"; static const char projectDirectoryKeyC[] = "Projects";
static const char * const useProjectDirectoryKeyC = "UseProjectsDirectory"; static const char useProjectDirectoryKeyC[] = "UseProjectsDirectory";
namespace Core { namespace Core {
namespace Internal { namespace Internal {

14
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -1184,15 +1184,15 @@ void MainWindow::aboutToShutdown()
hide(); hide();
} }
static const char *settingsGroup = "MainWindow"; static const char settingsGroup[] = "MainWindow";
static const char *colorKey = "Color"; static const char colorKey[] = "Color";
static const char *windowGeometryKey = "WindowGeometry"; static const char windowGeometryKey[] = "WindowGeometry";
static const char *windowStateKey = "WindowState"; static const char windowStateKey[] = "WindowState";
// TODO compat for <= 2.1, remove later // TODO compat for <= 2.1, remove later
static const char *geometryKey = "Geometry"; static const char geometryKey[] = "Geometry";
static const char *maxKey = "Maximized"; static const char maxKey[] = "Maximized";
static const char *fullScreenKey = "FullScreen"; static const char fullScreenKey[] = "FullScreen";
void MainWindow::readSettings() void MainWindow::readSettings()
{ {

40
src/plugins/coreplugin/mimedatabase.cpp
View File

@@ -61,29 +61,29 @@
enum { debugMimeDB = 0 }; enum { debugMimeDB = 0 };
// XML tags in mime files // XML tags in mime files
static const char *mimeInfoTagC = "mime-info"; static const char mimeInfoTagC[] = "mime-info";
static const char *mimeTypeTagC = "mime-type"; static const char mimeTypeTagC[] = "mime-type";
static const char *mimeTypeAttributeC = "type"; static const char mimeTypeAttributeC[] = "type";
static const char *subClassTagC = "sub-class-of"; static const char subClassTagC[] = "sub-class-of";
static const char *commentTagC = "comment"; static const char commentTagC[] = "comment";
static const char *globTagC = "glob"; static const char globTagC[] = "glob";
static const char *aliasTagC = "alias"; static const char aliasTagC[] = "alias";
static const char *patternAttributeC = "pattern"; static const char patternAttributeC[] = "pattern";
static const char *weightAttributeC = "weight"; static const char weightAttributeC[] = "weight";
static const char *localeAttributeC = "xml:lang"; static const char localeAttributeC[] = "xml:lang";
static const char *magicTagC = "magic"; static const char magicTagC[] = "magic";
static const char *priorityAttributeC = "priority"; static const char priorityAttributeC[] = "priority";
static const char *matchTagC = "match"; static const char matchTagC[] = "match";
static const char *matchValueAttributeC = "value"; static const char matchValueAttributeC[] = "value";
static const char *matchTypeAttributeC = "type"; static const char matchTypeAttributeC[] = "type";
static const char *matchStringTypeValueC = "string"; static const char matchStringTypeValueC[] = "string";
static const char *matchByteTypeValueC = "byte"; static const char matchByteTypeValueC[] = "byte";
static const char *matchOffsetAttributeC = "offset"; static const char matchOffsetAttributeC[] = "offset";
// Types // Types
static const char *textTypeC = "text/plain"; static const char textTypeC[] = "text/plain";
static const char *binaryTypeC = "application/octet-stream"; static const char binaryTypeC[] = "application/octet-stream";
// UTF16 byte order marks // UTF16 byte order marks
static const char bigEndianByteOrderMarkC[] = "\xFE\xFF"; static const char bigEndianByteOrderMarkC[] = "\xFE\xFF";

6
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -56,9 +56,9 @@
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>
#include <QtGui/QMessageBox> #include <QtGui/QMessageBox>
static const char *headerSuffixKeyC = "HeaderSuffix"; static const char headerSuffixKeyC[] = "HeaderSuffix";
static const char *sourceSuffixKeyC = "SourceSuffix"; static const char sourceSuffixKeyC[] = "SourceSuffix";
static const char *licenseTemplatePathKeyC = "LicenseTemplate"; static const char licenseTemplatePathKeyC[] = "LicenseTemplate";
const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("CppTools::Internal::CppFileSettingsWidget", const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("CppTools::Internal::CppFileSettingsWidget",
"/**************************************************************************\n" "/**************************************************************************\n"

16
src/plugins/cvs/cvssettings.cpp
View File

@@ -35,14 +35,14 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
static const char *groupC = "CVS"; static const char groupC[] = "CVS";
static const char *commandKeyC = "Command"; static const char commandKeyC[] = "Command";
static const char *rootC = "Root"; static const char rootC[] = "Root";
static const char *promptToSubmitKeyC = "PromptForSubmit"; static const char promptToSubmitKeyC[] = "PromptForSubmit";
static const char *diffOptionsKeyC = "DiffOptions"; static const char diffOptionsKeyC[] = "DiffOptions";
static const char *describeByCommitIdKeyC = "DescribeByCommitId"; static const char describeByCommitIdKeyC[] = "DescribeByCommitId";
static const char *defaultDiffOptions = "-du"; static const char defaultDiffOptions[] = "-du";
static const char *timeOutKeyC = "TimeOut"; static const char timeOutKeyC[] = "TimeOut";
enum { defaultTimeOutS = 30 }; enum { defaultTimeOutS = 30 };

2
src/plugins/debugger/debuggerstreamops.cpp
View File

@@ -296,7 +296,7 @@ QDataStream &operator>>(QDataStream& stream, DisassemblerLines &o)
DisassemblerLines r; DisassemblerLines r;
quint64 count; quint64 count;
stream >> count; stream >> count;
for (quint64 i = 0; i < count; i++) for (quint64 i = 0; i < count; ++i)
{ {
DisassemblerLine line; DisassemblerLine line;
stream >> line; stream >> line;

2
src/plugins/debugger/gdb/symbian.cpp
View File

@@ -506,7 +506,7 @@ void Snapshot::syncThreads(ThreadsHandler *handler) const
// Take advantage of direct access to cached register values. // Take advantage of direct access to cached register values.
Threads threads; Threads threads;
const unsigned count = threadInfo.size(); 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 ThreadData thread(t + 1); // Fake gdb thread ids starting from 1
thread.targetId = QString::number(threadInfo.at(t).id); thread.targetId = QString::number(threadInfo.at(t).id);
thread.state = threadInfo.at(t).state; thread.state = threadInfo.at(t).state;

6
src/plugins/debugger/watchwindow.cpp
View File

@@ -312,7 +312,7 @@ static inline MemoryMarkupList
QDebug dbg = qDebug().nospace(); QDebug dbg = qDebug().nospace();
dbg << rootToolTip << ' ' << address << ' ' << size << '\n'; dbg << rootToolTip << ' ' << address << ' ' << size << '\n';
QString name; QString name;
for (unsigned i = 0; i < size; i++) for (unsigned i = 0; i < size; ++i)
if (name != ranges.at(i).second) { if (name != ranges.at(i).second) {
dbg << ",[" << i << ' ' << ranges.at(i).first << ' ' << ranges.at(i).second << ']'; dbg << ",[" << i << ' ' << ranges.at(i).first << ' ' << ranges.at(i).second << ']';
name = ranges.at(i).second; name = ranges.at(i).second;
@@ -328,7 +328,7 @@ static inline MemoryMarkupList
int lastColorNumber = 0; int lastColorNumber = 0;
int childNumber = 0; int childNumber = 0;
for (unsigned i = 0; i < size; i++) { for (unsigned i = 0; i < size; ++i) {
const ColorNumberToolTipPair &range = ranges.at(i); const ColorNumberToolTipPair &range = ranges.at(i);
if (result.isEmpty() || lastColorNumber != range.first) { if (result.isEmpty() || lastColorNumber != range.first) {
lastColorNumber = range.first; lastColorNumber = range.first;
@@ -353,7 +353,7 @@ static inline MemoryMarkupList
QDebug dbg = qDebug().nospace(); QDebug dbg = qDebug().nospace();
dbg << rootName << ' ' << address << ' ' << size << '\n'; dbg << rootName << ' ' << address << ' ' << size << '\n';
QString name; QString name;
for (unsigned i = 0; i < size; i++) for (unsigned i = 0; i < size; ++i)
if (name != ranges.at(i).second) { if (name != ranges.at(i).second) {
dbg << ',' << i << ' ' << ranges.at(i).first << ' ' << ranges.at(i).second; dbg << ',' << i << ' ' << ranges.at(i).first << ' ' << ranges.at(i).second;
name = ranges.at(i).second; name = ranges.at(i).second;

2
src/plugins/designer/qtcreatorintegration.cpp
View File

@@ -226,7 +226,7 @@ static Function *findDeclaration(const Class *cl, const QString &functionName)
// we are interested only in declarations (can be decl of method or of a field) // we are interested only in declarations (can be decl of method or of a field)
// we are only interested in declarations of methods // we are only interested in declarations of methods
const Overview overview; const Overview overview;
for (unsigned j = 0; j < mCount; j++) { // go through all members for (unsigned j = 0; j < mCount; ++j) { // go through all members
if (Declaration *decl = cl->memberAt(j)->asDeclaration()) if (Declaration *decl = cl->memberAt(j)->asDeclaration())
if (Function *fun = decl->type()->asFunctionType()) { if (Function *fun = decl->type()->asFunctionType()) {
// Format signature // Format signature

4
src/plugins/git/gitclient.cpp
View File

@@ -72,8 +72,8 @@
#include <QtGui/QMessageBox> #include <QtGui/QMessageBox>
#include <QtGui/QToolButton> #include <QtGui/QToolButton>
static const char *const kGitDirectoryC = ".git"; static const char kGitDirectoryC[] = ".git";
static const char *const kBranchIndicatorC = "# On branch"; static const char kBranchIndicatorC[] = "# On branch";
namespace Git { namespace Git {
namespace Internal { namespace Internal {

8
src/plugins/git/gitorious/gitorious.cpp
View File

@@ -44,11 +44,11 @@ enum { debug = 0 };
enum Protocol { ListCategoriesProtocol, ListProjectsProtocol }; enum Protocol { ListCategoriesProtocol, ListProjectsProtocol };
static const char *protocolPropertyC = "gitoriousProtocol"; static const char protocolPropertyC[] = "gitoriousProtocol";
static const char *hostNamePropertyC = "gitoriousHost"; static const char hostNamePropertyC[] = "gitoriousHost";
static const char *pagePropertyC = "requestPage"; static const char pagePropertyC[] = "requestPage";
static const char *settingsKeyC = "GitoriousHosts"; static const char settingsKeyC[] = "GitoriousHosts";
// Gitorious paginates projects as 20 per page. It starts with page 1. // Gitorious paginates projects as 20 per page. It starts with page 1.
enum { ProjectsPageSize = 20 }; enum { ProjectsPageSize = 20 };

4
src/plugins/git/gitorious/gitorioushostwizardpage.cpp
View File

@@ -40,8 +40,8 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtGui/QVBoxLayout> #include <QtGui/QVBoxLayout>
static const char *settingsGroupC = "Gitorious"; static const char settingsGroupC[] = "Gitorious";
static const char *selectionKeyC = "/SelectedHost"; static const char selectionKeyC[] = "/SelectedHost";
namespace Gitorious { namespace Gitorious {
namespace Internal { namespace Internal {

52
src/plugins/perforce/perforceplugin.cpp
View File

@@ -139,32 +139,32 @@ static inline QProcessEnvironment overrideDiffEnvironmentVariable()
return rc; return rc;
} }
static const char * const CMD_ID_PERFORCE_MENU = "Perforce.Menu"; static const char CMD_ID_PERFORCE_MENU[] = "Perforce.Menu";
static const char * const CMD_ID_EDIT = "Perforce.Edit"; static const char CMD_ID_EDIT[] = "Perforce.Edit";
static const char * const CMD_ID_ADD = "Perforce.Add"; static const char CMD_ID_ADD[] = "Perforce.Add";
static const char * const CMD_ID_DELETE_FILE = "Perforce.Delete"; static const char CMD_ID_DELETE_FILE[] = "Perforce.Delete";
static const char * const CMD_ID_OPENED = "Perforce.Opened"; static const char CMD_ID_OPENED[] = "Perforce.Opened";
static const char * const CMD_ID_PROJECTLOG = "Perforce.ProjectLog"; static const char CMD_ID_PROJECTLOG[] = "Perforce.ProjectLog";
static const char * const CMD_ID_REPOSITORYLOG = "Perforce.RepositoryLog"; static const char CMD_ID_REPOSITORYLOG[] = "Perforce.RepositoryLog";
static const char * const CMD_ID_REVERT = "Perforce.Revert"; static const char CMD_ID_REVERT[] = "Perforce.Revert";
static const char * const CMD_ID_DIFF_CURRENT = "Perforce.DiffCurrent"; static const char CMD_ID_DIFF_CURRENT[] = "Perforce.DiffCurrent";
static const char * const CMD_ID_DIFF_PROJECT = "Perforce.DiffProject"; static const char CMD_ID_DIFF_PROJECT[] = "Perforce.DiffProject";
static const char * const CMD_ID_UPDATE_PROJECT = "Perforce.UpdateProject"; static const char CMD_ID_UPDATE_PROJECT[] = "Perforce.UpdateProject";
static const char * const CMD_ID_REVERT_PROJECT = "Perforce.RevertProject"; static const char CMD_ID_REVERT_PROJECT[] = "Perforce.RevertProject";
static const char * const CMD_ID_REVERT_UNCHANGED_PROJECT = "Perforce.RevertUnchangedProject"; static const char CMD_ID_REVERT_UNCHANGED_PROJECT[] = "Perforce.RevertUnchangedProject";
static const char * const CMD_ID_DIFF_ALL = "Perforce.DiffAll"; static const char CMD_ID_DIFF_ALL[] = "Perforce.DiffAll";
static const char * const CMD_ID_RESOLVE = "Perforce.Resolve"; static const char CMD_ID_RESOLVE[] = "Perforce.Resolve";
static const char * const CMD_ID_SUBMIT = "Perforce.Submit"; static const char CMD_ID_SUBMIT[] = "Perforce.Submit";
static const char * const CMD_ID_PENDING_CHANGES = "Perforce.PendingChanges"; static const char CMD_ID_PENDING_CHANGES[] = "Perforce.PendingChanges";
static const char * const CMD_ID_DESCRIBE = "Perforce.Describe"; static const char CMD_ID_DESCRIBE[] = "Perforce.Describe";
static const char * const CMD_ID_ANNOTATE_CURRENT = "Perforce.AnnotateCurrent"; static const char CMD_ID_ANNOTATE_CURRENT[] = "Perforce.AnnotateCurrent";
static const char * const CMD_ID_ANNOTATE = "Perforce.Annotate"; static const char CMD_ID_ANNOTATE[] = "Perforce.Annotate";
static const char * const CMD_ID_FILELOG_CURRENT = "Perforce.FilelogCurrent"; static const char CMD_ID_FILELOG_CURRENT[] = "Perforce.FilelogCurrent";
static const char * const CMD_ID_FILELOG = "Perforce.Filelog"; static const char CMD_ID_FILELOG[] = "Perforce.Filelog";
static const char * const CMD_ID_UPDATEALL = "Perforce.UpdateAll"; static const char CMD_ID_UPDATEALL[] = "Perforce.UpdateAll";
static const char * const CMD_ID_SEPARATOR1 = "Perforce.Separator1"; static const char CMD_ID_SEPARATOR1[] = "Perforce.Separator1";
static const char * const CMD_ID_SEPARATOR2 = "Perforce.Separator2"; static const char CMD_ID_SEPARATOR2[] = "Perforce.Separator2";
static const char * const CMD_ID_SEPARATOR3 = "Perforce.Separator3"; static const char CMD_ID_SEPARATOR3[] = "Perforce.Separator3";
//// ////
// PerforcePlugin // PerforcePlugin

20
src/plugins/perforce/perforcesettings.cpp
View File

@@ -43,16 +43,16 @@
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
static const char *groupC = "Perforce"; static const char groupC[] = "Perforce";
static const char *commandKeyC = "Command"; static const char commandKeyC[] = "Command";
static const char *defaultKeyC = "Default"; static const char defaultKeyC[] = "Default";
static const char *portKeyC = "Port"; static const char portKeyC[] = "Port";
static const char *clientKeyC = "Client"; static const char clientKeyC[] = "Client";
static const char *userKeyC = "User"; static const char userKeyC[] = "User";
static const char *promptToSubmitKeyC = "PromptForSubmit"; static const char promptToSubmitKeyC[] = "PromptForSubmit";
static const char *autoOpenKeyC = "PromptToOpen"; static const char autoOpenKeyC[] = "PromptToOpen";
static const char *timeOutKeyC = "TimeOut"; static const char timeOutKeyC[] = "TimeOut";
static const char *logCountKeyC = "LogCount"; static const char logCountKeyC[] = "LogCount";
enum { defaultTimeOutS = 30, defaultLogCount = 1000 }; enum { defaultTimeOutS = 30, defaultLogCount = 1000 };

2
src/plugins/projectexplorer/abi.cpp
View File

@@ -559,7 +559,7 @@ QList<Abi> Abi::abisOfBinary(const QString &path)
&& tmp.at(0).binaryFormat() != Abi::MachOFormat) && tmp.at(0).binaryFormat() != Abi::MachOFormat)
break; break;
offset += (offset % 2); // ar is 2 byte alligned offset += (offset % 2); // ar is 2 byte aligned
f.seek(offset); f.seek(offset);
data = f.read(1024); data = f.read(1024);
} }

2
src/plugins/projectexplorer/baseprojectwizarddialog.cpp
View File

@@ -44,7 +44,7 @@
\brief Base class for project wizards. \brief Base class for project wizards.
Presents the introductory page and takes care of setting the folder choosen Presents the introductory page and takes care of setting the folder chosen
as default projects' folder should the user wish to do that. as default projects' folder should the user wish to do that.
*/ */

6
src/plugins/projectexplorer/buildmanager.cpp
View File

@@ -366,7 +366,8 @@ void BuildManager::progressChanged()
int range = d->m_watcher.progressMaximum() - d->m_watcher.progressMinimum(); int range = d->m_watcher.progressMaximum() - d->m_watcher.progressMinimum();
if (range != 0) { if (range != 0) {
int percent = (d->m_watcher.progressValue() - d->m_watcher.progressMinimum()) * 100 / range; int percent = (d->m_watcher.progressValue() - d->m_watcher.progressMinimum()) * 100 / range;
d->m_progressFutureInterface->setProgressValueAndText(d->m_progress * 100 + percent, msgProgress(d->m_progress, d->m_maxProgress) + "\n" + d->m_watcher.progressText()); d->m_progressFutureInterface->setProgressValueAndText(d->m_progress * 100 + percent, msgProgress(d->m_progress, d->m_maxProgress)
+ QLatin1Char('\n') + d->m_watcher.progressText());
} }
} }
@@ -376,7 +377,8 @@ void BuildManager::progressTextChanged()
int percent = 0; int percent = 0;
if (range != 0) if (range != 0)
percent = (d->m_watcher.progressValue() - d->m_watcher.progressMinimum()) * 100 / range; percent = (d->m_watcher.progressValue() - d->m_watcher.progressMinimum()) * 100 / range;
d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100 + percent, msgProgress(d->m_progress, d->m_maxProgress) + "\n" + d->m_watcher.progressText()); d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100 + percent, msgProgress(d->m_progress, d->m_maxProgress) +
QLatin1Char('\n') + d->m_watcher.progressText());
} }
void BuildManager::nextStep() void BuildManager::nextStep()

2
src/plugins/projectexplorer/customwizard/customwizard.cpp
View File

@@ -382,7 +382,7 @@ static QString listWizards()
QString rc; QString rc;
QTextStream str(&rc); QTextStream str(&rc);
CategoryWizardMap categoryWizardMap; CategoryWizardMap categoryWizardMap;
foreach(const Core::IWizard *w, Core::IWizard::allWizards()) foreach (const Core::IWizard *w, Core::IWizard::allWizards())
categoryWizardMap.insert(w->category(), w); categoryWizardMap.insert(w->category(), w);
str << "### Registered wizards (" << categoryWizardMap.size() << ")\n"; str << "### Registered wizards (" << categoryWizardMap.size() << ")\n";
// Format // Format

2
src/plugins/projectexplorer/doubletabwidget.cpp
View File

@@ -316,7 +316,7 @@ void DoubleTabWidget::mousePressEvent(QMouseEvent *event)
m_tabs[m_currentIndex].currentSubTab = hit.second; m_tabs[m_currentIndex].currentSubTab = hit.second;
update(); update();
// todo next two lines were outside the if leading to // todo next two lines were outside the if leading to
// unecessary (?) signal emissions? // unnecessary (?) signal emissions?
event->accept(); event->accept();
emit currentIndexChanged(m_currentIndex, m_tabs.at(m_currentIndex).currentSubTab); emit currentIndexChanged(m_currentIndex, m_tabs.at(m_currentIndex).currentSubTab);
return; return;

2
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -447,7 +447,7 @@ void MiniProjectTargetSelector::mousePressEvent(QMouseEvent *e)
QString MiniProjectTargetSelector::fullName(ProjectExplorer::Project *project) QString MiniProjectTargetSelector::fullName(ProjectExplorer::Project *project)
{ {
return project->displayName() + " (" + project->file()->fileName() + ")"; return project->displayName() + " (" + project->file()->fileName() + QLatin1Char(')');
} }
void MiniProjectTargetSelector::addProject(ProjectExplorer::Project *project) void MiniProjectTargetSelector::addProject(ProjectExplorer::Project *project)

4
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -152,8 +152,8 @@ namespace {
bool debug = false; bool debug = false;
} }
static const char * const kCurrentProjectPath = "CurrentProject:Path"; static const char kCurrentProjectPath[] = "CurrentProject:Path";
static const char * const kCurrentProjectFilePath = "CurrentProject:FilePath"; static const char kCurrentProjectFilePath[] = "CurrentProject:FilePath";
namespace ProjectExplorer { namespace ProjectExplorer {

2
src/plugins/projectexplorer/projectfilewizardextension.cpp
View File

@@ -250,7 +250,7 @@ static int findMatchingProject(const QList<ProjectEntry> &projects,
static QString generatedProjectFilePath(const QList<Core::GeneratedFile> &files) static QString generatedProjectFilePath(const QList<Core::GeneratedFile> &files)
{ {
foreach (const Core::GeneratedFile file, files) foreach (const Core::GeneratedFile &file, files)
if (file.attributes() & Core::GeneratedFile::OpenProjectAttribute) if (file.attributes() & Core::GeneratedFile::OpenProjectAttribute)
return file.path(); return file.path();
return QString(); return QString();

4
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -39,8 +39,8 @@
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
static const char *const ID_KEY = "ProjectExplorer.ToolChain.Id"; static const char ID_KEY[] = "ProjectExplorer.ToolChain.Id";
static const char *const DISPLAY_NAME_KEY = "ProjectExplorer.ToolChain.DisplayName"; static const char DISPLAY_NAME_KEY[] = "ProjectExplorer.ToolChain.DisplayName";
namespace ProjectExplorer { namespace ProjectExplorer {
namespace Internal { namespace Internal {

14
src/plugins/projectexplorer/toolchainmanager.cpp
View File

@@ -44,13 +44,13 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtGui/QMainWindow> #include <QtGui/QMainWindow>
static const char *const TOOLCHAIN_DATA_KEY = "ToolChain."; static const char TOOLCHAIN_DATA_KEY[] = "ToolChain.";
static const char *const TOOLCHAIN_COUNT_KEY = "ToolChain.Count"; static const char TOOLCHAIN_COUNT_KEY[] = "ToolChain.Count";
static const char *const TOOLCHAIN_FILE_VERSION_KEY = "Version"; static const char TOOLCHAIN_FILE_VERSION_KEY[] = "Version";
static const char *const DEFAULT_DEBUGGER_COUNT_KEY = "DefaultDebugger.Count"; static const char DEFAULT_DEBUGGER_COUNT_KEY[] = "DefaultDebugger.Count";
static const char *const DEFAULT_DEBUGGER_ABI_KEY = "DefaultDebugger.Abi."; static const char DEFAULT_DEBUGGER_ABI_KEY[] = "DefaultDebugger.Abi.";
static const char *const DEFAULT_DEBUGGER_PATH_KEY = "DefaultDebugger.Path."; static const char DEFAULT_DEBUGGER_PATH_KEY[] = "DefaultDebugger.Path.";
static const char *const TOOLCHAIN_FILENAME = "/toolChains.xml"; static const char TOOLCHAIN_FILENAME[] = "/toolChains.xml";
static QString settingsFileName() static QString settingsFileName()
{ {

2
src/plugins/projectexplorer/userfileaccessor.cpp
View File

@@ -1842,7 +1842,7 @@ static QVariant version8VarNodeTransform(const QVariant &var)
}; };
static QSet<QString> map; static QSet<QString> map;
if (map.isEmpty()) if (map.isEmpty())
for (unsigned i = 0; i < sizeof(vars)/sizeof(vars[0]); i++) for (unsigned i = 0; i < sizeof(vars)/sizeof(vars[0]); ++i)
map.insert(QLatin1String("CURRENT_DOCUMENT:") + QLatin1String(vars[i])); map.insert(QLatin1String("CURRENT_DOCUMENT:") + QLatin1String(vars[i]));
QString str = var.toString(); QString str = var.toString();

2
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -281,7 +281,7 @@ QList<QToolButton *> ItemLibraryWidget::createToolBarWidgets()
{ {
QList<QToolButton *> buttons; QList<QToolButton *> buttons;
return buttons; //import managment gets disabled for now (TODO ###) return buttons; //import management gets disabled for now (TODO ###)
buttons << new QToolButton(); buttons << new QToolButton();
buttons.first()->setText("I "); buttons.first()->setText("I ");

3
src/plugins/qmldesigner/designercore/instances/componentnodeinstance.cpp
View File

@@ -84,7 +84,8 @@ void ComponentNodeInstance::setPropertyVariant(const QString &name, const QVaria
data.prepend(importArray); data.prepend(importArray);
data.append("\n"); data.append("\n");
component()->setData(data, QUrl(nodeInstanceServer()->fileUrl().toString() + "_"+ id())); component()->setData(data, QUrl(nodeInstanceServer()->fileUrl().toString() +
QLatin1Char('_')+ id()));
setId(id()); setId(id());
} }

4
src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
View File

@@ -79,7 +79,7 @@ static QList<qreal> parseNumbersList(QString::const_iterator &itr)
++itr; ++itr;
while ((*itr).isNumber() || while ((*itr).isNumber() ||
(*itr) == '-' || (*itr) == '+' || (*itr) == '.') { (*itr) == '-' || (*itr) == '+' || (*itr) == '.') {
temp = QString(); temp.clear();
if ((*itr) == '-') if ((*itr) == '-')
temp += *itr++; temp += *itr++;
@@ -589,7 +589,7 @@ void Context2D::setFont(const QString &fontString)
{ {
QFont font; QFont font;
// ### this is simplified and incomplete // ### this is simplified and incomplete
QStringList tokens = fontString.split(" "); QStringList tokens = fontString.split(QLatin1Char(' '));
foreach (const QString &token, tokens) { foreach (const QString &token, tokens) {
if (token == QLatin1String("italic")) if (token == QLatin1String("italic"))
font.setItalic(true); font.setItalic(true);

2
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
View File

@@ -154,7 +154,7 @@ QPixmap TiledCanvas::getTile(int xx, int yy)
pix.fill(Qt::green); pix.fill(Qt::green);
QString text = QString::number(xx) + " " + QString::number(yy); QString text = QString::number(xx) + QLatin1Char(' ') + QString::number(yy);
QPainter p(&pix); QPainter p(&pix);
p.drawText(pix.rect(), Qt::AlignHCenter | Qt::AlignVCenter, text); p.drawText(pix.rect(), Qt::AlignHCenter | Qt::AlignVCenter, text);

7
src/plugins/qmlprofiler/qmlprofilersummaryview.cpp
View File

@@ -143,9 +143,10 @@ void QmlProfilerSummaryView::addRangedEvent(int type, qint64 startTime, qint64 l
if (fileName.isEmpty()) if (fileName.isEmpty())
return; return;
const QChar colon = QLatin1Char(':');
QString localName = QUrl(fileName).toLocalFile(); QString localName = QUrl(fileName).toLocalFile();
QString displayName = localName.mid(localName.lastIndexOf(QChar('/'))+1)+QLatin1String(":")+QString::number(line); QString displayName = localName.mid(localName.lastIndexOf(QChar('/'))+1)+colon+QString::number(line);
QString location = fileName+":"+QString::number(line); QString location = fileName+colon+QString::number(line);
QHash<QString, BindingData *>::iterator it = d->m_bindingHash.find(location); QHash<QString, BindingData *>::iterator it = d->m_bindingHash.find(location);
if (it != d->m_bindingHash.end()) { if (it != d->m_bindingHash.end()) {
@@ -225,7 +226,7 @@ void QmlProfilerSummaryView::appendRow(const QString &displayName,
double maxTime, double maxTime,
double minTime) double minTime)
{ {
QString location =fileName+":"+QString::number(line); QString location =fileName+QLatin1Char(':')+QString::number(line);
ProfilerItem *locationColumn = new ProfilerItem(displayName); ProfilerItem *locationColumn = new ProfilerItem(displayName);
locationColumn->setData(QVariant(location),Qt::UserRole+1); locationColumn->setData(QVariant(location),Qt::UserRole+1);
locationColumn->setData(QVariant(fileName),Qt::UserRole+2); locationColumn->setData(QVariant(fileName),Qt::UserRole+2);

2
src/plugins/qmlprofiler/timelineview.cpp
View File

@@ -205,7 +205,7 @@ void TimelineView::updateTimeline(bool updateStartX)
QVariantList list = m_ranges.property(i).property("label").toVariant().value<QVariantList>(); QVariantList list = m_ranges.property(i).property("label").toVariant().value<QVariantList>();
for (int i = 0; i < list.size(); ++i) { for (int i = 0; i < list.size(); ++i) {
if (i > 0) if (i > 0)
label += "\n"; label += QLatin1Char('\n');
QString sub = list.at(i).toString(); QString sub = list.at(i).toString();
//### only do rewrite for bindings... //### only do rewrite for bindings...

2
src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp
View File

@@ -393,7 +393,7 @@ void S60PublisherOvi::endBuild(int result)
if (m_qt4bc->qtVersion()->qtVersion() == QtVersionNumber(4,6,3) ) if (m_qt4bc->qtVersion()->qtVersion() == QtVersionNumber(4,6,3) )
fileNamePostFix = QLatin1String("_installer.sis"); fileNamePostFix = QLatin1String("_installer.sis");
QString resultFile = m_qt4bc->buildDirectory() + "/" + m_qt4project->displayName() + fileNamePostFix; QString resultFile = m_qt4bc->buildDirectory() + QLatin1Char('/') + m_qt4project->displayName() + fileNamePostFix;
QFileInfo fi(resultFile); QFileInfo fi(resultFile);
if (result == QProcess::NormalExit && fi.exists()) { if (result == QProcess::NormalExit && fi.exists()) {

2
src/plugins/qt4projectmanager/qt4projectmanager.cpp
View File

@@ -77,7 +77,7 @@ using ProjectExplorer::FormType;
using ProjectExplorer::ResourceType; using ProjectExplorer::ResourceType;
using ProjectExplorer::UnknownFileType; using ProjectExplorer::UnknownFileType;
static const char * const kInstallBins = "CurrentProject:QT_INSTALL_BINS"; static const char kInstallBins[] = "CurrentProject:QT_INSTALL_BINS";
// Known file types of a Qt 4 project // Known file types of a Qt 4 project
static const char* qt4FileTypes[] = { static const char* qt4FileTypes[] = {

2
src/plugins/qt4projectmanager/qt4target.cpp
View File

@@ -1054,7 +1054,7 @@ QList<BuildConfigurationInfo> BuildConfigurationInfo::importBuildConfigurations(
if (!result.isEmpty()) if (!result.isEmpty())
return result; return result;
// Check for builds in build directoy // Check for builds in build directory
QList<Qt4BaseTargetFactory *> factories = QList<Qt4BaseTargetFactory *> factories =
ExtensionSystem::PluginManager::instance()->getObjects<Qt4BaseTargetFactory>(); ExtensionSystem::PluginManager::instance()->getObjects<Qt4BaseTargetFactory>();
foreach (Qt4BaseTargetFactory *factory, factories) { foreach (Qt4BaseTargetFactory *factory, factories) {

6
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -91,9 +91,9 @@ using namespace Qt4ProjectManager::Internal;
using ProjectExplorer::DebuggingHelperLibrary; using ProjectExplorer::DebuggingHelperLibrary;
static const char *QtVersionsSectionName = "QtVersions"; static const char QtVersionsSectionName[] = "QtVersions";
static const char *newQtVersionsKey = "NewQtVersions"; static const char newQtVersionsKey[] = "NewQtVersions";
static const char *PATH_AUTODETECTION_SOURCE = "PATH"; static const char PATH_AUTODETECTION_SOURCE[] = "PATH";
enum { debug = 0 }; enum { debug = 0 };

10
src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
View File

@@ -52,20 +52,20 @@
#include <QtGui/QIcon> #include <QtGui/QIcon>
static const char *mainSourceFileC = "main"; static const char mainSourceFileC[] = "main";
static const char *mainSourceShowC = " w.show();\n"; static const char mainSourceShowC[] = " w.show();\n";
static const char *mainSourceMobilityShowC = "#if defined(Q_WS_S60)\n" static const char mainSourceMobilityShowC[] = "#if defined(Q_WS_S60)\n"
" w.showMaximized();\n" " w.showMaximized();\n"
"#else\n" "#else\n"
" w.show();\n" " w.show();\n"
"#endif\n"; "#endif\n";
static const char *mainWindowUiContentsC = static const char mainWindowUiContentsC[] =
"\n <widget class=\"QMenuBar\" name=\"menuBar\" />" "\n <widget class=\"QMenuBar\" name=\"menuBar\" />"
"\n <widget class=\"QToolBar\" name=\"mainToolBar\" />" "\n <widget class=\"QToolBar\" name=\"mainToolBar\" />"
"\n <widget class=\"QWidget\" name=\"centralWidget\" />" "\n <widget class=\"QWidget\" name=\"centralWidget\" />"
"\n <widget class=\"QStatusBar\" name=\"statusBar\" />"; "\n <widget class=\"QStatusBar\" name=\"statusBar\" />";
static const char *mainWindowMobileUiContentsC = static const char mainWindowMobileUiContentsC[] =
"\n <widget class=\"QWidget\" name=\"centralWidget\" />"; "\n <widget class=\"QWidget\" name=\"centralWidget\" />";
static const char *baseClassesC[] = { "QMainWindow", "QWidget", "QDialog" }; static const char *baseClassesC[] = { "QMainWindow", "QWidget", "QDialog" };

4
src/plugins/regexp/regexpwindow.cpp
View File

@@ -145,8 +145,8 @@ RegExpWindow::RegExpWindow(QWidget *parent) :
refresh(); refresh();
} }
static const char *escapedBackSlash = "\\\\"; static const char escapedBackSlash[] = "\\\\";
static const char *escapedDoubleQuote = "\\\""; static const char escapedDoubleQuote[] = "\\\"";
static QString escapePattern(const QString &pattern) static QString escapePattern(const QString &pattern)
{ {

20
src/plugins/regexp/settings.cpp
View File

@@ -34,16 +34,16 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
static const char *syntaxKey = "Syntax"; static const char syntaxKey[] = "Syntax";
static const char *minimalKey = "Minimal"; static const char minimalKey[] = "Minimal";
static const char *caseSensitiveKey = "CaseSensitive"; static const char caseSensitiveKey[] = "CaseSensitive";
static const char *patternKey = "Patterns"; static const char patternKey[] = "Patterns";
static const char *currentPatternKey = "CurrentPattern"; static const char currentPatternKey[] = "CurrentPattern";
static const char *matchKey = "Matches"; static const char matchKey[] = "Matches";
static const char *currentMatchKey = "CurrentMatch"; static const char currentMatchKey[] = "CurrentMatch";
static const char *patternDefault = "[A-Za-z_]+([A-Za-z_0-9]*)"; static const char patternDefault[] = "[A-Za-z_]+([A-Za-z_0-9]*)";
static const char *matchDefault = "(10 + delta4) * 32"; static const char matchDefault[] = "(10 + delta4) * 32";
static const char *settingsGroup = "RegExp"; static const char settingsGroup[] = "RegExp";
namespace RegExp { namespace RegExp {
namespace Internal { namespace Internal {

6
src/plugins/texteditor/behaviorsettings.cpp
View File

@@ -37,9 +37,9 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtCore/QString> #include <QtCore/QString>
static const char * const mouseNavigationKey = "MouseNavigation"; static const char mouseNavigationKey[] = "MouseNavigation";
static const char * const scrollWheelZoomingKey = "ScrollWheelZooming"; static const char scrollWheelZoomingKey[] = "ScrollWheelZooming";
static const char * const groupPostfix = "BehaviorSettings"; static const char groupPostfix[] = "BehaviorSettings";
namespace TextEditor { namespace TextEditor {

2
src/plugins/texteditor/colorscheme.cpp
View File

@@ -42,7 +42,7 @@
using namespace TextEditor; using namespace TextEditor;
static const char *trueString = "true"; static const char trueString[] = "true";
// Format // Format

12
src/plugins/texteditor/completionsettings.cpp
View File

@@ -34,12 +34,12 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
static const char * const groupPostfix = "Completion"; static const char groupPostfix[] = "Completion";
static const char * const caseSensitivityKey = "CaseSensitivity"; static const char caseSensitivityKey[] = "CaseSensitivity";
static const char * const completionTriggerKey = "CompletionTrigger"; static const char completionTriggerKey[] = "CompletionTrigger";
static const char * const autoInsertBracesKey = "AutoInsertBraces"; static const char autoInsertBracesKey[] = "AutoInsertBraces";
static const char * const partiallyCompleteKey = "PartiallyComplete"; static const char partiallyCompleteKey[] = "PartiallyComplete";
static const char * const spaceAfterFunctionNameKey = "SpaceAfterFunctionName"; static const char spaceAfterFunctionNameKey[] = "SpaceAfterFunctionName";
using namespace TextEditor; using namespace TextEditor;

26
src/plugins/texteditor/displaysettings.cpp
View File

@@ -35,19 +35,19 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtCore/QString> #include <QtCore/QString>
static const char * const displayLineNumbersKey = "DisplayLineNumbers"; static const char displayLineNumbersKey[] = "DisplayLineNumbers";
static const char * const textWrappingKey = "TextWrapping"; static const char textWrappingKey[] = "TextWrapping";
static const char * const showWrapColumnKey = "ShowWrapColumn"; static const char showWrapColumnKey[] = "ShowWrapColumn";
static const char * const wrapColumnKey = "WrapColumn"; static const char wrapColumnKey[] = "WrapColumn";
static const char * const visualizeWhitespaceKey = "VisualizeWhitespace"; static const char visualizeWhitespaceKey[] = "VisualizeWhitespace";
static const char * const displayFoldingMarkersKey = "DisplayFoldingMarkers"; static const char displayFoldingMarkersKey[] = "DisplayFoldingMarkers";
static const char * const highlightCurrentLineKey = "HighlightCurrentLine2Key"; static const char highlightCurrentLineKey[] = "HighlightCurrentLine2Key";
static const char * const highlightBlocksKey = "HighlightBlocksKey"; static const char highlightBlocksKey[] = "HighlightBlocksKey";
static const char * const animateMatchingParenthesesKey= "AnimateMatchingParenthesesKey"; static const char animateMatchingParenthesesKey[] = "AnimateMatchingParenthesesKey";
static const char * const markTextChangesKey = "MarkTextChanges"; static const char markTextChangesKey[] = "MarkTextChanges";
static const char * const autoFoldFirstCommentKey = "AutoFoldFirstComment"; static const char autoFoldFirstCommentKey[] = "AutoFoldFirstComment";
static const char * const centerCursorOnScrollKey = "CenterCursorOnScroll"; static const char centerCursorOnScrollKey[] = "CenterCursorOnScroll";
static const char * const groupPostfix = "DisplaySettings"; static const char groupPostfix[] = "DisplaySettings";
namespace TextEditor { namespace TextEditor {

4
src/plugins/texteditor/extraencodingsettings.cpp
View File

@@ -38,8 +38,8 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
// Keep this for compatibility reasons. // Keep this for compatibility reasons.
static const char * const kGroupPostfix = "EditorManager"; static const char kGroupPostfix[] = "EditorManager";
static const char * const kUtf8BomBehaviorKey = "Utf8BomBehavior"; static const char kUtf8BomBehaviorKey[] = "Utf8BomBehavior";
using namespace TextEditor; using namespace TextEditor;

10
src/plugins/texteditor/fontsettings.cpp
View File

@@ -44,11 +44,11 @@
#include <QtGui/QFont> #include <QtGui/QFont>
#include <QtGui/QMainWindow> #include <QtGui/QMainWindow>
static const char *fontFamilyKey = "FontFamily"; static const char fontFamilyKey[] = "FontFamily";
static const char *fontSizeKey = "FontSize"; static const char fontSizeKey[] = "FontSize";
static const char *fontZoomKey= "FontZoom"; static const char fontZoomKey[] = "FontZoom";
static const char *antialiasKey = "FontAntialias"; static const char antialiasKey[] = "FontAntialias";
static const char *schemeFileNameKey = "ColorScheme"; static const char schemeFileNameKey[] = "ColorScheme";
namespace { namespace {
static const bool DEFAULT_ANTIALIAS = true; static const bool DEFAULT_ANTIALIAS = true;

22
src/plugins/texteditor/tabsettings.cpp
View File

@@ -40,17 +40,17 @@
#include <QtGui/QTextCursor> #include <QtGui/QTextCursor>
#include <QtGui/QTextDocument> #include <QtGui/QTextDocument>
static const char *spacesForTabsKey = "SpacesForTabs"; static const char spacesForTabsKey[] = "SpacesForTabs";
static const char *autoSpacesForTabsKey = "AutoSpacesForTabs"; static const char autoSpacesForTabsKey[] = "AutoSpacesForTabs";
static const char *smartBackspaceKey = "SmartBackspace"; static const char smartBackspaceKey[] = "SmartBackspace";
static const char *autoIndentKey = "AutoIndent"; static const char autoIndentKey[] = "AutoIndent";
static const char *tabSizeKey = "TabSize"; static const char tabSizeKey[] = "TabSize";
static const char *indentSizeKey = "IndentSize"; static const char indentSizeKey[] = "IndentSize";
static const char *indentBracesKey = "IndentBraces"; static const char indentBracesKey[] = "IndentBraces";
static const char *doubleIndentBlocksKey = "DoubleIndentBlocks"; static const char doubleIndentBlocksKey[] = "DoubleIndentBlocks";
static const char *tabKeyBehaviorKey = "TabKeyBehavior"; static const char tabKeyBehaviorKey[] = "TabKeyBehavior";
static const char *groupPostfix = "TabSettings"; static const char groupPostfix[] = "TabSettings";
static const char *paddingModeKey = "PaddingMode"; static const char paddingModeKey[] = "PaddingMode";
namespace TextEditor { namespace TextEditor {

12
src/plugins/texteditor/texteditorplugin.cpp
View File

@@ -68,12 +68,12 @@
using namespace TextEditor; using namespace TextEditor;
using namespace TextEditor::Internal; using namespace TextEditor::Internal;
static const char * const kCurrentDocumentSelection = "CurrentDocument:Selection"; static const char kCurrentDocumentSelection[] = "CurrentDocument:Selection";
static const char * const kCurrentDocumentRow = "CurrentDocument:Row"; static const char kCurrentDocumentRow[] = "CurrentDocument:Row";
static const char * const kCurrentDocumentColumn = "CurrentDocument:Column"; static const char kCurrentDocumentColumn[] = "CurrentDocument:Column";
static const char * const kCurrentDocumentRowCount = "CurrentDocument:RowCount"; static const char kCurrentDocumentRowCount[] = "CurrentDocument:RowCount";
static const char * const kCurrentDocumentColumnCount = "CurrentDocument:ColumnCount"; static const char kCurrentDocumentColumnCount[] = "CurrentDocument:ColumnCount";
static const char * const kCurrentDocumentFontSize = "CurrentDocument:FontSize"; static const char kCurrentDocumentFontSize[] = "CurrentDocument:FontSize";
TextEditorPlugin *TextEditorPlugin::m_instance = 0; TextEditorPlugin *TextEditorPlugin::m_instance = 0;

2
src/plugins/vcsbase/vcsbaseeditor.h
View File

@@ -236,7 +236,7 @@ protected:
QString findDiffFile(const QString &f, Core::IVersionControl *control = 0) const; QString findDiffFile(const QString &f, Core::IVersionControl *control = 0) const;
virtual bool canRevertDiffChunk(const DiffChunk &dc) const; virtual bool canRevertDiffChunk(const DiffChunk &dc) const;
// Revert a patch chunk. Default implemenation uses patch.exe // Revert a patch chunk. Default implementation uses patch.exe
virtual bool revertDiffChunk(const DiffChunk &dc) const; virtual bool revertDiffChunk(const DiffChunk &dc) const;
private: private:

12
src/tools/qtcdebugger/main.cpp
View File

@@ -57,16 +57,16 @@ using namespace RegistryAccess;
enum { debug = 0 }; enum { debug = 0 };
static const char *titleC = "Qt Creator Debugger"; static const char titleC[] = "Qt Creator Debugger";
static const char *organizationC = "Nokia"; static const char organizationC[] = "Nokia";
// Optional // Optional
static const WCHAR *debuggerWow32RegistryKeyC = L"Software\\Wow6432Node\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"; static const WCHAR debuggerWow32RegistryKeyC[] = L"Software\\Wow6432Node\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug";
static const WCHAR *debuggerRegistryDefaultValueNameC = L"Debugger.Default"; static const WCHAR debuggerRegistryDefaultValueNameC[] = L"Debugger.Default";
static const char *linkC = "http://msdn.microsoft.com/en-us/library/cc266343.aspx"; static const char linkC[] = "http://msdn.microsoft.com/en-us/library/cc266343.aspx";
static const char *creatorBinaryC = "qtcreator.exe"; static const char creatorBinaryC[] = "qtcreator.exe";
#ifdef __GNUC__ #ifdef __GNUC__
#define RRF_RT_ANY 0x0000ffff // no type restriction #define RRF_RT_ANY 0x0000ffff // no type restriction