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

diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp
index e316d69e..bf4af7ea 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -110,16 +110,16 @@ static const char* const update_xpm_data[] =
 const char **update_xpm = (const char **)update_xpm_data;
 
 
-InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag)
-    : TQWidget(parent), state(flag), key(k)
+InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * tqparent, bool &flag)
+    : TQWidget(tqparent), state(flag), key(k)
 {
-    TQHBoxLayout *layout = new TQHBoxLayout(this);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
     cb = new TQCheckBox(text,this);
 
     init();
 
-    layout->addWidget(cb);
-    layout->addStretch(1);
+    tqlayout->addWidget(cb);
+    tqlayout->addStretch(1);
     
     connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool)));
 }
@@ -151,19 +151,19 @@ void InputBool::setEnabled(bool b)
 }
 
 
-InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal)
-    : TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
+InputInt::InputInt(const TQString &label, TQWidget *tqparent, int &val, int minVal, int maxVal)
+    : TQWidget(tqparent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
 {
-    TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
     
     sp = new TQSpinBox(minVal, maxVal, 1, this);
     lab = new TQLabel(sp, label+":", this);
     
     init();
   
-    layout->addWidget(lab);
-    layout->addWidget(sp);
-    layout->addStretch(1);
+    tqlayout->addWidget(lab);
+    tqlayout->addWidget(sp);
+    tqlayout->addStretch(1);
 
     connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
 }
@@ -175,8 +175,8 @@ InputInt::~InputInt()
 
 void InputInt::init()
 {
-    m_val = QMAX(m_minVal, m_val);
-    m_val = QMIN(m_maxVal, m_val);
+    m_val = TQMAX(m_minVal, m_val);
+    m_val = TQMIN(m_maxVal, m_val);
     sp->setValue(m_val);
 }
 
@@ -197,31 +197,31 @@ void InputInt::setEnabled(bool state)
 
 
 InputString::InputString(const TQString & label, 
-                         TQWidget *parent, TQCString &s, StringMode m)
-    : TQWidget(parent), str(s), sm(m), m_values(0), m_index(0)
+                         TQWidget *tqparent, TQCString &s, StringMode m)
+    : TQWidget(tqparent), str(s), sm(m), m_values(0), m_index(0)
 {
     le = 0; br = 0; com = 0;
     
     if (m == StringFixed) {
-        TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
+        TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
         com = new TQComboBox(this); 
 	lab = new TQLabel(com,label+":", this);
-	layout->addWidget(lab);
-        layout->addWidget(com);
-        layout->addStretch(1);
+	tqlayout->addWidget(lab);
+        tqlayout->addWidget(com);
+        tqlayout->addStretch(1);
     } else {
-        TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
+        TQGridLayout *tqlayout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
         le = new KLineEdit(this);
 	lab = new TQLabel(le,label+":", this);
-	layout->addWidget(lab, 0, 0);
+	tqlayout->addWidget(lab, 0, 0);
         le->setText(s);
-        layout->addWidget(le, 0, 1);
+        tqlayout->addWidget(le, 0, 1);
         
         if (m == StringFile || m == StringDir) {
             br = new TQPushButton(this);
             br->setPixmap(SmallIcon(m==StringFile? "document" : "folder"));
             TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder"));
-            layout->addWidget(br, 0, 2);
+            tqlayout->addWidget(br, 0, 2);
         }
     }
     
@@ -245,7 +245,7 @@ InputString::~InputString()
 void InputString::init()
 {
     if (sm == StringFixed) {
-        int *itemIndex = m_values->find(str);
+        int *itemIndex = m_values->tqfind(str);
         if (itemIndex) 
             com->setCurrentItem(*itemIndex);
         else
@@ -324,32 +324,32 @@ void InputString::browse()
 
 
 InputStrList::InputStrList(const TQString & label, 
-                           TQWidget *parent, TQStrList &sl, ListMode lm)
-    : TQWidget(parent), strList(sl)
+                           TQWidget *tqparent, TQStrList &sl, ListMode lm)
+    : TQWidget(tqparent), strList(sl)
 {
-    TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5);
+    TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5);
     
-    TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */
-    TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5);
+    TQWidget *dw = new TQWidget(this); /* dummy widget used for tqlayouting */
+    TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5);
     le  = new KLineEdit(dw);
     lab = new TQLabel(le,label+":", this );
-    layout->addWidget(lab, 0, 0);
-    boxlayout->addWidget(le, 1);
+    tqlayout->addWidget(lab, 0, 0);
+    boxtqlayout->addWidget(le, 1);
 
     add = new TQPushButton(dw);
     add->setPixmap(TQPixmap( add_xpm ));
     TQToolTip::add(add, i18n("Add item"));
-    boxlayout->addWidget(add);
+    boxtqlayout->addWidget(add);
     
     del = new TQPushButton(dw);
     del->setPixmap(TQPixmap( del_xpm ));
     TQToolTip::add(del, i18n("Delete selected item"));
-    boxlayout->addWidget(del);
+    boxtqlayout->addWidget(del);
 
     upd = new TQPushButton(dw); 
     upd->setPixmap(TQPixmap( update_xpm ));
     TQToolTip::add(upd, i18n("Update selected item"));
-    boxlayout->addWidget(upd);
+    boxtqlayout->addWidget(upd);
     
     lb  = new TQListBox(this);
     lb->setMinimumSize(400, 100);
@@ -364,17 +364,17 @@ InputStrList::InputStrList(const TQString & label,
             brFile = new TQPushButton(dw);
             brFile->setPixmap(SmallIcon("document"));
             TQToolTip::add(brFile, i18n("Browse to a file"));
-            boxlayout->addWidget(brFile);
+            boxtqlayout->addWidget(brFile);
         } 
         if (lm & ListDir) {
             brDir = new TQPushButton(dw);
             brDir->setPixmap(SmallIcon("folder"));
             TQToolTip::add(brDir, i18n("Browse to a folder"));
-            boxlayout->addWidget(brDir);
+            boxtqlayout->addWidget(brDir);
         }
     }
-    layout->addWidget(dw, 0, 1);
-    layout->addWidget(lb, 1, 1);
+    tqlayout->addWidget(dw, 0, 1);
+    tqlayout->addWidget(lb, 1, 1);
     
     connect( le,   TQT_SIGNAL(returnPressed()), 
              this, TQT_SLOT(addString()) );