Commit 3fb2a9da authored by Thomas Häber's avatar Thomas Häber

changed depreciated QMIN and QMAX macros to qMin() and qMax() (with help of...

changed depreciated QMIN and QMAX macros to qMin() and qMax() (with help of the English Breakfast Network)

svn path=/trunk/KDE/kdemultimedia/juk/; revision=587495
parent 24ca1e29
......@@ -99,8 +99,8 @@ public:
}
lvHeight += lv->horizontalScrollBar()->height() + lv->header()->height();
lv->setMinimumHeight(QMIN(lvHeight, 400));
resize(QMIN(width(), 500), QMIN(minimumHeight(), 400));
lv->setMinimumHeight(qMin(lvHeight, 400));
resize(qMin(width(), 500), qMin(minimumHeight(), 400));
}
};
......
......@@ -293,7 +293,7 @@ void TrackItem::slotUpdate()
--size;
} while(m_label->heightForWidth(m_label->width()) > imageSize && size >= 0);
m_label->setFixedHeight(QMIN(imageSize, m_label->heightForWidth(m_label->width())));
m_label->setFixedHeight(qMin(imageSize, m_label->heightForWidth(m_label->width())));
}
////////////////////////////////////////////////////////////////////////////////
......
......@@ -1952,7 +1952,7 @@ void Playlist::slotUpdateColumnWidths()
minimumWidth[column] = header()->fontMetrics().width(header()->label(column)) + 10;
minimumWidthTotal += minimumWidth[column];
minimumFixedWidth[column] = QMAX(minimumWidth[column], m_columnFixedWidths[column]);
minimumFixedWidth[column] = qMax(minimumWidth[column], m_columnFixedWidths[column]);
minimumFixedWidthTotal += minimumFixedWidth[column];
}
......
......@@ -91,13 +91,13 @@ void ViewMode::paintCell(PlaylistBox::Item *item,
if (!pm->isNull()) {
int x = (width - pm->width()) / 2;
x = QMAX(x, item->listView()->itemMargin());
x = qMax(x, item->listView()->itemMargin());
painter->drawPixmap(x, y, *pm);
}
y += pm->height() + fm.height() - fm.descent();
for(QStringList::Iterator it = m_lines[item].begin(); it != m_lines[item].end(); ++it) {
int x = (width - fm.width(*it)) / 2;
x = QMAX(x, item->listView()->itemMargin());
x = qMax(x, item->listView()->itemMargin());
painter->drawText(x, y, *it);
y += fm.height() - fm.descent();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment