TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


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

1 files changed, 10 insertions, 10 deletions

diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h
index 4d448644..0617d977 100644
--- a/kdevdesigner/designer/resource.h
+++ b/kdevdesigner/designer/resource.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** 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
 ** 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
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -44,7 +44,7 @@ class TQPalette;
 class FormWindow;
 class MainWindow;
 class TQDomElement;
-class QDesignerGridLayout;
+class TQDesignerGridLayout;
 class TQListViewItem;
 class TQMainWindow;
 struct LanguageInterface;
@@ -77,7 +77,7 @@ public:
 
     bool save( const TQString& filename, bool formCodeOnly = FALSE);
     bool save( TQIODevice* );
-    void paste( const TQString &cb, TQWidget *parent );
+    void paste( const TQString &cb, TQWidget *tqparent );
 
     static void saveImageData( const TQImage &img, TQTextStream &ts, int indent );
     static void loadCustomWidgets( const TQDomElement &e, Resource *r );
@@ -86,7 +86,7 @@ public:
     static bool saveFormCode( FormFile *formfile, LanguageInterface *langIface );
 
 private:
-    void saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStream &ts, int indent );
+    void saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStream &ts, int indent );
     void saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent );
     void saveObjectProperties( TQObject *w, TQTextStream &ts, int indent );
     void saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type t, TQTextStream &ts, int indent );
@@ -111,8 +111,8 @@ private:
     void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent );
     void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent );
 
-    TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 );
-    TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o );
+    TQObject *createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout = 0 );
+    TQWidget *createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o );
     void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
     void createColumn( const TQDomElement &e, TQWidget *widget );
     void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e);
@@ -125,7 +125,7 @@ private:
     void loadTabOrder( const TQDomElement &e );
     void loadItem( const TQDomElement &n, TQPixmap &pix, TQString &txt, bool &hasPixmap );
     void loadActions( const TQDomElement &n );
-    void loadChildAction( TQObject *parent, const TQDomElement &e );
+    void loadChildAction( TQObject *tqparent, const TQDomElement &e );
     void loadToolBars( const TQDomElement &n );
     void loadMenuBar( const TQDomElement &n );
     void loadPopupMenu( PopupMenuEditor *pm, const TQDomElement &e );