Use non-tq sizeHint functions to fix bindings

(cherry picked from commit d4e11a5f488204ab8886e167c7c4af1e6e16ab58)

19 files changed, 24 insertions, 24 deletions

diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index b473d2a61..c733faaae 100644
--- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -44,7 +44,7 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
 	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked()));
 	m_remove->setEnabled(false);
 
-	m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->tqsizeHint().height()*2));
+	m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2));
 
 	TQHBoxLayout	*l0 = new TQHBoxLayout(this, 0, 3);
 	TQVBoxLayout	*l1 = new TQVBoxLayout(0, 0, 0);
diff --git a/kdeprint/cups/imageposition.cpp b/kdeprint/cups/imageposition.cpp
index 5f08fcd61..1489b1856 100644
--- a/kdeprint/cups/imageposition.cpp
+++ b/kdeprint/cups/imageposition.cpp
@@ -44,7 +44,7 @@ ImagePosition::ImagePosition(TQWidget *parent, const char *name)
 	: TQWidget(parent,name)
 {
 	position_ = Center;
-	setMinimumSize(tqsizeHint());
+	setMinimumSize(sizeHint());
 	tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
 	pix_.load(locate("data", "kdeprint/preview-mini.png"));
 }
@@ -147,7 +147,7 @@ void ImagePosition::paintEvent(TQPaintEvent*)
 	p.end();
 }
 
-TQSize ImagePosition::tqsizeHint() const
+TQSize ImagePosition::sizeHint() const
 {
 	return TQSize(60, 80);
 }
diff --git a/kdeprint/cups/imageposition.h b/kdeprint/cups/imageposition.h
index 406e96951..1aa3aedde 100644
--- a/kdeprint/cups/imageposition.h
+++ b/kdeprint/cups/imageposition.h
@@ -45,7 +45,7 @@ public:
 	void setPosition(int horiz = 1, int vert = 1);
 	PositionType position() const { return (PositionType)position_; }
 	TQString positionString() const;
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 
 protected:
 	void paintEvent(TQPaintEvent *);
diff --git a/kdeprint/cups/imagepreview.cpp b/kdeprint/cups/imagepreview.cpp
index 16a6271cb..db92cfe9f 100644
--- a/kdeprint/cups/imagepreview.cpp
+++ b/kdeprint/cups/imagepreview.cpp
@@ -72,7 +72,7 @@ void ImagePreview::setBlackAndWhite(bool on){
 	update();
 }
 
-TQSize ImagePreview::tqminimumSizeHint() const
+TQSize ImagePreview::minimumSizeHint() const
 {
 	return image_.size();
 }
diff --git a/kdeprint/cups/imagepreview.h b/kdeprint/cups/imagepreview.h
index ff9da9fb8..1e9ad8076 100644
--- a/kdeprint/cups/imagepreview.h
+++ b/kdeprint/cups/imagepreview.h
@@ -32,7 +32,7 @@ public:
 	void setParameters(int brightness, int hue, int saturation, int gamma);
 	void setImage(const TQImage& image);
 	void setBlackAndWhite(bool on);
-	TQSize tqminimumSizeHint() const;
+	TQSize minimumSizeHint() const;
 
 private: // Private attributes
 	int brightness_;
diff --git a/kdeprint/cups/kpimagepage.cpp b/kdeprint/cups/kpimagepage.cpp
index d669bc475..1157d3f07 100644
--- a/kdeprint/cups/kpimagepage.cpp
+++ b/kdeprint/cups/kpimagepage.cpp
@@ -313,7 +313,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	TQRadioButton	*left = new TQRadioButton(positionbox);
 	TQRadioButton	*right = new TQRadioButton(positionbox);
 	TQRadioButton	*hcenter = new TQRadioButton(positionbox);
-	TQSize	sz = bottom->tqsizeHint();
+	TQSize	sz = bottom->sizeHint();
 	bottom->setFixedSize(sz);
 	vcenter->setFixedSize(sz);
 	top->setFixedSize(sz);
diff --git a/kdeprint/cups/kptagspage.cpp b/kdeprint/cups/kptagspage.cpp
index 0e2d93ea3..ff9d3bd9b 100644
--- a/kdeprint/cups/kptagspage.cpp
+++ b/kdeprint/cups/kptagspage.cpp
@@ -153,12 +153,12 @@ void KPTagsPage::getOptions(TQMap<TQString,TQString>& opts, bool)
 	}
 }
 
-TQSize KPTagsPage::tqsizeHint() const
+TQSize KPTagsPage::sizeHint() const
 {
 	return TQSize(-1, -1);
 }
 
-TQSize KPTagsPage::tqminimumSizeHint() const
+TQSize KPTagsPage::minimumSizeHint() const
 {
 	return TQSize(-1, -1);
 }
diff --git a/kdeprint/cups/kptagspage.h b/kdeprint/cups/kptagspage.h
index 599ecebbf..05d2ea407 100644
--- a/kdeprint/cups/kptagspage.h
+++ b/kdeprint/cups/kptagspage.h
@@ -34,8 +34,8 @@ public:
 	void setOptions(const TQMap<TQString,TQString>& opts);
 	bool isValid(TQString& msg);
 
-	TQSize tqsizeHint() const;
-	TQSize tqminimumSizeHint() const;
+	TQSize sizeHint() const;
+	TQSize minimumSizeHint() const;
 
 private:
 	TQTable	*m_tags;
diff --git a/kdeprint/kdeprintd.cpp b/kdeprint/kdeprintd.cpp
index e607629cb..53ef18276 100644
--- a/kdeprint/kdeprintd.cpp
+++ b/kdeprint/kdeprintd.cpp
@@ -86,8 +86,8 @@ void StatusWindow::setMessage(const TQString& msg)
 {
 	//QSize	oldSz = size();
 	m_label->setText(msg);
-	//QSize	sz = m_label->tqsizeHint();
-	//sz += TQSize(layout()->margin()*2, layout()->margin()*2+layout()->spacing()+m_button->tqsizeHint().height());
+	//QSize	sz = m_label->sizeHint();
+	//sz += TQSize(layout()->margin()*2, layout()->margin()*2+layout()->spacing()+m_button->sizeHint().height());
 	// dialog will never be smaller
 	//sz = sz.expandedTo(oldSz);
 	//resize(sz);
diff --git a/kdeprint/kfilelist.cpp b/kdeprint/kfilelist.cpp
index 85117a922..62ce50706 100644
--- a/kdeprint/kfilelist.cpp
+++ b/kdeprint/kfilelist.cpp
@@ -263,7 +263,7 @@ void KFileList::slotOpenFile()
 	}
 }
 
-TQSize KFileList::tqsizeHint() const
+TQSize KFileList::sizeHint() const
 {
 	return TQSize(100, 100);
 }
diff --git a/kdeprint/kfilelist.h b/kdeprint/kfilelist.h
index 8a7ecd50a..ae0c31ab6 100644
--- a/kdeprint/kfilelist.h
+++ b/kdeprint/kfilelist.h
@@ -37,7 +37,7 @@ public:
 
 	void setFileList(const TQStringList&);
 	TQStringList fileList() const;
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 
 protected slots:
 	void slotAddFile();
diff --git a/kdeprint/kpposterpage.cpp b/kdeprint/kpposterpage.cpp
index 1fa7a23b5..fa4b1481b 100644
--- a/kdeprint/kpposterpage.cpp
+++ b/kdeprint/kpposterpage.cpp
@@ -194,7 +194,7 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name )
 	m_lockbtn->setToggleButton( true );
 	m_lockbtn->setPixmap( SmallIcon( "encrypted" ) );
 	m_lockbtn->setOn( true );
-	m_lockbtn->setFixedSize( m_lockbtn->tqsizeHint() );
+	m_lockbtn->setFixedSize( m_lockbtn->sizeHint() );
 	TQToolTip::add( m_lockbtn, i18n( "Link/unlink poster and print size" ) );
 
 	for ( int i=0; i<KPrinter::NPageSize-1; i++ )
diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp
index 4163a87fe..de5d98d7d 100644
--- a/kdeprint/management/cjanuswidget.cpp
+++ b/kdeprint/management/cjanuswidget.cpp
@@ -118,7 +118,7 @@ void CJanusWidget::CListBox::computeWidth()
 		item = item->next();
 	}
 	if (verticalScrollBar()->isVisible())
-		w += verticalScrollBar()->tqsizeHint().width();
+		w += verticalScrollBar()->sizeHint().width();
 	w += (frameWidth()*2);
 	setFixedWidth(w);
 }
diff --git a/kdeprint/management/kmprinterview.cpp b/kdeprint/management/kmprinterview.cpp
index 5eff6d946..6e0762d2f 100644
--- a/kdeprint/management/kmprinterview.cpp
+++ b/kdeprint/management/kmprinterview.cpp
@@ -105,9 +105,9 @@ void KMPrinterView::slotPrinterSelected(const TQString& p)
 	m_current = p;
 }
 
-TQSize KMPrinterView::tqminimumSizeHint() const
+TQSize KMPrinterView::minimumSizeHint() const
 {
-	return TQWidgetStack::tqminimumSizeHint();
+	return TQWidgetStack::minimumSizeHint();
 }
 
 #include "kmprinterview.moc"
diff --git a/kdeprint/management/kmprinterview.h b/kdeprint/management/kmprinterview.h
index 0b3a17789..365ff903e 100644
--- a/kdeprint/management/kmprinterview.h
+++ b/kdeprint/management/kmprinterview.h
@@ -42,7 +42,7 @@ public:
 	void setViewType(ViewType t);
 	ViewType viewType() const 	{ return m_type; }
 
-	TQSize tqminimumSizeHint() const;
+	TQSize minimumSizeHint() const;
 
 signals:
 	void printerSelected(const TQString&);
diff --git a/kdeprint/management/kxmlcommandselector.cpp b/kdeprint/management/kxmlcommandselector.cpp
index f46222fba..1eab506fc 100644
--- a/kdeprint/management/kxmlcommandselector.cpp
+++ b/kdeprint/management/kxmlcommandselector.cpp
@@ -275,7 +275,7 @@ void KXmlCommandSelector::slotHelpCommand()
 {
 	KPopupFrame *pop = new KPopupFrame( m_helpbtn );
 	KActiveLabel *lab = new KActiveLabel( m_help, pop );
-	lab->resize( lab->tqsizeHint() );
+	lab->resize( lab->sizeHint() );
 	pop->setMainWidget( lab );
 	pop->exec( m_helpbtn->mapToGlobal( TQPoint( m_helpbtn->width(), 0 ) ) );
 	pop->close( 0 );
diff --git a/kdeprint/management/sidepixmap.cpp b/kdeprint/management/sidepixmap.cpp
index 696d7b025..b8bda7ae4 100644
--- a/kdeprint/management/sidepixmap.cpp
+++ b/kdeprint/management/sidepixmap.cpp
@@ -42,7 +42,7 @@ bool SidePixmap::isValid()
 			&& (m_side.width() == m_tiledown.width()));
 }
 
-TQSize SidePixmap::tqsizeHint() const
+TQSize SidePixmap::sizeHint() const
 {
 	return (TQSize(m_side.width()+lineWidth(), 300+lineWidth()));
 }
diff --git a/kdeprint/management/sidepixmap.h b/kdeprint/management/sidepixmap.h
index 330b63e2d..e81699fba 100644
--- a/kdeprint/management/sidepixmap.h
+++ b/kdeprint/management/sidepixmap.h
@@ -29,7 +29,7 @@ class KDEPRINT_EXPORT SidePixmap : public TQFrame
 {
 public:
 	SidePixmap(TQWidget *parent = 0, const char *name = 0);
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 	bool isValid();
 
 protected:
diff --git a/kdeprint/messagewindow.cpp b/kdeprint/messagewindow.cpp
index 4f64f8edb..a354a8c39 100644
--- a/kdeprint/messagewindow.cpp
+++ b/kdeprint/messagewindow.cpp
@@ -60,7 +60,7 @@ MessageWindow::~MessageWindow()
 
 void MessageWindow::slotTimer()
 {
-	TQSize psz = parentWidget()->size(), sz = tqsizeHint();
+	TQSize psz = parentWidget()->size(), sz = sizeHint();
 	move( parentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) );
 	if ( !isVisible() )
 	{