Update submodule, fixing compilation on newer gcc

GuLinux · GuLinux · commit fa8145d8091f · 2017-09-24T22:37:31.000+01:00
diff --git a/GuLinux-Commons b/GuLinux-Commons
@@ -1 +1 @@
-Subproject commit b851d5e2383e6c49595cd83a9f7ca0d60b882e73
+Subproject commit c9304c8587d8af6c8f10748457a65217290a5892
diff --git a/src/commons/commandline.cpp b/src/commons/commandline.cpp
@@ -20,7 +20,7 @@
 #include "commandline.h"
 #include <QCoreApplication>
 #include "commons/configuration.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include <QCommandLineParser>
 #include <iostream>
 #include "loghandler.h"
diff --git a/src/commons/configuration.cpp b/src/commons/configuration.cpp
@@ -20,7 +20,7 @@
 #include <QSettings>
 #include "commons/utils.h"
 #include <QMetaType>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include <QDir>
 #include <QDateTime>
 #include <QProcessEnvironment>
diff --git a/src/drivers/imager.cpp b/src/drivers/imager.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "imager.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include "commons/utils.h"
 #include <QCoreApplication>
 #include <QMutex>
diff --git a/src/drivers/imagercontrol.cpp b/src/drivers/imagercontrol.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "imager.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include <QHash>
 #include <functional>
 
diff --git a/src/drivers/imagerproperties.cpp b/src/drivers/imagerproperties.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "imager.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 
 using namespace std;
 
diff --git a/src/drivers/imagerthread.cpp b/src/drivers/imagerthread.cpp
@@ -26,7 +26,7 @@
 #include <boost/lockfree/spsc_queue.hpp>
 #include "stlutils.h"
 #include "Qt/benchmark.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include "imagerexception.h"
 #include <QElapsedTimer>
 #include "commons/messageslogger.h"
diff --git a/src/drivers/qhy/qhyccdimager.cpp b/src/drivers/qhy/qhyccdimager.cpp
@@ -28,7 +28,7 @@
 #include <QtConcurrent/QtConcurrent>
 #include "commons/fps_counter.h"
 #include <chrono>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include "qhyexception.h"
 #include "qhyimagingworker.h"
 #include <chrono>
diff --git a/src/drivers/qhy/qhycontrol.cpp b/src/drivers/qhy/qhycontrol.cpp
@@ -4,7 +4,7 @@
 #include "c++/stringbuilder.h"
 #include "qhyccd.h"
 #include <QMap>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 using namespace std;
 using namespace std::placeholders;
 using namespace GuLinux;
diff --git a/src/drivers/qhy/qhydriver.cpp b/src/drivers/qhy/qhydriver.cpp
@@ -23,7 +23,7 @@
 #include <QDebug>
 #include <QString>
 #include <QRegularExpression>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include "qhyexception.h"
 #include <QThread>
 
diff --git a/src/drivers/v4l2/v4l2control.cpp b/src/drivers/v4l2/v4l2control.cpp
@@ -22,7 +22,7 @@
 #include <QHash>
 #include "v4l2exception.h"
 #include "c++/stringbuilder.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 
 using namespace std;
 using namespace GuLinux;
diff --git a/src/drivers/v4l2/v4l2device.cpp b/src/drivers/v4l2/v4l2device.cpp
@@ -21,7 +21,7 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include <QDebug>
 #include "c++/stringbuilder.h"
 #include "v4l2exception.h"
diff --git a/src/drivers/v4l2/v4l2driver.cpp b/src/drivers/v4l2/v4l2driver.cpp
@@ -20,7 +20,7 @@
 #include "v4l2imager.h"
 #include <QDir>
 #include <QDebug>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 
 using namespace std;
 
diff --git a/src/drivers/v4l2/v4l2formats.cpp b/src/drivers/v4l2/v4l2formats.cpp
@@ -21,7 +21,7 @@
 #include <linux/videodev2.h>
 #include <QDebug>
 #include "v4l2utils.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 
 using namespace std;
 
diff --git a/src/drivers/zwo_asi/zwo_asi_imager.cpp b/src/drivers/zwo_asi/zwo_asi_imager.cpp
@@ -26,7 +26,7 @@
 #include <QRect>
 #include <atomic>
 #include <ratio>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include "commons/utils.h"
 #include "zwoexception.h"
 #include "asiimagingworker.h"
diff --git a/src/image_handlers/backend/local_saveimages.cpp b/src/image_handlers/backend/local_saveimages.cpp
@@ -30,7 +30,7 @@
 #include "commons/configuration.h"
 #include <boost/lockfree/spsc_queue.hpp>
 #include "commons/opencv_utils.h"
-#include <Qt/strings.h>
+#include <Qt/qt_strings_helper.h>
 #include "output_writers/filewriter.h"
 #include "recordinginformation.h"
 #include <atomic>
diff --git a/src/image_handlers/backend/recordinginformation.cpp b/src/image_handlers/backend/recordinginformation.cpp
@@ -18,13 +18,13 @@
  */
 
 #include "recordinginformation.h"
-#include <Qt/strings.h>
+#include <Qt/qt_strings_helper.h>
 #include <QDateTime>
 #include "drivers/imager.h"
 #include <QJsonDocument>
 #include "commons/configuration.h"
 #include <QFile>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 
 using namespace std;
 
diff --git a/src/image_handlers/frontend/displayimage.cpp b/src/image_handlers/frontend/displayimage.cpp
@@ -25,7 +25,7 @@
 #include <QImage>
 #include <boost/lockfree/spsc_queue.hpp>
 #include <QDebug>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include "commons/utils.h"
 #include <opencv2/opencv.hpp>
 #include "commons/opencv_utils.h"
diff --git a/src/image_handlers/output_writers/cvvideowriter.cpp b/src/image_handlers/output_writers/cvvideowriter.cpp
@@ -18,7 +18,7 @@
 
 #include <QDebug>
 #include <QObject>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include "cvvideowriter.h"
 #include "commons/opencv_utils.h"
 #include "image_handlers/saveimages.h"
diff --git a/src/image_handlers/output_writers/imagefilewriter.cpp b/src/image_handlers/output_writers/imagefilewriter.cpp
@@ -18,7 +18,7 @@
 
 #include "imagefilewriter.h"
 #include <functional>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include <opencv2/opencv.hpp>
 #include <QDir>
 #include <CCfits/CCfits>
diff --git a/src/image_handlers/saveimages.cpp b/src/image_handlers/saveimages.cpp
@@ -18,7 +18,7 @@
 
 #include "saveimages.h"
 #include <QObject>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 
 using namespace std;
 
diff --git a/src/network/client/connectionmanager.cpp b/src/network/client/connectionmanager.cpp
@@ -30,8 +30,8 @@
 
 #include <QPushButton>
 
-#include "Qt/strings.h"
-#include "Qt/functional.h"
+#include "Qt/qt_strings_helper.h"
+#include "Qt/qt_functional.h"
 #include "commons/utils.h"
 
 #include "network/protocol/protocol.h"
diff --git a/src/network/client/networkclient.cpp b/src/network/client/networkclient.cpp
@@ -22,7 +22,7 @@
 #include "network/networkdispatcher.h"
 #include "protocol/protocol.h"
 #include "protocol/driverprotocol.h"
-#include "Qt/functional.h"
+#include "Qt/qt_functional.h"
 
 using namespace std;
 
diff --git a/src/network/client/remoteconfiguration.cpp b/src/network/client/remoteconfiguration.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "remoteconfiguration.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include "network/protocol/configurationprotocol.h"
 
 using namespace std;
diff --git a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp
@@ -21,7 +21,7 @@
 #include <QIODevice>
 #include <QDataStream>
 #include <QJsonDocument>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include <QCoreApplication>
 #include <QBuffer>
 
diff --git a/src/network/server/networkserver.cpp b/src/network/server/networkserver.cpp
@@ -23,7 +23,7 @@
 #include "network/networkdispatcher.h"
 #include "network/protocol/protocol.h"
 #include "network/protocol/driverprotocol.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include <QElapsedTimer>
 #include "network/server/filesystemforwarder.h"
 
diff --git a/src/planetaryimager_daemon.cpp b/src/planetaryimager_daemon.cpp
@@ -30,7 +30,7 @@
 #include "network/server/framesforwarder.h"
 #include "drivers/supporteddrivers.h"
 
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include "commons/commandline.h"
 using namespace std;
 
diff --git a/src/planetaryimager_mainwindow.cpp b/src/planetaryimager_mainwindow.cpp
@@ -42,8 +42,8 @@
 #include <QGridLayout>
 #include <QToolBar>
 #include <QWhatsThis>
-#include "Qt/strings.h"
-#include <Qt/functional.h>
+#include "Qt/qt_strings_helper.h"
+#include <Qt/qt_functional.h>
 #include <QGraphicsScene>
 #include <QFileInfo>
 #include <QDesktopServices>
diff --git a/src/widgets/cameracontrolswidget.cpp b/src/widgets/cameracontrolswidget.cpp
@@ -22,13 +22,13 @@
 #include "commons/utils.h"
 #include "commons/configuration.h"
 #include <QSettings>
-#include "Qt/functional.h"
+#include "Qt/qt_functional.h"
 #include <QLayout>
 #include <QCheckBox>
 #include <QComboBox>
 #include "controls/controls.h"
 #include "ui_cameracontrolswidget.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include <QMetaObject>
 #include <QMenu>
 #include <QAction>
@@ -37,7 +37,7 @@
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QJsonDocument>
-#include "Qt/functional.h"
+#include "Qt/qt_functional.h"
 #include <QSortFilterProxyModel>
 
 using namespace std;
diff --git a/src/widgets/camerainfowidget.cpp b/src/widgets/camerainfowidget.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "camerainfowidget.h"
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 #include <QGridLayout>
 #include <QLabel>
 #include <QSpacerItem>
diff --git a/src/widgets/configurationdialog.cpp b/src/widgets/configurationdialog.cpp
@@ -23,8 +23,8 @@
 #include <functional>
 #include <QSpinBox>
 #include <QMessageBox>
-#include "Qt/strings.h"
-#include "Qt/functional.h"
+#include "Qt/qt_strings_helper.h"
+#include "Qt/qt_functional.h"
 
 using namespace std::placeholders;
 using namespace std;
diff --git a/src/widgets/controls/controlwidget.h b/src/widgets/controls/controlwidget.h
@@ -20,7 +20,7 @@
 #define SETTINGWIDGET_H
 #include <QWidget>
 #include "drivers/imager.h"
-#include "Qt/functional.h"
+#include "Qt/qt_functional.h"
 #include <QLayout>
 #include "c++/dptr.h"
 
diff --git a/src/widgets/editroidialog.cpp b/src/widgets/editroidialog.cpp
@@ -21,8 +21,8 @@
 #include "ui_editroidialog.h"
 #include <QSize>
 #include <QRect>
-#include "Qt/strings.h"
-#include "Qt/functional.h"
+#include "Qt/qt_strings_helper.h"
+#include "Qt/qt_functional.h"
 #include <QDebug>
 
 using namespace std;
diff --git a/src/widgets/histogramwidget.cpp b/src/widgets/histogramwidget.cpp
@@ -19,7 +19,7 @@
 #include "histogramwidget.h"
 #include "ui_histogramwidget.h"
 #include "commons/configuration.h"
-#include "Qt/functional.h"
+#include "Qt/qt_functional.h"
 #include <QMap>
 #include <opencv2/opencv.hpp>
 #include "histogramstatswidget.h"
diff --git a/src/widgets/recordingpanel.cpp b/src/widgets/recordingpanel.cpp
@@ -21,7 +21,7 @@
 #include "commons/configuration.h"
 #include "savefileconfiguration.h"
 #include "commons/messageslogger.h"
-#include <Qt/functional.h>
+#include <Qt/qt_functional.h>
 #include <QDir>
 #include <QDialog>
 #include <QElapsedTimer>
diff --git a/src/widgets/statusbarinfowidget.cpp b/src/widgets/statusbarinfowidget.cpp
@@ -20,7 +20,7 @@
 #include "ui_statusbarinfowidget.h"
 #include <QDebug>
 #include <QTimer>
-#include "Qt/strings.h"
+#include "Qt/qt_strings_helper.h"
 
 using namespace std;
 
diff --git a/support/ser_extract_frames.cpp b/support/ser_extract_frames.cpp
@@ -1,5 +1,5 @@
 #include "src/commons/ser_header.h"
-#include "GuLinux-Commons/Qt/strings.h"
+#include "GuLinux-Commons/Qt/qt_strings_helper.h"
 
 #include <iostream>
 #include <QFile>
