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, 21 insertions, 20 deletions

diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index 9dfa53c..1816b08 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "konqmficon.h"
@@ -41,11 +41,11 @@ typedef KGenericFactory<KonqMFIcon> KonqMFIconFactory;
 K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon,
                            KonqMFIconFactory("mfkonqmficon"))
 
-KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &)
-: KParts::Plugin(parent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) {
+KonqMFIcon::KonqMFIcon(TQObject *tqparent, const char *name, const TQStringList &)
+: KParts::Plugin(tqparent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) {
 	KGlobal::locale()->insertCatalogue("mf_konqplugin");
 
-	m_part = dynamic_cast<KHTMLPart*>(parent);
+	m_part = dynamic_cast<KHTMLPart*>(tqparent);
 	if (!m_part) { 
 		kdDebug() << "couldn't get part" << endl;
 		return;
@@ -157,7 +157,7 @@ void KonqMFIcon::extractCard(DOM::Node node) {
 
 	if (!name.isEmpty()) {
 		value += "END:VCARD\n";
-		_cards.append(qMakePair(name, value));
+		_cards.append(tqMakePair(name, value));
 	}
 }
 
@@ -202,7 +202,7 @@ void KonqMFIcon::extractEvent(DOM::Node node) {
 
 	if (!name.isEmpty()) {
 		value += "END:VEVENT\nEND:VCALENDAR\n";
-		_events.append(qMakePair(name, value));
+		_events.append(tqMakePair(name, value));
 	}
 }
 
@@ -249,11 +249,11 @@ void KonqMFIcon::contextMenu() {
 	m_menu->insertTitle(i18n("Microformats"));
 	connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int)));
 	int id = 0;
-	for (TQValueList<QPair<TQString, TQString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) {
+	for (TQValueList<TQPair<TQString, TQString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) {
 		m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id);
 		id++;
 	}
-	for (TQValueList<QPair<TQString, TQString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) {
+	for (TQValueList<TQPair<TQString, TQString> >::ConstIterator it = _cards.begin(); it != _cards.end(); ++it) {
 		m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id);
 		id++;
 	}
@@ -275,7 +275,7 @@ void KonqMFIcon::addMFIcon() {
 
 	m_mfIcon = new KURLLabel(m_statusBarEx->statusBar());
 	m_mfIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small));
-	m_mfIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+	m_mfIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
 	m_mfIcon->setUseCursor(false);
 	//FIXME hackish
 	m_mfIcon->setPixmap(TQPixmap(locate("data", "microformat/pics/microformat.png")));
diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h
index 5a9e02c..8213f8f 100644
--- a/konq-plugins/microformat/konqmficon.h
+++ b/konq-plugins/microformat/konqmficon.h
@@ -17,12 +17,12 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
-#ifndef KONQFEEDICON_H
-#define KONQFEEDICON_H
+#ifndef KONTQFEEDICON_H
+#define KONTQFEEDICON_H
 
 #include <khtml_part.h>
 #include <kparts/plugin.h>
@@ -41,8 +41,9 @@ namespace KParts {
 
 class KonqMFIcon : public KParts::Plugin, PluginBase {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		KonqMFIcon(TQObject *parent, const char *name, const TQStringList &);
+		KonqMFIcon(TQObject *tqparent, const char *name, const TQStringList &);
 
 		~KonqMFIcon();
 
@@ -56,7 +57,7 @@ class KonqMFIcon : public KParts::Plugin, PluginBase {
 		KURLLabel *m_mfIcon;
 		KParts::StatusBarExtension *m_statusBarEx;
 		TQGuardedPtr<KPopupMenu> m_menu;
-		TQValueList<QPair<TQString, TQString> > _events, _cards;
+		TQValueList<TQPair<TQString, TQString> > _events, _cards;
 
 	private slots:
 		void waitPartToLoad();
diff --git a/konq-plugins/microformat/pluginbase.cpp b/konq-plugins/microformat/pluginbase.cpp
index 486721a..f722340 100644
--- a/konq-plugins/microformat/pluginbase.cpp
+++ b/konq-plugins/microformat/pluginbase.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <kprocess.h>
diff --git a/konq-plugins/microformat/pluginbase.h b/konq-plugins/microformat/pluginbase.h
index 17a504d..a786af5 100644
--- a/konq-plugins/microformat/pluginbase.h
+++ b/konq-plugins/microformat/pluginbase.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef PLUGINBASE_H