diff --git a/gui/cachesettings.cpp b/gui/cachesettings.cpp index 58e4b4eee..85e92de38 100644 --- a/gui/cachesettings.cpp +++ b/gui/cachesettings.cpp @@ -175,17 +175,14 @@ void CacheItem::calculate() emit getCount(); } -#if QT_VERSION < 0x050000 static inline void setResizeMode(QHeaderView *hdr, int idx, QHeaderView::ResizeMode mode) { + #if QT_VERSION < 0x050000 hdr->setResizeMode(idx, mode); -} -#else -static inline void setResizeMode(QHeaderView *hdr, int idx, QHeaderView::ResizeMode mode) -{ + #else hdr->setSectionResizeMode(idx, mode); + #endif } -#endif CacheTree::CacheTree(QWidget *parent) : QTreeWidget(parent) diff --git a/replaygain/rgdialog.cpp b/replaygain/rgdialog.cpp index dbf921dbe..b229a1e16 100644 --- a/replaygain/rgdialog.cpp +++ b/replaygain/rgdialog.cpp @@ -81,27 +81,23 @@ int RgDialog::instanceCount() return iCount; } -#if QT_VERSION < 0x050000 static inline void setResizeMode(QHeaderView *hdr, int idx, QHeaderView::ResizeMode mode) { + #if QT_VERSION < 0x050000 hdr->setResizeMode(idx, mode); -} - -static inline void setResizeMode(QHeaderView *hdr, QHeaderView::ResizeMode mode) -{ - hdr->setResizeMode(mode); -} -#else -static inline void setResizeMode(QHeaderView *hdr, int idx, QHeaderView::ResizeMode mode) -{ + #else hdr->setSectionResizeMode(idx, mode); + #endif } static inline void setResizeMode(QHeaderView *hdr, QHeaderView::ResizeMode mode) { + #if QT_VERSION < 0x050000 + hdr->setResizeMode(mode); + #else hdr->setSectionResizeMode(mode); + #endif } -#endif RgDialog::RgDialog(QWidget *parent) : SongDialog(parent, "RgDialog", QSize(800, 400)) diff --git a/widgets/playqueueview.cpp b/widgets/playqueueview.cpp index 4fcc74d5c..435ad0cc1 100644 --- a/widgets/playqueueview.cpp +++ b/widgets/playqueueview.cpp @@ -84,27 +84,23 @@ void PlayQueueGroupedView::paintEvent(QPaintEvent *e) GroupedView::paintEvent(e); } -#if QT_VERSION < 0x050000 static inline void setResizeMode(QHeaderView *hdr, int idx, QHeaderView::ResizeMode mode) { + #if QT_VERSION < 0x050000 hdr->setResizeMode(idx, mode); -} - -static inline void setResizeMode(QHeaderView *hdr, QHeaderView::ResizeMode mode) -{ - hdr->setResizeMode(mode); -} -#else -static inline void setResizeMode(QHeaderView *hdr, int idx, QHeaderView::ResizeMode mode) -{ + #else hdr->setSectionResizeMode(idx, mode); + #endif } static inline void setResizeMode(QHeaderView *hdr, QHeaderView::ResizeMode mode) { + #if QT_VERSION < 0x050000 + hdr->setResizeMode(mode); + #else hdr->setSectionResizeMode(mode); + #endif } -#endif void PlayQueueTreeView::initHeader() {