Rename a number of old tq methods that are no longer tq specific

3 files changed, 9 insertions, 9 deletions

diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index f45b30bf..7cf7dae9 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/kexi/plugins/reports/kexireportfactory.cpp
@@ -139,7 +139,7 @@ KexiReportFactory::startEditing(const TQCString &c, TQWidget *w, KFormDesigner::
 			editText();
 		}
 		else
-			createEditor(c, label->text(), label, container, label->tqgeometry(), label->tqalignment());
+			createEditor(c, label->text(), label, container, label->geometry(), label->alignment());
 		return true;
 	}
 	return false;
@@ -153,7 +153,7 @@ KexiReportFactory::isPropertyVisibleInternal(const TQCString &classname, TQWidge
 			return false;
 	}
 	else if(classname == "PicLabel") {
-		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "tqalignment"))
+		if((property == "text") || (property == "indent") || (property == "textFormat") || (property == "font") || (property == "alignment"))
 			return false;
 	}
 
@@ -180,7 +180,7 @@ KexiReportFactory::changeText(const TQString &text)
 	TQWidget *w = WidgetFactory::m_widget;
 	changeProperty("text", text, m_container);
 
-	int width = w->tqsizeHint().width();
+	int width = w->sizeHint().width();
 
 	if(w->width() < width)
 		w->resize(width, w->height() );
@@ -212,7 +212,7 @@ KexiReportFactory::editText()
 	}
 
 	if(classname == "Label")
-		m_widget->resize(m_widget->tqsizeHint());
+		m_widget->resize(m_widget->sizeHint());
 }
 
 bool
diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp
index 89423b03..cacf40b7 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -40,13 +40,13 @@ KexiReportForm::~KexiReportForm()
 	kexipluginsdbg << "KexiReportForm::~KexiReportForm(): close" << endl;
 }
 
-//tqrepaint all tqchildren widgets
+//repaint all children widgets
 static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		static_cast<TQWidget*>(obj)->tqrepaint();
+		static_cast<TQWidget*>(obj)->repaint();
 	}
 	delete list;
 }
@@ -144,7 +144,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -178,7 +178,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 }
 
 TQSize
-KexiReportForm::tqsizeHint() const
+KexiReportForm::sizeHint() const
 {
 	//todo: find better size (user configured?)
 	return TQSize(400,300);
diff --git a/kexi/plugins/reports/kexireportform.h b/kexi/plugins/reports/kexireportform.h
index 8813a2c3..7898ec98 100644
--- a/kexi/plugins/reports/kexireportform.h
+++ b/kexi/plugins/reports/kexireportform.h
@@ -47,7 +47,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportForm : public TQWidget, public KFormDesig
 		virtual void clearForm();
 		virtual void highlightWidgets(TQWidget *from, TQWidget *to/*, const TQPoint &p*/);
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	private:
 		/*TQString m_ds;