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 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tdeprint/cups') 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; -- cgit v1.2.1