summaryrefslogtreecommitdiffstats
path: root/src/designer/src/designer/qdesigner_workbench.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QDesigner: Use QList instead of QVectorJarek Kobus2020-06-091-1/+1
| | | | | | Task-number: QTBUG-84469 Change-Id: Icb0da4e9657c1e85632c12fa906cc75272d74306 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Revert "Qt Designer: Migrate from QList to QVector"Friedemann Kleint2020-06-081-1/+1
| | | | | | | | | | This reverts commit ee87edebe6f934ec915b7cb4a0f5a28f73e9f221. The official class name will be QList. Task-number: QTBUG-84469 Change-Id: Ia6c1f0ed64b3ef3d5b8e0c0435ec76fbe76f867b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Update dependenciesFriedemann Kleint2020-03-311-10/+11
| | | | | | | | | | | | | | Adapt to qtbase/bcaff2b06fc46fce8a3ae6d613c025c8d097229c merging the QAction classes, qtbase/d975ad4ed728553b765c61f38c1e0df899187cf5 merging the QShortcut classes and qtbase/d975ad4ed728553b765c61f38c1e0df899187cf5 moving the Undo framework to QtGui. Clean up include directives. Change-Id: Ib825f17284390c103d5ac2ae1f2c8fe65a534f1a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Qt Designer: Migrate from QList to QVectorFriedemann Kleint2019-12-091-1/+1
| | | | | Change-Id: I75f6f4b7157616ba86bf520e1936536571a66ba5 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-221-1/+1
| | | | | | | It is being deprecated. Change-Id: I5a2216b313c53ff7d42e02c0d91632550f3536ae Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Qt Designer: Port QList->QVector for some internal classesFriedemann Kleint2019-11-201-1/+1
| | | | | Change-Id: I10d9aba4e504f9759dcbedad84601eb3f1083b19 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Prepare for deprecation of classes in Qt 6Friedemann Kleint2019-11-191-1/+1
| | | | | | | | | - Use auto for QStringRef. - Use auto for QList and iterators, refactoring some loops. Task-number: QTBUG-79896 Change-Id: I065d5b6d49404e51a10a7e1d7373eff41f9cb032 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix Qt API usageFriedemann Kleint2019-11-151-2/+2
| | | | | | | | | | | | Replace: empty() by isEmpty() front()/back() by constFirst()/constLast(), preventing detaching Streamline some code. Task-number: QTBUG-79896 Change-Id: Ic3f8414db79a83a30b55369a9352f332b41aa621 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Remove usages of deprecated APIs of QDesktopWidgetSona Kurazyan2019-10-091-7/+5
| | | | | | | | | | - Replaced QDesktopWidget::screenNumber(QWidget*) -> QWidget::screen() - Removed unused QDesktopWidget includes. Task-number: QTBUG-76491 Change-Id: I5be0e4aac2faa4cbd389be45ea6c45ae1eab507a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Qt Designer: Replace 'typedef' by 'using'Friedemann Kleint2019-06-051-1/+1
| | | | | | | | Apply Fixits by Qt Creator with some amendments (use Qt standard typedefs for QWidget/QObjectList and QOverload for slots). Change-Id: Icf0600d8e5381e83ae8037895c07a09d7e6b481a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Introduce nullptrFriedemann Kleint2019-06-051-20/+20
| | | | | | | Apply Fixits by Qt Creator with some amendments. Change-Id: Idc948b1132fbb61c3ae6706b71659e2e8790fbc6 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: introduce member initializationFriedemann Kleint2019-06-111-5/+1
| | | | | | | | | | | Fix warnings emitted by clang, use default constructors where applicable. Initialize remaining member variables about which clang warns about missing initialization in the constructor. Change-Id: Ic23a1f36f7507dc728ca6daf0d2067727125c0a9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Fix deprecation warningsFriedemann Kleint2019-02-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | qtpaths.cpp:114:19: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations] qtpaths.cpp:218:21: warning: ‘static void QStandardPaths::enableTestMode(bool)’ is deprecated [-Wdeprecated-declarations] aboutdialog.cpp:144:81: warning: ‘const QRect QDesktopWidget::availableGeometry(const QPoint&) const’ is deprecated: Use QGuiApplication::screenAt() [-Wdeprecated-declarations] qtdocinstaller.cpp:66:70: warning: ‘QDir& QDir::operator=(const QString&)’ is deprecated: Use QDir::setPath() instead [-Wdeprecated-declarations] optionswidget.cpp:187:32: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations] optionswidget.cpp:116:25: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations] mainwindow.cpp:219:70: warning: ‘const QRect QDesktopWidget::screenGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] mainwindow.cpp:727:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations] qdesigner_workbench.cpp:272:81: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] qdesigner_workbench.cpp:577:51: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] qdesigner_workbench.cpp:586:83: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] appfontdialog.cpp:355:41: warning: ‘void qStableSort(RandomAccessIterator, RandomAccessIterator) [with RandomAccessIterator = int*]’ is deprecated: Use std::stable_sort [-Wdeprecated-declarations] mainwindow.cpp:263:75: warning: ‘void qStableSort(RandomAccessIterator, RandomAccessIterator, LessThan) [with RandomAccessIterator = QToolBar**; LessThan = bool (*)(const QToolBar*, const QToolBar*)]’ is deprecated: Use std::stable_sort [-Wdeprecated-declarations] shared/qdesigner_menu.cpp:175:31: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/qdesigner_toolbar.cpp:406:31: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/actionrepository.cpp:321:33: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/qdesigner_menubar.cpp:316:35: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] shared/qdesigner_tabwidget.cpp:220:73: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] Change-Id: I78d288be2e061dba03cbe72a77ca3b9742f79111 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Qt Designer: Fix clang-tidy warnings about if / return statementsFriedemann Kleint2018-07-311-37/+35
| | | | | | | | | | - Simplify/streamline if statmenents (comparison against bool literal) - Change else if to if after return/break/continue - Fix indentation - Do not check for non-null before invoking delete on pointer Change-Id: I1b803b01cffd56b3f11e63c3e2e7ae103b1d8799 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Fix Qt include statementsFriedemann Kleint2018-05-231-24/+24
| | | | | | | | | | | | Change #include <QtCore/QDebug> to #include <QtCore/qdebug.h> according to the coding style. Change-Id: I2ba2e99d003f245c61ce836acb5af3208e1e0b29 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Replace a few QList<> by QVector<>Friedemann Kleint2017-04-131-5/+2
| | | | | Change-Id: I7f338d14e7956f5f4b3e1d21d01e84ba7d7a0224 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Use typedefs QObject/WidgetList where appropriateFriedemann Kleint2017-04-131-1/+1
| | | | | | | Remove the TabOrder typedef in MetaDataBaseItem. Change-Id: I75852ee6b6a71cee7fbbbd82653cd9069894f421 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Remove foreachFriedemann Kleint2017-01-101-24/+21
| | | | | | | Use range based for. Change-Id: I61a51aad99a9b2a20263fa3fa5ed991ac899ff2e Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Qt Designer: Remove use of Java-style map iteratorsFriedemann Kleint2016-10-311-4/+1
| | | | | | | Use STL style iterators instead. Change-Id: Id82546f667059c69521507f3a3b6b997de5cd6ba Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-021-7/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/designer/src/designer/qdesigner.cpp One side changed Q_OS_MAC -> Q_OS_MACOS; the other changed it to Q_OS_OSX and combined with Q_OS_WIN. Kept the latter. tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result One side added some XML next to where another made a local change. Change-Id: I812b55fbaccc85baa9856aedf90f9258428dfcab
| * Qt Designer: Use Q_OS_MACOS macro instead of Q_OS_MACFriedemann Kleint2016-07-011-7/+7
| | | | | | | | | | | | | | | | Q_OS_MACOS was introduced by qtbase 3e2bde35786f503c9031c34454b741a02426bb9a. Change-Id: I2d780a4ffc43ec216014f541e36a9c118817207d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Updated license headers and license testsAntti Kokko2016-06-101-17/+12
|/ | | | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) License header tests also updated to match current headers. Change-Id: Ia6bdacaa3c5bbc9d31334e1a0cabfe502a484dc4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Port Qt Designer to Qt 5 signals & slot connection syntax.Friedemann Kleint2015-07-141-14/+21
| | | | | | | | Use Qt 5 signals & slot connection with exception of private slots and tool classes from the shared directory. Change-Id: I2bf4bfbdff709d15c8ee4ae3de3039bf3d210d6a Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Update copyright headersAntti Kokko2015-02-141-7/+7
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7f14f408e04c5c4f73a913fae153adcffbebe38f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-09-251-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Qt Designer: Fix message about file open failure.Friedemann Kleint2013-02-061-1/+1
| | | | | Change-Id: Ic59e7fc11c9a67546a22901b82681dd75831455a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | | Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-251-24/+24
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Designer: Fix crash when switching from docked to multiple windows.Friedemann Kleint2012-07-031-2/+22
| | | | | | | | | | Make sure the preference dialog is destroyed before changing the UI mode by introducing a flag that is set on UI mode changes, triggering the update afterwards. Change-Id: I9c488ba6b1b24faccb0a1606994aaf0474b56fc2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ib4b7580dda53886247ad6eb10d17d8e67c51980d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I3841a7c154b90b73fe8f498fda035c8b3545c692 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed compile.Rohan McGovern2012-01-201-1/+1
| | | | | | | | | | | QDir::convertSeparators -> QDir::toNativeSeparators convertSeparators was deprecated since Qt 4.2 (!) and recently was removed from Qt 5. Change-Id: I6a7dad582ed4270cfbd09defc94c73103bb2a9fe Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-061-1/+1
| | | | | | Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94 Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Designer: Fix warnings about assigned/unused variables.Friedemann Kleint2011-10-271-1/+0
| | | | | | Change-Id: I99196befc6fe5578bc9a1813a9ec21c08c5c3b25 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QtTools/Designer/shared: Replace Q_WS_ by Q_OS_ where appropriate.Friedemann Kleint2011-10-191-11/+11
| | | | | Change-Id: I166d859f8f446fb4bd08ed05aae1e3db0346b263 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Designer: Fix string conversion warnings/introduce QStringLiteral.Friedemann Kleint2011-09-271-1/+1
| | | | | | | | on this occasion. Change-Id: Ib80dfdf8aae162b02500293a83e3bc12941f7406 Reviewed-on: http://codereview.qt-project.org/5637 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge remote-tracking branch 'origin/refactor' into masterLars Knoll2011-09-131-11/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/assistant/help/help.pro src/designer/src/components/formeditor/formwindow.cpp src/designer/src/components/formeditor/formwindow_dnditem.cpp src/designer/src/components/formeditor/layout_propertysheet.cpp src/designer/src/components/formeditor/qdesigner_resource.cpp src/designer/src/components/lib/lib.pro src/designer/src/components/signalsloteditor/signalsloteditor.cpp src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp src/designer/src/components/widgetbox/widgetbox_dnditem.cpp src/designer/src/components/widgetbox/widgetboxtreewidget.cpp src/designer/src/lib/lib.pro src/designer/src/lib/shared/qdesigner_formbuilder.cpp src/designer/src/lib/shared/qdesigner_propertysheet.cpp src/designer/src/lib/shared/shared.pri src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro src/linguist/lupdate/qdeclarative.cpp src/linguist/shared/profileevaluator.cpp src/linguist/shared/qph.cpp src/linguist/shared/ts.cpp src/qtconfig/mainwindow.cpp src/shared/qtgradienteditor/qtcolorline.cpp src/shared/qtgradienteditor/qtgradientwidget.cpp sync.profile Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff
| * QtTools: Widget library split.Friedemann Kleint2011-05-241-11/+11
| |
* | X11: Keep the menubar inside the widgetbox window in toplevel modeMichał Zając2011-09-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now the appmenu protocol does not make it possible to associate a menubar with all application windows. This means in top level mode you can only reach the menubar when the widgetbox window is active. Since this is quite inconvenient, better not use the native menubar in this configuration and keep the menubar in the widgetbox window. Merge-request: 1229 Reviewed-by: denis (cherry-picked from commit a45398677309ab905b69c599177b4c2951292b04) Change-Id: Ib2994551558d87db84874f84f279be5e766cde15 Reviewed-on: http://codereview.qt-project.org/4602 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Update licenseheader text in source files for qttools Qt moduleJyri Tahtela2011-05-241-17/+17
|/ | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Designer: Refactor save/load.Friedemann Kleint2011-05-191-22/+12
| | | | | | | | | | | | | | | | | | | | No longer pop up message boxes in QDesignerFormWindowInterface:: contents(), introduce QDesignerFormWindowInterface::checkContents() instead that checks for orphaned top level spacers (use in Designer application). Give QDesignerFormWindowInterface::setContents() a bool return and pass an optional error string back for IDE integrations. Remove all Qt3 form conversion logic from the loading logic (since there is no more uic3); do not do any additional checks there since everything has been moved to QAbstractFormBuilder::load() (including language). Thus, QDesignerFormWindowInterface::setContents() no longer pops up message boxes, either. Dependent on: qtbase/449b8a93170ecc19f2f438b160d0bc4122999401
* Designer: BC cleanup of QDesignerIntegrationInterface.Friedemann Kleint2011-05-131-2/+2
| | | | | | | | | | | | | | Add features enumeration similar to that of QDesignerFormWindowInterface. Add missing virtuals for IDE integration. Make a cleaned-up version of Qt Designer's implemenation public as QDesignerIntegration such that IDE integrations can use an integration class derived from it. Add a bit of documentation, marked as \internal. Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+1100
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12