diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 23:54:16 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 23:54:16 -0600 |
commit | d4e11a5f488204ab8886e167c7c4af1e6e16ab58 (patch) | |
tree | 367a2caa6169a869cfbf6395dffe2d28e0f72654 /kstyles | |
parent | 2c4de80e1e29b261fe8770483f97b2d702e4bd08 (diff) | |
download | tdelibs-d4e11a5f488204ab8886e167c7c4af1e6e16ab58.tar.gz tdelibs-d4e11a5f488204ab8886e167c7c4af1e6e16ab58.zip |
Use non-tq sizeHint functions to fix bindings
Diffstat (limited to 'kstyles')
-rw-r--r-- | kstyles/asteroid/asteroid.cpp | 4 | ||||
-rw-r--r-- | kstyles/highcolor/highcolor.cpp | 6 | ||||
-rw-r--r-- | kstyles/highcontrast/highcontrast.cpp | 4 | ||||
-rw-r--r-- | kstyles/keramik/keramik.cpp | 8 | ||||
-rw-r--r-- | kstyles/kthemestyle/kthemestyle.cpp | 6 | ||||
-rw-r--r-- | kstyles/light/lightstyle-v2.cpp | 4 | ||||
-rw-r--r-- | kstyles/light/lightstyle-v3.cpp | 4 | ||||
-rw-r--r-- | kstyles/plastik/plastik.cpp | 4 |
8 files changed, 20 insertions, 20 deletions
diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp index 35e6f3b7a..59b37df83 100644 --- a/kstyles/asteroid/asteroid.cpp +++ b/kstyles/asteroid/asteroid.cpp @@ -2468,8 +2468,8 @@ TQSize AsteroidStyle::tqsizeFromContents(ContentsType ct, TQMenuItem *mi = o.menuItem(); if (mi->custom()) { - sw = mi->custom()->tqsizeHint().width(); - sh = mi->custom()->tqsizeHint().height(); + sw = mi->custom()->sizeHint().width(); + sh = mi->custom()->sizeHint().height(); } else if (mi->widget()) { /* This is a do-nothing branch */ } else if (mi->isSeparator()) { diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp index cbfc2699c..318b0f207 100644 --- a/kstyles/highcolor/highcolor.cpp +++ b/kstyles/highcolor/highcolor.cpp @@ -1185,7 +1185,7 @@ void HighColorStyle::tqdrawControl( TQ_ControlElement element, // Make the label indicate if the button is a default button or not if ( active || button->isDefault() ) { // Draw "fake" bold text - this enables the font metrics to remain - // the same as computed in TQPushButton::tqsizeHint(), but gives + // the same as computed in TQPushButton::sizeHint(), but gives // a reasonable bold effect. int i; @@ -1875,8 +1875,8 @@ TQSize HighColorStyle::tqsizeFromContents( ContentsType contents, int w = contentSize.width(), h = contentSize.height(); if ( mi->custom() ) { - w = mi->custom()->tqsizeHint().width(); - h = mi->custom()->tqsizeHint().height(); + w = mi->custom()->sizeHint().width(); + h = mi->custom()->sizeHint().height(); if ( ! mi->custom()->fullSpan() ) h += 2*itemVMargin + 2*itemFrame; } diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp index 006b745bf..732a566c6 100644 --- a/kstyles/highcontrast/highcontrast.cpp +++ b/kstyles/highcontrast/highcontrast.cpp @@ -1730,8 +1730,8 @@ TQSize HighContrastStyle::tqsizeFromContents( ContentsType contents, int w = contentSize.width(), h = contentSize.height(); if ( mi->custom() ) { - w = mi->custom()->tqsizeHint().width(); - h = mi->custom()->tqsizeHint().height(); + w = mi->custom()->sizeHint().width(); + h = mi->custom()->sizeHint().height(); if ( ! mi->custom()->fullSpan() ) h += 2*itemVMargin + 2*itemFrame; } diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index c29aaa90e..2ca9ed360 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -1936,7 +1936,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQComboBox* combo) const { if (combo->width() >= 80) return false; - int suggestedWidth = combo->tqsizeHint().width(); + int suggestedWidth = combo->sizeHint().width(); if (combo->width() - suggestedWidth < -5) return true; @@ -2475,8 +2475,8 @@ TQSize KeramikStyle::tqsizeFromContents( ContentsType contents, int w = contentSize.width(), h = contentSize.height(); if ( mi->custom() ) { - w = mi->custom()->tqsizeHint().width(); - h = mi->custom()->tqsizeHint().height(); + w = mi->custom()->sizeHint().width(); + h = mi->custom()->sizeHint().height(); if ( ! mi->custom()->fullSpan() ) h += 2*itemVMargin + 2*itemFrame; } @@ -2586,7 +2586,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, { //Note that the widget here == the combo, not the completion //box, so we don't get any recursion - int suggestedWidth = widget->tqsizeHint().width(); + int suggestedWidth = widget->sizeHint().width(); TQRect def = opt.rect(); def.addCoords( 4, -4, -6, 4 ); diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp index 859165211..b9f2b4ba1 100644 --- a/kstyles/kthemestyle/kthemestyle.cpp +++ b/kstyles/kthemestyle/kthemestyle.cpp @@ -260,8 +260,8 @@ TQSize KThemeStyle::tqsizeFromContents( ContentsType contents, if ( mi->custom() ) { - w = mi->custom() ->tqsizeHint().width(); - h = mi->custom() ->tqsizeHint().height(); + w = mi->custom() ->sizeHint().width(); + h = mi->custom() ->sizeHint().height(); if ( ! mi->custom() ->fullSpan() ) h += 2 * itemVMargin + 2 * itemFrame; } @@ -1178,7 +1178,7 @@ void KThemeStyle::tqdrawControl( ControlElement element, if ( active || button->isDefault() && button->isEnabled() ) { // Draw "fake" bold text - this enables the font metrics to remain - // the same as computed in TQPushButton::tqsizeHint(), but gives + // the same as computed in TQPushButton::sizeHint(), but gives // a reasonable bold effect. int i; diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp index 9858ce4f8..bb9373bed 100644 --- a/kstyles/light/lightstyle-v2.cpp +++ b/kstyles/light/lightstyle-v2.cpp @@ -1529,8 +1529,8 @@ TQSize LightStyleV2::tqsizeFromContents( ContentsType contents, int w = contentsSize.width(), h = contentsSize.height(); if (mi->custom()) { - w = mi->custom()->tqsizeHint().width(); - h = mi->custom()->tqsizeHint().height(); + w = mi->custom()->sizeHint().width(); + h = mi->custom()->sizeHint().height(); if (! mi->custom()->fullSpan() && h < 22) h = 22; } else if(mi->widget()) { diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index b42ac5ef5..1493322fa 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -1756,8 +1756,8 @@ TQSize LightStyleV3::tqsizeFromContents( ContentsType contents, int w = contentsSize.width(), h = contentsSize.height(); if (mi->custom()) { - w = mi->custom()->tqsizeHint().width(); - h = mi->custom()->tqsizeHint().height(); + w = mi->custom()->sizeHint().width(); + h = mi->custom()->sizeHint().height(); if (! mi->custom()->fullSpan() && h < 22) h = 22; } else if(mi->widget()) { diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index 4dd8f9cd1..d935a0ee5 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -3365,8 +3365,8 @@ TQSize PlastikStyle::tqsizeFromContents(ContentsType t, bool checkable = popup->isCheckable(); if (mi->custom()) { - w = mi->custom()->tqsizeHint().width(); - h = mi->custom()->tqsizeHint().height(); + w = mi->custom()->sizeHint().width(); + h = mi->custom()->sizeHint().height(); if (!mi->custom()->fullSpan() ) h += 4; } else if (mi->widget()) { |