summaryrefslogtreecommitdiffstats
path: root/kviewshell/plugins/djvu/libdjvu/GRect.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 19:03:33 +0000
commite69e8b1d09fb579316595b4e6a850e717358a8b1 (patch)
treea24fc20865f65772f530d16177520190594ffdd2 /kviewshell/plugins/djvu/libdjvu/GRect.h
parenteecec9afb81fdebb0f22e9da22635874c403f854 (diff)
downloadtdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz
tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kviewshell/plugins/djvu/libdjvu/GRect.h')
-rw-r--r--kviewshell/plugins/djvu/libdjvu/GRect.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/kviewshell/plugins/djvu/libdjvu/GRect.h b/kviewshell/plugins/djvu/libdjvu/GRect.h
index 1a86f80d..f3e031e1 100644
--- a/kviewshell/plugins/djvu/libdjvu/GRect.h
+++ b/kviewshell/plugins/djvu/libdjvu/GRect.h
@@ -132,7 +132,7 @@ namespace DJVU {
class GRect
{
public:
- /** #OrientationBits# defines 3 mutually exclusive
+ /** #Qt::OrientationBits# defines 3 mutually exclusive
bits to indicate the image orientation.
There are four possible rotation values for an image
@@ -150,7 +150,7 @@ public:
};
/** #Orientations# defines all 8 possible orientations, using
- the three \Ref{OrientationBits}.
+ the three \Ref{Qt::OrientationBits}.
\begin{itemize}
\item {\em TDLRNR} for Top Down, Left to Right, No Rotation.
\item {\em BULRNR} for Bottom Up, Left to Right, No Rotation.
@@ -209,11 +209,11 @@ public:
contains all pixels with horizontal pixel coordinates in range #xmin#
(inclusive) to #xmax# (exclusive) and vertical coordinates #ymin#
(inclusive) to #ymax# (exclusive). */
- int contains(int x, int y) const;
+ int tqcontains(int x, int y) const;
/** Returns true if this rectangle contains the passed rectangle #rect#.
The function basically checks, that the intersection of this rectangle
with #rect# is #rect#. */
- int contains(const GRect & rect) const;
+ int tqcontains(const GRect & rect) const;
/** Returns true if rectangles #r1# and #r2# are equal. */
friend int operator==(const GRect & r1, const GRect & r2);
/** Returns true if rectangles #r1# and #r2# are not equal. */
@@ -379,7 +379,7 @@ GRect::area() const
}
inline int
-GRect::contains(int x, int y) const
+GRect::tqcontains(int x, int y) const
{
return (x>=xmin && x<xmax && y>=ymin && y<ymax);
}