diff options
Diffstat (limited to 'examples/svg')
-rw-r--r-- | examples/svg/embedded/desktopservices/contenttab.cpp | 5 | ||||
-rw-r--r-- | examples/svg/embedded/desktopservices/desktopservices.pro | 7 | ||||
-rw-r--r-- | examples/svg/embedded/embedded.pro | 2 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/config_wince/config.xml | 13 | ||||
-rw-r--r-- | examples/svg/embedded/fluidlauncher/fluidlauncher.pro | 35 | ||||
-rw-r--r-- | examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro | 5 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/bearercloud.cpp | 39 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/cloud.cpp | 7 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/main.cpp | 8 | ||||
-rw-r--r-- | examples/svg/opengl/framebufferobject/framebufferobject.pro | 2 | ||||
-rw-r--r-- | examples/svg/opengl/opengl.pro | 2 | ||||
-rw-r--r-- | examples/svg/svg.pro | 2 | ||||
-rw-r--r-- | examples/svg/svgviewer/exportdialog.cpp | 3 | ||||
-rw-r--r-- | examples/svg/svgviewer/svgviewer.pro | 6 |
14 files changed, 35 insertions, 101 deletions
diff --git a/examples/svg/embedded/desktopservices/contenttab.cpp b/examples/svg/embedded/desktopservices/contenttab.cpp index d388c23..8d467df 100644 --- a/examples/svg/embedded/desktopservices/contenttab.cpp +++ b/examples/svg/embedded/desktopservices/contenttab.cpp @@ -104,10 +104,9 @@ void ContentTab::setIcon(const QString &icon) void ContentTab::populateListWidget() { - QFileInfoList fileList = m_ContentDir.entryInfoList(QDir::Files, QDir::Time); - foreach(QFileInfo item, fileList) { + const QFileInfoList fileList = m_ContentDir.entryInfoList(QDir::Files, QDir::Time); + for (const QFileInfo &item : fileList) new QListWidgetItem(m_Icon, itemName(item), this); - } } QString ContentTab::itemName(const QFileInfo &item) diff --git a/examples/svg/embedded/desktopservices/desktopservices.pro b/examples/svg/embedded/desktopservices/desktopservices.pro index 1410451..0ffcec5 100644 --- a/examples/svg/embedded/desktopservices/desktopservices.pro +++ b/examples/svg/embedded/desktopservices/desktopservices.pro @@ -11,11 +11,4 @@ music.files = data/*.mp3 data/*.wav image.files = data/*.png target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/desktopservices - -wince*{ - music.path = "\\My Documents\\My Music" - image.path = "\\My Documents\\My Pictures" - DEPLOYMENT += music image -} - INSTALLS += target diff --git a/examples/svg/embedded/embedded.pro b/examples/svg/embedded/embedded.pro index 42232fb..aebb72b 100644 --- a/examples/svg/embedded/embedded.pro +++ b/examples/svg/embedded/embedded.pro @@ -2,4 +2,4 @@ TEMPLATE = subdirs qtHaveModule(widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo # Disable platforms without process support -winrt: SUBDIRS -= fluidlauncher +uikit|winrt: SUBDIRS -= fluidlauncher diff --git a/examples/svg/embedded/fluidlauncher/config_wince/config.xml b/examples/svg/embedded/fluidlauncher/config_wince/config.xml deleted file mode 100644 index 3b57770..0000000 --- a/examples/svg/embedded/fluidlauncher/config_wince/config.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<demolauncher> - <demos> - <example filename="embeddedsvgviewer" name="SVG Viewer" image="screenshots/embeddedsvgviewer.png" args="shapes.svg"/> - <example filename="styledemo" name="Stylesheets" image="screenshots/styledemo.png"/> - <example filename="deform" name="Vector Deformation" image="screenshots/deform.png" args="-small-screen"/> - <example filename="pathstroke" name="Path Stroking" image="screenshots/pathstroke.png" args="-small-screen"/> - <example filename="wiggly" name="Wiggly Text" image="screenshots/wiggly.png"/> - </demos> - <slideshow timeout="60000" interval="10000"> - <imagedir dir="slides"/> - </slideshow> -</demolauncher> diff --git a/examples/svg/embedded/fluidlauncher/fluidlauncher.pro b/examples/svg/embedded/fluidlauncher/fluidlauncher.pro index 4046055..63cf1fa 100644 --- a/examples/svg/embedded/fluidlauncher/fluidlauncher.pro +++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.pro @@ -19,38 +19,3 @@ RESOURCES = fluidlauncher.qrc target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/fluidlauncher INSTALLS += target - -wince*{ - QT += svg - - BUILD_DIR = release - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - BUILD_DIR = debug - } - - requires(!isEmpty(_QMAKE_SUPER_CACHE_)) - base = $$dirname(_QMAKE_SUPER_CACHE_) - baseex = $$base/qtbase/examples - svgex = $$base/qtsvg/examples - executables.files = \ - $$svgex/svg/embedded/embeddedsvgviewer/$${BUILD_DIR}/embeddedsvgviewer.exe \ - $$baseex/embedded/styleexample/$${BUILD_DIR}/styleexample.exe \ - $$baseex/painting/deform/$${BUILD_DIR}/deform.exe \ - $$baseex/painting/pathstroke/$${BUILD_DIR}/pathstroke.exe \ - $$baseex/graphicsview/elasticnodes/$${BUILD_DIR}/elasticnodes.exe \ - $$baseex/widgets/wiggly/$${BUILD_DIR}/wiggly.exe \ - $$baseex/painting/concentriccircles/$${BUILD_DIR}/concentriccircles.exe \ - $$baseex/draganddrop/$${BUILD_DIR}/fridgemagnets.exe - - executables.path = . - - files.files = $$PWD/screenshots $$PWD/slides $$PWD/../embeddedsvgviewer/shapes.svg - files.path = . - - config.files = $$PWD/config_wince/config.xml - config.path = . - - DEPLOYMENT += config files executables - - DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg -} diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro index 40d4a6c..a0d6793 100644 --- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro +++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro @@ -7,8 +7,3 @@ RESOURCES += embeddedsvgviewer.qrc target.path = $$[QT_INSTALL_EXAMPLES]/svg/embeddedsvgviewer INSTALLS += target - -wince* { - DEPLOYMENT_PLUGIN += qsvg -} - diff --git a/examples/svg/network/bearercloud/bearercloud.cpp b/examples/svg/network/bearercloud/bearercloud.cpp index 1ec711e..bf2a444 100644 --- a/examples/svg/network/bearercloud/bearercloud.cpp +++ b/examples/svg/network/bearercloud/bearercloud.cpp @@ -113,17 +113,19 @@ void BearerCloud::cloudMoved() void BearerCloud::timerEvent(QTimerEvent *) { - QList<Cloud *> clouds; - foreach (QGraphicsItem *item, items()) { + std::vector<Cloud *> clouds; + const auto graphicsItems = items(); + clouds.reserve(graphicsItems.size()); + for (QGraphicsItem *item : graphicsItems) { if (Cloud *cloud = qgraphicsitem_cast<Cloud *>(item)) - clouds << cloud; + clouds.push_back(cloud); } - foreach (Cloud *cloud, clouds) + for (Cloud *cloud : clouds) cloud->calculateForces(); bool cloudsMoved = false; - foreach (Cloud *cloud, clouds) + for (Cloud *cloud : clouds) cloudsMoved |= cloud->advance(); if (!cloudsMoved) { @@ -158,8 +160,13 @@ void BearerCloud::configurationAdded(const QNetworkConfiguration &config) //! [3] void BearerCloud::configurationRemoved(const QNetworkConfiguration &config) { - foreach (const QNetworkConfiguration::StateFlags &state, configStates.uniqueKeys()) - configStates.remove(state, config.identifier()); + const auto id = config.identifier(); + for (auto it = configStates.begin(), end = configStates.end(); it != end; /* erasing */) { + if (it.value() == id) + it = configStates.erase(it); + else + ++it; + } Cloud *item = configurations.take(config.identifier()); @@ -173,10 +180,15 @@ void BearerCloud::configurationRemoved(const QNetworkConfiguration &config) //! [4] void BearerCloud::configurationChanged(const QNetworkConfiguration &config) { - foreach (const QNetworkConfiguration::StateFlags &state, configStates.uniqueKeys()) - configStates.remove(state, config.identifier()); + const auto id = config.identifier(); + for (auto it = configStates.begin(), end = configStates.end(); it != end; /* erasing */) { + if (it.value() == id) + it = configStates.erase(it); + else + ++it; + } - configStates.insert(config.state(), config.identifier()); + configStates.insert(config.state(), id); cloudMoved(); } @@ -185,10 +197,9 @@ void BearerCloud::configurationChanged(const QNetworkConfiguration &config) //! [1] void BearerCloud::updateConfigurations() { - QList<QNetworkConfiguration> allConfigurations = manager.allConfigurations(); - - while (!allConfigurations.isEmpty()) - configurationAdded(allConfigurations.takeFirst()); + const auto allConfigurations = manager.allConfigurations(); + for (const QNetworkConfiguration &config : allConfigurations) + configurationAdded(config); cloudMoved(); } diff --git a/examples/svg/network/bearercloud/cloud.cpp b/examples/svg/network/bearercloud/cloud.cpp index be6797f..fb5bfd2 100644 --- a/examples/svg/network/bearercloud/cloud.cpp +++ b/examples/svg/network/bearercloud/cloud.cpp @@ -108,7 +108,8 @@ void Cloud::calculateForces() qreal xvel = 0; qreal yvel = 0; QLineF orbitForce; - foreach (QGraphicsItem *item, scene()->items()) { + const auto graphicsItems = scene()->items(); + for (QGraphicsItem *item : graphicsItems) { // other clouds Cloud *cloud = qgraphicsitem_cast<Cloud *>(item); if (!cloud && item->data(0) != QLatin1String("This Device")) @@ -245,7 +246,6 @@ void Cloud::stateChanged(QNetworkSession::State state) else finalOpacity = 1.0; -#if !defined(Q_OS_WINCE) QString tooltip; if (configuration.name().isEmpty()) @@ -303,9 +303,6 @@ void Cloud::stateChanged(QNetworkSession::State state) tooltip += tr("<br>Sent data: %1 bytes").arg(session->bytesWritten()); setToolTip(tooltip); -#else - Q_UNUSED(state); -#endif } //! [2] diff --git a/examples/svg/network/bearercloud/main.cpp b/examples/svg/network/bearercloud/main.cpp index 62b6e88..a06b4ea 100644 --- a/examples/svg/network/bearercloud/main.cpp +++ b/examples/svg/network/bearercloud/main.cpp @@ -55,11 +55,6 @@ protected: void resizeEvent(QResizeEvent *) { fitInView(sceneRect(), Qt::KeepAspectRatio); } -#ifdef Q_OS_WINCE - void hideEvent(QHideEvent *) { - qApp->quit(); - } -#endif }; CloudView::CloudView(QGraphicsScene *scene) @@ -67,9 +62,6 @@ CloudView::CloudView(QGraphicsScene *scene) { setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing | QPainter::SmoothPixmapTransform); -#if defined (Q_OS_WINCE) - setWindowState(Qt::WindowMaximized); -#endif } #include "main.moc" diff --git a/examples/svg/opengl/framebufferobject/framebufferobject.pro b/examples/svg/opengl/framebufferobject/framebufferobject.pro index dd3211f..d180d4d 100644 --- a/examples/svg/opengl/framebufferobject/framebufferobject.pro +++ b/examples/svg/opengl/framebufferobject/framebufferobject.pro @@ -1,4 +1,4 @@ -contains(QT_CONFIG, opengles2):error("This example is written for OpenGL 1.x") +qtConfig(opengles2):error("This example is written for OpenGL 1.x") QT += widgets opengl svg diff --git a/examples/svg/opengl/opengl.pro b/examples/svg/opengl/opengl.pro index 661015f..82c616c 100644 --- a/examples/svg/opengl/opengl.pro +++ b/examples/svg/opengl/opengl.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -qtHaveModule(widgets):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): SUBDIRS += framebufferobject +qtHaveModule(widgets):!qtConfig(opengles2):!qtConfig(dynamicgl): SUBDIRS += framebufferobject diff --git a/examples/svg/svg.pro b/examples/svg/svg.pro index c828a95..410415b 100644 --- a/examples/svg/svg.pro +++ b/examples/svg/svg.pro @@ -3,4 +3,4 @@ TEMPLATE = subdirs qtHaveModule(widgets): SUBDIRS += embeddedsvgviewer svggenerator svgviewer SUBDIRS += embedded richtext draganddrop network -qtHaveModule(opengl):!contains(QT_CONFIG, opengles2): SUBDIRS += opengl +qtHaveModule(opengl):!qtConfig(opengles2): SUBDIRS += opengl diff --git a/examples/svg/svgviewer/exportdialog.cpp b/examples/svg/svgviewer/exportdialog.cpp index 04c9e12..b7cb96a 100644 --- a/examples/svg/svgviewer/exportdialog.cpp +++ b/examples/svg/svgviewer/exportdialog.cpp @@ -195,7 +195,8 @@ void ExportDialog::browse() if (!fileName.isEmpty()) fileDialog.setDirectory(QFileInfo(fileName).absolutePath()); QStringList mimeTypes; - foreach (const QByteArray &mimeType, QImageWriter::supportedMimeTypes()) + const auto supportedMimeTypes = QImageWriter::supportedMimeTypes(); + for (const QByteArray &mimeType : supportedMimeTypes) mimeTypes.append(QLatin1String(mimeType)); fileDialog.setMimeTypeFilters(mimeTypes); const int pngIndex = mimeTypes.indexOf("image/png"); diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro index 6eea56a..8f3ae05 100644 --- a/examples/svg/svgviewer/svgviewer.pro +++ b/examples/svg/svgviewer/svgviewer.pro @@ -15,9 +15,3 @@ CONFIG += console # install target.path = $$[QT_INSTALL_EXAMPLES]/svg/svgviewer INSTALLS += target - -wince*: { - addFiles.files = files\\*.svg - addFiles.path = "\\My Documents" - DEPLOYMENT += addFiles -} |