QDialog Constructor : Use windows flags to avoid '?' on Windows

This commit is contained in:
Magne Sjaastad 2017-11-27 10:47:49 +01:00
parent 8c57fdf22a
commit c9451dde50
2 changed files with 6 additions and 4 deletions

View File

@ -51,10 +51,11 @@ namespace caf
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmUiPropertyViewDialog::PdmUiPropertyViewDialog(QWidget* parent, PdmObject* object, const QString& windowTitle, const QString& uiConfigName) PdmUiPropertyViewDialog::PdmUiPropertyViewDialog(QWidget* parent, PdmObject* object, const QString& windowTitle, const QString& uiConfigName)
: QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
{ {
m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
initialize(parent, object, windowTitle, uiConfigName); initialize(object, windowTitle, uiConfigName);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -62,10 +63,11 @@ PdmUiPropertyViewDialog::PdmUiPropertyViewDialog(QWidget* parent, PdmObject* obj
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmUiPropertyViewDialog::PdmUiPropertyViewDialog(QWidget* parent, PdmObject* object, const QString& windowTitle, PdmUiPropertyViewDialog::PdmUiPropertyViewDialog(QWidget* parent, PdmObject* object, const QString& windowTitle,
const QString& uiConfigName, const QDialogButtonBox::StandardButtons& standardButtons) const QString& uiConfigName, const QDialogButtonBox::StandardButtons& standardButtons)
: QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
{ {
m_buttonBox = new QDialogButtonBox(standardButtons); m_buttonBox = new QDialogButtonBox(standardButtons);
initialize(parent, object, windowTitle, uiConfigName); initialize(object, windowTitle, uiConfigName);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -87,7 +89,7 @@ QDialogButtonBox* PdmUiPropertyViewDialog::dialogButtonBox()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiPropertyViewDialog::initialize(QWidget* parent, PdmObject* object, const QString& windowTitle, void PdmUiPropertyViewDialog::initialize(PdmObject* object, const QString& windowTitle,
const QString& uiConfigName) const QString& uiConfigName)
{ {
m_pdmObject = object; m_pdmObject = object;

View File

@ -57,7 +57,7 @@ public:
QDialogButtonBox* dialogButtonBox(); QDialogButtonBox* dialogButtonBox();
private: private:
void initialize(QWidget* parent, PdmObject* object, const QString& windowTitle, const QString& uiConfigName); void initialize(PdmObject* object, const QString& windowTitle, const QString& uiConfigName);
void setupUi(); void setupUi();
private: private: