From d4e11a5f488204ab8886e167c7c4af1e6e16ab58 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 --- tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp | 2 +- tdeprint/cups/imageposition.cpp | 4 ++-- tdeprint/cups/imageposition.h | 2 +- tdeprint/cups/imagepreview.cpp | 2 +- tdeprint/cups/imagepreview.h | 2 +- tdeprint/cups/kpimagepage.cpp | 2 +- tdeprint/cups/kptagspage.cpp | 4 ++-- tdeprint/cups/kptagspage.h | 4 ++-- tdeprint/kfilelist.cpp | 2 +- tdeprint/kfilelist.h | 2 +- tdeprint/kpposterpage.cpp | 2 +- tdeprint/management/cjanuswidget.cpp | 2 +- tdeprint/management/kmprinterview.cpp | 4 ++-- tdeprint/management/kmprinterview.h | 2 +- tdeprint/management/kxmlcommandselector.cpp | 2 +- tdeprint/management/sidepixmap.cpp | 2 +- tdeprint/management/sidepixmap.h | 2 +- tdeprint/messagewindow.cpp | 2 +- tdeprint/tdeprintd.cpp | 4 ++-- 19 files changed, 24 insertions(+), 24 deletions(-) (limited to 'tdeprint') diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index e677da988..b1bd96ee6 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/tdeprint/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/tdeprint/cups/imageposition.cpp b/tdeprint/cups/imageposition.cpp index 70a84ba7f..9e5d9748e 100644 --- a/tdeprint/cups/imageposition.cpp +++ b/tdeprint/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", "tdeprint/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/tdeprint/cups/imageposition.h b/tdeprint/cups/imageposition.h index 5fbae48da..350fe4a6e 100644 --- a/tdeprint/cups/imageposition.h +++ b/tdeprint/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/tdeprint/cups/imagepreview.cpp b/tdeprint/cups/imagepreview.cpp index fb27974da..9912c1886 100644 --- a/tdeprint/cups/imagepreview.cpp +++ b/tdeprint/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/tdeprint/cups/imagepreview.h b/tdeprint/cups/imagepreview.h index 12a57ddb3..4655e5d7c 100644 --- a/tdeprint/cups/imagepreview.h +++ b/tdeprint/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/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index d3e438389..13332dee3 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/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/tdeprint/cups/kptagspage.cpp b/tdeprint/cups/kptagspage.cpp index d91a8b427..4431bedf3 100644 --- a/tdeprint/cups/kptagspage.cpp +++ b/tdeprint/cups/kptagspage.cpp @@ -153,12 +153,12 @@ void KPTagsPage::getOptions(TQMap& 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/tdeprint/cups/kptagspage.h b/tdeprint/cups/kptagspage.h index ac99072ec..0cb02b6e7 100644 --- a/tdeprint/cups/kptagspage.h +++ b/tdeprint/cups/kptagspage.h @@ -34,8 +34,8 @@ public: void setOptions(const TQMap& opts); bool isValid(TQString& msg); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; private: TQTable *m_tags; diff --git a/tdeprint/kfilelist.cpp b/tdeprint/kfilelist.cpp index 1f67851c6..4f3cabe5b 100644 --- a/tdeprint/kfilelist.cpp +++ b/tdeprint/kfilelist.cpp @@ -263,7 +263,7 @@ void KFileList::slotOpenFile() } } -TQSize KFileList::tqsizeHint() const +TQSize KFileList::sizeHint() const { return TQSize(100, 100); } diff --git a/tdeprint/kfilelist.h b/tdeprint/kfilelist.h index 03b7977d8..d5ef3ada1 100644 --- a/tdeprint/kfilelist.h +++ b/tdeprint/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/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp index d82e5b572..2e0e78894 100644 --- a/tdeprint/kpposterpage.cpp +++ b/tdeprint/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; inext(); } if (verticalScrollBar()->isVisible()) - w += verticalScrollBar()->tqsizeHint().width(); + w += verticalScrollBar()->sizeHint().width(); w += (frameWidth()*2); setFixedWidth(w); } diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp index 19264a946..025a1812c 100644 --- a/tdeprint/management/kmprinterview.cpp +++ b/tdeprint/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/tdeprint/management/kmprinterview.h b/tdeprint/management/kmprinterview.h index ba1bd38b1..14354a3b5 100644 --- a/tdeprint/management/kmprinterview.h +++ b/tdeprint/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/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp index dfefe0a8b..6f2b4485e 100644 --- a/tdeprint/management/kxmlcommandselector.cpp +++ b/tdeprint/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/tdeprint/management/sidepixmap.cpp b/tdeprint/management/sidepixmap.cpp index dc5dc901f..6972d9fff 100644 --- a/tdeprint/management/sidepixmap.cpp +++ b/tdeprint/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/tdeprint/management/sidepixmap.h b/tdeprint/management/sidepixmap.h index d9f87661d..4d521b343 100644 --- a/tdeprint/management/sidepixmap.h +++ b/tdeprint/management/sidepixmap.h @@ -29,7 +29,7 @@ class TDEPRINT_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/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp index 32ce8db9b..a1b6ddf29 100644 --- a/tdeprint/messagewindow.cpp +++ b/tdeprint/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() ) { diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index e320cf0bc..8b126d5bf 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.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); -- cgit v1.2.1