AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMdiArea: don't use out parameters, return by value

Browse Source 
Change-Id: I787b56033899d6845886c4707cf3acf7428f94a2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2013-10-05 01:43:29 +02:00 committed by The Qt Project
parent 1e4d70b5b6
commit ca6b36e21f
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/widgets/widgets/qmdiarea.cpp
View File

@ -447,9 +447,11 @@ QRect MinOverlapPlacer::findMinOverlapRect(const QVector<QRect> &source, const Q
\internal
Gets candidates for the final placement.
*/
void MinOverlapPlacer::getCandidatePlacements(const QSize &size, const QVector<QRect> &rects,
const QRect &domain,QVector<QRect> &candidates)
QVector<QRect> MinOverlapPlacer::getCandidatePlacements(const QSize &size, const QVector<QRect> &rects,
const QRect &domain)
{
QVector<QRect> result;
QVector<int> xlist;
xlist.reserve(2 + rects.size());
xlist << domain.left() << domain.right() - size.width() + 1;
@ -471,10 +473,11 @@ void MinOverlapPlacer::getCandidatePlacements(const QSize &size, const QVector<Q
std::sort(ylist.begin(), ylist.end());
ylist.erase(std::unique(ylist.begin(), ylist.end()), ylist.end());
candidates.reserve(candidates.size() + ylist.size() * xlist.size());
result.reserve(ylist.size() * xlist.size());
foreach (int y, ylist)
foreach (int x, xlist)
candidates << QRect(QPoint(x, y), size);
result << QRect(QPoint(x, y), size);
return result;
}
/*!
@ -482,9 +485,11 @@ void MinOverlapPlacer::getCandidatePlacements(const QSize &size, const QVector<Q
Finds all rectangles in 'source' not completely inside 'domain'. The result is stored
in 'result' and also removed from 'source'.
*/
void MinOverlapPlacer::findNonInsiders(const QRect &domain, QVector<QRect> &source,
QVector<QRect> &result)
QVector<QRect> MinOverlapPlacer::findNonInsiders(const QRect &domain, QVector<QRect> &source)
{
QVector<QRect> result;
result.reserve(source.size());
QMutableVectorIterator<QRect> it(source);
while (it.hasNext()) {
const QRect srcRect = it.next();
@ -493,6 +498,8 @@ void MinOverlapPlacer::findNonInsiders(const QRect &domain, QVector<QRect> &sour
it.remove();
}
}
return result;
}
/*!
@ -500,9 +507,11 @@ void MinOverlapPlacer::findNonInsiders(const QRect &domain, QVector<QRect> &sour
Finds all rectangles in 'source' that overlaps 'domain' by the maximum overlap area
between 'domain' and any rectangle in 'source'. The result is stored in 'result'.
*/
void MinOverlapPlacer::findMaxOverlappers(const QRect &domain, const QVector<QRect> &source,
QVector<QRect> &result)
QVector<QRect> MinOverlapPlacer::findMaxOverlappers(const QRect &domain, const QVector<QRect> &source)
{
QVector<QRect> result;
result.reserve(source.size());
int maxOverlap = -1;
foreach (const QRect &srcRect, source) {
QRect intersection = domain.intersected(srcRect);
@ -515,6 +524,8 @@ void MinOverlapPlacer::findMaxOverlappers(const QRect &domain, const QVector<QRe
result << srcRect;
}
}
return result;
}
/*!
@ -526,14 +537,12 @@ void MinOverlapPlacer::findMaxOverlappers(const QRect &domain, const QVector<QRe
QPoint MinOverlapPlacer::findBestPlacement(const QRect &domain, const QVector<QRect> &rects,
QVector<QRect> &source)
{
QVector<QRect> nonInsiders;
findNonInsiders(domain, source, nonInsiders);
const QVector<QRect> nonInsiders = findNonInsiders(domain, source);
if (!source.empty())
return findMinOverlapRect(source, rects).topLeft();
QVector<QRect> maxOverlappers;
findMaxOverlappers(domain, nonInsiders, maxOverlappers);
QVector<QRect> maxOverlappers = findMaxOverlappers(domain, nonInsiders);
return findMinOverlapRect(maxOverlappers, rects).topLeft();
}
@ -554,8 +563,7 @@ QPoint MinOverlapPlacer::place(const QSize &size, const QVector<QRect> &rects,
return QPoint();
}
QVector<QRect> candidates;
getCandidatePlacements(size, rects, domain, candidates);
QVector<QRect> candidates = getCandidatePlacements(size, rects, domain);
return findBestPlacement(domain, rects, candidates);
}

13
src/widgets/widgets/qmdiarea_p.h
View File

@ -126,15 +126,10 @@ class MinOverlapPlacer : public Placer
QPoint place(const QSize &size, const QVector<QRect> &rects, const QRect &domain) const;
static int accumulatedOverlap(const QRect &source, const QVector<QRect> &rects);
static QRect findMinOverlapRect(const QVector<QRect> &source, const QVector<QRect> &rects);
static void getCandidatePlacements(
const QSize &size, const QVector<QRect> &rects, const QRect &domain,
QVector<QRect> &candidates);
static QPoint findBestPlacement(
const QRect &domain, const QVector<QRect> &rects, QVector<QRect> &source);
static void findNonInsiders(
const QRect &domain, QVector<QRect> &source, QVector<QRect> &result);
static void findMaxOverlappers(
const QRect &domain, const QVector<QRect> &source, QVector<QRect> &result);
static QVector<QRect> getCandidatePlacements(const QSize &size, const QVector<QRect> &rects, const QRect &domain);
static QPoint findBestPlacement(const QRect &domain, const QVector<QRect> &rects, QVector<QRect> &source);
static QVector<QRect> findNonInsiders(const QRect &domain, QVector<QRect> &source);
static QVector<QRect> findMaxOverlappers(const QRect &domain, const QVector<QRect> &source);
};
} // namespace QMdi