TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 13 insertions, 13 deletions

diff --git a/kdict/actions.cpp b/kdict/actions.cpp
index 2496d1b7..0ae5c793 100644
--- a/kdict/actions.cpp
+++ b/kdict/actions.cpp
@@ -24,9 +24,9 @@
 #include <ktoolbar.h>
 
 
-DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name,
+DictComboAction::DictComboAction( const TQString &text, TQObject *tqparent, const char *name,
                                   bool editable, bool autoSized )
-  : KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(KGlobalSettings::completionMode())
+  : KAction( text, 0, tqparent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(KGlobalSettings::completionMode())
 {
 }
 
@@ -46,7 +46,7 @@ int DictComboAction::plug( TQWidget *widget, int index )
     m_combo = new KComboBox(m_editable,bar);
     m_combo->setCompletionMode(m_compMode);
 
-    bar->insertWidget( id_, m_combo->sizeHint().width(), m_combo, index );
+    bar->insertWidget( id_, m_combo->tqsizeHint().width(), m_combo, index );
     bar->setItemAutoSized(id_,m_autoSized);
 
     if ( m_combo ) {
@@ -103,7 +103,7 @@ TQString DictComboAction::currentText() const
   if (m_combo)
     return m_combo->currentText();
   else
-    return TQString::null;
+    return TQString();
 }
 
 void DictComboAction::selectAll()
@@ -155,7 +155,7 @@ void DictComboAction::setList(TQStringList items)
     if (m_editable && m_combo->completionObject())
       m_combo->completionObject()->setItems(items);
     if (!m_autoSized)
-      m_combo->setFixedWidth(m_combo->sizeHint().width());
+      m_combo->setFixedWidth(m_combo->tqsizeHint().width());
   }
 }
 
@@ -193,8 +193,8 @@ void DictComboAction::slotComboActivated(const TQString &s)
 //*********************************************************************************
 
 
-DictLabelAction::DictLabelAction( const TQString &text, TQObject *parent, const char *name )
-  : KAction( text, 0, parent, name )
+DictLabelAction::DictLabelAction( const TQString &text, TQObject *tqparent, const char *name )
+  : KAction( text, 0, tqparent, name )
 {
 }
 
@@ -213,9 +213,9 @@ int DictLabelAction::plug( TQWidget *widget, int index )
     int id = KAction::getToolButtonID();
 
     TQLabel *label = new TQLabel( text(), widget,  "kde toolbar widget" );
-    label->setMinimumWidth(label->sizeHint().width());
-    label->setBackgroundMode( Qt::PaletteButton );
-    label->setAlignment(AlignCenter | AlignVCenter);
+    label->setMinimumWidth(label->tqsizeHint().width());
+    label->setBackgroundMode( TQt::PaletteButton );
+    label->tqsetAlignment(AlignCenter | AlignVCenter);
     label->adjustSize();
 
     tb->insertWidget( id, label->width(), label, index );
@@ -263,8 +263,8 @@ void DictLabelAction::setBuddy(TQWidget *buddy)
 
 
 DictButtonAction::DictButtonAction( const TQString& text, TQObject* receiver,
-                                    const char* slot, TQObject* parent, const char* name )
-  : KAction( text, 0, receiver, slot, parent, name )
+                                    const char* slot, TQObject* tqparent, const char* name )
+  : KAction( text, 0, receiver, slot, tqparent, name )
 {
 }
 
@@ -320,7 +320,7 @@ void DictButtonAction::unplug( TQWidget *widget )
 int DictButtonAction::widthHint()
 {
   if (m_button)
-    return m_button->sizeHint().width();
+    return m_button->tqsizeHint().width();
   else
     return 0;
 }