port C++ code to Qt5

This commit is contained in:
wmayer
2016-12-13 14:22:59 +01:00
parent f844d5164f
commit 5096f55ccb
22 changed files with 176 additions and 13 deletions

View File

@@ -280,9 +280,15 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge
ui->treeView->setModel(model);
QHeaderView* header = ui->treeView->header();
#if QT_VERSION >= 0x050000
header->setSectionResizeMode(0, QHeaderView::Stretch);
header->setDefaultAlignment(Qt::AlignLeft);
header->setSectionsMovable(false);
#else
header->setResizeMode(0, QHeaderView::Stretch);
header->setDefaultAlignment(Qt::AlignLeft);
header->setMovable(false);
#endif
on_filletType_activated(0);
findShapes();
}

View File

@@ -36,7 +36,11 @@ class SheetViewHeader : public QHeaderView {
Q_OBJECT
public:
SheetViewHeader(Qt::Orientation o) : QHeaderView(o) {
#if QT_VERSION >= 0x050000
setSectionsClickable(true);
#else
setClickable(true);
#endif
}
Q_SIGNALS:
void resizeFinished();

View File

@@ -63,7 +63,11 @@ void TemplateTextField::execDialog()
if(uiCode == QDialog::Accepted) {
if (tmplte) {
newContent = ui->getFieldContent();
QString qsClean = Qt::escape(newContent); //Qt5 note: this becomes qsNewContent.toHtmlEscaped();
#if QT_VERSION >= 0x050000
QString qsClean = newContent.toHtmlEscaped();
#else
QString qsClean = Qt::escape(newContent);
#endif
std::string utf8Content = qsClean.toUtf8().constData();
tmplte->EditableTexts.setValue(fieldNameStr, utf8Content);
}

View File

@@ -28,7 +28,7 @@
#include <Gui/MDIView.h>
#include <Gui/Window.h>
# if QT_VERSION >= 0x040400
#if QT_VERSION >= 0x040400
#include <QWebView>
#endif