Author: mir3x Date: Sun Sep 25 19:42:08 2016 New Revision: 33892 URL: http://svn.gna.org/viewcvs/freeciv?rev=33892&view=rev Log: Qt client - Don't use deprecated QAbstractItemDelegateV2 and QAbstractItemDelegateV3 Patch by Louis Moureaux <louis94>
See patch #7704 Modified: branches/S2_6/client/gui-qt/citydlg.cpp branches/S2_6/client/gui-qt/cityrep.cpp branches/S2_6/client/gui-qt/plrdlg.cpp Modified: branches/S2_6/client/gui-qt/citydlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/citydlg.cpp?rev=33892&r1=33891&r2=33892&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/citydlg.cpp (original) +++ branches/S2_6/client/gui-qt/citydlg.cpp Sun Sep 25 19:42:08 2016 @@ -2900,7 +2900,7 @@ bool is_flying = false; bool is_unit = true; QPixmap pix_dec(option.rect.width(), option.rect.height()); - QStyleOptionViewItemV2 opt; + QStyleOptionViewItem opt; color col; QIcon icon = qapp->style()->standardIcon(QStyle::SP_DialogCancelButton); bool free_sprite = false; Modified: branches/S2_6/client/gui-qt/cityrep.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/cityrep.cpp?rev=33892&r1=33891&r2=33892&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/cityrep.cpp (original) +++ branches/S2_6/client/gui-qt/cityrep.cpp Sun Sep 25 19:42:08 2016 @@ -69,7 +69,7 @@ const QStyleOptionViewItem &option, const QModelIndex &index) const { - QStyleOptionViewItemV3 opt = QItemDelegate::setOptions(index, option); + QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option); QString txt; QFont font; QPalette palette; Modified: branches/S2_6/client/gui-qt/plrdlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/plrdlg.cpp?rev=33892&r1=33891&r2=33892&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/plrdlg.cpp (original) +++ branches/S2_6/client/gui-qt/plrdlg.cpp Sun Sep 25 19:42:08 2016 @@ -67,7 +67,7 @@ QRect rct; QPixmap pix(16, 16); - QStyleOptionViewItemV3 opt = QItemDelegate::setOptions(index, option); + QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option); painter->save(); switch (player_dlg_columns[index.column()].type) { case COL_FLAG: _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits