diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-27 09:21:59 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-06-27 10:16:09 +0200 |
commit | 371d398f70e10408e0eaba7b5f05e638a0048599 (patch) | |
tree | dc9a33c4dd8c0f8f0477fdd3a7e0d55cd94c7dfb /src/widgets/dialogs/qmessagebox.cpp | |
parent | 48b1322df382503d9b15c6a8e81ec83ac82893a0 (diff) |
Renamed QLine/TextControl to QWidgetLine/TextControl
Renamed them to free up the QTextControl and QLineControl
class names for a new API in QtGui.
Reviewed-by: Jørgen Lind
Diffstat (limited to 'src/widgets/dialogs/qmessagebox.cpp')
-rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index f0851abc9a..26180ab38b 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -341,7 +341,7 @@ void QMessageBoxPrivate::updateSize() if (width > hardLimit) { label->d_func()->ensureTextControl(); - if (QTextControl *control = label->d_func()->control) { + if (QWidgetTextControl *control = label->d_func()->control) { QTextOption opt = control->document()->defaultTextOption(); opt.setWrapMode(QTextOption::WrapAnywhere); control->document()->setDefaultTextOption(opt); @@ -367,7 +367,7 @@ void QMessageBoxPrivate::updateSize() width = qMax(width, layoutMinimumWidth()); if (width > hardLimit) { // longest word is really big, so wrap anywhere informativeLabel->d_func()->ensureTextControl(); - if (QTextControl *control = informativeLabel->d_func()->control) { + if (QWidgetTextControl *control = informativeLabel->d_func()->control) { QTextOption opt = control->document()->defaultTextOption(); opt.setWrapMode(QTextOption::WrapAnywhere); control->document()->setDefaultTextOption(opt); |