Initial conversion for TQt for Qt4 3.4.0 TP2

This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase.  If it does then it needs to be fixed!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 8 insertions, 8 deletions

diff --git a/kdecore/kgenericfactory.h b/kdecore/kgenericfactory.h
index 0bdeaa846..e3f04ce66 100644
--- a/kdecore/kgenericfactory.h
+++ b/kdecore/kgenericfactory.h
@@ -62,7 +62,7 @@ protected:
     {
         if ( m_aboutData )
             return new KInstance( m_aboutData );
-        if ( !m_instanceName ) {
+        if ( m_instanceName.isEmpty() ) {
             kdWarning() << "KGenericFactory: instance requested but no instance name or about data passed to the constructor!" << endl;
             return 0;
         }
@@ -133,7 +133,7 @@ KInstance *KGenericFactoryBase<T>::instance()
  *                         const TQStringList &args);</code>
  *     <li>If the class is derived from KParts::Part then it needs to have
  *         a constructor like:
- *         <code>MyPart( TQWidget *parentWidget, const char *widgetName,
+ *         <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
  *                       TQObject *parent, const char *name,
  *                       const TQStringList &args );</code>
  * </ul>
@@ -190,8 +190,8 @@ protected:
                                   const char *className, const TQStringList &args )
     {
         KGenericFactoryBase<Product>::initializeMessageCatalogue();
-        return KDEPrivate::ConcreteFactory<Product, ParentType>
-            ::create( 0, 0, parent, name, className, args );
+        return TQT_TQOBJECT((KDEPrivate::ConcreteFactory<Product, ParentType>
+            ::create( 0, 0, parent, name, className, args )));
     }
 };
 
@@ -216,7 +216,7 @@ protected:
  *                         const TQStringList &args);</code>
  *     <li>If the class is derived from KParts::Part then it needs to have
  *         a constructor like:
- *         <code>MyPart( TQWidget *parentWidget, const char *widgetName,
+ *         <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
  *                       TQObject *parent, const char *name,
  *                       const TQStringList &args );</code>
  * </ul>
@@ -253,7 +253,7 @@ protected:
  *     {
  *         Q_ OBJECT
  *     public:
- *         MyDialogComponent( TQWidget *parentWidget, const char *name,
+ *         MyDialogComponent( TQWidget *tqparentWidget, const char *name,
  *                            const TQStringList &args );
  *         ...
  *     };
@@ -311,7 +311,7 @@ protected:
  *                         const TQStringList &args);</code>
  *     <li>If the class is derived from KParts::Part then it needs to have
  *         a constructor like:
- *         <code>MyPart( TQWidget *parentWidget, const char *widgetName,
+ *         <code>MyPart( TQWidget *tqparentWidget, const char *widgetName,
  *                       TQObject *parent, const char *name,
  *                       const TQStringList &args );</code>
  * </ul>
@@ -348,7 +348,7 @@ protected:
  *     {
  *         Q_ OBJECT
  *     public:
- *         MyDialogComponent( TQWidget *parentWidget, const char *name,
+ *         MyDialogComponent( TQWidget *tqparentWidget, const char *name,
  *                            const TQStringList &args );
  *         ...
  *     };