|
 |
20fdc39 |
From fcdcbbcab46c57be1814e6a7fa0dddde7495d371 Mon Sep 17 00:00:00 2001
|
|
|
20fdc39 |
From: =?UTF-8?q?Nicol=C3=A1s=20Alvarez?= <nicolas.alvarez@gmail.com>
|
|
|
20fdc39 |
Date: Fri, 5 Dec 2014 15:34:28 -0300
|
|
|
20fdc39 |
Subject: [PATCH 07/24] Fix build of DCC code in MSVC.
|
|
|
20fdc39 |
|
|
|
20fdc39 |
Replaced QDialogButtonBox::QDialogButtonBox::Retry with
|
|
|
20fdc39 |
QDialogButtonBox::Retry. I don't know why the former works in gcc though.
|
|
|
20fdc39 |
---
|
|
|
20fdc39 |
src/dcc/resumedialog.cpp | 4 ++--
|
|
|
20fdc39 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
20fdc39 |
|
|
|
20fdc39 |
diff --git a/src/dcc/resumedialog.cpp b/src/dcc/resumedialog.cpp
|
|
|
20fdc39 |
index aae884e..cc9ce19 100644
|
|
|
20fdc39 |
--- a/src/dcc/resumedialog.cpp
|
|
|
20fdc39 |
+++ b/src/dcc/resumedialog.cpp
|
|
|
20fdc39 |
@@ -164,7 +164,7 @@ namespace Konversation
|
|
|
20fdc39 |
m_buttonBox->button(QDialogButtonBox::Ok)->setText(i18n("&Overwrite"));
|
|
|
20fdc39 |
m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_enabledActions & RA_Overwrite);
|
|
|
20fdc39 |
|
|
|
20fdc39 |
- m_buttonBox->button(QDialogButtonBox::QDialogButtonBox::Retry)->setEnabled(true);
|
|
|
20fdc39 |
+ m_buttonBox->button(QDialogButtonBox::Retry)->setEnabled(true);
|
|
|
20fdc39 |
if (m_enabledActions & RA_OverwriteDefaultPath)
|
|
|
20fdc39 |
m_overwriteDefaultPathCheckBox->setEnabled(false);
|
|
|
20fdc39 |
}
|
|
|
20fdc39 |
@@ -173,7 +173,7 @@ namespace Konversation
|
|
|
20fdc39 |
m_buttonBox->button(QDialogButtonBox::Ok)->setText(i18n("R&ename"));
|
|
|
20fdc39 |
m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_enabledActions & RA_Rename);
|
|
|
20fdc39 |
|
|
|
20fdc39 |
- m_buttonBox->button(QDialogButtonBox::QDialogButtonBox::Retry)->setEnabled(false);
|
|
|
20fdc39 |
+ m_buttonBox->button(QDialogButtonBox::Retry)->setEnabled(false);
|
|
|
20fdc39 |
if (m_enabledActions & RA_OverwriteDefaultPath)
|
|
|
20fdc39 |
m_overwriteDefaultPathCheckBox->setEnabled(true);
|
|
|
20fdc39 |
}
|
|
|
20fdc39 |
--
|
|
|
20fdc39 |
2.1.0
|
|
|
20fdc39 |
|