diff --git a/dviRenderer.cpp b/dviRenderer.cpp index a98d2328f..60f4c82ba 100644 --- a/dviRenderer.cpp +++ b/dviRenderer.cpp @@ -47,10 +47,9 @@ QPainter *foreGroundPainter; // QPainter used for text //------ now comes the dviRenderer class implementation ---------- -dviRenderer::dviRenderer(QWidget *par) - : DocumentRenderer(par), - dviFile(0), - info(new infoDialog(par)), +dviRenderer::dviRenderer() + : dviFile(0), + info(new infoDialog(0)), resolutionInDPI(0), embedPS_progress(0), embedPS_numOfProgressedFiles(0), diff --git a/dviRenderer.h b/dviRenderer.h index d89f78b0a..f1e9230bc 100644 --- a/dviRenderer.h +++ b/dviRenderer.h @@ -5,7 +5,7 @@ // Class for rendering TeX DVI files. // Part of KDVI- A previewer for TeX DVI files. // -// (C) 2001-2005 Stefan Kebekus. Distributed under the GPL. +// (C) 2001-2006 Stefan Kebekus. Distributed under the GPL. #ifndef _dvirenderer_h_ #define _dvirenderer_h_ @@ -87,7 +87,7 @@ class dviRenderer : public DocumentRenderer, bigEndianByteReader Q_OBJECT public: - dviRenderer(QWidget *parent); + dviRenderer(); ~dviRenderer(); virtual bool setFile(const QString &fname, const KUrl &base); diff --git a/kdvi_multipage.cpp b/kdvi_multipage.cpp index cb4c7cd57..cb9346e37 100644 --- a/kdvi_multipage.cpp +++ b/kdvi_multipage.cpp @@ -37,14 +37,12 @@ QTime performanceTimer; int performanceFlag = 0; #endif -typedef KParts::GenericFactory KDVIMultiPageFactory; -K_EXPORT_COMPONENT_FACTORY(kdvipart, KDVIMultiPageFactory) +K_EXPORT_COMPONENT_FACTORY( kdvipart, KGenericFactory( "kdvipart" ) ) -KDVIMultiPage::KDVIMultiPage(QWidget *parentWidget, QObject *parent, - const QStringList& args) - : KMultiPage(parentWidget, parent), DVIRenderer(parentWidget) +KDVIMultiPage::KDVIMultiPage(QObject *parent, const QStringList& args) + : KMultiPage(parent) { Q_UNUSED(args); #ifdef PERFORMANCE_MEASUREMENT @@ -53,8 +51,6 @@ KDVIMultiPage::KDVIMultiPage(QWidget *parentWidget, QObject *parent, searchUsed = false; - setInstance(KDVIMultiPageFactory::instance()); - // Points to the same object as renderer to avoid downcasting. // FIXME: Remove when the API of the Renderer-class is finished. DVIRenderer.setName("DVI renderer"); diff --git a/kdvi_multipage.h b/kdvi_multipage.h index 0abe7d607..507f4b092 100644 --- a/kdvi_multipage.h +++ b/kdvi_multipage.h @@ -17,8 +17,7 @@ class KDVIMultiPage : public KMultiPage Q_OBJECT public: - KDVIMultiPage(QWidget *parentWidget, QObject *parent, - const QStringList& args = QStringList()); + KDVIMultiPage(QObject *parent, const QStringList& args = QStringList()); virtual ~KDVIMultiPage(); // Interface definition start ------------------------------------------------