summaryrefslogtreecommitdiffstats
path: root/kfaxview
diff options
context:
space:
mode:
Diffstat (limited to 'kfaxview')
-rw-r--r--kfaxview/faxmultipage.cpp4
-rw-r--r--kfaxview/faxmultipage.h3
-rw-r--r--kfaxview/faxrenderer.cpp20
-rw-r--r--kfaxview/faxrenderer.h3
-rw-r--r--kfaxview/libkfaximage/faxexpand.h4
-rw-r--r--kfaxview/libkfaximage/kfaximage.cpp28
-rw-r--r--kfaxview/libkfaximage/kfaximage.h5
-rw-r--r--kfaxview/main.cpp6
8 files changed, 38 insertions, 35 deletions
diff --git a/kfaxview/faxmultipage.cpp b/kfaxview/faxmultipage.cpp
index 44c1e273..2362d281 100644
--- a/kfaxview/faxmultipage.cpp
+++ b/kfaxview/faxmultipage.cpp
@@ -31,9 +31,9 @@ typedef KParts::GenericFactory<FaxMultiPage> FaxMultiPageFactory;
K_EXPORT_COMPONENT_FACTORY(kfaxviewpart, FaxMultiPageFactory)
-FaxMultiPage::FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
+FaxMultiPage::FaxMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
const char *name, const TQStringList&)
- : KMultiPage(parentWidget, widgetName, parent, name), faxRenderer(parentWidget)
+ : KMultiPage(tqparentWidget, widgetName, tqparent, name), faxRenderer(tqparentWidget)
{
/* This is kparts wizardry that cannot be understood by man. Simply
change the names to match your implementation. */
diff --git a/kfaxview/faxmultipage.h b/kfaxview/faxmultipage.h
index 65a7fa25..71e24b72 100644
--- a/kfaxview/faxmultipage.h
+++ b/kfaxview/faxmultipage.h
@@ -81,6 +81,7 @@ does only the minimal initialization required.
class FaxMultiPage : public KMultiPage
{
Q_OBJECT
+ TQ_OBJECT
public:
/** Constructor
@@ -89,7 +90,7 @@ public:
kmultipage. Please have a look at the constructor's source code to
see how to adjust this for your implementation.
*/
- FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
+ FaxMultiPage(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent,
const char *name, const TQStringList& args = TQStringList());
/** Destructor
diff --git a/kfaxview/faxrenderer.cpp b/kfaxview/faxrenderer.cpp
index 3e597863..ec21ca06 100644
--- a/kfaxview/faxrenderer.cpp
+++ b/kfaxview/faxrenderer.cpp
@@ -36,7 +36,7 @@ FaxRenderer::FaxRenderer(TQWidget* par)
: DocumentRenderer(par)
{
#ifdef KF_DEBUG
- kdError() << "FaxRenderer( parent=" << par << " )" << endl;
+ kdError() << "FaxRenderer( tqparent=" << par << " )" << endl;
#endif
}
@@ -96,8 +96,8 @@ void FaxRenderer::drawPage(double resolution, RenderedDocumentPage* page)
// problems occur if KViewShell required a shrunken version of
// the page, e.g. to print multiple pages on one sheet of paper.
- int width_in_pixel = qRound(resolution * psize.width().getLength_in_inch());
- int height_in_pixel = qRound(resolution * psize.height().getLength_in_inch());
+ int width_in_pixel = tqRound(resolution * psize.width().getLength_in_inch());
+ int height_in_pixel = tqRound(resolution * psize.height().getLength_in_inch());
img = img.smoothScale(width_in_pixel, height_in_pixel);
foreGroundPaint->drawImage(0, 0, img);
@@ -135,8 +135,8 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
TQFileInfo fi(fname);
TQString filename = fi.absFilePath();
if (!fi.exists() || fi.isDir()) {
- KMessageBox::error( parentWidget,
- i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").arg(filename),
+ KMessageBox::error( tqparentWidget,
+ i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist.</qt>").tqarg(filename),
i18n("File Error"));
// the return value 'false' indicates that this operation was not successful.
mutex.unlock();
@@ -156,12 +156,12 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
// leaving an error message in fax.errorString(). We try to handle
// this case gracefully.
if (fax.errorString().isEmpty())
- KMessageBox::error( parentWidget,
- i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
+ KMessageBox::error( tqparentWidget,
+ i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
i18n("File Error"));
else
- KMessageBox::detailedError( parentWidget,
- i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").arg(filename),
+ KMessageBox::detailedError( tqparentWidget,
+ i18n("<qt><strong>File error.</strong> The specified file '%1' could not be loaded.</qt>").tqarg(filename),
fax.errorString(),
i18n("File Error"));
clear();
@@ -178,7 +178,7 @@ bool FaxRenderer::setFile(const TQString &fname, const KURL &)
Length w,h;
if (numPages != 0) {
- for(Q_UINT16 pg=0; pg < numPages; pg++) {
+ for(TQ_UINT16 pg=0; pg < numPages; pg++) {
TQSize pageSize = fax.page_size(pg);
TQPoint dpi = fax.page_dpi(pg);
double dpix = dpi.x();
diff --git a/kfaxview/faxrenderer.h b/kfaxview/faxrenderer.h
index e83f6ff4..d7022b61 100644
--- a/kfaxview/faxrenderer.h
+++ b/kfaxview/faxrenderer.h
@@ -39,6 +39,7 @@ implements only the necessary methods setFile() and drawPage().
class FaxRenderer : public DocumentRenderer
{
Q_OBJECT
+ TQ_OBJECT
public:
/** Default constructor
@@ -46,7 +47,7 @@ public:
This constructor simply prints a message (if debugging is
enabled) and calls the default constructor.
*/
- FaxRenderer(TQWidget* parent);
+ FaxRenderer(TQWidget* tqparent);
/** Destructor
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
diff --git a/kfaxview/main.cpp b/kfaxview/main.cpp
index 05692315..cacb24a0 100644
--- a/kfaxview/main.cpp
+++ b/kfaxview/main.cpp
@@ -97,14 +97,14 @@ int main(int argc, char** argv)
if (!url.isValid())
{
- kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).arg(args->arg(0)) << endl;
+ kdError(4300) << TQString(I18N_NOOP("The URL %1 is not well-formed.")).tqarg(args->arg(0)) << endl;
return -1;
}
if (!url.isLocalFile())
{
kdError(4300) << TQString(I18N_NOOP("The URL %1 does not point to a local file. You can only specify local "
- "files if you are using the '--unique' option.")).arg(args->arg(0)) << endl;
+ "files if you are using the '--unique' option.")).tqarg(args->arg(0)) << endl;
return -1;
}
@@ -118,7 +118,7 @@ int main(int argc, char** argv)
QCStringList apps = app.dcopClient()->registeredApplications();
for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it )
{
- if ((*it).find("kviewshell") == 0)
+ if ((*it).tqfind("kviewshell") == 0)
{
TQByteArray data, replyData;
TQCString replyType;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-14 09:44:10 +0000