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, 17 insertions, 15 deletions

diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp
index c18c061..9d0fdb3 100644
--- a/konq-plugins/adblock/adblock.cpp
+++ b/konq-plugins/adblock/adblock.cpp
@@ -56,11 +56,11 @@ using namespace DOM;
 typedef KGenericFactory<AdBlock> AdBlockFactory;
 K_EXPORT_COMPONENT_FACTORY( libadblock, AdBlockFactory( "adblock" ) )
 
-AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) :
-    KParts::Plugin(parent, name),
+AdBlock::AdBlock(TQObject *tqparent, const char *name, const TQStringList &) :
+    KParts::Plugin(tqparent, name),
     m_label(0), m_menu(0)
 {
-    m_part = dynamic_cast<KHTMLPart *>(parent);
+    m_part = dynamic_cast<KHTMLPart *>(tqparent);
     if(!m_part) { kdDebug() << "couldn't get KHTMLPart" << endl; return; }           
 
     m_menu = new KPopupMenu(m_part->widget());
@@ -95,7 +95,7 @@ void AdBlock::initLabel()
     KIconLoader *loader = instance()->iconLoader();
 
     m_label->setFixedHeight(loader->currentSize(KIcon::Small));
-    m_label->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    m_label->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     m_label->setUseCursor(false);
     m_label->setPixmap(loader->loadIcon("filter", KIcon::Small));
 
@@ -176,7 +176,7 @@ void AdBlock::fillWithImages(AdElementList &elements)
 	if (!url.isEmpty() && url != m_part->baseURL().url())
 	{
 	    AdElement element(url, "image", "IMG", false);
-	    if (!elements.contains( element )) 
+	    if (!elements.tqcontains( element )) 
 		elements.append( element);
 	}
     }
@@ -203,7 +203,7 @@ void AdBlock::fillWithHtmlTag(AdElementList &elements,
 	if (!url.isEmpty() && url != m_part->baseURL().url())
 	{
 	    AdElement element(url, tagName.string(), category, false);
-	    if (!elements.contains( element )) 
+	    if (!elements.tqcontains( element )) 
 		elements.append( element);
 	}
     }
diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h
index 0a9b15b..87c1e5d 100644
--- a/konq-plugins/adblock/adblock.h
+++ b/konq-plugins/adblock/adblock.h
@@ -18,8 +18,8 @@
   02110-1301, USA.
 */
 
-#ifndef KONQ_ADBLOCK_H
-#define KONQ_ADBLOCK_H
+#ifndef KONTQ_ADBLOCK_H
+#define KONTQ_ADBLOCK_H
 
 #include <tqguardedptr.h>
 #include <tqvaluelist.h>
@@ -46,9 +46,10 @@ typedef TQValueList<AdElement> AdElementList;
 class AdBlock : public KParts::Plugin
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    AdBlock(TQObject *parent, const char *name, const TQStringList &);
+    AdBlock(TQObject *tqparent, const char *name, const TQStringList &);
     ~AdBlock();
     
 private:
diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp
index 1aff0f6..d4e0140 100644
--- a/konq-plugins/adblock/adblockdialogue.cpp
+++ b/konq-plugins/adblock/adblockdialogue.cpp
@@ -32,8 +32,8 @@
 #include <tqfont.h>
 #include <tqpainter.h>
 
-AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) :
-    KDialogBase( parent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true )
+AdBlockDlg::AdBlockDlg(TQWidget *tqparent, AdElementList &elements) :
+    KDialogBase( tqparent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true )
 {
     TQVBox *page = makeVBoxMainWidget();
     m_label1 = new TQLabel( i18n("All blockable items in this page:"), page, "label1" );
diff --git a/konq-plugins/adblock/adblockdialogue.h b/konq-plugins/adblock/adblockdialogue.h
index 0890d09..b0e397f 100644
--- a/konq-plugins/adblock/adblockdialogue.h
+++ b/konq-plugins/adblock/adblockdialogue.h
@@ -17,8 +17,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef KONQ_ADBLOCKDLG_H
-#define KONQ_ADBLOCKDLG_H
+#ifndef KONTQ_ADBLOCKDLG_H
+#define KONTQ_ADBLOCKDLG_H
 
 #include <kdialogbase.h>
 #include <tqlistview.h>
@@ -30,6 +30,7 @@ class KPopupMenu;
 class AdBlockDlg : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 private:
     TQLineEdit *m_filter;
@@ -39,7 +40,7 @@ private:
     KPopupMenu *m_menu;
 
 public:
-    AdBlockDlg(TQWidget *parent, AdElementList &elements);
+    AdBlockDlg(TQWidget *tqparent, AdElementList &elements);
     ~AdBlockDlg();
 
 private slots:
@@ -55,7 +56,7 @@ signals:
 
 // ----------------------------------------------------------------------------
 
-class ListViewItem : public QListViewItem
+class ListViewItem : public TQListViewItem
 {
 private:
     bool m_blocked;