TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


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

1 files changed, 12 insertions, 11 deletions

diff --git a/kommander/plugin/kommanderplugin.h b/kommander/plugin/kommanderplugin.h
index d74abaa4..ae06fdc0 100644
--- a/kommander/plugin/kommanderplugin.h
+++ b/kommander/plugin/kommanderplugin.h
@@ -1,29 +1,29 @@
 /****************************************************************************
-  ** kommanderplugin.h - KommanderPlugin class definition created from QWidgetPlugin
+  ** kommanderplugin.h - KommanderPlugin class definition created from TQWidgetPlugin
   ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
   ** Copyright (C) 2003 Marc Britton
   **
-  ** This file is part of the widgets module of the Qt GUI Toolkit.
+  ** This file is part of the widgets module of the TQt GUI Toolkit.
   **
   ** This file may be distributed under the terms of the Q Public License
   ** as defined by Trolltech AS of Norway and appearing in the file
-  ** LICENSE.QPL included in the packaging of this file.
+  ** LICENSE.TQPL included in the packaging of this file.
   **
   ** This file may be distributed and/or modified under the terms of the
   ** GNU General Public License version 2 as published by the Free Software
   ** Foundation and appearing in the file LICENSE.GPL included in the
   ** packaging of this file.
   **
-  ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-  ** licenses may use this file in accordance with the Qt Commercial License
+  ** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+  ** licenses may use this file in accordance with the TQt Commercial License
   ** Agreement provided with the Software.
   **
   ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
   ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   **
   ** See http://www.trolltech.com/pricing.html or email [email protected] for
-  **   information about Qt Commercial License Agreements.
-  ** See http://www.trolltech.com/qpl/ for QPL licensing information.
+  **   information about TQt Commercial License Agreements.
+  ** See http://www.trolltech.com/qpl/ for TQPL licensing information.
   ** See http://www.trolltech.com/gpl/ for GPL licensing information.
   **
   ** Contact [email protected] if any conditions of this licensing are
@@ -45,15 +45,16 @@ class TQIconSet;
 class KOMMANDER_EXPORT KommanderPlugin : public TQObject 
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
     KommanderPlugin();
     ~KommanderPlugin();
 
-    virtual void addWidget( const TQString &name, const TQString &group, const TQString &toolTip, TQIconSet *iconSet, const TQString &whatsThis = TQString::null, bool isContainer = false);
+    virtual void addWidget( const TQString &name, const TQString &group, const TQString &toolTip, TQIconSet *iconSet, const TQString &whatsThis = TQString(), bool isContainer = false);
     virtual void removeWidget( const TQString &name );
     virtual TQStringList widgets() const;
 
-    virtual TQWidget *create( const TQString &key, TQWidget *parent = 0, const char *name = 0 ) = 0;
+    virtual TQWidget *create( const TQString &key, TQWidget *tqparent = 0, const char *name = 0 ) = 0;
     virtual TQString group( const TQString &key ) const;
     virtual TQString toolTip( const TQString &key ) const;
     virtual TQString whatsThis( const TQString &key ) const;
@@ -75,7 +76,7 @@ class KOMMANDER_EXPORT KommanderPlugin : public TQObject
      * @param maxArgs maximum number of accepted arguments
      * @return true if registration was successful
      */
-    static bool registerFunction(int id, const TQString& function, const TQString description = TQString::null,
+    static bool registerFunction(int id, const TQString& function, const TQString description = TQString(),
     int minArgs = -1, int maxArgs = -1);
 
     
@@ -84,7 +85,7 @@ private:
     struct WidgetInfo
     {
       WidgetInfo() { }
-      WidgetInfo( const TQString &g, const TQString &t, TQIconSet *i, const TQString &w = TQString::null, bool c = false)
+      WidgetInfo( const TQString &g, const TQString &t, TQIconSet *i, const TQString &w = TQString(), bool c = false)
           : group( g ), toolTip( t ), iconSet(i), whatsThis( w ), isContainer( c )
       {}