Rename old tq methods that no longer need a unique name

3 files changed, 23 insertions, 23 deletions

diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp
index 3c80d2a..3b096cd 100644
--- a/lilo-config/kde-qt-common/EditWidget.cpp
+++ b/lilo-config/kde-qt-common/EditWidget.cpp
@@ -42,7 +42,7 @@ EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, T
 	if(isFile) {
 		select=new TQPushButton(_("Select..."), this);
 		connect(select, TQT_SIGNAL(clicked()), TQT_SLOT(selectFileClicked()));
-		select->resize(select->tqminimumSizeHint());
+		select->resize(select->minimumSizeHint());
 		setStretchFactor(select, 0);
 	} else
 		select=0;
@@ -53,29 +53,29 @@ void EditWidget::selectFileClicked()
     if(!filename.isEmpty())
 	line->setText(filename);
 }
-TQSize EditWidget::tqsizeHint() const
+TQSize EditWidget::sizeHint() const
 {
-	int w=2*SPACE_MARGIN+lbl->tqsizeHint().width()+SPACE_INSIDE+line->tqsizeHint().width();
-	int h=lbl->tqsizeHint().height();
-	if(h<line->tqsizeHint().height())
-		h=line->tqsizeHint().height();
+	int w=2*SPACE_MARGIN+lbl->sizeHint().width()+SPACE_INSIDE+line->sizeHint().width();
+	int h=lbl->sizeHint().height();
+	if(h<line->sizeHint().height())
+		h=line->sizeHint().height();
 	if(select!=0) {
-		w+=SPACE_INSIDE+select->tqsizeHint().width();
-		if(h<select->tqsizeHint().height())
-			h=select->tqsizeHint().height();
+		w+=SPACE_INSIDE+select->sizeHint().width();
+		if(h<select->sizeHint().height())
+			h=select->sizeHint().height();
 	}
 	return TQSize(w, h);
 }
-TQSize EditWidget::tqminimumSizeHint() const
+TQSize EditWidget::minimumSizeHint() const
 {
-	int w=2*SPACE_MARGIN+lbl->tqminimumSizeHint().width()+SPACE_INSIDE+line->tqminimumSizeHint().width();
-	int h=lbl->tqminimumSizeHint().height();
-	if(h<line->tqminimumSizeHint().height())
-		h=line->tqminimumSizeHint().height();
+	int w=2*SPACE_MARGIN+lbl->minimumSizeHint().width()+SPACE_INSIDE+line->minimumSizeHint().width();
+	int h=lbl->minimumSizeHint().height();
+	if(h<line->minimumSizeHint().height())
+		h=line->minimumSizeHint().height();
 	if(select!=0) {
-		w+=SPACE_INSIDE+select->tqminimumSizeHint().width();
-		if(h<select->tqminimumSizeHint().height())
-			h=select->tqminimumSizeHint().height();
+		w+=SPACE_INSIDE+select->minimumSizeHint().width();
+		if(h<select->minimumSizeHint().height())
+			h=select->minimumSizeHint().height();
 	}
 	return TQSize(w, h);
 }
diff --git a/lilo-config/kde-qt-common/EditWidget.h b/lilo-config/kde-qt-common/EditWidget.h
index e0901f9..b781cf2 100644
--- a/lilo-config/kde-qt-common/EditWidget.h
+++ b/lilo-config/kde-qt-common/EditWidget.h
@@ -58,7 +58,7 @@ public:
 	void cut() { line->cut(); };
 	void copy() const { line->copy(); };
 	void paste() { line->paste(); };
-	void tqsetAlignment(int flag) { line->tqsetAlignment(flag); };
+	void setAlignment(int flag) { line->setAlignment(flag); };
 	int tqalignment() const { return line->tqalignment(); };
 	void cursorLeft(bool mark, int steps=1) { line->cursorLeft(mark, steps); };
 	void cursorRight(bool mark, int steps=1) { line->cursorRight(mark, steps); };
@@ -72,8 +72,8 @@ public:
 	bool edited() const { return line->edited(); };
 	bool hasMarkedText() const { return line->hasMarkedText(); };
 	TQString markedText() const { return line->markedText(); };
-	virtual TQSize tqsizeHint() const;
-	virtual TQSize tqminimumSizeHint() const;
+	virtual TQSize sizeHint() const;
+	virtual TQSize minimumSizeHint() const;
 public slots:
 	virtual void setText(const TQString &text) { line->setText(text); };
 	void selectAll() { line->selectAll(); };
diff --git a/lilo-config/qt/standalone.cpp b/lilo-config/qt/standalone.cpp
index 111ab40..4dc73e2 100644
--- a/lilo-config/qt/standalone.cpp
+++ b/lilo-config/qt/standalone.cpp
@@ -62,14 +62,14 @@ Standalone::Standalone(TQWidget *parent, const char *name):TQWidget(parent,name)
 	TQWhatsThis::add(_cancel, _("This button exits the program without saving your changes."));
 	connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(cancel()));
 	_apply->setEnabled(false);
-	setMinimumWidth(actions->tqsizeHint().width()+10);
+	setMinimumWidth(actions->sizeHint().width()+10);
 	arrangeWidgets();
 }
 
 void Standalone::arrangeWidgets()
 {
-	m->setGeometry(SPACE_MARGIN, SPACE_MARGIN, width()-2*SPACE_MARGIN, height()-actions->tqsizeHint().height()-SPACE_MARGIN-SPACE_INSIDE);
-	actions->setGeometry(SPACE_MARGIN, height()-actions->tqsizeHint().height()-SPACE_MARGIN, width()-2*SPACE_MARGIN, actions->tqsizeHint().height());
+	m->setGeometry(SPACE_MARGIN, SPACE_MARGIN, width()-2*SPACE_MARGIN, height()-actions->sizeHint().height()-SPACE_MARGIN-SPACE_INSIDE);
+	actions->setGeometry(SPACE_MARGIN, height()-actions->sizeHint().height()-SPACE_MARGIN, width()-2*SPACE_MARGIN, actions->sizeHint().height());
 }
 
 void Standalone::resizeEvent(TQResizeEvent *e)