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, 5 insertions, 5 deletions

diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp
index feb193eb..425f01fe 100644
--- a/umbrello/umbrello/dialogs/assocpage.cpp
+++ b/umbrello/umbrello/dialogs/assocpage.cpp
@@ -14,7 +14,7 @@
 #include <klocale.h>
 #include "assocpropdlg.h"
 
-AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(parent) {
+AssocPage::AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o) : TQWidget(tqparent) {
     m_pObject = o;
     m_pView = v;
     int margin = fontMetrics().height();
@@ -25,12 +25,12 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa
     m_pAssocGB = new TQGroupBox(i18n("Associations"), this);
     mainLayout -> addWidget(m_pAssocGB);
 
-    TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB);
-    layout -> setSpacing(10);
-    layout -> setMargin(margin);
+    TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pAssocGB);
+    tqlayout -> setSpacing(10);
+    tqlayout -> setMargin(margin);
 
     m_pAssocLB = new TQListBox(m_pAssocGB);
-    layout -> addWidget(m_pAssocLB);
+    tqlayout -> addWidget(m_pAssocLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;