oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtutils: rename QMessageBox wrapper to avoid conflicts on win32

Browse Source
This commit is contained in:
itsmattkc
2022-07-23 09:40:03 -07:00
parent 925d63d707
commit 21d6aef0ca
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/qtutils.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ QFrame *QtUtils::CreateVerticalLine()
return l;
}
int QtUtils::MessageBox(QWidget *parent, QMessageBox::Icon icon, const QString &title, const QString &message, QMessageBox::StandardButtons buttons)
int QtUtils::MsgBox(QWidget *parent, QMessageBox::Icon icon, const QString &title, const QString &message, QMessageBox::StandardButtons buttons)
{
QMessageBox b(parent);
b.setIcon(icon);
app/common/qtutils.h
+1 -7
View File
@@ -33,12 +33,6 @@
#include <QFrame>
#include <QMessageBox>
#include "common/define.h"
#ifdef MessageBox
#undef MessageBox
#endif
namespace olive {
class QtUtils {
@@ -56,7 +50,7 @@ public:
static QFrame* CreateVerticalLine();
static int MessageBox(QWidget *parent, QMessageBox::Icon icon, const QString& title, const QString& message, QMessageBox::StandardButtons buttons = QMessageBox::Ok);
static int MsgBox(QWidget *parent, QMessageBox::Icon icon, const QString& title, const QString& message, QMessageBox::StandardButtons buttons = QMessageBox::Ok);
static QDateTime GetCreationDate(const QFileInfo &info);