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

1 files changed, 11 insertions, 11 deletions

diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp
index 63fd1e58..818df7ac 100644
--- a/quanta/dialogs/filecombo.cpp
+++ b/quanta/dialogs/filecombo.cpp
@@ -29,13 +29,13 @@
 #include "filecombo.h"
 #include "qextfileinfo.h"
 
-FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name )
-  :TQWidget(parent,name)
+FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *tqparent, const char *name )
+  :TQWidget(tqparent,name)
 {
   baseURL = a_baseURL;
   m_absolutePath = false;
 
-  TQHBoxLayout *layout = new TQHBoxLayout(this);
+  TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
 
   combo   = new TQComboBox(true,this);
   combo->setEditable(true);
@@ -44,8 +44,8 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name )
   button  ->setFixedSize(35,25);
   button  ->setText(i18n("..."));
 
-  layout  ->addWidget( combo );
-  layout  ->addWidget( button );
+  tqlayout  ->addWidget( combo );
+  tqlayout  ->addWidget( button );
 
   connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) );
   connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&)));
@@ -53,12 +53,12 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name )
   setFocusProxy(combo);
 }
 
-FileCombo::FileCombo( TQWidget *parent, const char *name )
-   :TQWidget( parent, name )
+FileCombo::FileCombo( TQWidget *tqparent, const char *name )
+   :TQWidget( tqparent, name )
 {
   baseURL.setPath(".");
 
-  TQHBoxLayout *layout = new TQHBoxLayout(this);
+  TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
 
   combo   = new TQComboBox(true,this);
   button  = new TQPushButton(this);
@@ -66,8 +66,8 @@ FileCombo::FileCombo( TQWidget *parent, const char *name )
   button  ->setFixedSize(35,25);
   button  ->setText(i18n("..."));
 
-  layout  ->addWidget( combo );
-  layout  ->addWidget( button );
+  tqlayout  ->addWidget( combo );
+  tqlayout  ->addWidget( button );
 
   connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) );
   connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&)));
@@ -97,7 +97,7 @@ void FileCombo::slotFileSelect()
   delete dlg;
   if ( !url.isEmpty() )
   {
-    if (!m_absolutePath) url = QExtFileInfo::toRelative(url, baseURL);
+    if (!m_absolutePath) url = TQExtFileInfo::toRelative(url, baseURL);
     combo->setEditText( url.path() );
   }
 }