--nextPart2364400.UoykAey99O
Content-Type: multipart/mixed;
  boundary="Boundary-01=_LAK3GcI1LzLyZ9v"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_LAK3GcI1LzLyZ9v
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

On Tuesday 04 Sep 2007, Nhuh Put wrote:
> KScanDialogFactory can disappear completly, all the necessary stuff
> is already in KPluginFactory. I would port libkscan and remove the
> factory class nex Monday.

Patch attached.

Is there any problem with changing the requested translation catalogue=20
from libkscan to just kscan?  Is there anything else I should do if I=20
do change it?

Alex



=2D-=20
KDE: http://www.kde.org
Ubuntu/Kubuntu: http://www.ubuntu.org http://www.kubuntu.org

--Boundary-01=_LAK3GcI1LzLyZ9v
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="kscan.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="kscan.diff"

Index: kdelibs/kio/kio/kscan.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- kdelibs/kio/kio/kscan.cpp	(revision 708118)
+++ kdelibs/kio/kio/kscan.cpp	(working copy)
@@ -119,99 +119,5 @@ int KOCRDialog::nextId()
 }
=20
=20
=2D///////////////////////////////////////////////////////////////////
=2D
=2Dclass KScanDialogFactory::KScanDialogFactoryPrivate
=2D{
=2Dpublic:
=2D    KComponentData m_componentData;
=2D};
=2D
=2DKScanDialogFactory::KScanDialogFactory( const char *componentName,
=2D                                        const char *catalogName,
=2D                                        QObject *parent )
=2D    : KPluginFactory(componentName, catalogName, parent),
=2D      d( new KScanDialogFactoryPrivate )
=2D{
=2D}
=2D
=2DKScanDialogFactory::~KScanDialogFactory()
=2D{
=2D    delete d;
=2D}
=2D
=2DQObject *KScanDialogFactory::createObject( QObject *parent,
=2D                                           const char *classname,
=2D                                           const QStringList &args )
=2D{
=2D    if ( strcmp( classname, "KScanDialog" ) !=3D 0 )
=2D        return 0;
=2D
=2D    if ( parent && !parent->isWidgetType() )
=2D       return 0;
=2D
=2D    Q_UNUSED( args );
=2D
=2D    return createDialog( static_cast<QWidget *>( parent ) );
=2D}
=2D
=2Dvoid KScanDialogFactory::setName(const QByteArray &componentName)
=2D{
=2D    d->m_componentData =3D KComponentData(componentName);
=2D}
=2D
=2Dconst KComponentData &KScanDialogFactory::componentData() const
=2D{
=2D    return d->m_componentData;
=2D}
=2D
=2D
=2D///////////////////////////////////////////////////////////////////
=2D
=2Dclass KOCRDialogFactory::KOCRDialogFactoryPrivate
=2D{
=2Dpublic:
=2D    KComponentData m_componentData;
=2D};
=2D
=2DKOCRDialogFactory::KOCRDialogFactory( const char *componentName,
=2D                                      const char *catalogName,
=2D                                      QObject *parent )
=2D    : KPluginFactory(componentName, catalogName, parent),
=2D      d( new KOCRDialogFactoryPrivate )
=2D{
=2D}
=2D
=2DKOCRDialogFactory::~KOCRDialogFactory()
=2D{
=2D    delete d;
=2D}
=2D
=2DQObject *KOCRDialogFactory::createObject( QObject *parent,
=2D                                          const char *classname,
=2D                                          const QStringList &args )
=2D{
=2D    if ( strcmp( classname, "KOCRDialog" ) !=3D 0 )
=2D        return 0;
=2D
=2D    if ( parent && !parent->isWidgetType() )
=2D       return 0;
=2D
=2D    Q_UNUSED( args );
=2D
=2D    return createDialog( static_cast<QWidget *>( parent ) );
=2D}
=2D
=2Dvoid KOCRDialogFactory::setName(const QByteArray &componentName)
=2D{
=2D    d->m_componentData =3D KComponentData(componentName);
=2D}
=2D
=2Dconst KComponentData &KOCRDialogFactory::componentData() const
=2D{
=2D    return d->m_componentData;
=2D}
=2D
=2D
=20
 #include "kscan.moc"
Index: kdelibs/kio/kio/kscan.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- kdelibs/kio/kio/kscan.h	(revision 708118)
+++ kdelibs/kio/kio/kscan.h	(working copy)
@@ -56,9 +56,6 @@ class QImage;
  * This will create and show a non-modal scanning dialog. Connect to more
  * signals if you like.
  *
=2D * If you implement an own scan-dialog, you also have to implement a
=2D * KScanDialogFactory.
=2D *
  * @short A baseclass and accessor for Scanning Dialogs
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
@@ -168,54 +165,6 @@ private:
=20
=20
 /**
=2D * A factory for creating a KScanDialog. You need to reimplement
=2D * createDialog().
=2D * @short Factory for creating KScanDialogs
=2D */
=2Dclass KIO_EXPORT KScanDialogFactory : public KPluginFactory
=2D{
=2Dpublic:
=2D    virtual ~KScanDialogFactory();
=2D
=2D    /**
=2D     * Your library should reimplement this method to return your KScanD=
ialog
=2D     * derived dialog.
=2D     * @param parent the QWidget's parent, or 0
=2D     */
=2D    virtual KScanDialog * createDialog( QWidget *parent=3D0 ) =3D 0;
=2D
=2Dprotected:
=2D    /**
=2D     * Creates a new KScanDialogFactory.
=2D     * @param parent the QWidget's parent, or 0
=2D     */
=2D    KScanDialogFactory( const char *componentName =3D 0,
=2D                        const char *catalogName =3D 0,
=2D                        QObject *parent =3D 0 );
=2D
=2D    virtual QObject* createObject( QObject* parent =3D 0,
=2D                                   const char* classname =3D "QObject",
=2D                                   const QStringList &args =3D QStringLi=
st() );
=2D
=2D
=2D    /**
=2D     * Creates a new instance with the given name.
=2D     * @param componentName the name of the instance
=2D     */
=2D    void setName(const QByteArray &componentName);
=2D
=2D    /**
=2D     * Returns the instance.
=2D     * @return the KComponentData
=2D     */
=2D    const KComponentData &componentData() const;
=2D
=2Dprivate:
=2D    class KScanDialogFactoryPrivate;
=2D    KScanDialogFactoryPrivate * const d;
=2D};
=2D
=2D/**
  * Base class for OCR Dialogs.
  */
 class KIO_EXPORT KOCRDialog : public KPageDialog
@@ -286,56 +235,4 @@ private:
 };
=20
=20
=2D/**
=2D * A factory for creating a KOCRDialog. You need to reimplement
=2D * createDialog().
=2D * @short Factory for creating KScanDialogs
=2D */
=2Dclass KIO_EXPORT KOCRDialogFactory : public KPluginFactory
=2D{
=2Dpublic:
=2D    virtual ~KOCRDialogFactory();
=2D
=2D    /**
=2D     * Your library should reimplement this method to return your KOCRDi=
alog
=2D     * derived dialog.
=2D     * @param parent the QWidget's parent, or 0
=2D     * @param modal if true the dialog is model
=2D     */
=2D    virtual KOCRDialog * createDialog( QWidget *parent=3D0,
=2D					bool modal=3Dfalse ) =3D 0;
=2D
=2Dprotected:
=2D    /**
=2D     * Creates a new KScanDialogFactory.
=2D     * @param parent the QWidget's parent, or 0
=2D     */
=2D
=2D    KOCRDialogFactory( const char *componentName =3D 0,
=2D                       const char *catalogName =3D 0,
=2D                       QObject *parent =3D 0 );
=2D
=2D    virtual QObject* createObject( QObject* parent =3D 0,
=2D                                   const char* classname =3D "QObject",
=2D                                   const QStringList &args =3D QStringLi=
st() );
=2D
=2D
=2D    /**
=2D     * Creates a new instance with the given name.
=2D     * @param componentName the name of the instance
=2D     */
=2D    void setName(const QByteArray &componentName);
=2D
=2D    /**
=2D     * Returns the instance.
=2D     * @return the KComponentData
=2D     */
=2D    const KComponentData &componentData() const;
=2D
=2Dprivate:
=2D    class KOCRDialogFactoryPrivate;
=2D    KOCRDialogFactoryPrivate * const d;
=2D};
=2D
=2D
 #endif // KSCAN_H
Index: kdegraphics/libkscan/scandialog.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- kdegraphics/libkscan/scandialog.cpp	(revision 708154)
+++ kdegraphics/libkscan/scandialog.cpp	(working copy)
@@ -48,27 +48,14 @@
=20
 #define SCANDIA_SPLITTER_SIZES "ScanDialogSplitter %1"
=20
=2DK_EXPORT_PLUGIN(ScanDialogFactory("kscan", "libkscan"))
=2D
=2DScanDialogFactory::ScanDialogFactory( const char *componentName,
=2D                                      const char *catalogName,
=2D                                      QObject *parent )
=2D    : KScanDialogFactory( componentName, catalogName, parent )
=2D{
=2D    setName( "ScanDialogFactory" );
=2D    //KGlobal::locale()->insertCatalog( QString::fromLatin1("libkscan") =
);
=2D}
=2D
=2DKScanDialog * ScanDialogFactory::createDialog( QWidget *parent)
=2D{
=2D    return new ScanDialog( parent );
=2D}
+K_PLUGIN_FACTORY( ScanDialogFactory, registerPlugin<ScanDialog>(); )
+K_EXPORT_PLUGIN( ScanDialogFactory("kscan", "libkscan") )
=20
=20
 ///////////////////////////////////////////////////////////////////
=20
=20
=2DScanDialog::ScanDialog( QWidget *parent )
+ScanDialog::ScanDialog( QWidget *parent, const QVariantList & )
    : KScanDialog( Tabbed, Close|Help, parent ),
      good_scan_connect(false)
 {
Index: kdegraphics/libkscan/scandialog.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- kdegraphics/libkscan/scandialog.h	(revision 708154)
+++ kdegraphics/libkscan/scandialog.h	(working copy)
@@ -34,7 +34,7 @@ class ScanDialog : public KScanDialog
    Q_OBJECT
=20
 public:
=2D   ScanDialog( QWidget *parent =3D 0 );
+   ScanDialog( QWidget *parent =3D 0, const QVariantList &args =3D QVarian=
tList() );
    ~ScanDialog();
=20
    virtual bool setup();
@@ -68,17 +68,5 @@ private:
    ScanDialogPrivate *d;
 };
=20
=2Dclass ScanDialogFactory : public KScanDialogFactory
=2D{
=2Dpublic:
=2D   ScanDialogFactory( const char *componentName =3D 0,
=2D                      const char *catalogName =3D 0,
=2D                      QObject *parent=3D0 );
=2D
=2Dprotected:
=2D   virtual KScanDialog * createDialog( QWidget *parent=3D0 );
=2D
=2D
=2D};
=20
 #endif // SCAN_H

--Boundary-01=_LAK3GcI1LzLyZ9v--

--nextPart2364400.UoykAey99O
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)

iD8DBQBG3KALBRauKLutZ9ARAg2mAKChlc8QSxDRhh9usWdGte0j3P4qiwCfaynN
gBsX3UYmNOdaKIEQ7I4olDk=
=EYcl
-----END PGP SIGNATURE-----

--nextPart2364400.UoykAey99O--