Commit Graph

39 Commits

Author SHA1 Message Date
Christian Kandeler
52bf349bf3 CplusPlus: Remove pragma suppressing gcc warning.
The respective warning was provoked by Qt code, which has been fixed and
no longer causes that problem.

Change-Id: I1b9efc2e6f9d2af7719d4c921f37f8335c351bfe
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-15 13:06:56 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-06 14:55:08 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Leandro Melo
23c637c4f6 C++: Introduce unicode char/strings support
Those are the types char16_t and char32_t along with the new
char/string literals u'', U'', u"", u8"", and U"".

This is particularly important for the use of QStringLiteral
since in some platforms it relies on expansion such as above.

Note: The string literals quickfixes still need some tunning.

Task-number: QTCREATORBUG-7449
Change-Id: Iebcfea15677dc8e0ebb6143def89a5477e1be7d4
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-06 14:55:07 +02:00
Thiago Macieira
e58f203e4c Silence a warning about unrecognised pragma with ICC
src/libs/cplusplus/MatchingText.cpp(64): warning #161: unrecognized #pragma
  #    pragma GCC diagnostic ignored "-Wstrict-overflow"
              ^

This pragma is recognised in GCC only, so don't enable it for when ICC
fakes to be GCC.

Change-Id: I3d9830dc2b12632dd08d8c8961219bd253ad8c1d
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-28 00:28:30 +02:00
Flex Ferrum
4ca6c51c7f C++: Lambda formatting issues.
Fix code formatting in cases when '{' and '}' appear within expression
context (ex. lambda expression, initializer lists).

Change-Id: I42b28170a8d6d5fd08a9a1a8d8e7698219c18966
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-03-12 14:38:26 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Kai Koehne
1b93bdca24 Disable gcc warning about always-true Q_ASSERT check
gcc 4.5.1 warned about the Q_ASSERT in QStringRef::at() being
always false for isCompleteStringLiteral, isCompleteCharLiteral.

Change-Id: Idb20f81f92876eff685166c8deeebd6e151303b1
Reviewed-on: http://codereview.qt.nokia.com/3070
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-08-17 13:03:52 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
a9a5e3ea17 Exported header cleanup. 2011-01-20 14:03:07 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Erik Verbruggen
8e4fb678fd Removing SimpleToken 2010-07-02 11:18:51 +02:00
Erik Verbruggen
e3e8b1a5c0 Removed the TokenCache. 2010-07-02 11:18:51 +02:00
Thorbjørn Lindeijer
173cdff56c Merge branch '2.0'
Conflicts:
	src/plugins/cppeditor/cppquickfix.cpp
	src/plugins/mercurial/mercurialjobrunner.cpp
	src/plugins/subversion/subversionplugin.cpp
2010-06-15 13:22:33 +02:00
Thorbjørn Lindeijer
a6e5298591 Fixed handling of text wrapping and a text layout corner case
Due to using QTextCursor::columnNumber() instead of
QTextCursor::positionInBlock(), a lot of code would not work correctly
when used with wrapped lines.

In addition, there was an issue with columnNumber() returning 0 right
after inserting a character before the last character of a line.

Reviewed-by: mae
2010-06-15 12:25:01 +02:00
Erik Verbruggen
05639e4688 Merge branch 'origin/2.0' (early part) 2010-06-15 11:30:51 +02:00
Thorbjørn Lindeijer
6875a50d27 Don't pass QChar as const & since it's just a unsigned short
Reviewed-by: ogoffart
2010-06-14 16:10:35 +02:00
Erik Verbruggen
e42ca194c5 Introduced token caching to prevent repetetive tokenizing.
Also removed TokenUnderCursor as it's functionality is in the token cache.

Reviewed-by: ckamm
2010-06-14 10:10:05 +02:00
Erik Verbruggen
424b9724d6 Revert "Introduced a token cache for the C++ editor."
This reverts commit c2393df023.
2010-06-04 12:37:26 +02:00
Erik Verbruggen
c2393df023 Introduced a token cache for the C++ editor.
This should speed things up a bit, because before, the line was tokenized at
least 3 times.
2010-06-04 09:36:05 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Roquette
32199de9d9 Added semicolon after } when creating unnamed enumeration
Task-number: QTCREATORBUG-643
Merge-request: 109
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
2010-02-01 15:07:18 +01:00
Roberto Raggi
fa2eca8262 Insert semicolon when matching enum declarations.
Task-number: QTCREATORBUG-282
2009-11-16 18:15:33 +01:00
dt
5c9b3694e3 Remove debuggign output 2009-10-06 17:14:21 +02:00
Roberto Raggi
bdd0169c3c Don't override escaped quotes. 2009-10-05 16:21:30 +02:00
Roberto Raggi
b9ce92ec4d Remove all the synthesized characters when matching curly braces 2009-09-21 18:19:09 +02:00
Roberto Raggi
a49395a0ea Made the indenter more Qt friendly. Added support for moc keywords. 2009-09-21 16:10:17 +02:00
Roberto Raggi
5df7b96735 Renamed maybeOverrideCharacter() 2009-09-18 12:28:15 +02:00
Roberto Raggi
6c7c333128 Cleanup 2009-09-18 11:07:05 +02:00
Roberto Raggi
a5156e6283 Introduced MatchingText::shouldInsertNewline() and use it to insert lines after a class definition. 2009-09-18 10:59:31 +02:00
Roberto Raggi
9a799da6c9 Re-enable check for automatically inserted block end. 2009-09-17 18:54:12 +02:00
Roberto Raggi
da4fcd22ef Pass the lookahead character to matching text. 2009-09-17 18:39:10 +02:00
Roberto Raggi
82b80b9e39 Automagically insert matching characters. 2009-09-17 17:58:00 +02:00
Roberto Raggi
dfa6be721d Added the helper class MatchingText and use it to automagically insert text for curly braces. 2009-09-17 15:51:15 +02:00