TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

1 files changed, 15 insertions, 10 deletions

diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h
index 11734d5..6bcffce 100644
--- a/kate/filetemplates/plugin/filetemplates.h
+++ b/kate/filetemplates/plugin/filetemplates.h
@@ -39,12 +39,13 @@
 class KatePluginFactory : public KLibFactory
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KatePluginFactory();
     virtual ~KatePluginFactory();
 
-    virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() );
+    virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   private:
     static KInstance* s_instance;
@@ -73,9 +74,10 @@ class KatePluginFactory : public KLibFactory
 class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KateFileTemplates( TQObject* parent = 0, const char* name = 0 );
+    KateFileTemplates( TQObject* tqparent = 0, const char* name = 0 );
     virtual ~KateFileTemplates();
 
     void addView (Kate::MainWindow *win);
@@ -100,14 +102,14 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface
     /**
      * @return a a pointer to the active main window
      */
-    TQWidget * parentWindow();
+    TQWidget * tqparentWindow();
 
   public slots:
     /**
      * Update the template collection by rereading the template
      * directories. Also updates the menu.
      */
-    void updateTemplateDirs(const TQString &s=TQString::null);
+    void updateTemplateDirs(const TQString &s=TQString());
 
   private slots:
     /**
@@ -154,11 +156,12 @@ class TemplateInfo;
 /**
  * This widget provide a GUI for editing template properties.
  */
-class KateTemplateInfoWidget : public QWidget
+class KateTemplateInfoWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KateTemplateInfoWidget( TQWidget *parent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 );
+    KateTemplateInfoWidget( TQWidget *tqparent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 );
     ~KateTemplateInfoWidget() {}
 
     TemplateInfo *info;
@@ -191,8 +194,9 @@ class KateTemplateWizard : public KWizard
 {
   friend class KateFileTemplates;
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KateTemplateWizard( TQWidget* parent, KateFileTemplates *ktf );
+    KateTemplateWizard( TQWidget* tqparent, KateFileTemplates *ktf );
     ~KateTemplateWizard() {}
 
   public slots:
@@ -227,11 +231,12 @@ class KateTemplateWizard : public KWizard
     class TQCheckBox *cbOpenTemplate;
 };
 
-class KateTemplateManager : public QWidget
+class KateTemplateManager : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KateTemplateManager( KateFileTemplates *kft=0, TQWidget *parent=0, const char *name=0 );
+    KateTemplateManager( KateFileTemplates *kft=0, TQWidget *tqparent=0, const char *name=0 );
     ~KateTemplateManager() {}
 
   public slots:
@@ -255,4 +260,4 @@ class KateTemplateManager : public QWidget
 };
 
 #endif // _PLUGIN_KATE_FILETEMPLATES_H_
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;