TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 108 insertions, 108 deletions

diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index 604c9fab..385ec891 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -26,12 +26,12 @@
 #include "factory.h"
 #include "utils.h"
 
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qheader.h>
-#include <qstyle.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqheader.h>
+#include <tqstyle.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
@@ -54,7 +54,7 @@ class EditorItemPrivate
 };
 
 //! @internal
-static void paintListViewExpander(QPainter* p, QWidget* w, int height, const QColorGroup& cg, bool isOpen)
+static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const TQColorGroup& cg, bool isOpen)
 {
 	const int marg = (height -2 - BRANCHBOX_SIZE) / 2;
 	int xmarg = marg;
@@ -65,9 +65,9 @@ static void paintListViewExpander(QPainter* p, QWidget* w, int height, const QCo
 	KStyle* kstyle = dynamic_cast<KStyle*>(widget->style());
 	if (kstyle) {
 		kstyle->drawKStylePrimitive(
-			KStyle::KPE_ListViewExpander, p, w, QRect( xmarg, marg, BRANCHBOX_SIZE, BRANCHBOX_SIZE ), 
-			cg, isOpen ? 0 : QStyle::Style_On,
-				QStyleOption::Default);
+			KStyle::KPE_ListViewExpander, p, w, TQRect( xmarg, marg, BRANCHBOX_SIZE, BRANCHBOX_SIZE ), 
+			cg, isOpen ? 0 : TQStyle::Style_On,
+				TQStyleOption::Default);
 	}
 	else {
 #endif
@@ -90,23 +90,23 @@ static void paintListViewExpander(QPainter* p, QWidget* w, int height, const QCo
 
 //! @internal
 //! Based on KPopupTitle, see kpopupmenu.cpp
-class GroupWidgetBase : public QWidget
+class GroupWidgetBase : public TQWidget
 {
 	public:
-		GroupWidgetBase(QWidget* parent)
-		: QWidget(parent)
+		GroupWidgetBase(TQWidget* tqparent)
+		: TQWidget(tqparent)
 		, m_isOpen(true)
 		, m_mouseDown(false)
 		{
-			setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed, 0, 1));
+			tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1));
 		}
 
-		void setText( const QString &text )
+		void setText( const TQString &text )
 		{
 			m_titleStr = text;
 		}
 
-		void setIcon( const QPixmap &pix )
+		void setIcon( const TQPixmap &pix )
 		{
 			m_miniicon = pix;
 		}
@@ -121,21 +121,21 @@ class GroupWidgetBase : public QWidget
 			m_isOpen = set;
 		}
 
-		virtual QSize sizeHint () const
+		virtual TQSize tqsizeHint () const
 		{
-			QSize s( QWidget::sizeHint() );
+			TQSize s( TQWidget::tqsizeHint() );
 			s.setHeight(fontMetrics().height()*2);
 			return s;
 		}
 
 	protected:
-		virtual void paintEvent(QPaintEvent *) {
-			QRect r(rect());
-			QPainter p(this);
-			QStyle::StyleFlags flags = m_mouseDown ? QStyle::Style_Down : QStyle::Style_Default;
-			kapp->style().drawPrimitive(QStyle::PE_HeaderSection, &p, r, palette().active(), flags);
+		virtual void paintEvent(TQPaintEvent *) {
+			TQRect r(rect());
+			TQPainter p(this);
+			TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default;
+			kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, tqpalette().active(), flags);
 
-			paintListViewExpander(&p, this, r.height()+2, palette().active(), isOpen());
+			paintListViewExpander(&p, this, r.height()+2, tqpalette().active(), isOpen());
 			if (!m_miniicon.isNull()) {
 				p.drawPixmap(24, (r.height()-m_miniicon.height())/2, m_miniicon);
 			}
@@ -143,8 +143,8 @@ class GroupWidgetBase : public QWidget
 			if (!m_titleStr.isNull())
 			{
 				int indent = 16 + (m_miniicon.isNull() ? 0 : (m_miniicon.width()+4));
-				p.setPen(palette().active().text());
-				QFont f = p.font();
+				p.setPen(tqpalette().active().text());
+				TQFont f = p.font();
 				f.setBold(true);
 				p.setFont(f);
 				p.drawText(indent+8, 0, width()-(indent+8),
@@ -155,20 +155,20 @@ class GroupWidgetBase : public QWidget
 //			p.drawLine(0, 0, r.right(), 0);
 		}
 
-		virtual bool event( QEvent * e ) {
-			if (e->type()==QEvent::MouseButtonPress || e->type()==QEvent::MouseButtonRelease) {
-				QMouseEvent* me = static_cast<QMouseEvent*>(e);
+		virtual bool event( TQEvent * e ) {
+			if (e->type()==TQEvent::MouseButtonPress || e->type()==TQEvent::MouseButtonRelease) {
+				TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
 				if (me->button() == Qt::LeftButton) {
-					m_mouseDown = e->type()==QEvent::MouseButtonPress;
+					m_mouseDown = e->type()==TQEvent::MouseButtonPress;
 					update();
 				}
 			}
-			return QWidget::event(e);
+			return TQWidget::event(e);
 		}
 
 	protected:
-		QString m_titleStr;
-		QPixmap m_miniicon;
+		TQString m_titleStr;
+		TQPixmap m_miniicon;
 		bool m_isOpen : 1;
 		bool m_mouseDown : 1;
 };
@@ -176,9 +176,9 @@ class GroupWidgetBase : public QWidget
 class GroupWidget : public GroupWidgetBase
 {
 	public:
-		GroupWidget(EditorGroupItem *parentItem)
-		: GroupWidgetBase(parentItem->listView()->viewport())
-		, m_parentItem(parentItem)
+		GroupWidget(EditorGroupItem *tqparentItem)
+		: GroupWidgetBase(tqparentItem->listView()->viewport())
+		, m_parentItem(tqparentItem)
 		{
 		}
 
@@ -195,21 +195,21 @@ class GroupContainer::Private
 {
 	public:
 		Private() {}
-		QVBoxLayout* lyr;
+		TQVBoxLayout* lyr;
 		GroupWidgetBase *groupWidget;
-		QGuardedPtr<QWidget> contents;
+		TQGuardedPtr<TQWidget> contents;
 };
 
 }//namespace
 
 using namespace KoProperty;
 
-GroupContainer::GroupContainer(const QString& title, QWidget* parent)
-: QWidget(parent)
+GroupContainer::GroupContainer(const TQString& title, TQWidget* tqparent)
+: TQWidget(tqparent)
 , d(new Private())
 {
-	setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed, 0, 1));
-	d->lyr = new QVBoxLayout(this);
+	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 1));
+	d->lyr = new TQVBoxLayout(this);
 	d->groupWidget = new GroupWidgetBase(this);
 	d->groupWidget->setText( title );
 	d->lyr->addWidget(d->groupWidget);
@@ -221,7 +221,7 @@ GroupContainer::~GroupContainer()
 	delete d;
 }
 
-void GroupContainer::setContents( QWidget* contents )
+void GroupContainer::setContents( TQWidget* contents )
 {
 	if (d->contents) {
 		d->contents->hide();
@@ -236,26 +236,26 @@ void GroupContainer::setContents( QWidget* contents )
 	update();
 }
 
-bool GroupContainer::event( QEvent * e ) {
-	if (e->type()==QEvent::MouseButtonPress) {
-		QMouseEvent* me = static_cast<QMouseEvent*>(e);
-		if (me->button() == Qt::LeftButton && d->contents && d->groupWidget->rect().contains(me->pos())) {
+bool GroupContainer::event( TQEvent * e ) {
+	if (e->type()==TQEvent::MouseButtonPress) {
+		TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+		if (me->button() == Qt::LeftButton && d->contents && TQT_TQRECT_OBJECT(d->groupWidget->rect()).tqcontains(me->pos())) {
 			d->groupWidget->setOpen(!d->groupWidget->isOpen());
 			if (d->groupWidget->isOpen())
 				d->contents->show();
 			else
 				d->contents->hide();
-			d->lyr->invalidate();
+			d->lyr->tqinvalidate();
 			update();
 		}
 	}
-	return QWidget::event(e);
+	return TQWidget::event(e);
 }
 
 //////////////////////////////////////////////////////
 
-EditorItem::EditorItem(Editor *editor, EditorItem *parent, Property *property, QListViewItem *after)
- : KListViewItem(parent, after,
+EditorItem::EditorItem(Editor *editor, EditorItem *tqparent, Property *property, TQListViewItem *after)
+ : KListViewItem(tqparent, after,
 	property->captionForDisplaying().isEmpty() ? property->name() : property->captionForDisplaying())
 {
 	d = new EditorItemPrivate();
@@ -266,7 +266,7 @@ EditorItem::EditorItem(Editor *editor, EditorItem *parent, Property *property, Q
 	//setHeight(static_cast<Editor*>(listView())->baseRowHeight()*3);
 /*
 	if (property && !property->caption().isEmpty()) {
-			QSimpleRichText srt(property->caption(), font());
+			TQSimpleRichText srt(property->caption(), font());
 			srt.setWidth(columnWidth(0)-KPROPEDITOR_ITEM_MARGIN*2-20+1);
 			int oldHeight = it.current()->height();
 			int textHeight = srt.height()+KPROPEDITOR_ITEM_MARGIN;
@@ -280,8 +280,8 @@ EditorItem::EditorItem(Editor *editor, EditorItem *parent, Property *property, Q
 */
 }
 
-EditorItem::EditorItem(KListView *parent)
- : KListViewItem(parent)
+EditorItem::EditorItem(KListView *tqparent)
+ : KListViewItem(tqparent)
 {
 	d = new EditorItemPrivate();
 	d->property = 0;
@@ -289,8 +289,8 @@ EditorItem::EditorItem(KListView *parent)
 	setMultiLinesEnabled(true);
 }
 
-EditorItem::EditorItem(EditorItem *parent, const QString &text)
- : KListViewItem(parent, text)
+EditorItem::EditorItem(EditorItem *tqparent, const TQString &text)
+ : KListViewItem(tqparent, text)
 {
 	d = new EditorItemPrivate();
 	d->property = 0;
@@ -298,8 +298,8 @@ EditorItem::EditorItem(EditorItem *parent, const QString &text)
 	setMultiLinesEnabled(true);
 }
 
-EditorItem::EditorItem(EditorItem *parent, EditorItem *after, const QString &text)
- : KListViewItem(parent, after, text)
+EditorItem::EditorItem(EditorItem *tqparent, EditorItem *after, const TQString &text)
+ : KListViewItem(tqparent, after, text)
 {
 	d = new EditorItemPrivate();
 	d->property = 0;
@@ -319,7 +319,7 @@ EditorItem::property()
 }
 
 void
-EditorItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int align)
+EditorItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align)
 {
 	//int margin = static_cast<Editor*>(listView())->itemMargin();
 	if(!d->property)
@@ -327,50 +327,50 @@ EditorItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int width
 
 	if(column == 0)
 	{
-		QFont font = listView()->font();
+		TQFont font = listView()->font();
 		if(d->property->isModified())
 			font.setBold(true);
 		p->setFont(font);
 		p->setBrush(cg.highlight());
 		p->setPen(cg.highlightedText());
 		KListViewItem::paintCell(p, cg, column, width, align);
-		p->fillRect(parent() ? 0 : 50, 0, width, height()-1,
-			QBrush(isSelected() ? cg.highlight() : backgroundColor()));
+		p->fillRect(tqparent() ? 0 : 50, 0, width, height()-1,
+			TQBrush(isSelected() ? cg.highlight() : backgroundColor()));
 		p->setPen(isSelected() ? cg.highlightedText() : cg.text());
 		int delta = -20+KPROPEDITOR_ITEM_MARGIN;
-		if ((firstChild() && dynamic_cast<EditorGroupItem*>(parent()))) {
+		if ((firstChild() && dynamic_cast<EditorGroupItem*>(tqparent()))) {
 			delta = -KPROPEDITOR_ITEM_MARGIN-1;
 		}
-		if (dynamic_cast<EditorDummyItem*>(parent())) {
+		if (dynamic_cast<EditorDummyItem*>(tqparent())) {
 			delta = KPROPEDITOR_ITEM_MARGIN*2;
 		}
-		else if (parent() && dynamic_cast<EditorDummyItem*>(parent()->parent())) {
-			if (dynamic_cast<EditorGroupItem*>(parent()))
+		else if (tqparent() && dynamic_cast<EditorDummyItem*>(tqparent()->tqparent())) {
+			if (dynamic_cast<EditorGroupItem*>(tqparent()))
 				delta += KPROPEDITOR_ITEM_MARGIN*2;
 			else
 				delta += KPROPEDITOR_ITEM_MARGIN*5;
 		}
 		p->drawText(
-			QRect(delta,2, width+listView()->columnWidth(1)-KPROPEDITOR_ITEM_MARGIN*2, height()),
-			Qt::AlignLeft | Qt::AlignTop /*| Qt::SingleLine*/, text(0));
+			TQRect(delta,2, width+listView()->columnWidth(1)-KPROPEDITOR_ITEM_MARGIN*2, height()),
+			TQt::AlignLeft | TQt::AlignTop /*| TQt::SingleLine*/, text(0));
 
 		p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR );
 		p->drawLine(width-1, 0, width-1, height()-1);
 		p->drawLine(0, -1, width-1, -1);
 
 		p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR ); //! \todo custom color?
-		if (dynamic_cast<EditorDummyItem*>(parent()))
+		if (dynamic_cast<EditorDummyItem*>(tqparent()))
 			p->drawLine(0, 0, 0, height()-1 );
 	}
 	else if(column == 1)
 	{
-		QColorGroup icg(cg);
-		icg.setColor(QColorGroup::Background, backgroundColor());
+		TQColorGroup icg(cg);
+		icg.setColor(TQColorGroup::Background, backgroundColor());
 		p->setBackgroundColor(backgroundColor());
 		Widget *widget = d->editor->createWidgetForProperty(d->property, false /*don't change Widget::property() */);
 		if(widget) {
-			QRect r(0, 0, d->editor->header()->sectionSize(1), height() - (widget->hasBorders() ? 0 : 1));
-			p->setClipRect(r, QPainter::CoordPainter);
+			TQRect r(0, 0, d->editor->header()->sectionSize(1), height() - (widget->hasBorders() ? 0 : 1));
+			p->setClipRect(r, TQPainter::CoordPainter);
 			p->setClipping(true);
 			widget->drawViewer(p, icg, r, d->property->value());
 			p->setClipping(false);
@@ -381,17 +381,17 @@ EditorItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int width
 }
 
 void
-EditorItem::paintBranches(QPainter *p, const QColorGroup &cg, int w, int y, int h)
+EditorItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, int h)
 {
 	p->eraseRect(0,0,w,h);
 	KListViewItem *item = static_cast<KListViewItem*>(firstChild());
 	if(!item)
 		return;
 
-	QColor backgroundColor;
+	TQColor backgroundColor;
 	p->save();
 	p->translate(0,y);
-	QFont font = listView()->font();
+	TQFont font = listView()->font();
 	while(item)
 	{
 		if(item->isSelected())
@@ -402,30 +402,30 @@ EditorItem::paintBranches(QPainter *p, const QColorGroup &cg, int w, int y, int
 			else
 				backgroundColor = item->backgroundColor();
 		}
-//		p->fillRect(-50,0,50, item->height(), QBrush(backgroundColor));
+//		p->fillRect(-50,0,50, item->height(), TQBrush(backgroundColor));
 		p->save();
 		p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR );
 		int delta = 0;
 		int fillWidth = w;
 		int x = 0;
-		if (dynamic_cast<EditorGroupItem*>(item->parent())) {
+		if (dynamic_cast<EditorGroupItem*>(item->tqparent())) {
 			delta = 0;//-19;
 			fillWidth += 19;
 		}
 		else {
-			if (dynamic_cast<EditorGroupItem*>(item) || /*for flat mode*/ dynamic_cast<EditorDummyItem*>(item->parent()))
+			if (dynamic_cast<EditorGroupItem*>(item) || /*for flat mode*/ dynamic_cast<EditorDummyItem*>(item->tqparent()))
 				x = 19;
 			else
 				x = -19;
 			fillWidth += 19;
 		}
-		if (dynamic_cast<EditorDummyItem*>(item->parent())) {
+		if (dynamic_cast<EditorDummyItem*>(item->tqparent())) {
 			x = 19;
 		}
-		else if (item->parent() && dynamic_cast<EditorDummyItem*>(item->parent()->parent())) {
+		else if (item->tqparent() && dynamic_cast<EditorDummyItem*>(item->tqparent()->tqparent())) {
 			x = 0;
 		}
-		p->fillRect(x+1, 0, fillWidth-1, item->height()-1, QBrush(backgroundColor));
+		p->fillRect(x+1, 0, fillWidth-1, item->height()-1, TQBrush(backgroundColor));
 		p->drawLine(x, item->height()-1, w, item->height()-1 );
 		if (!dynamic_cast<EditorGroupItem*>(item))
 			p->drawLine(x, 0, x, item->height()-1 );
@@ -434,8 +434,8 @@ EditorItem::paintBranches(QPainter *p, const QColorGroup &cg, int w, int y, int
 //	for (int i=0; i<10000000; i++)
 //		;
 //		if(item->isSelected())  {
-//			p->fillRect(parent() ? 0 : 50, 0, w, item->height()-1, QBrush(cg.highlight()));
-//			p->fillRect(-50,0,50, item->height(), QBrush(cg.highlight()));
+//			p->fillRect(tqparent() ? 0 : 50, 0, w, item->height()-1, TQBrush(cg.highlight()));
+//			p->fillRect(-50,0,50, item->height(), TQBrush(cg.highlight()));
 //		}
 
 		//sorry, but we need to draw text here again
@@ -443,22 +443,22 @@ EditorItem::paintBranches(QPainter *p, const QColorGroup &cg, int w, int y, int
 			|| (static_cast<EditorItem*>(item)->property() && static_cast<EditorItem*>(item)->property()->isModified()) );
 		p->setFont(font);
 		p->setPen(item->isSelected() ? cg.highlightedText() : cg.text());
-		if (item->firstChild() && dynamic_cast<EditorGroupItem*>(item->parent())) {
+		if (item->firstChild() && dynamic_cast<EditorGroupItem*>(item->tqparent())) {
 			delta = 19-KPROPEDITOR_ITEM_MARGIN-1;
 		}
-		else if (dynamic_cast<EditorDummyItem*>(item->parent())) {
+		else if (dynamic_cast<EditorDummyItem*>(item->tqparent())) {
 			delta = 19;
 		}
-		if (item->parent() && dynamic_cast<EditorDummyItem*>(item->parent()->parent())) {
-			if (dynamic_cast<EditorGroupItem*>(item->parent()))
+		if (item->tqparent() && dynamic_cast<EditorDummyItem*>(item->tqparent()->tqparent())) {
+			if (dynamic_cast<EditorGroupItem*>(item->tqparent()))
 				delta += KPROPEDITOR_ITEM_MARGIN*2;
 			else
 				delta += KPROPEDITOR_ITEM_MARGIN*5;
 		}
 
-		if (!dynamic_cast<EditorDummyItem*>(item->parent()))
-			p->drawText(QRect(delta+1,0, w+listView()->columnWidth(1), item->height()),
-			Qt::AlignLeft | Qt::AlignVCenter /*| Qt::SingleLine*/, item->text(0));
+		if (!dynamic_cast<EditorDummyItem*>(item->tqparent()))
+			p->drawText(TQRect(delta+1,0, w+listView()->columnWidth(1), item->height()),
+			TQt::AlignLeft | TQt::AlignVCenter /*| TQt::SingleLine*/, item->text(0));
 
 		if(item->firstChild())  {
 			paintListViewExpander(p, listView(), item->height(),
@@ -469,7 +469,7 @@ EditorItem::paintBranches(QPainter *p, const QColorGroup &cg, int w, int y, int
 		EditorItem *editorItem = dynamic_cast<EditorItem*>(item);
 		if (editorItem && editorItem->property() && !editorItem->property()->icon().isEmpty()) {
 			//int margin = listView()->itemMargin();
-			QPixmap pix = SmallIcon(editorItem->property()->icon());
+			TQPixmap pix = SmallIcon(editorItem->property()->icon());
 			if (!pix.isNull())
 				p->drawPixmap(-19+(19-pix.width())/2, (item->height() - pix.height()) / 2, pix);
 		}
@@ -481,15 +481,15 @@ EditorItem::paintBranches(QPainter *p, const QColorGroup &cg, int w, int y, int
 }
 
 void
-EditorItem::paintFocus(QPainter *, const QColorGroup &, const QRect & )
+EditorItem::paintFocus(TQPainter *, const TQColorGroup &, const TQRect & )
 {
 }
 
 int
-EditorItem::compare( QListViewItem *i, int col, bool ascending ) const
+EditorItem::compare( TQListViewItem *i, int col, bool ascending ) const
 {
 	if (!ascending)
-		return -QListViewItem::key( col, ascending ).localeAwareCompare( i->key( col, ascending ) );
+		return -TQListViewItem::key( col, ascending ).localeAwareCompare( i->key( col, ascending ) );
 
 	if (d->property) {
 //		kopropertydbg << d->property->name() << " " << d->property->sortingKey() << " | "
@@ -512,16 +512,16 @@ EditorItem::setHeight( int height )
 
 //////////////////////////////////////////////////////
 
-EditorGroupItem::EditorGroupItem(EditorItem *parent, EditorItem *after, const QString &text, const QString &icon, int sortOrder)
- : EditorItem(parent, after, text)
+EditorGroupItem::EditorGroupItem(EditorItem *tqparent, EditorItem *after, const TQString &text, const TQString &icon, int sortOrder)
+ : EditorItem(tqparent, after, text)
  , m_label(0)
  , m_sortOrder(sortOrder)
 {
 	init(icon);
 }
 
-EditorGroupItem::EditorGroupItem(EditorItem *parent, const QString &text, const QString &icon, int sortOrder)
- : EditorItem(parent, text)
+EditorGroupItem::EditorGroupItem(EditorItem *tqparent, const TQString &text, const TQString &icon, int sortOrder)
+ : EditorItem(tqparent, text)
  , m_label(0)
  , m_sortOrder(sortOrder)
 {
@@ -533,12 +533,12 @@ EditorGroupItem::~EditorGroupItem()
 	delete m_label;
 }
 
-QWidget* EditorGroupItem::label() const
+TQWidget* EditorGroupItem::label() const
 {
 	return m_label;
 }
 
-void EditorGroupItem::init(const QString &icon)
+void EditorGroupItem::init(const TQString &icon)
 {
 	setOpen(true);
 	setSelectable(false);
@@ -550,7 +550,7 @@ void EditorGroupItem::init(const QString &icon)
 }
 
 void
-EditorGroupItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int /*align*/)
+EditorGroupItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int /*align*/)
 {
 	Q_UNUSED(p);
 	Q_UNUSED(cg);
@@ -563,22 +563,22 @@ EditorGroupItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int
 	//	return;
 	/*p->setPen( KPROPEDITOR_ITEM_BORDER_COLOR ); //! \todo custom color?
 
-	p->setClipRect(listView()->itemRect(this));
+	p->setClipRect(listView()->tqitemRect(this));
 	if(column == 1)
 		p->translate(-listView()->columnWidth(0) + 20, 0);
 	int totalWidth = listView()->columnWidth(0) + listView()->columnWidth(1) - 20;
-	p->eraseRect(QRect(0,0, totalWidth,height()-1));
+	p->eraseRect(TQRect(0,0, totalWidth,height()-1));
 	p->drawLine(0, height()-1, totalWidth-1, height()-1);
 
-	QFont font = listView()->font();
+	TQFont font = listView()->font();
 	font.setBold(true);
 	p->setFont(font);
 	p->setBrush(cg.highlight());
 	//p->setPen(cg.highlightedText());
 	KListViewItem::paintCell(p, cg, column, width, align);
 	p->setPen(cg.text());
-	p->drawText(QRect(0,0, totalWidth, height()),
-		Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, text(0));*/
+	p->drawText(TQRect(0,0, totalWidth, height()),
+		TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, text(0));*/
 }
 
 void
@@ -589,7 +589,7 @@ EditorGroupItem::setup()
 }
 
 int
-EditorGroupItem::compare( QListViewItem *i, int col, bool ascending ) const
+EditorGroupItem::compare( TQListViewItem *i, int col, bool ascending ) const
 {
 	Q_UNUSED(col);
 	Q_UNUSED(ascending);