From 18aecb8ec08ac370cb99e78e63acee0275e6334c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 23:54:16 -0600 Subject: Use non-tq sizeHint functions to fix bindings (cherry picked from commit d4e11a5f488204ab8886e167c7c4af1e6e16ab58) --- kdeprint/management/cjanuswidget.cpp | 2 +- kdeprint/management/kmprinterview.cpp | 4 ++-- kdeprint/management/kmprinterview.h | 2 +- kdeprint/management/kxmlcommandselector.cpp | 2 +- kdeprint/management/sidepixmap.cpp | 2 +- kdeprint/management/sidepixmap.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kdeprint/management') 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: -- cgit v1.2.1