Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -Naurb ./src/qt-creator-2.3.1-src/src/libs/3rdparty/cplusplus/Token.h ./src_patched/qt-creator-2.3.1-src/src/libs/3rdparty/cplusplus/Token.h
- --- ./src/qt-creator-2.3.1-src/src/libs/3rdparty/cplusplus/Token.h 2011-09-21 10:31:14.000000000 +0400
- +++ ./src_patched/qt-creator-2.3.1-src/src/libs/3rdparty/cplusplus/Token.h 2011-11-16 20:25:28.400382335 +0400
- @@ -103,11 +103,9 @@
- T_FIRST_KEYWORD,
- T_ASM = T_FIRST_KEYWORD,
- T_AUTO,
- - T_BOOL,
- T_BREAK,
- T_CASE,
- T_CATCH,
- - T_CHAR,
- T_CLASS,
- T_CONST,
- T_CONST_CAST,
- @@ -115,7 +113,6 @@
- T_DEFAULT,
- T_DELETE,
- T_DO,
- - T_DOUBLE,
- T_DYNAMIC_CAST,
- T_ELSE,
- T_ENUM,
- @@ -123,14 +120,11 @@
- T_EXPORT,
- T_EXTERN,
- T_FALSE,
- - T_FLOAT,
- T_FOR,
- T_FRIEND,
- T_GOTO,
- T_IF,
- T_INLINE,
- - T_INT,
- - T_LONG,
- T_MUTABLE,
- T_NAMESPACE,
- T_NEW,
- @@ -141,8 +135,6 @@
- T_REGISTER,
- T_REINTERPRET_CAST,
- T_RETURN,
- - T_SHORT,
- - T_SIGNED,
- T_SIZEOF,
- T_STATIC,
- T_STATIC_CAST,
- @@ -157,12 +149,9 @@
- T_TYPEID,
- T_TYPENAME,
- T_UNION,
- - T_UNSIGNED,
- T_USING,
- T_VIRTUAL,
- - T_VOID,
- T_VOLATILE,
- - T_WCHAR_T,
- T_WHILE,
- T___ATTRIBUTE__,
- @@ -222,6 +211,20 @@
- T_Q_GADGET,
- T_LAST_KEYWORD = T_Q_GADGET,
- + T_FIRST_POD,
- + T_BOOL = T_FIRST_POD,
- + T_CHAR,
- + T_DOUBLE,
- + T_FLOAT,
- + T_INT,
- + T_LONG,
- + T_SHORT,
- + T_SIGNED,
- + T_UNSIGNED,
- + T_VOID,
- + T_WCHAR_T,
- + T_LAST_POD = T_WCHAR_T,
- +
- // aliases
- T_OR = T_PIPE_PIPE,
- T_AND = T_AMPER_AMPER,
- @@ -287,6 +290,9 @@
- inline bool isKeyword() const
- { return f.kind >= T_FIRST_KEYWORD && f.kind < T_FIRST_QT_KEYWORD; }
- + inline bool isPodType() const
- + { return f.kind >= T_FIRST_POD && f.kind <= T_LAST_POD; }
- +
- inline bool isComment() const
- { return f.kind == T_COMMENT || f.kind == T_DOXY_COMMENT ||
- f.kind == T_CPP_COMMENT || f.kind == T_CPP_DOXY_COMMENT; }
- diff -Naurb ./src/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditor.cpp ./src_patched/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditor.cpp
- --- ./src/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditor.cpp 2011-09-21 10:31:14.000000000 +0400
- +++ ./src_patched/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditor.cpp 2011-11-16 21:37:11.576917776 +0400
- @@ -2232,6 +2232,7 @@
- if (categories.isEmpty()) {
- categories << QLatin1String(TextEditor::Constants::C_NUMBER)
- << QLatin1String(TextEditor::Constants::C_STRING)
- + << QLatin1String(TextEditor::Constants::C_POD_TYPE)
- << QLatin1String(TextEditor::Constants::C_TYPE)
- << QLatin1String(TextEditor::Constants::C_KEYWORD)
- << QLatin1String(TextEditor::Constants::C_OPERATOR)
- diff -Naurb ./src/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditorenums.h ./src_patched/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditorenums.h
- --- ./src/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditorenums.h 2011-09-21 10:31:14.000000000 +0400
- +++ ./src_patched/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditorenums.h 2011-11-16 20:25:28.393715669 +0400
- @@ -44,6 +44,7 @@
- enum CppFormats {
- CppNumberFormat,
- CppStringFormat,
- + CppPodTypeFormat,
- CppTypeFormat,
- CppKeywordFormat,
- CppOperatorFormat,
- diff -Naurb ./src/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditor.h ./src_patched/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditor.h
- --- ./src/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditor.h 2011-09-21 10:31:14.000000000 +0400
- +++ ./src_patched/qt-creator-2.3.1-src/src/plugins/cppeditor/cppeditor.h 2011-11-16 21:37:11.513584445 +0400
- @@ -286,6 +286,7 @@
- QTextCharFormat m_occurrencesFormat;
- QTextCharFormat m_occurrencesUnusedFormat;
- QTextCharFormat m_occurrenceRenameFormat;
- + QTextCharFormat m_podTypeFormat;
- QTextCharFormat m_typeFormat;
- QTextCharFormat m_localFormat;
- QTextCharFormat m_fieldFormat;
- diff -Naurb ./src/qt-creator-2.3.1-src/src/plugins/cppeditor/cpphighlighter.cpp ./src_patched/qt-creator-2.3.1-src/src/plugins/cppeditor/cpphighlighter.cpp
- --- ./src/qt-creator-2.3.1-src/src/plugins/cppeditor/cpphighlighter.cpp 2011-09-21 10:31:14.000000000 +0400
- +++ ./src_patched/qt-creator-2.3.1-src/src/plugins/cppeditor/cpphighlighter.cpp 2011-11-16 22:25:15.196829839 +0400
- @@ -195,6 +195,9 @@
- } else if (tk.isKeyword() || isQtKeyword(text.midRef(tk.begin(), tk.length())) || tk.isObjCAtKeyword())
- setFormat(tk.begin(), tk.length(), m_formats[CppKeywordFormat]);
- + else if (tk.isPodType())
- + setFormat(tk.begin(), tk.length(), m_formats[CppPodTypeFormat]);
- +
- else if (tk.isOperator())
- setFormat(tk.begin(), tk.length(), m_formats[CppOperatorFormat]);
- diff -Naurb ./src/qt-creator-2.3.1-src/src/plugins/texteditor/texteditorconstants.h ./src_patched/qt-creator-2.3.1-src/src/plugins/texteditor/texteditorconstants.h
- --- ./src/qt-creator-2.3.1-src/src/plugins/texteditor/texteditorconstants.h 2011-09-21 10:31:14.000000000 +0400
- +++ ./src_patched/qt-creator-2.3.1-src/src/plugins/texteditor/texteditorconstants.h 2011-11-16 21:37:11.580251109 +0400
- @@ -115,6 +115,7 @@
- const char * const C_NUMBER = "Number";
- const char * const C_STRING = "String";
- +const char * const C_POD_TYPE = "POD";
- const char * const C_TYPE = "Type";
- const char * const C_LOCAL = "Local";
- const char * const C_FIELD = "Field";
- diff -Naurb ./src/qt-creator-2.3.1-src/src/plugins/texteditor/texteditorsettings.cpp ./src_patched/qt-creator-2.3.1-src/src/plugins/texteditor/texteditorsettings.cpp
- --- ./src/qt-creator-2.3.1-src/src/plugins/texteditor/texteditorsettings.cpp 2011-09-21 10:31:14.000000000 +0400
- +++ ./src_patched/qt-creator-2.3.1-src/src/plugins/texteditor/texteditorsettings.cpp 2011-11-16 22:24:37.580164320 +0400
- @@ -135,6 +135,7 @@
- // Standard categories
- formatDescriptions.append(FormatDescription(QLatin1String(C_NUMBER), tr("Number"), Qt::darkBlue));
- formatDescriptions.append(FormatDescription(QLatin1String(C_STRING), tr("String"), Qt::darkGreen));
- + formatDescriptions.append(FormatDescription(QLatin1String(C_POD_TYPE), tr("POD Type"), Qt::darkYellow));
- formatDescriptions.append(FormatDescription(QLatin1String(C_TYPE), tr("Type"), Qt::darkMagenta));
- formatDescriptions.append(FormatDescription(QLatin1String(C_LOCAL), tr("Local")));
- formatDescriptions.append(FormatDescription(QLatin1String(C_FIELD), tr("Field"), Qt::darkRed));
- @@ -144,7 +145,10 @@
- virtualMethodFormatDescriptor.format().setItalic(true);
- formatDescriptions.append(virtualMethodFormatDescriptor);
- - formatDescriptions.append(FormatDescription(QLatin1String(C_KEYWORD), tr("Keyword"), Qt::darkYellow));
- + FormatDescription keywordFormatDescriptor(QLatin1String(C_KEYWORD), tr("Keyword"), Qt::black);
- + keywordFormatDescriptor.format().setBold(true);
- + formatDescriptions.append(keywordFormatDescriptor);
- +
- formatDescriptions.append(FormatDescription(QLatin1String(C_OPERATOR), tr("Operator")));
- formatDescriptions.append(FormatDescription(QLatin1String(C_PREPROCESSOR), tr("Preprocessor"), Qt::darkBlue));
- formatDescriptions.append(FormatDescription(QLatin1String(C_LABEL), tr("Label"), Qt::darkRed));
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement