diff options
author | Mahmoud Badri <mahmoud.badri@qt.io> | 2018-10-05 15:04:23 +0300 |
---|---|---|
committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2018-10-10 10:29:26 +0000 |
commit | fe04c1301a1a6865fc96ee3a561696015ba3a1ae (patch) | |
tree | 4206bf178c6add95de590a5cd20248ffc58f9c2b /src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp | |
parent | 9b0276d7aba5d93a2619d0f39698c43cdb13c084 (diff) |
Change many CStrings to QString
- A lot of CString, CFilePath, and Qt3DSFile occureneces and their
relevant code has been removed to save the costy back and forth
conversion between CString and QString.
- Renovated several classes as part of the process (Preferences
classes, recent items, build configuration, probably few more)
- Assorted tweaks here and there
Task-number: QT3DS-1899
Task-number: QT3DS-2455
Change-Id: Ibbf4c3b7ab0b9fe6e19d8aed822fa29d43b99086
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp')
-rw-r--r-- | src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp index 7e93f2d9..153e2447 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp @@ -393,7 +393,7 @@ void InspectorControlView::showContextMenu(int x, int y, int handle, int instanc void InspectorControlView::toggleMasterLink() { Q3DStudio::ScopedDocumentEditor editor(*g_StudioApp.GetCore()->GetDoc(), - L"Link Property", __FILE__, __LINE__); + QObject::tr("Link Property"), __FILE__, __LINE__); bool wasLinked = editor->IsPropertyLinked(m_instance, m_handle); if (wasLinked) @@ -650,10 +650,10 @@ bool InspectorControlView::toolTipsEnabled() QString InspectorControlView::convertPathToProjectRoot(const QString &presentationPath) { QDir projDir(g_StudioApp.GetCore()->getProjectFile().getProjectPath()); - QFileInfo presentationFile(g_StudioApp.GetCore()->GetDoc()->GetDocumentPath() - .GetAbsolutePath().toQString()); + QFileInfo presentationFile(g_StudioApp.GetCore()->GetDoc()->GetDocumentPath()); QDir presentationDir(presentationFile.absolutePath()); QString absPath = presentationDir.absoluteFilePath(presentationPath); + return projDir.relativeFilePath(absPath); } |