Commit Graph

30 Commits

Author SHA1 Message Date
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Tobias Hunger
3e7d00749f Core::Id: Do not warn when reading invalid ids from settings
Change-Id: Ic2fc0df7f3ac5e8006123bf94c4e55a3a7d86593
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-28 13:08:19 +01:00
Tobias Hunger
4e5e6b45fe Core::Id: Fix possible crash in operator ==
Revert a workaround applied earlier

Change-Id: I825bdf6df662a5509166b9b7d12a4fb305cba6cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-01-23 15:59:19 +01:00
hjk
baffa492d9 Core: simplify ILocator interface
Use data members instead of virtual functions for id, displayName and
priority, use Core::Id, not QStrings for id, de-pimpl CommandLocator.

Change-Id: Id8b41f184cb995138b2d76c923d6d3ae02b7e3f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-18 15:51:13 +01:00
hjk
42c16ff7d3 Core: Use the new Id methods in a few places
There are a lot more left.

Change-Id: I97d32629aa6deef0f4819f70cc0b8437f2814257
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-17 10:57:22 +01:00
hjk
931627e86c Core: add convenience functions to Core::Id.
These are meant to help the outphasing of the Id(QString) constructor
and generally split the interface into "persistent" and "non-persistent".

Change-Id: Id23f613c304e020044e4996448d68164725c898c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-15 11:23:46 +01:00
Daniel Teske
0d3683450f Fix crash on Core::Id().toString()
Change-Id: I515c5df8480f54e49ef0873472b54459f2db5a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-12-11 13:38:11 +01:00
hjk
cfde02f60a Create a way to pre-register Core::Ids
This enables using integral values in addition to strings as key.

Change-Id: I0d03441eab4172b31f813d478bdd2946d7056117
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-12-05 14:37:01 +01:00
Orgad Shaneh
7c4e2b6c60 Id: Add QByteArray constructor
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-20 08:57:35 +01: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
Daniel Teske
77288af63e IdCache: Use delete[] for memory qstrdup allocated
Change-Id: Id39e31191116196e1a9385e0d22bef0bfbb6c861
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-13 17:38:03 +02:00
Kai Koehne
c636fc2efe Core: Fix MSVC compiler warning about strdup
Fix

 warning: C4996: 'strdup': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _strdup.

 By just using qstrdup.

Change-Id: I40664b6ed763b27951d983ec13dcc638270a1beb
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 12:55:06 +02:00
hjk
7ca93f9b1e coreid: add overload for ==(const char *)
Saves code on caller side and cycles for the hashing.

Change-Id: I9d0c739b44a4611a4d70d33cf2798e0b078a72b5
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-06 09:14:25 +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
hjk
7ba0a4de9c debugger: add dumper for Core::Id
Change-Id: Ibcc5b0e80acf037ed87b79ae4f52a1b0677388eb
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-18 12:39:54 +02:00
Christian Kandeler
ffb19c510c Fix Core::Id cleanup.
qstrdup() uses new[] to allocate the array.

Change-Id: I014cfb697d792ff7bae5f1fdc58d8e6069f06e14
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-07 18:37:18 +02:00
Tobias Hunger
60191a68dc Make ids handle unicode strings
This should not have any effect on existing ASCII-only ids (not
even when it comes to conversion costs), but will make sure that
ids generated from user data (file names, etc) will work.

Change-Id: I0a086ad433190a038f20fe3f98f525ad8c56db81
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-16 11:50:54 +02:00
Tobias Hunger
1cc3a5ecd9 Core: Clean up context
Move the context code into its own implementation file (from id.cpp)

Change-Id: I5e487e0ab0a9b3a33ef32f2d5b7a5d703bded099
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-03 13:28:26 +02:00
Kai Koehne
979d8f4d2b Core: Fix msvc warning about strdup being deprecated
"warning: C4996: 'strdup': The POSIX name for this item is deprecated.
Instead, use the ISO C++ conformant name: _strdup."

Change-Id: Ic2335664c4d2baf74eaa201ba4a85e8af3575bfb
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-17 10:50:23 +02: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
658a608083 core: prevent allocations when looking up an existing Core::Id
Change-Id: I7bd2f83ffc6a57135aab9f76ff929eca48d16885
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-01 14:08:10 +01:00
Tobias Hunger
97496df1bf Task: Update Task to use Utils::FileName and Core::Id
Use Utils::FileName and Core::Id in Task structure.

Change-Id: Ia0ed459f86df36ffe547abde7c240b0ac409bcf5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-30 11:34:43 +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
Friedemann Kleint
2892f13b8c CorePlugin: Compile with QT_NO_CAST_FROM_ASCII.
- Wrap literals in QLatin1String()/QLatin1Char().
- Extract some string constants avoiding repeated
  QString construction.
- Fix repeated invocation of Container.end() in loops.

Change-Id: If737735507aaf82e53063adda53f54c46418f42f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-22 14:47:29 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
hjk
82f5573626 more Id type fixes
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-10 15:57:09 +01:00
hjk
cfc9b71ecb coreplugin: replace QByteArray by int for ids
Change-Id: I3135cb745b4e8adc6d7a7145bac51317544f9844
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-10 15:56:31 +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
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 18:04:55 +02:00