TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

1 files changed, 6 insertions, 5 deletions

diff --git a/kbabel/commonui/toolaction.h b/kbabel/commonui/toolaction.h
index 7159aaf2..064b8981 100644
--- a/kbabel/commonui/toolaction.h
+++ b/kbabel/commonui/toolaction.h
@@ -18,11 +18,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -42,15 +42,16 @@ class KActionCollection;
 class KDE_EXPORT ToolAction : public KAction
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * parent = 0, const char * name = 0);
+    ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * tqparent = 0, const char * name = 0);
 
     /**
     * return the list of KActions created for a list of tools. @ref command
     * allows to specify rescriction of commands, for which the list should
     * or shouldn't be created according to the @ref excludeCommand flag.
     */
-    static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent=0, const TQString& namePrefix=TQString::null );
+    static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* tqparent=0, const TQString& namePrefix=TQString() );
     
     /**
     * returns information about all available validation tools (KDataTools with support for CatalogItem