Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

- Remove warnings about deprecated QStyleOptionView by using unversioned version

Browse source 
- Fix warning about converting strings.
This commit is contained in:
Arne Schwabe 2016-10-27 14:53:24 +02:00
parent d218b33609
commit 2e65e745ee
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
companion/src/modeledit/mixerslist.cpp
View file

@ -75,7 +75,7 @@ bool MixersList::dropMimeData( int index, const QMimeData * data, Qt::DropAction
*/ */
void MixersDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const void MixersDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{ {
QStyleOptionViewItemV4 options = option; QStyleOptionViewItem options = option;
initStyleOption(&options, index); initStyleOption(&options, index);
painter->save(); painter->save();
@ -107,7 +107,7 @@ void MixersDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option
*/ */
QSize MixersDelegate::sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const QSize MixersDelegate::sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const
{ {
QStyleOptionViewItemV4 options = option; QStyleOptionViewItem options = option;
initStyleOption(&options, index); initStyleOption(&options, index);
//setup html document //setup html document
@ -125,7 +125,7 @@ QSize MixersDelegate::sizeHint ( const QStyleOptionViewItem & option, const QMod
return QSize(doc.idealWidth(), height); return QSize(doc.idealWidth(), height);
} }
void MixersDelegate::SetupDocument(QTextDocument & doc, const QStyleOptionViewItemV4 & options) const void MixersDelegate::SetupDocument(QTextDocument & doc, const QStyleOptionViewItem & options) const
{ {
//setup html document //setup html document
doc.setHtml(options.text); doc.setHtml(options.text);

2
companion/src/modeledit/mixerslist.h
View file

@ -46,7 +46,7 @@ class MixersDelegate : public QStyledItemDelegate
QSize sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const; QSize sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const;
private: private:
void SetupDocument(QTextDocument & doc, const QStyleOptionViewItemV4 & options) const; void SetupDocument(QTextDocument & doc, const QStyleOptionViewItem & options) const;
}; };

4
companion/src/mountlist.cpp
View file

@ -210,7 +210,7 @@
#ifdef MOUNTED_GETMNTINFO #ifdef MOUNTED_GETMNTINFO
# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME # if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
static char * static const char *
fstype_to_string (short int t) fstype_to_string (short int t)
{ {
switch (t) switch (t)
@ -305,7 +305,7 @@ fstype_to_string (short int t)
} }
# endif # endif
static char * static const char *
fsp_to_string (const struct statfs *fsp) fsp_to_string (const struct statfs *fsp)
{ {
# if HAVE_STRUCT_STATFS_F_FSTYPENAME # if HAVE_STRUCT_STATFS_F_FSTYPENAME