diff options
Diffstat (limited to 'kpdf/core')
-rw-r--r-- | kpdf/core/document.cpp | 10 | ||||
-rw-r--r-- | kpdf/core/document.h | 2 | ||||
-rw-r--r-- | kpdf/core/generator_pdf/generator_pdf.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index f97be985..0a81af68 100644 --- a/kpdf/core/document.cpp +++ b/kpdf/core/document.cpp @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <kuserprofile.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // local includes #include "document.h" @@ -204,7 +204,7 @@ bool KPDFDocument::openDocument( const TQString & docFile, const KURL & url, con if ( !d->saveBookmarksTimer ) { d->saveBookmarksTimer = new TQTimer( this ); - connect( d->saveBookmarksTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( saveDocumentInfo() ) ); + connect( d->saveBookmarksTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( saveDocumentInfo() ) ); } d->saveBookmarksTimer->start( 5 * 60 * 1000 ); @@ -212,7 +212,7 @@ bool KPDFDocument::openDocument( const TQString & docFile, const KURL & url, con if ( !d->memCheckTimer ) { d->memCheckTimer = new TQTimer( this ); - connect( d->memCheckTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimedMemoryCheck() ) ); + connect( d->memCheckTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimedMemoryCheck() ) ); } d->memCheckTimer->start( 2000 ); @@ -357,7 +357,7 @@ void KPDFDocument::reparseConfig() TQWidget *KPDFDocument::widget() const { - return TQT_TQWIDGET(parent()); + return static_cast<TQWidget*>(parent()); } bool KPDFDocument::isOpened() const @@ -1068,7 +1068,7 @@ void KPDFDocument::processLink( const KPDFLink * link ) const KPDFLinkBrowse * browse = static_cast< const KPDFLinkBrowse * >( link ); // if the url is a mailto one, invoke mailer if ( browse->url().startsWith( "mailto:", false ) ) - kapp->invokeMailer( browse->url() ); + tdeApp->invokeMailer( browse->url() ); else { TQString url = browse->url(); diff --git a/kpdf/core/document.h b/kpdf/core/document.h index a0529261..247a8dfd 100644 --- a/kpdf/core/document.h +++ b/kpdf/core/document.h @@ -49,7 +49,7 @@ class KURL; */ class KPDFDocument : public TQObject { - Q_OBJECT + TQ_OBJECT public: KPDFDocument( TQWidget *widget ); diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp index 08578a8e..c5ec1b97 100644 --- a/kpdf/core/generator_pdf/generator_pdf.cpp +++ b/kpdf/core/generator_pdf/generator_pdf.cpp @@ -260,7 +260,7 @@ const DocumentSynopsis * PDFGenerator::generateDocumentSynopsis() bool PDFGenerator::isAllowed( int permissions ) { #if !KPDF_FORCE_DRM - if (kapp->authorize("skip_drm") && !KpdfSettings::obeyDRM()) return true; + if (tdeApp->authorize("skip_drm") && !KpdfSettings::obeyDRM()) return true; #endif bool b = true; @@ -1216,7 +1216,7 @@ void PDFPixmapGeneratorThread::run() // 1. set OutputDev parameters and Generate contents d->generator->kpdfOutputDev->setParams( width, height, - genObjectRects, genObjectRects, TRUE /*thread safety*/ ); + genObjectRects, genObjectRects, true /*thread safety*/ ); d->generator->pdfdoc->displayPage( d->generator->kpdfOutputDev, page->number() + 1, fakeDpiX, fakeDpiY, d->currentRequest->rotation, false, true, false ); if ( genObjectRects ) |