diff options
Diffstat (limited to 'kdvi')
45 files changed, 85 insertions, 116 deletions
diff --git a/kdvi/TeXFont.h b/kdvi/TeXFont.h index 39fedb76..77923f12 100644 --- a/kdvi/TeXFont.h +++ b/kdvi/TeXFont.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // TeXFont.h // // Part of KDVI - A DVI previewer for the KDE desktop environemt diff --git a/kdvi/TeXFontDefinition.h b/kdvi/TeXFontDefinition.h index a059a405..6c345967 100644 --- a/kdvi/TeXFontDefinition.h +++ b/kdvi/TeXFontDefinition.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /* * The layout of a font information block. * There is one of these for every loaded font or magnification thereof. diff --git a/kdvi/TeXFont_PFB.h b/kdvi/TeXFont_PFB.h index ed80d72b..4c3c2a7b 100644 --- a/kdvi/TeXFont_PFB.h +++ b/kdvi/TeXFont_PFB.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // TeXFont_PFB.cpp // // Part of KDVI - A DVI previewer for the KDE desktop environemt diff --git a/kdvi/TeXFont_PK.h b/kdvi/TeXFont_PK.h index ab9c6b5c..c85eff47 100644 --- a/kdvi/TeXFont_PK.h +++ b/kdvi/TeXFont_PK.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - #ifndef _TEXFONT_PK_H #define _TEXFONT_PK_H diff --git a/kdvi/TeXFont_TFM.h b/kdvi/TeXFont_TFM.h index 1d10dc1b..5c86aaf9 100644 --- a/kdvi/TeXFont_TFM.h +++ b/kdvi/TeXFont_TFM.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // TeXFont_TFM.h // // Part of KDVI - A DVI previewer for the KDE desktop environemt diff --git a/kdvi/bigEndianByteReader.h b/kdvi/bigEndianByteReader.h index 269d97d1..8bcc53f2 100644 --- a/kdvi/bigEndianByteReader.h +++ b/kdvi/bigEndianByteReader.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /* This file is part of KDVI (C) 2001 by Stefan Kebekus (kebekus@kde.org) This library is free software; you can redistribute it and/or @@ -1,4 +1,3 @@ -// -*- C++ -*- /* * Mnemonics for bytes in dvi file. */ diff --git a/kdvi/dviFile.cpp b/kdvi/dviFile.cpp index d4c53dd2..c9c8db92 100644 --- a/kdvi/dviFile.cpp +++ b/kdvi/dviFile.cpp @@ -57,7 +57,7 @@ #include <tqdir.h> #include <tqfileinfo.h> #include <stdlib.h> -#include <kprocio.h> +#include <tdeprocio.h> extern "C" { #include "dvi.h" @@ -375,7 +375,7 @@ TQString dvifile::convertPDFtoPS(const TQString &PDFFilename) tmpfile.unlink(); // Use pdf2ps to do the conversion - KProcIO proc; + TDEProcIO proc; proc << "pdf2ps" << PDFFilename << convertedFileName; if (proc.start(TDEProcess::Block) == false) convertedFileName = TQString(); // Indicates that conversion failed, won't try again. diff --git a/kdvi/dviFile.h b/kdvi/dviFile.h index b82d19de..5f6dd671 100644 --- a/kdvi/dviFile.h +++ b/kdvi/dviFile.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: dviFile // diff --git a/kdvi/dviPageCache.h b/kdvi/dviPageCache.h index 68e41c90..3aa34695 100644 --- a/kdvi/dviPageCache.h +++ b/kdvi/dviPageCache.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /*************************************************************************** * Copyright (C) 2005 by Wilfried Huss * * Wilfried.Huss@gmx.at * @@ -26,7 +25,7 @@ class DVIPageCache : public DocumentPageCache { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp index 46a56980..67013f82 100644 --- a/kdvi/dviRenderer.cpp +++ b/kdvi/dviRenderer.cpp @@ -39,9 +39,9 @@ #include <tdeio/netaccess.h> #include <tdelocale.h> #include <kprinter.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kprogress.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include "documentWidget.h" @@ -77,14 +77,14 @@ dviRenderer::dviRenderer(TQWidget *par) // initialize the dvi machinery dviFile = 0; - connect(&font_pool, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) ); + connect(&font_pool, TQ_SIGNAL( setStatusBarText( const TQString& ) ), this, TQ_SIGNAL( setStatusBarText( const TQString& ) ) ); parentWidget = par; shrinkfactor = 3; current_page = 0; resolutionInDPI = 0.0; - connect( &clearStatusBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearStatusBar()) ); + connect( &clearStatusBarTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearStatusBar()) ); currentlyDrawnPage = 0; editorCommand = ""; @@ -103,7 +103,7 @@ dviRenderer::dviRenderer(TQWidget *par) PS_interface = new ghostscript_interface(); // pass status bar messages through - connect(PS_interface, TQT_SIGNAL( setStatusBarText( const TQString& ) ), this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) ); + connect(PS_interface, TQ_SIGNAL( setStatusBarText( const TQString& ) ), this, TQ_SIGNAL( setStatusBarText( const TQString& ) ) ); } @@ -225,7 +225,7 @@ void dviRenderer::drawPage(double resolution, RenderedDocumentPage *page) dviFile->sourceSpecialMarker = false; // Show the dialog as soon as event processing is finished, and // the program is idle - TQTimer::singleShot( 0, this, TQT_SLOT(showThatSourceInformationIsPresent()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(showThatSourceInformationIsPresent()) ); } } @@ -254,7 +254,7 @@ void dviRenderer::showThatSourceInformationIsPresent() // here. Most of the code is stolen from there. // Check if the 'Don't show again' feature was used - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TDEConfigGroupSaver saver( config, "Notification Messages" ); bool showMsg = config->readBoolEntry( "KDVI-info_on_source_specials", true); @@ -767,8 +767,8 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum // henceforth dimiss the output of the older programm. "If it // hasn't failed until now, we don't care." if (proc != 0) { - tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); - tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); proc = 0; } @@ -778,9 +778,9 @@ void dviRenderer::handleSRCLink(const TQString &linkText, TQMouseEvent *e, Docum kdError(4300) << "Could not allocate ShellProcess for the editor command." << endl; return; } - tqApp->connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(editorCommand_terminated(TDEProcess *))); + tqApp->connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(editorCommand_terminated(TDEProcess *))); // Merge the editor-specific editor message here. export_errorString = i18n("<qt>The external program<br><br><tt><strong>%1</strong></tt><br/><br/>which was used to call the editor " "for inverse search, reported an error. You might wish to look at the <strong>document info " diff --git a/kdvi/dviRenderer.h b/kdvi/dviRenderer.h index 6dc76545..e8ccdb0b 100644 --- a/kdvi/dviRenderer.h +++ b/kdvi/dviRenderer.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: dviRenderer // @@ -84,7 +83,7 @@ struct drawinf { class dviRenderer : public DocumentRenderer, bigEndianByteReader { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/dviRenderer_draw.cpp b/kdvi/dviRenderer_draw.cpp index 74b5fd22..8433b5d4 100644 --- a/kdvi/dviRenderer_draw.cpp +++ b/kdvi/dviRenderer_draw.cpp @@ -70,7 +70,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqpainter.h> #include <tqbitmap.h> #include <tqimage.h> diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp index d6e15873..cae3007c 100644 --- a/kdvi/dviRenderer_export.cpp +++ b/kdvi/dviRenderer_export.cpp @@ -35,7 +35,7 @@ #include <tdeio/netaccess.h> #include <tdelocale.h> #include <kprinter.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <tqlabel.h> #include <tqpainter.h> @@ -61,8 +61,8 @@ void dviRenderer::exportPDF() // has been called meanwhile. See also the exportPS method. if (proc != 0) { // Make sure all further output of the programm is ignored - tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); - tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); proc = 0; } @@ -120,7 +120,7 @@ void dviRenderer::exportPDF() if (progress != 0) { progress->TextLabel2->setText( i18n("Please be patient") ); progress->setTotalSteps( dviFile->total_pages ); - tqApp->connect(progress, TQT_SIGNAL(finished()), this, TQT_SLOT(abortExternalProgramm())); + tqApp->connect(progress, TQ_SIGNAL(finished()), this, TQ_SLOT(abortExternalProgramm())); } proc = new KShellProcess(); @@ -128,11 +128,11 @@ void dviRenderer::exportPDF() kdError(4300) << "Could not allocate ShellProcess for the dvipdfm command." << endl; return; } - tqApp->disconnect( this, TQT_SIGNAL(mySignal()), 0, 0 ); + tqApp->disconnect( this, TQ_SIGNAL(mySignal()), 0, 0 ); - tqApp->connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(dvips_terminated(TDEProcess *))); + tqApp->connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(dvips_terminated(TDEProcess *))); export_errorString = i18n("<qt>The external program 'dvipdf', which was used to export the file, reported an error. " "You might wish to look at the <strong>document info dialog</strong> which you will " @@ -167,8 +167,8 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin // enough to ignore the exit status of the editor if another command // has been called meanwhile. See also the exportPDF method. if (proc != 0) { - tqApp->disconnect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); - tqApp->disconnect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), 0, 0); + tqApp->disconnect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), 0, 0); proc = 0; } @@ -223,7 +223,7 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin if (progress != 0) { progress->TextLabel2->setText( i18n("Please be patient") ); progress->setTotalSteps( dviFile->total_pages ); - tqApp->connect(progress, TQT_SIGNAL(finished()), this, TQT_SLOT(abortExternalProgramm())); + tqApp->connect(progress, TQ_SIGNAL(finished()), this, TQ_SLOT(abortExternalProgramm())); } // There is a major problem with dvips, at least 5.86 and lower: the @@ -294,9 +294,9 @@ void dviRenderer::exportPS(const TQString& fname, const TQString& options, KPrin return; } - tqApp->connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); - tqApp->connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(dvips_terminated(TDEProcess *))); + tqApp->connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(dvips_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(dvips_terminated(TDEProcess *))); export_errorString = i18n("<qt>The external program 'dvips', which was used to export the file, reported an error. " "You might wish to look at the <strong>document info dialog</strong> which you will " "find in the File-Menu for a precise error report.</qt>") ; diff --git a/kdvi/dviRenderer_prescan.cpp b/kdvi/dviRenderer_prescan.cpp index 84493dcc..c285642c 100644 --- a/kdvi/dviRenderer_prescan.cpp +++ b/kdvi/dviRenderer_prescan.cpp @@ -21,8 +21,8 @@ #include <kdebug.h> #include <tdelocale.h> #include <kmimetype.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <kprogress.h> #include <tqapplication.h> #include <tqbitmap.h> @@ -290,7 +290,7 @@ void dviRenderer::prescan_ParsePSHeaderSpecial(const TQString& cp) // to find it. if (!TQFile::exists(_file)) { // Otherwise, use kpsewhich to find the eps file. - KProcIO proc; + TDEProcIO proc; proc << "kpsewhich" << cp; proc.start(TDEProcess::Block); proc.readln(_file); diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp index 8b8545b6..614a2704 100644 --- a/kdvi/dviWidget.cpp +++ b/kdvi/dviWidget.cpp @@ -45,7 +45,7 @@ void DVIWidget::mousePressEvent(TQMouseEvent* e) // Check if the mouse is pressed on a source-hyperlink // source hyperlinks can be invoked with the Middle Mousebutton or alternatively // with Control+Left Mousebutton - if ((e->button() == Qt::MidButton || (e->button() == Qt::LeftButton && (e->state() & ControlButton))) + if ((e->button() == TQt::MidButton || (e->button() == TQt::LeftButton && (e->state() & ControlButton))) && (pageData->sourceHyperLinkList.size() > 0)) { int minIndex = 0; diff --git a/kdvi/dviWidget.h b/kdvi/dviWidget.h index 7b2a50aa..b0890499 100644 --- a/kdvi/dviWidget.h +++ b/kdvi/dviWidget.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // Class: DVIWidget // @@ -22,7 +21,7 @@ class textSelection; class DVIWidget : public DocumentWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/dvisourcesplitter.h b/kdvi/dvisourcesplitter.h index 35b84e7a..626911ad 100644 --- a/kdvi/dvisourcesplitter.h +++ b/kdvi/dvisourcesplitter.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // C++ Interface: dvisourcesplitter // diff --git a/kdvi/fontEncoding.cpp b/kdvi/fontEncoding.cpp index 71ed6d9f..e8504bd8 100644 --- a/kdvi/fontEncoding.cpp +++ b/kdvi/fontEncoding.cpp @@ -9,7 +9,7 @@ #ifdef HAVE_FREETYPE #include <kdebug.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tqfile.h> #include <tqstringlist.h> @@ -25,7 +25,7 @@ fontEncoding::fontEncoding(const TQString &encName) _isValid = false; // Use kpsewhich to find the encoding file. - KProcIO proc; + TDEProcIO proc; TQString encFileName; proc << "kpsewhich" << encName; if (proc.start(TDEProcess::Block) == false) { diff --git a/kdvi/fontEncoding.h b/kdvi/fontEncoding.h index 8ce0d18b..ecd73454 100644 --- a/kdvi/fontEncoding.h +++ b/kdvi/fontEncoding.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // fontEncoding.h // // Part of KDVI - A DVI previewer for the KDE desktop environemt diff --git a/kdvi/fontEncodingPool.h b/kdvi/fontEncodingPool.h index 05736137..7ddc8f43 100644 --- a/kdvi/fontEncodingPool.h +++ b/kdvi/fontEncodingPool.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // fontEncodingPool.h // // Part of KDVI - A DVI previewer for the KDE desktop environemt diff --git a/kdvi/fontMap.cpp b/kdvi/fontMap.cpp index 7b4e35a8..7893c97c 100644 --- a/kdvi/fontMap.cpp +++ b/kdvi/fontMap.cpp @@ -9,7 +9,7 @@ #ifdef HAVE_FREETYPE #include <kdebug.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tqfile.h> #include "fontMap.h" @@ -31,7 +31,7 @@ fontMap::fontMap() // way to give both options at the same time, there is seemingly no // other way than to try both options one after another. We use the // teTeX 3.0 format first. - KProcIO proc; + TDEProcIO proc; proc << "kpsewhich" << "--format=map" << "ps2pk.map"; if (proc.start(TDEProcess::Block) == false) { kdError(4700) << "fontMap::fontMap(): kpsewhich could not be started." << endl; diff --git a/kdvi/fontMap.h b/kdvi/fontMap.h index 4e02f742..8b5c0bc5 100644 --- a/kdvi/fontMap.h +++ b/kdvi/fontMap.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // fontMap.h // // Part of KDVI - A DVI previewer for the KDE desktop environemt diff --git a/kdvi/fontpool.cpp b/kdvi/fontpool.cpp index 830d0f67..3edd31e3 100644 --- a/kdvi/fontpool.cpp +++ b/kdvi/fontpool.cpp @@ -7,11 +7,11 @@ #include <config.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> -#include <kprocio.h> +#include <tdeprocess.h> +#include <tdeprocio.h> #include <math.h> #include <tqapplication.h> #include <tqfile.h> @@ -300,12 +300,12 @@ void fontPool::locateFonts(bool makePK, bool locateTFMonly, bool *virtualFontsFo TQStringList shellProcessCmdLine; - KProcIO kpsewhichIO; + TDEProcIO kpsewhichIO; // If PK fonts are generated, the kpsewhich command will re-route // the output of MetaFont into its stderr. Here we make sure this // output is intercepted and parsed. - tqApp->connect(&kpsewhichIO, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(mf_output_receiver(TDEProcess *, char *, int))); + tqApp->connect(&kpsewhichIO, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(mf_output_receiver(TDEProcess *, char *, int))); kpsewhichIO.setUseShell(true); diff --git a/kdvi/fontpool.h b/kdvi/fontpool.h index d5575ff9..7928fed0 100644 --- a/kdvi/fontpool.h +++ b/kdvi/fontpool.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // fontpool.h // // (C) 2001-2004 Stefan Kebekus @@ -37,7 +36,7 @@ class KShellProcess; **/ class fontPool : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp index 23bae486..5cd64aaf 100644 --- a/kdvi/fontprogress.cpp +++ b/kdvi/fontprogress.cpp @@ -9,7 +9,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <kprogress.h> #include <tqapplication.h> #include <tqframe.h> @@ -61,7 +61,7 @@ fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString progress = 0; procIO = 0; - tqApp->connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(killProcIO())); + tqApp->connect(this, TQ_SIGNAL(finished()), this, TQ_SLOT(killProcIO())); } @@ -83,7 +83,7 @@ void fontProgressDialog::increaseNumSteps(const TQString& explanation) } -void fontProgressDialog::setTotalSteps(int steps, KProcIO *proc) +void fontProgressDialog::setTotalSteps(int steps, TDEProcIO *proc) { procIO = proc; if (ProgressBar1 != 0) { diff --git a/kdvi/fontprogress.h b/kdvi/fontprogress.h index 73b135e4..20eae300 100644 --- a/kdvi/fontprogress.h +++ b/kdvi/fontprogress.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // fontprogress.h // @@ -11,7 +10,7 @@ #include <kdialogbase.h> #include <tqguardedptr.h> -class KProcIO; +class TDEProcIO; class KProgress; class TQLabel; @@ -30,7 +29,7 @@ class TQLabel; **/ class fontProgressDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -45,8 +44,8 @@ public: /** Used to initialize the progress bar. If the argument proc is non-zero, the associated process will be killed when the "abort" button is pressed. The FontProgress uses a TQGuarderPtr - internally, so it is save to delete the KProcIO anytime. */ - void setTotalSteps(int, KProcIO *proc=0); + internally, so it is save to delete the TDEProcIO anytime. */ + void setTotalSteps(int, TDEProcIO *proc=0); TQLabel* TextLabel2; @@ -59,7 +58,7 @@ private: TQLabel* TextLabel1; KProgress* ProgressBar1; int progress; - TQGuardedPtr<KProcIO> procIO; + TQGuardedPtr<TDEProcIO> procIO; }; #endif // FONT_GENERATION_H diff --git a/kdvi/glyph.h b/kdvi/glyph.h index 2265c6df..596adbce 100644 --- a/kdvi/glyph.h +++ b/kdvi/glyph.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - #ifndef _GLYPH_H #define _GLYPH_H diff --git a/kdvi/infodialog.h b/kdvi/infodialog.h index 36946ded..0d0bdc00 100644 --- a/kdvi/infodialog.h +++ b/kdvi/infodialog.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // infodialog.h // // (C) 2001 Stefan Kebekus @@ -19,7 +18,7 @@ class TQWidget; class infoDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/kdvi.h b/kdvi/kdvi.h index c04fe189..c204b660 100644 --- a/kdvi/kdvi.h +++ b/kdvi/kdvi.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // kdvi.h // // global variables and definitions for kdvi. diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp index 2da7abc2..a6aa58b8 100644 --- a/kdvi/kdvi_multipage.cpp +++ b/kdvi/kdvi_multipage.cpp @@ -67,13 +67,13 @@ KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQO DVIRenderer.setName("DVI renderer"); setRenderer(&DVIRenderer); - docInfoAction = new TDEAction(i18n("Document &Info"), "application-vnd.tde.info", 0, &DVIRenderer, TQT_SLOT(showInfo()), actionCollection(), "info_dvi"); - embedPSAction = new TDEAction(i18n("Embed External PostScript Files..."), 0, this, TQT_SLOT(slotEmbedPostScript()), actionCollection(), "embed_postscript"); - new TDEAction(i18n("Enable All Warnings && Messages"), 0, this, TQT_SLOT(doEnableWarnings()), actionCollection(), "enable_msgs"); - exportPSAction = new TDEAction(i18n("PostScript..."), 0, &DVIRenderer, TQT_SLOT(exportPS()), actionCollection(), "export_postscript"); - exportPDFAction = new TDEAction(i18n("PDF..."), 0, &DVIRenderer, TQT_SLOT(exportPDF()), actionCollection(), "export_pdf"); + docInfoAction = new TDEAction(i18n("Document &Info"), "application-vnd.tde.info", 0, &DVIRenderer, TQ_SLOT(showInfo()), actionCollection(), "info_dvi"); + embedPSAction = new TDEAction(i18n("Embed External PostScript Files..."), 0, this, TQ_SLOT(slotEmbedPostScript()), actionCollection(), "embed_postscript"); + new TDEAction(i18n("Enable All Warnings && Messages"), 0, this, TQ_SLOT(doEnableWarnings()), actionCollection(), "enable_msgs"); + exportPSAction = new TDEAction(i18n("PostScript..."), 0, &DVIRenderer, TQ_SLOT(exportPS()), actionCollection(), "export_postscript"); + exportPDFAction = new TDEAction(i18n("PDF..."), 0, &DVIRenderer, TQ_SLOT(exportPDF()), actionCollection(), "export_pdf"); - KStdAction::tipOfDay(this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday"); + KStdAction::tipOfDay(this, TQ_SLOT(showTip()), actionCollection(), "help_tipofday"); setXMLFile("kdvi_part.rc"); @@ -81,7 +81,7 @@ KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQO enableActions(false); // Show tip of the day, when the first main window is shown. - TQTimer::singleShot(0,this,TQT_SLOT(showTipOnStart())); + TQTimer::singleShot(0,this,TQ_SLOT(showTipOnStart())); } @@ -365,7 +365,7 @@ void KDVIMultiPage::print() default: break; } - // Qt::Orientation + // Orientation if ( printer->orientation() == KPrinter::Landscape ) dvips_options += "-t landscape "; @@ -435,12 +435,12 @@ DocumentWidget* KDVIMultiPage::createDocumentWidget() "singlePageWidget" ); // Lets not forget the connections we make in the KMultiPage - connect(documentWidget, TQT_SIGNAL(clearSelection()), this, TQT_SLOT(clearSelection())); - connect(this, TQT_SIGNAL(enableMoveTool(bool)), documentWidget, TQT_SLOT(slotEnableMoveTool(bool))); + connect(documentWidget, TQ_SIGNAL(clearSelection()), this, TQ_SLOT(clearSelection())); + connect(this, TQ_SIGNAL(enableMoveTool(bool)), documentWidget, TQ_SLOT(slotEnableMoveTool(bool))); // Handle source links - connect(documentWidget, TQT_SIGNAL(SRCLink(const TQString&, TQMouseEvent*, DocumentWidget*)), getRenderer(), - TQT_SLOT(handleSRCLink(const TQString& ,TQMouseEvent*, DocumentWidget*))); + connect(documentWidget, TQ_SIGNAL(SRCLink(const TQString&, TQMouseEvent*, DocumentWidget*)), getRenderer(), + TQ_SLOT(handleSRCLink(const TQString& ,TQMouseEvent*, DocumentWidget*))); return documentWidget; } diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h index 29adbe26..099f472f 100644 --- a/kdvi/kdvi_multipage.h +++ b/kdvi/kdvi_multipage.h @@ -1,4 +1,3 @@ -// -*- C++ -*- #ifndef KDVIMULTIPAGE_H #define KDVIMULTIPAGE_H @@ -11,7 +10,7 @@ class KPrinter; class KDVIMultiPage : public KMultiPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/kprinterwrapper.h b/kdvi/kprinterwrapper.h index d7133f03..d276abb4 100644 --- a/kdvi/kprinterwrapper.h +++ b/kdvi/kprinterwrapper.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // kprinterwrapper.h // // Part of KDVI - A DVI previewer for the KDE desktop environemt diff --git a/kdvi/optionDialogFontsWidget.h b/kdvi/optionDialogFontsWidget.h index 975a826e..263409fe 100644 --- a/kdvi/optionDialogFontsWidget.h +++ b/kdvi/optionDialogFontsWidget.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // optionDialogFontsWidget.h // // Part of KDVI - A DVI previewer for the KDE desktop environemt @@ -14,7 +13,7 @@ class optionDialogFontsWidget : public optionDialogFontsWidget_base { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/optionDialogFontsWidget_base.ui b/kdvi/optionDialogFontsWidget_base.ui index bb7e18f4..2a36bb98 100644 --- a/kdvi/optionDialogFontsWidget_base.ui +++ b/kdvi/optionDialogFontsWidget_base.ui @@ -56,9 +56,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>buttonGroup1_clicked(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kdvi/optionDialogSpecialWidget.cpp b/kdvi/optionDialogSpecialWidget.cpp index 800a5d19..b07a5b35 100644 --- a/kdvi/optionDialogSpecialWidget.cpp +++ b/kdvi/optionDialogSpecialWidget.cpp @@ -73,8 +73,8 @@ optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* parent, const c usersEditorCommand = currentEditorCommand; slotComboBox(i); - connect(urll, TQT_SIGNAL(leftClickedURL(const TQString&)), this, TQT_SLOT(slotExtraHelpButton(const TQString&))); - connect(editorChoice, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotComboBox( int ) ) ); + connect(urll, TQ_SIGNAL(leftClickedURL(const TQString&)), this, TQ_SLOT(slotExtraHelpButton(const TQString&))); + connect(editorChoice, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotComboBox( int ) ) ); // Editor description strings (and their translations) vary in // size. Find the longest description string available to make sure @@ -87,7 +87,7 @@ optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* parent, const c } editorDescription->setMinimumWidth(maximumWidth+10); - connect(kcfg_EditorCommand, TQT_SIGNAL( textChanged (const TQString &) ), this, TQT_SLOT( slotUserDefdEditorCommand( const TQString & ) ) ); + connect(kcfg_EditorCommand, TQ_SIGNAL( textChanged (const TQString &) ), this, TQ_SLOT( slotUserDefdEditorCommand( const TQString & ) ) ); } optionDialogSpecialWidget::~optionDialogSpecialWidget() @@ -123,7 +123,7 @@ void optionDialogSpecialWidget::slotComboBox(int item) void optionDialogSpecialWidget::slotExtraHelpButton( const TQString & ) { - kapp->invokeHelp( "inv-search", "kdvi" ); + tdeApp->invokeHelp( "inv-search", "kdvi" ); } void optionDialogSpecialWidget::apply() diff --git a/kdvi/optionDialogSpecialWidget.h b/kdvi/optionDialogSpecialWidget.h index b7772107..feb09a57 100644 --- a/kdvi/optionDialogSpecialWidget.h +++ b/kdvi/optionDialogSpecialWidget.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // optionDialogSpecialWidget.h // // Part of KDVI - A DVI previewer for the KDE desktop environemt @@ -14,7 +13,7 @@ class optionDialogSpecialWidget : public optionDialogSpecialWidget_base { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/performanceMeasurement.h b/kdvi/performanceMeasurement.h index d7e4c9b4..d9f82e16 100644 --- a/kdvi/performanceMeasurement.h +++ b/kdvi/performanceMeasurement.h @@ -1,5 +1,3 @@ -// -*- C++ -*- - //#define PERFORMANCE_MEASUREMENT #ifdef PERFORMANCE_MEASUREMENT diff --git a/kdvi/prebookmark.h b/kdvi/prebookmark.h index 412652b9..0b277b3f 100644 --- a/kdvi/prebookmark.h +++ b/kdvi/prebookmark.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /*************************************************************************** * Copyright (C) 2005 by Stefan Kebekus * * kebekus@kde.org * diff --git a/kdvi/psgs.cpp b/kdvi/psgs.cpp index 7551a12f..3e58c2f4 100644 --- a/kdvi/psgs.cpp +++ b/kdvi/psgs.cpp @@ -11,7 +11,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tdetempfile.h> #include <kurl.h> #include <tqdir.h> @@ -207,7 +207,7 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co // Step 2: Call GS with the File TQFile::remove(filename.ascii()); - KProcIO proc; + TDEProcIO proc; TQStringList argus; argus << "gs"; argus << "-dSAFER" << "-dPARANOIDSAFER" << "-dDELAYSAFER" << "-dNOPAUSE" << "-dBATCH"; @@ -329,7 +329,7 @@ TQString ghostscript_interface::locateEPSfile(const TQString &filename, const KU // Otherwise, use kpsewhich to find the eps file. TQString EPSfilename; - KProcIO proc; + TDEProcIO proc; proc << "kpsewhich" << filename; proc.start(TDEProcess::Block); proc.readln(EPSfilename); diff --git a/kdvi/psgs.h b/kdvi/psgs.h index 74dc1015..d5750bd2 100644 --- a/kdvi/psgs.h +++ b/kdvi/psgs.h @@ -1,4 +1,3 @@ -// -*- C++ -*- // // ghostscript_interface // @@ -33,7 +32,7 @@ public: class ghostscript_interface : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/renderedDviPagePixmap.h b/kdvi/renderedDviPagePixmap.h index 9f020057..cd7da3d7 100644 --- a/kdvi/renderedDviPagePixmap.h +++ b/kdvi/renderedDviPagePixmap.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /*************************************************************************** * Copyright (C) 2005 by Wilfried Huss * * Wilfried.Huss@gmx.at * @@ -29,7 +28,7 @@ class RenderedDviPagePixmap : public RenderedDocumentPagePixmap { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdvi/special.cpp b/kdvi/special.cpp index 760d849b..4f5ba4ac 100644 --- a/kdvi/special.cpp +++ b/kdvi/special.cpp @@ -11,7 +11,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kmimetype.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <tqdir.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/kdvi/squeeze.c b/kdvi/squeeze.c index d0e2515f..90268241 100644 --- a/kdvi/squeeze.c +++ b/kdvi/squeeze.c @@ -35,7 +35,9 @@ * as a constant string. */ #include <stdio.h> +#include <stdlib.h> #include <string.h> + #define LINELENGTH (72) #define BUFLENGTH (1000) #undef putchar @@ -107,7 +109,6 @@ int main(int argc, char *argv[]) int c ; char *b ; char seeking ; - extern void exit() ; if (argc > 3 || (in=(argc < 2 ? stdin : fopen(argv[1], "r")))==NULL || (out=(argc < 3 ? stdout : fopen(argv[2], "w")))==NULL) { diff --git a/kdvi/xdvi.h b/kdvi/xdvi.h index 0770cd8b..d3602164 100644 --- a/kdvi/xdvi.h +++ b/kdvi/xdvi.h @@ -1,4 +1,3 @@ -// -*- C++ -*- #ifndef _xdvi_h #define _xdvi_h |