Mercurial > hg > easyhg
changeset 60:73073f34a5ee
* win32 build fixes
| author | Chris Cannam |
|---|---|
| date | Tue, 16 Nov 2010 19:53:14 +0000 |
| parents | 4557da8bdee6 |
| children | bf57a16315bd |
| files | debug.cpp panned.cpp |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/debug.cpp Tue Nov 16 15:14:17 2010 +0000 +++ b/debug.cpp Tue Nov 16 19:53:14 2010 +0000 @@ -37,7 +37,7 @@ mutex.lock(); if (!debug) { prefix = new char[20]; - sprintf(prefix, "[%lu]", (unsigned long)getpid()); + sprintf(prefix, "[%lu]", (unsigned long)QCoreApplication::applicationPid()); logFile = new QFile(QDir::homePath() + "/.easyhg.log"); if (logFile->open(QIODevice::WriteOnly | QIODevice::Append)) { QDebug(QtDebugMsg) << (const char *)prefix
--- a/panned.cpp Tue Nov 16 15:14:17 2010 +0000 +++ b/panned.cpp Tue Nov 16 19:53:14 2010 +0000 @@ -32,10 +32,10 @@ void Panned::resizeEvent(QResizeEvent *ev) { - QPointF near = mapToScene(0, 0); - QPointF far = mapToScene(width(), height()); - QSizeF sz(far.x()-near.x(), far.y()-near.y()); - QRectF pr(near, sz); + QPointF nearpt = mapToScene(0, 0); + QPointF farpt = mapToScene(width(), height()); + QSizeF sz(farpt.x()-nearpt.x(), farpt.y()-nearpt.y()); + QRectF pr(nearpt, sz); if (pr != m_pannedRect) { m_pannedRect = pr; @@ -54,10 +54,10 @@ void Panned::drawForeground(QPainter *paint, const QRectF &) { - QPointF near = mapToScene(0, 0); - QPointF far = mapToScene(width(), height()); - QSizeF sz(far.x()-near.x(), far.y()-near.y()); - QRectF pr(near, sz); + QPointF nearpt = mapToScene(0, 0); + QPointF farpt = mapToScene(width(), height()); + QSizeF sz(farpt.x()-nearpt.x(), farpt.y()-nearpt.y()); + QRectF pr(nearpt, sz); if (pr != m_pannedRect) { if (pr.x() != m_pannedRect.x()) emit pannedContentsScrolled();