TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

4 files changed, 15 insertions, 13 deletions

diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp
index f669308..3ee1f91 100644
--- a/konq-plugins/validators/plugin_validators.cpp
+++ b/konq-plugins/validators/plugin_validators.cpp
@@ -44,9 +44,9 @@ static const KAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Pa
 K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin,
 	                    PluginValidatorsFactory( &aboutdata ) )
 
-PluginValidators::PluginValidators( TQObject* parent, const char* name,
+PluginValidators::PluginValidators( TQObject* tqparent, const char* name,
                                     const TQStringList & )
-  : Plugin( parent, name ), m_configDialog(0), m_part(0)
+  : Plugin( tqparent, name ), m_configDialog(0), m_part(0)
 {
   setInstance(PluginValidatorsFactory::instance());
 
@@ -71,14 +71,14 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
 
   m_menu->setEnabled( false );
 
-  if ( parent && parent->inherits( "KHTMLPart" ))
+  if ( tqparent && tqparent->inherits( "KHTMLPart" ))
     {
       m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ),
 				   "configure", 0,
 				   this, TQT_SLOT(slotConfigure()),
 				   actionCollection(), "configure") );
 
-      m_part = static_cast<KHTMLPart *>( parent );
+      m_part = static_cast<KHTMLPart *>( tqparent );
       m_configDialog = new ValidatorsDialog( m_part->widget() );
       setURLs();
 
@@ -90,7 +90,7 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
 PluginValidators::~PluginValidators()
 {
   delete m_configDialog;
-// Dont' delete the action. KActionCollection as parent does the job already
+// Dont' delete the action. KActionCollection as tqparent does the job already
 // and not deleting it at this point also ensures that in case we are not unplugged
 // from the GUI yet and the ~KXMLGUIClient destructor will do so it won't hit a
 // dead pointer. The kxmlgui factory keeps references to the actions, but it does not
@@ -140,8 +140,8 @@ void PluginValidators::slotConfigure()
 
 void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl)
 {
-  // The parent is assumed to be a KHTMLPart
-  if ( !parent()->inherits("KHTMLPart") )
+  // The tqparent is assumed to be a KHTMLPart
+  if ( !tqparent()->inherits("KHTMLPart") )
     {
       TQString title = i18n( "Cannot Validate Source" );
       TQString text = i18n( "You cannot validate anything except web pages with "
@@ -181,10 +181,10 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl)
         {
           KMessageBox::sorry(
           	m_part->widget(),
-          	i18n("<qt>The selected URL cannot be verified because it contains "
+          	i18n("<qt>The selected URL cannot be verified because it tqcontains "
           	     "a password. Sending this URL to <b>%1</b> would put the security "
           	     "of <b>%2</b> at risk.</qt>")
-          	     .arg(validatorUrl.host()).arg(partUrl.host()));
+          	     .tqarg(validatorUrl.host()).tqarg(partUrl.host()));
           return;
         }
       // Set entered URL as a parameter
diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h
index 2363ddb..6743d99 100644
--- a/konq-plugins/validators/plugin_validators.h
+++ b/konq-plugins/validators/plugin_validators.h
@@ -41,8 +41,9 @@ class KURL;
 class PluginValidators : public KParts::Plugin
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  PluginValidators( TQObject* parent, const char* name,
+  PluginValidators( TQObject* tqparent, const char* name,
                     const TQStringList & );
   virtual ~PluginValidators();
 
diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp
index 864de55..bd0e4d9 100644
--- a/konq-plugins/validators/validatorsdialog.cpp
+++ b/konq-plugins/validators/validatorsdialog.cpp
@@ -29,8 +29,8 @@
 #include "validatorsdialog.h"
 #include "validatorsdialog.moc"
 
-ValidatorsDialog::ValidatorsDialog(TQWidget *parent,  const char *name )
-  : KDialogBase( parent, name, false, i18n("Configure"), Ok|Cancel, Ok, true )
+ValidatorsDialog::ValidatorsDialog(TQWidget *tqparent,  const char *name )
+  : KDialogBase( tqparent, name, false, i18n("Configure"), Ok|Cancel, Ok, true )
 {
   setCaption(i18n("Configure Validating Servers"));
   setMinimumWidth(300);
diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h
index 4fe9714..345323a 100644
--- a/konq-plugins/validators/validatorsdialog.h
+++ b/konq-plugins/validators/validatorsdialog.h
@@ -28,9 +28,10 @@
 class ValidatorsDialog : public KDialogBase
 {
  Q_OBJECT
+  TQ_OBJECT
 
  public:
-  ValidatorsDialog(TQWidget *parent=0, const char *name=0 );
+  ValidatorsDialog(TQWidget *tqparent=0, const char *name=0 );
   ~ValidatorsDialog();
 
   const TQString getWWWValidatorUrl() const {return m_WWWValidatorCB->currentText();}