TQt4 port kdeadmin

This enables compilation under both Qt3 and Qt4


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

1 files changed, 19 insertions, 19 deletions

diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp
index 292e016..e80cd19 100644
--- a/lilo-config/kde-qt-common/EditWidget.cpp
+++ b/lilo-config/kde-qt-common/EditWidget.cpp
@@ -28,7 +28,7 @@
 */
 #include "EditWidget.moc"
 #include "ui.h"
-EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, TQWidget *parent, const char *name, WFlags f, bool allowLines):TQHBox(allowLines, parent, name, f)
+EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, TQWidget *tqparent, const char *name, WFlags f, bool allowLines):TQHBox(allowLines, tqparent, name, f)
 {
 	setMargin(SPACE_MARGIN);
 	setSpacing(SPACE_INSIDE);
@@ -42,40 +42,40 @@ 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->minimumSizeHint());
+		select->resize(select->tqminimumSizeHint());
 		setStretchFactor(select, 0);
 	} else
 		select=0;
 }
 void EditWidget::selectFileClicked()
 {
-    TQString filename=FileDlg::getOpenFileName(TQString::null, TQString::null, this);
+    TQString filename=FileDlg::getOpenFileName(TQString(), TQString(), this);
     if(!filename.isEmpty())
 	line->setText(filename);
 }
-TQSize EditWidget::sizeHint() const
+TQSize EditWidget::tqsizeHint() const
 {
-	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();
+	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();
 	if(select!=0) {
-		w+=SPACE_INSIDE+select->sizeHint().width();
-		if(h<select->sizeHint().height())
-			h=select->sizeHint().height();
+		w+=SPACE_INSIDE+select->tqsizeHint().width();
+		if(h<select->tqsizeHint().height())
+			h=select->tqsizeHint().height();
 	}
 	return TQSize(w, h);
 }
-TQSize EditWidget::minimumSizeHint() const
+TQSize EditWidget::tqminimumSizeHint() const
 {
-	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();
+	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();
 	if(select!=0) {
-		w+=SPACE_INSIDE+select->minimumSizeHint().width();
-		if(h<select->minimumSizeHint().height())
-			h=select->minimumSizeHint().height();
+		w+=SPACE_INSIDE+select->tqminimumSizeHint().width();
+		if(h<select->tqminimumSizeHint().height())
+			h=select->tqminimumSizeHint().height();
 	}
 	return TQSize(w, h);
 }