From f956c09d42b89a147d3cdf5787d54253d5cfe4cb Mon Sep 17 00:00:00 2001
From: Scott Wheeler <wheeler@kde.org>
Date: Thu, 25 Nov 2004 19:42:04 +0000
Subject: [PATCH] remove trigraph, don't use round() (it's C99)

svn path=/branches/kpdf_experiments/kdegraphics/kpdf/; revision=366203
---
 kpdf/document.cpp | 2 +-
 kpdf/pageview.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/kpdf/document.cpp b/kpdf/document.cpp
index 4ce3a0c76..9b7f7894e 100644
--- a/kpdf/document.cpp
+++ b/kpdf/document.cpp
@@ -42,7 +42,7 @@
 #include "settings.h"
 
 /* Notes:
-- FIXME event queuing to avoid flow loops (!!??) maybe avoided by the
+- FIXME event queuing to avoid flow loops (!!?) maybe avoided by the
   warning to not call something 'active' inside an observer method.
 */
 
diff --git a/kpdf/pageview.cpp b/kpdf/pageview.cpp
index bfc7669a3..c6a42a4af 100644
--- a/kpdf/pageview.cpp
+++ b/kpdf/pageview.cpp
@@ -41,6 +41,8 @@
 #include "page.h"
 #include "settings.h"
 
+#define ROUND(x) (int(x + 0.5))
+
 // structure used internally by PageView for data storage
 class PageViewPrivate
 {
@@ -1295,8 +1297,8 @@ void PageView::slotRelayoutPages()
         if ( focusedPage )
         {
             const QRect & geometry = focusedPage->geometry();
-            center( geometry.left() + (int) round( focusedX * (double)geometry.width() ),
-                    geometry.top() + (int) round( focusedY * (double)geometry.height() ) );
+            center( geometry.left() + ROUND( focusedX * (double)geometry.width() ),
+                    geometry.top() + ROUND( focusedY * (double)geometry.height() ) );
         }
         else
             center( fullWidth / 2, 0 );