diff options
Diffstat (limited to 'examples/corelib/tools/contiguouscache')
3 files changed, 24 insertions, 28 deletions
diff --git a/examples/corelib/tools/contiguouscache/CMakeLists.txt b/examples/corelib/tools/contiguouscache/CMakeLists.txt index bf5e902620..2fab4803c1 100644 --- a/examples/corelib/tools/contiguouscache/CMakeLists.txt +++ b/examples/corelib/tools/contiguouscache/CMakeLists.txt @@ -4,16 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(contiguouscache LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/corelib/tools/contiguouscache") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) +qt_standard_project_setup() + qt_add_executable(contiguouscache main.cpp randomlistmodel.cpp randomlistmodel.h @@ -24,14 +18,21 @@ set_target_properties(contiguouscache PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(contiguouscache PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets +target_link_libraries(contiguouscache PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS contiguouscache - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET contiguouscache + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.cpp b/examples/corelib/tools/contiguouscache/randomlistmodel.cpp index 3997be2198..4832f0ae24 100644 --- a/examples/corelib/tools/contiguouscache/randomlistmodel.cpp +++ b/examples/corelib/tools/contiguouscache/randomlistmodel.cpp @@ -3,16 +3,12 @@ #include "randomlistmodel.h" #include <QRandomGenerator> -static const int bufferSize(500); -static const int lookAhead(100); -static const int halfLookAhead(lookAhead/2); +static constexpr int bufferSize(500); +static constexpr int lookAhead(100); +static constexpr int halfLookAhead(lookAhead / 2); RandomListModel::RandomListModel(QObject *parent) -: QAbstractListModel(parent), m_rows(bufferSize), m_count(10000) -{ -} - -RandomListModel::~RandomListModel() + : QAbstractListModel(parent), m_rows(bufferSize), m_count(10000) { } @@ -31,14 +27,14 @@ QVariant RandomListModel::data(const QModelIndex &index, int role) const if (row > m_rows.lastIndex()) { if (row - m_rows.lastIndex() > lookAhead) - cacheRows(row-halfLookAhead, qMin(m_count, row+halfLookAhead)); + cacheRows(row - halfLookAhead, qMin(m_count, row + halfLookAhead)); else while (row > m_rows.lastIndex()) - m_rows.append(fetchRow(m_rows.lastIndex()+1)); + m_rows.append(fetchRow(m_rows.lastIndex() + 1)); } else if (row < m_rows.firstIndex()) { if (m_rows.firstIndex() - row > lookAhead) - cacheRows(qMax(0, row-halfLookAhead), row+halfLookAhead); + cacheRows(qMax(0, row - halfLookAhead), row + halfLookAhead); else while (row < m_rows.firstIndex()) - m_rows.prepend(fetchRow(m_rows.firstIndex()-1)); + m_rows.prepend(fetchRow(m_rows.firstIndex() - 1)); } return m_rows.at(row); diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.h b/examples/corelib/tools/contiguouscache/randomlistmodel.h index 72a6e05f7c..b95acdf3f9 100644 --- a/examples/corelib/tools/contiguouscache/randomlistmodel.h +++ b/examples/corelib/tools/contiguouscache/randomlistmodel.h @@ -13,7 +13,6 @@ class RandomListModel : public QAbstractListModel Q_OBJECT public: RandomListModel(QObject *parent = nullptr); - ~RandomListModel(); int rowCount(const QModelIndex & = QModelIndex()) const override; QVariant data(const QModelIndex &, int) const override; |