Qt6 port:

* Explicitly include some missing headers
* Use 'static const char*' for XPM icon
* Skip template parameters for qMakePair
* Constructor of QFileInfo is marked as 'explicit' now
* QString::fromLatin1() also accepts a QByteArray
* QDateTime::fromTime_t() is deprecated in Qt5 and has been removed in Qt6. Use QDateTime::fromSecsSinceEpoch()
* QDateTime::toTime_t() is deprecated in Qt5 and has been removed in Qt6. Use QDateTime::toSecsSinceEpoch()
* QApplication::globalStrut() is deprecated. Don't use it any more.
* QWidget::isTopLevel() is deprecated, use QWidget::isWindow()
This commit is contained in:
wmayer
2022-11-02 15:16:41 +01:00
parent e610d884eb
commit fac648fff5
18 changed files with 26 additions and 29 deletions

View File

@@ -144,7 +144,7 @@ private:
SbRotation rotateView(SbRotation, int axis, float rotAngle, SbVec3f customAxis = SbVec3f(0, 0, 0)) const;
void rotateView(const SbRotation&);
QString str(char* str);
QString str(const char* str);
char* enum2str(int);
QMenu* createNaviCubeMenu();
public:
@@ -1674,7 +1674,7 @@ bool NaviCubeImplementation::processSoEvent(const SoEvent* ev) {
}
QString NaviCubeImplementation::str(char* str) {
QString NaviCubeImplementation::str(const char* str) {
return QString::fromLatin1(str);
}