forked from jengelh/wxWidgets-3_2
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
|
From: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
Date: 2014-12-05 19:29:16.174123839 +0100
|
||
|
|
|
||
|
|
build: fix compile errors/warnings
|
||
|
|
|
||
|
|
./src/qt/accel.cpp: In member function 'QList<QShortcut*>
|
||
|
|
wxAcceleratorTable::ConvertShortcutTable(QWidget*) const':
|
||
|
|
./src/qt/accel.cpp:88:11: error: 'Node' is not a member of
|
||
|
|
'wxAccelList'
|
||
|
|
|
||
|
|
gcc: ./src/qt/checkbox.cpp:122:1: warning: control reaches end of non-void function [-Wreturn-type]
|
||
|
|
rpmlint: I: Program returns random data in a function
|
||
|
|
rpmlint: E: wxQt-3_2 no-return-in-nonvoid-function ./src/qt/checkbox.cpp:122
|
||
|
|
---
|
||
|
|
src/qt/accel.cpp | 2 +-
|
||
|
|
src/qt/checkbox.cpp | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
Index: wxWidgets-trunk/src/qt/accel.cpp
|
||
|
|
===================================================================
|
||
|
|
--- wxWidgets-trunk.orig/src/qt/accel.cpp
|
||
|
|
+++ wxWidgets-trunk/src/qt/accel.cpp
|
||
|
|
@@ -85,7 +85,7 @@ QList< QShortcut* > wxAcceleratorTable::
|
||
|
|
{
|
||
|
|
QList< QShortcut* > qtList;
|
||
|
|
|
||
|
|
- for ( wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst(); node; node = node->GetNext() )
|
||
|
|
+ for ( wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst(); node; node = node->GetNext() )
|
||
|
|
{
|
||
|
|
qtList << ConvertAccelerator( node->GetData(), parent );
|
||
|
|
}
|
||
|
|
Index: wxWidgets-trunk/src/qt/checkbox.cpp
|
||
|
|
===================================================================
|
||
|
|
--- wxWidgets-trunk.orig/src/qt/checkbox.cpp
|
||
|
|
+++ wxWidgets-trunk/src/qt/checkbox.cpp
|
||
|
|
@@ -116,7 +116,7 @@ wxCheckBoxState wxCheckBox::DoGet3StateV
|
||
|
|
case Qt::Checked:
|
||
|
|
return wxCHK_CHECKED;
|
||
|
|
|
||
|
|
- case Qt::PartiallyChecked:
|
||
|
|
+ default:
|
||
|
|
return wxCHK_UNDETERMINED;
|
||
|
|
}
|
||
|
|
}
|