From e985f7e545f4739493965aad69bbecb136dc9346 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 16 Jun 2011 19:02:47 +0000
Subject: 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
---
 kommander/factory/kommanderfactory.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'kommander/factory/kommanderfactory.h')

diff --git a/kommander/factory/kommanderfactory.h b/kommander/factory/kommanderfactory.h
index ba3d7744..147749c2 100644
--- a/kommander/factory/kommanderfactory.h
+++ b/kommander/factory/kommanderfactory.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** 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
@@ -42,7 +42,7 @@ class KommanderPlugin;
 struct KommanderWidgetInfo
 {
     KommanderWidgetInfo() {}
-    KommanderWidgetInfo( const TQString &g, const TQString &t, TQIconSet *i, const TQString &w = TQString::null, bool c = FALSE )
+    KommanderWidgetInfo( 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 )
     {
     }
@@ -60,13 +60,13 @@ public:
     KommanderFactory();
     virtual ~KommanderFactory();
 
-    static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
-    static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
+    static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 );
+    static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 );
     static int loadPlugins( bool force = FALSE );
     static void addPlugin( KommanderPlugin *plugin );
     static void loadImages( const TQString &dir );
 
-    static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name );
+    static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name );
 
     static FeatureList featureList();
 private:
@@ -74,18 +74,18 @@ private:
     void loadImageCollection( const TQDomElement &e );
     void loadConnections( const TQDomElement &e, TQObject *connector );
     void loadTabOrder( const TQDomElement &e );
-    TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg );
-    TQLayout *createLayout( TQWidget *widget, TQLayout*  layout, LayoutType type );
-    LayoutType layoutType( TQLayout *l ) const;
+    TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg );
+    TQLayout *createLayout( TQWidget *widget, TQLayout*  tqlayout, LayoutType type );
+    LayoutType tqlayoutType( TQLayout *l ) const;
     void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e );
-    void createSpacer( const TQDomElement &e, TQLayout *layout );
+    void createSpacer( const TQDomElement &e, TQLayout *tqlayout );
     TQImage loadFromCollection( const TQString &name );
     TQPixmap loadPixmap( const TQDomElement &e );
     TQColorGroup loadColorGroup( const TQDomElement &e );
     void createColumn( const TQDomElement &e, TQWidget *widget );
     void loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap );
     void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
-    void loadChildAction( TQObject *parent, const TQDomElement &e );
+    void loadChildAction( TQObject *tqparent, const TQDomElement &e );
     void loadActions( const TQDomElement &e );
     void loadToolBars( const TQDomElement &e );
     void loadMenuBar( const TQDomElement &e );
@@ -109,7 +109,7 @@ private:
 	TQString name;
 	TQPixmap pix;
 	TQString field;
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Field& ) const { return FALSE; }
 #endif
     };
-- 
cgit v1.2.1