Rename old tq methods that no longer need a unique name

3 files changed, 15 insertions, 15 deletions

diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index acc72c24..2e30d5f4 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -73,7 +73,7 @@ ContainerWidget::~ContainerWidget()
 {
 }
 
-TQSize ContainerWidget::tqsizeHint() const
+TQSize ContainerWidget::sizeHint() const
 {
 	return TQSize(30,30); //default
 }
@@ -125,7 +125,7 @@ KFDTabWidget::~KFDTabWidget()
 }
 
 TQSize
-KFDTabWidget::tqsizeHint() const
+KFDTabWidget::sizeHint() const
 {
 	TQSize s(30,30); // default min size
 	for(int i=0; i < count(); i++)
@@ -218,10 +218,10 @@ VFlow::paintEvent(TQPaintEvent *)
 }
 
 TQSize
-VFlow::tqsizeHint() const
+VFlow::sizeHint() const
 {
 	if(tqlayout())
-		return tqlayout()->tqsizeHint();
+		return tqlayout()->sizeHint();
 	else
 		return TQSize(700, 50); // default
 }
@@ -318,7 +318,7 @@ SubForm::SubForm(TQWidget *parent, const char *name)
 : TQScrollView(parent, name), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
-	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
+	viewport()->setPaletteBackgroundColor(colorGroup().mid());
 }
 
 void
@@ -860,7 +860,7 @@ void ContainerFactory::renameTabPage()
 #if TDE_VERSION < KDE_MAKE_VERSION(3,1,9)
 	       TQLineEdit::Normal,
 #endif
-	       tab->tabLabel(w), &ok, w->tqtopLevelWidget());
+	       tab->tabLabel(w), &ok, w->topLevelWidget());
 	if(ok)
 		tab->changeTab(w, name);
 }
diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index b88b437f..6f013e9c 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -126,7 +126,7 @@ class KFORMEDITOR_EXPORT VFlow : public TQFrame
 		virtual ~VFlow(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 	protected:
 		bool  m_preview;
@@ -144,7 +144,7 @@ class KFORMEDITOR_EXPORT ContainerWidget : public TQWidget
 		ContainerWidget(TQWidget *parent, const char *name);
 		virtual ~ContainerWidget();
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
 		virtual void dragMoveEvent( TQDragMoveEvent *e );
@@ -170,7 +170,7 @@ class KFORMEDITOR_EXPORT KFDTabWidget : public KFormDesigner::TabWidget
 		KFDTabWidget(TQWidget *parent, const char *name);
 		virtual ~KFDTabWidget();
 
-		virtual TQSize tqsizeHint() const;
+		virtual TQSize sizeHint() const;
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
 		virtual void dragMoveEvent( TQDragMoveEvent *e );
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 24827e13..afc37086 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -431,13 +431,13 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 		w = new KProgress(p, n);
 
 	else if(c == "KDateWidget")
-		w = new KDateWidget(TQDate::tqcurrentDate(), p, n);
+		w = new KDateWidget(TQDate::currentDate(), p, n);
 
 	else if(c == "KTimeWidget")
 		w = new KTimeWidget(TQTime::currentTime(), p, n);
 
 	else if(c == "KDateTimeWidget")
-		w = new KDateTimeWidget(TQDateTime::tqcurrentDateTime(), p, n);
+		w = new KDateTimeWidget(TQDateTime::currentDateTime(), p, n);
 
 	else if(c == "Line")
 		w = new Line(options & WidgetFactory::VerticalOrientation ? Qt::Vertical : Qt::Horizontal, p, n);
@@ -605,13 +605,13 @@ StdWidgetFactory::changeText(const TQString &text)
 	else
 		changeProperty("text", text, m_container->form());
 
-	/* By-hand method not needed as tqsizeHint() can do that for us
+	/* By-hand method not needed as sizeHint() can do that for us
 	TQFontMetrics fm = w->fontMetrics();
 	TQSize s(fm.width( text ), fm.height());
 	int width;
 	if(n == TQLABEL_OBJECT_NAME_STRING) // labels are resized to fit the text
 	{
-		w->resize(w->tqsizeHint());
+		w->resize(w->sizeHint());
 		WidgetFactory::m_editor->resize(w->size());
 		return;
 	}
@@ -624,7 +624,7 @@ StdWidgetFactory::changeText(const TQString &text)
 		width = w->style().sizeFromContents( TQStyle::CT_RadioButton, w, s).width();
 	else
 		return;
-	int width = w->tqsizeHint().width();*/
+	int width = w->sizeHint().width();*/
 
 #if 0 //not needed here, size hint is used on creation in InsertWidgetCommand::execute()
 	if(w->width() < width)
@@ -956,7 +956,7 @@ StdWidgetFactory::editText()
 	}
 
 	if(classname == TQLABEL_OBJECT_NAME_STRING)
-		widget()->resize(widget()->tqsizeHint());
+		widget()->resize(widget()->sizeHint());
 }
 
 void