summaryrefslogtreecommitdiffstats
path: root/kfaxview/libkfaximage
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 /kfaxview/libkfaximage
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 'kfaxview/libkfaximage')
-rw-r--r--kfaxview/libkfaximage/faxexpand.h4
-rw-r--r--kfaxview/libkfaximage/kfaximage.cpp28
-rw-r--r--kfaxview/libkfaximage/kfaximage.h5
3 files changed, 19 insertions, 18 deletions
diff --git a/kfaxview/libkfaximage/faxexpand.h b/kfaxview/libkfaximage/faxexpand.h
index 736779bd..72819e23 100644
--- a/kfaxview/libkfaximage/faxexpand.h
+++ b/kfaxview/libkfaximage/faxexpand.h
@@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
#include <tqglobal.h>
#include <tqimage.h>
-#define t32bits Q_UINT32
-#define t16bits Q_UINT16
+#define t32bits TQ_UINT32
+#define t16bits TQ_UINT16
typedef t16bits pixnum;
diff --git a/kfaxview/libkfaximage/kfaximage.cpp b/kfaxview/libkfaximage/kfaximage.cpp
index c0efb624..ea0d4943 100644
--- a/kfaxview/libkfaximage/kfaximage.cpp
+++ b/kfaxview/libkfaximage/kfaximage.cpp
@@ -38,10 +38,10 @@ static const char FAXMAGIC[] = "\000PC Research, Inc\000\000\000\000\000\000";
static const char littleTIFF[] = "\x49\x49\x2a\x00";
static const char bigTIFF[] = "\x4d\x4d\x00\x2a";
-KFaxImage::KFaxImage( const TQString &filename, TQObject *parent, const char *name )
- : TQObject(parent,name)
+KFaxImage::KFaxImage( const TQString &filename, TQObject *tqparent, const char *name )
+ : TQObject(tqparent,name)
{
- KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkfaximage") );
+ KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkfaximage") );
loadImage(filename);
}
@@ -53,7 +53,7 @@ bool KFaxImage::loadImage( const TQString &filename )
reset();
m_filename = filename;
- m_errorString = TQString::null;
+ m_errorString = TQString();
if (m_filename.isEmpty())
return false;
@@ -126,9 +126,9 @@ pagenode *KFaxImage::AppendImageNode(int type)
bool KFaxImage::NewImage(pagenode *pn, int w, int h)
{
pn->image = TQImage( w, h, 1, 2, TQImage::systemByteOrder() );
- pn->image.setColor(0, qRgb(255,255,255));
- pn->image.setColor(1, qRgb(0,0,0));
- pn->data = (Q_UINT16*) pn->image.bits();
+ pn->image.setColor(0, tqRgb(255,255,255));
+ pn->image.setColor(1, tqRgb(0,0,0));
+ pn->data = (TQ_UINT16*) pn->image.bits();
pn->bytes_per_line = pn->image.bytesPerLine();
pn->dpi = KFAX_DPI_FINE;
@@ -293,7 +293,7 @@ KFaxImage::notetiff()
get2(buf, endian) : get4(buf, endian);
}
break;
- case 274: /* Orientation */
+ case 274: /* Qt::Orientation */
switch(value) {
default: /* row0 at top, col0 at left */
orient = 0;
@@ -327,7 +327,7 @@ KFaxImage::notetiff()
case 279: /* StripByteCounts */
if (count != nstrips) {
str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
- .arg(filename()).arg(nstrips).arg(count);
+ .tqarg(filename()).tqarg(nstrips).tqarg(count);
kfaxerror(str);
goto realbad;
}
@@ -403,7 +403,7 @@ KFaxImage::notetiff()
void
KFaxImage::badfile(pagenode *pn)
{
- kfaxerror(i18n("%1: Bad Fax File").arg(filename()));
+ kfaxerror(i18n("%1: Bad Fax File").tqarg(filename()));
FreeImage(pn);
}
@@ -636,12 +636,12 @@ KFaxImage::GetImage(pagenode *pn)
}
// byte-swapping the image on little endian machines
-#if defined(Q_BYTE_ORDER) && (Q_BYTE_ORDER == Q_LITTLE_ENDIAN)
+#if defined(Q_BYTE_ORDER) && (Q_BYTE_ORDER == TQ_LITTLE_ENDIAN)
for (int y=pn->image.height()-1; y>=0; --y) {
- Q_UINT32 *source = (Q_UINT32 *) pn->image.scanLine(y);
- Q_UINT32 *dest = source;
+ TQ_UINT32 *source = (TQ_UINT32 *) pn->image.scanLine(y);
+ TQ_UINT32 *dest = source;
for (int x=(pn->bytes_per_line/4)-1; x>=0; --x) {
- Q_UINT32 dv = 0, sv = *source;
+ TQ_UINT32 dv = 0, sv = *source;
for (int bit=32; bit>0; --bit) {
dv <<= 1;
dv |= sv&1;
diff --git a/kfaxview/libkfaximage/kfaximage.h b/kfaxview/libkfaximage/kfaximage.h
index c0d61cb6..52dd7736 100644
--- a/kfaxview/libkfaximage/kfaximage.h
+++ b/kfaxview/libkfaximage/kfaximage.h
@@ -50,9 +50,10 @@ class pagenode;
#define KFAX_DPI_SUPERFINE TQPoint(406,392)
-class KDE_EXPORT KFaxImage : public QObject
+class KDE_EXPORT KFaxImage : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -63,7 +64,7 @@ public:
* @see: numPages
*/
- KFaxImage( const TQString &filename = TQString::null, TQObject *parent = 0, const char *name = 0 );
+ KFaxImage( const TQString &filename = TQString(), TQObject *tqparent = 0, const char *name = 0 );
/**
* Destructor