Commit 73afe72d authored by Mathieu Faverge's avatar Mathieu Faverge

Fix compilation with both Qt4 and Qt5

parent 5bf05854
......@@ -80,24 +80,24 @@ Settings_tab::Settings_tab(Core *core, std::string ecname)
// Create the header
hdr_label = new QLabel(this);
hdr_label->setObjectName(QString::fromUtf8("hdr_label"));
hdr_label->setText(QApplication::translate("settings", "Colors set:", 0, QApplication::UnicodeUTF8));
hdr_label->setObjectName(QString("hdr_label"));
hdr_label->setText(QApplication::translate("settings", "Colors set:", 0));
list_palette = new QComboBox(this);
list_palette->setObjectName(QString::fromUtf8("list_palette"));
list_palette->setObjectName(QString("list_palette"));
hdr_spacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
btn_palette_cp = new QPushButton(this);
btn_palette_cp->setObjectName(QString::fromUtf8("btn_palette_cp"));
btn_palette_cp->setText(QApplication::translate("settings", "Copy", 0, QApplication::UnicodeUTF8));
btn_palette_cp->setObjectName(QString("btn_palette_cp"));
btn_palette_cp->setText(QApplication::translate("settings", "Copy", 0));
btn_palette_rm = new QPushButton(this);
btn_palette_rm->setObjectName(QString::fromUtf8("btn_palette_rm"));
btn_palette_rm->setText(QApplication::translate("settings", "Remove", 0, QApplication::UnicodeUTF8));
btn_palette_rm->setObjectName(QString("btn_palette_rm"));
btn_palette_rm->setText(QApplication::translate("settings", "Remove", 0));
header = new QHBoxLayout();
header->setObjectName(QString::fromUtf8("header"));
header->setObjectName(QString("header"));
header->addWidget(hdr_label);
header->addWidget(list_palette);
header->addItem(hdr_spacer);
......@@ -107,19 +107,19 @@ Settings_tab::Settings_tab(Core *core, std::string ecname)
// Create the content
content = new QTableWidget(this);
content->setColumnCount(3);
content->setObjectName(QString::fromUtf8("content"));
content->setObjectName(QString("content"));
QTableWidgetItem *__qtablewidgetitem = new QTableWidgetItem();
content->setHorizontalHeaderItem(0, __qtablewidgetitem);
__qtablewidgetitem->setText(QApplication::translate("settings", "Name", 0, QApplication::UnicodeUTF8));
__qtablewidgetitem->setText(QApplication::translate("settings", "Name", 0));
QTableWidgetItem *__qtablewidgetitem1 = new QTableWidgetItem();
content->setHorizontalHeaderItem(1, __qtablewidgetitem1);
__qtablewidgetitem1->setText(QApplication::translate("settings", "Color", 0, QApplication::UnicodeUTF8));
__qtablewidgetitem1->setText(QApplication::translate("settings", "Color", 0));
QTableWidgetItem *__qtablewidgetitem2 = new QTableWidgetItem();
content->setHorizontalHeaderItem(2, __qtablewidgetitem2);
__qtablewidgetitem2->setText(QApplication::translate("settings", "Visible", 0, QApplication::UnicodeUTF8));
__qtablewidgetitem2->setText(QApplication::translate("settings", "Visible", 0));
QSizePolicy sizePolicy3(QSizePolicy::Expanding, QSizePolicy::Expanding);
sizePolicy3.setHorizontalStretch(100);
......@@ -131,22 +131,22 @@ Settings_tab::Settings_tab(Core *core, std::string ecname)
ftr_spacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
btn_apply = new QPushButton(this);
btn_apply->setObjectName(QString::fromUtf8("btn_apply"));
btn_apply->setText(QApplication::translate("settings", "Apply", 0, QApplication::UnicodeUTF8));
btn_apply->setObjectName(QString("btn_apply"));
btn_apply->setText(QApplication::translate("settings", "Apply", 0));
btn_cancel = new QPushButton(this);
btn_cancel->setObjectName(QString::fromUtf8("btn_cancel"));
btn_cancel->setText(QApplication::translate("settings", "Cancel", 0, QApplication::UnicodeUTF8));
btn_cancel->setObjectName(QString("btn_cancel"));
btn_cancel->setText(QApplication::translate("settings", "Cancel", 0));
btn_reload = new QPushButton(this);
btn_reload->setObjectName(QString::fromUtf8("btn_reload"));
btn_reload->setText(QApplication::translate("settings", "Reload from file", 0, QApplication::UnicodeUTF8));
btn_reload->setObjectName(QString("btn_reload"));
btn_reload->setText(QApplication::translate("settings", "Reload from file", 0));
#ifndef QT_NO_TOOLTIP
btn_reload->setToolTip(QApplication::translate("settings", "Reload all the states types from the displayed trace", 0, QApplication::UnicodeUTF8));
btn_reload->setToolTip(QApplication::translate("settings", "Reload all the states types from the displayed trace", 0));
#endif // QT_NO_TOOLTIP
footer = new QHBoxLayout();
footer->setObjectName(QString::fromUtf8("footer"));
footer->setObjectName(QString("footer"));
footer->addItem(ftr_spacer);
footer->addWidget(btn_apply);
footer->addWidget(btn_cancel);
......@@ -154,7 +154,7 @@ Settings_tab::Settings_tab(Core *core, std::string ecname)
// Assemble the background
background = new QVBoxLayout(this);
background->setObjectName(QString::fromUtf8("background"));
background->setObjectName(QString("background"));
background->addLayout(header);
background->addWidget(content);
background->addLayout(footer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment