HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1486:8539a975891c

Switched to cpp_utils package...

jeandet -

r1486:8539a975891c

parent child

Context file:

r1486:8539a975891c

subprojects/cpp_utils.wrap created 644 +5 0

@@ -0,0 +1,5
	1	[wrap-git]
	2	directory = cpp_utils
	3	url = https://github.com/jeandet/cpp_utils.git
	4	revision = master
	5

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 63c6ae3895dda76aabbc560a636a1f3d8d4d95bf		1	Subproject commit 29637e951955d1747d325407e2d833646c98f1c2

gui/src/Catalogue2/eventeditor.cpp +4 -4

             #include "Catalogue2/eventeditor.h"
             #include "ui_eventeditor.h"
             #include <Common/DateUtils.h>
-            #include <Common/StringUtils.h>
+            #include <containers/algorithms.hpp>
             EventEditor::EventEditor(QWidget* parent) : QWidget(parent), ui(new Ui::EventEditor)
             {
             void EventEditor::_setTags(const CatalogueController::Event_ptr& event, mode is_editable)
             {
-                this->ui->Tags->setText(StringUtils::join(event->tags, ", "));
+                this->ui->Tags->setText(QString::fromStdString(cpp_utils::containers::join(event->tags, ',')));
                 this->ui->Tags->setEnabled(bool(is_editable));
             }
             void EventEditor::_setProducts(const CatalogueController::Event_ptr& event, mode is_editable)
             {
                 QStringList products;
-                this->ui->Products->setText(StringUtils::join(event->products, ", ",
+                std::transform(std::cbegin(event->products),std::cend(event->products),std::begin(products),[](const auto& product) { return QString::fromStdString(product.name); });
-                    [](const auto& product) { return QString::fromStdString(product.name); }));
+                this->ui->Products->setText(cpp_utils::containers::join(products, QString(", ")));
                 this->ui->Products->setEnabled(bool(is_editable));
             }

gui/src/Catalogue2/eventsmodel.cpp +3 -2

                 along with SciQLop.  If not, see <https://www.gnu.org/licenses/>.
             */
             #include "Catalogue2/eventsmodel.h"
-            #include <Common/containers.h>
             #include <SqpApplication.h>
+            #include <containers/algorithms.hpp>
             EventsModel::EventsModel(QObject* parent) : QAbstractItemModel(parent) {}
                 auto item = to_item(index);
                 if (item->type == ItemType::Product)
                 {
-                    auto repoIndex = SciQLop::containers::index_of(_items, item->parent);
+                    auto repoIndex = cpp_utils::containers::index_of(_items, item->parent);
                     return createIndex(repoIndex, 0, item->parent);
                 }
                 return QModelIndex();

gui/src/Catalogue2/repositoriesmodel.cpp +2 -2

                 along with SciQLop.  If not, see <https://www.gnu.org/licenses/>.
             */
             #include <Catalogue2/repositoriesmodel.h>
-            #include <Common/containers.h>
+            #include <containers/algorithms.hpp>
             #include <SqpApplication.h>
                 auto item = to_item(index);
                 if (item->type == ItemType::Catalogue)
                 {
-                    auto repoIndex = SciQLop::containers::index_of(_items, item->parent);
+                    auto repoIndex = cpp_utils::containers::index_of(_items, item->parent);
                     return createIndex(repoIndex, 0, item->parent);
                 }
                 return QModelIndex();

gui/src/Visualization/VisualizationGraphHelper.cpp +1 -1

             #include <Data/TimeSeriesUtils.h>
             #include <Data/VectorTimeSerie.h>
-            #include <Common/cpp_utils.h>
+            #include <cpp_utils.hpp>
             #include <Variable/Variable2.h>
             #include <algorithm>
             #include <cmath>

gui/src/Visualization/VisualizationGraphWidget.cpp +3 -2

             #include <Actions/ActionsGuiController.h>
             #include <Actions/FilteringAction.h>
             #include <Common/MimeTypesDef.h>
-            #include <Common/containers.h>
+            #include <cpp_utils_qt/cpp_utils_qt.hpp>
+            #include <containers/algorithms.hpp>
             #include <Data/DateTimeRangeHelper.h>
             #include <DragAndDrop/DragDropGuiController.h>
             #include <Settings/SqpSettingsDefs.h>
                                 auto alreadySelectedZones
                                     = parentVisualizationWidget()->selectionZoneManager().selectedItems();
                                 selectedZone->setAssociatedEditedZones(alreadySelectedZones);
-                                if (SciQLop::containers::contains(alreadySelectedZones, selectedZone))
+                                if (cpp_utils::containers::contains(alreadySelectedZones, selectedZone))
                                 {
                                     alreadySelectedZones.removeOne(selectedZone);
                                 }

gui/tests/GUITestUtils/GUITestUtils.h +8 -8

             #ifndef GUITESTUTILS_H
             #define GUITESTUTILS_H
-            #include <Common/cpp_utils.h>
+            #include <types/detectors.hpp>
             #include <QCoreApplication>
             #include <QCursor>
             #include <QDesktopWidget>
                 return QPoint { widget->width() / 2, widget->height() / 2 };
             }
-            HAS_METHOD(viewport)
+            HAS_METHOD(has_viewport, viewport)
             template <typename T>
             static inline constexpr bool is_QWidgetOrDerived = std::is_base_of<QWidget, T>::value;
             template <typename T>
             using viewport_type = decltype(std::declval<T>().viewport());
-            HAS_METHOD(topLevelItem)
+            HAS_METHOD(has_topLevelItem, topLevelItem)
             template <typename T>
             void mouseMove(T* widget, QPoint pos, Qt::MouseButton mouseModifier)
             {
                 QCursor::setPos(widget->mapToGlobal(pos));
                 QMouseEvent event(QEvent::MouseMove, pos, Qt::NoButton, mouseModifier, Qt::NoModifier);
-                if constexpr (has_viewport<T>)
+                if constexpr (has_viewport_v<T>)
                 {
                     if constexpr (is_QWidgetOrDerived<viewport_type<T>>)
                     {
             template <typename T>
             void setMouseTracking(T* widget)
             {
-                if constexpr (has_viewport<T>)
+                if constexpr (has_viewport_v<T>)
                 {
                     if constexpr (is_QWidgetOrDerived<viewport_type<T>>)
                     {
             template <typename T, typename T2>
             auto getItem(T* widget, T2 itemIndex)
             {
-                if constexpr (has_topLevelItem<T>)
+                if constexpr (has_topLevelItem_v<T>)
                 {
                     return widget->topLevelItem(itemIndex);
                 }
             void dragnDropItem(T1* sourceWidget, T2* destWidget, T3* item, T4* destItem = Q_NULLPTR)
             {
                 auto itemCenterPos = sourceWidget->visualItemRect(item).center();
-                if constexpr (has_viewport<T1>)
+                if constexpr (has_viewport_v<T1>)
                 {
                     QTest::mousePress(sourceWidget->viewport(), Qt::LeftButton, Qt::NoModifier, itemCenterPos);
                 }
                         auto destItemCenterPos = destWidget->visualItemRect(destItem).center();
                         QTest::mouseRelease(destWidget, Qt::LeftButton, Qt::NoModifier, destItemCenterPos);
                     }
-                    else if constexpr (has_viewport<T2>)
+                    else if constexpr (has_viewport_v<T2>)
                     {
                         QTest::mouseRelease(destWidget->viewport(), Qt::LeftButton);
                     }

gui/tests/catalogue/browser/main.cpp +1 -1

             #include <cstdlib>
-            #include <Common/cpp_utils.h>
+            #include <cpp_utils.hpp>
             #include <SqpApplication.h>
             #include <GUITestUtils.h>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages