Remove dialogs doc related warnings
Change-Id: I79a771d18913237d894ca1a5aeaa07586106c645 Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
This commit is contained in:
parent
b9ef4a9c30
commit
3a888a7182
@ -1658,15 +1658,12 @@ static const Qt::WindowFlags DefaultWindowFlags =
|
|||||||
during the execution of the program. Use setCustomColor() to set
|
during the execution of the program. Use setCustomColor() to set
|
||||||
the custom colors, and use customColor() to get them.
|
the custom colors, and use customColor() to get them.
|
||||||
|
|
||||||
Additional widgets that allow users to pick colors are available
|
|
||||||
as \l{Qt Solutions}.
|
|
||||||
|
|
||||||
The \l{dialogs/standarddialogs}{Standard Dialogs} example shows
|
The \l{dialogs/standarddialogs}{Standard Dialogs} example shows
|
||||||
how to use QColorDialog as well as other built-in Qt dialogs.
|
how to use QColorDialog as well as other built-in Qt dialogs.
|
||||||
|
|
||||||
\image plastique-colordialog.png A color dialog in the Plastique widget style.
|
\image plastique-colordialog.png A color dialog in the Plastique widget style.
|
||||||
|
|
||||||
\sa QColor, QFileDialog, QPrintDialog, QFontDialog, {Standard Dialogs Example}
|
\sa QColor, QFileDialog, QFontDialog, {Standard Dialogs Example}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -407,12 +407,6 @@ void QErrorMessagePrivate::retranslateStrings()
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
|
||||||
\fn void QErrorMessage::message(const QString & message)
|
|
||||||
|
|
||||||
Use showMessage(\a message) instead.
|
|
||||||
*/
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#endif // QT_NO_ERRORMESSAGE
|
#endif // QT_NO_ERRORMESSAGE
|
||||||
|
@ -171,7 +171,7 @@ Q_WIDGETS_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_h
|
|||||||
The \l{dialogs/standarddialogs}{Standard Dialogs} example shows
|
The \l{dialogs/standarddialogs}{Standard Dialogs} example shows
|
||||||
how to use QFileDialog as well as other built-in Qt dialogs.
|
how to use QFileDialog as well as other built-in Qt dialogs.
|
||||||
|
|
||||||
\sa QDir, QFileInfo, QFile, QPrintDialog, QColorDialog, QFontDialog, {Standard Dialogs Example},
|
\sa QDir, QFileInfo, QFile, QColorDialog, QFontDialog, {Standard Dialogs Example},
|
||||||
{Application Example}
|
{Application Example}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -131,7 +131,7 @@ static const Qt::WindowFlags DefaultWindowFlags =
|
|||||||
|
|
||||||
\image plastique-fontdialog.png A font dialog in the Plastique widget style.
|
\image plastique-fontdialog.png A font dialog in the Plastique widget style.
|
||||||
|
|
||||||
\sa QFont, QFontInfo, QFontMetrics, QColorDialog, QFileDialog, QPrintDialog,
|
\sa QFont, QFontInfo, QFontMetrics, QColorDialog, QFileDialog,
|
||||||
{Standard Dialogs Example}
|
{Standard Dialogs Example}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -1027,31 +1027,6 @@ bool QFontDialogPrivate::canBeNativeDialog() const
|
|||||||
return (staticName == dynamicName);
|
return (staticName == dynamicName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
|
||||||
\fn QFont QFontDialog::getFont(bool *ok, const QFont &initial, QWidget* parent, const char* name)
|
|
||||||
\since 4.5
|
|
||||||
|
|
||||||
Call getFont(\a ok, \a initial, \a parent) instead.
|
|
||||||
|
|
||||||
\warning Do not delete \a parent during the execution of the dialog.
|
|
||||||
If you want to do this, you should create the dialog
|
|
||||||
yourself using one of the QFontDialog constructors.
|
|
||||||
|
|
||||||
The \a name parameter is ignored.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*!
|
|
||||||
\fn QFont QFontDialog::getFont(bool *ok, QWidget* parent, const char* name)
|
|
||||||
|
|
||||||
Call getFont(\a ok, \a parent) instead.
|
|
||||||
|
|
||||||
\warning Do not delete \a parent during the execution of the dialog.
|
|
||||||
If you want to do this, you should create the dialog
|
|
||||||
yourself using one of the QFontDialog constructors.
|
|
||||||
|
|
||||||
The \a name parameter is ignored.
|
|
||||||
*/
|
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#include "qfontdialog.moc"
|
#include "qfontdialog.moc"
|
||||||
|
@ -1330,41 +1330,6 @@ QString QInputDialog::getItem(QWidget *parent, const QString &title, const QStri
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
|
||||||
\fn QString QInputDialog::getText(const QString &title, const QString &label,
|
|
||||||
QLineEdit::EchoMode echo = QLineEdit::Normal,
|
|
||||||
const QString &text = QString(), bool *ok = 0,
|
|
||||||
QWidget *parent = 0, const char *name = 0, Qt::WindowFlags flags = 0)
|
|
||||||
|
|
||||||
Call getText(\a parent, \a title, \a label, \a echo, \a text, \a
|
|
||||||
ok, \a flags) instead.
|
|
||||||
|
|
||||||
The \a name parameter is ignored.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*!
|
|
||||||
\fn double QInputDialog::getDouble(const QString &title, const QString &label, double value = 0,
|
|
||||||
double min = -2147483647, double max = 2147483647,
|
|
||||||
int decimals = 1, bool *ok = 0,
|
|
||||||
QWidget *parent = 0, const char *name = 0, Qt::WindowFlags flags = 0)
|
|
||||||
|
|
||||||
Call getDouble(\a parent, \a title, \a label, \a value, \a
|
|
||||||
min, \a max, \a decimals, \a ok, \a flags).
|
|
||||||
|
|
||||||
The \a name parameter is ignored.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*!
|
|
||||||
\fn QString QInputDialog::getItem(const QString &title, const QString &label, const QStringList &list,
|
|
||||||
int current = 0, bool editable = true, bool *ok = 0,
|
|
||||||
QWidget *parent = 0, const char *name = 0, Qt::WindowFlags flags = 0)
|
|
||||||
|
|
||||||
Call getItem(\a parent, \a title, \a label, \a list, \a current,
|
|
||||||
\a editable, \a ok, \a flags) instead.
|
|
||||||
|
|
||||||
The \a name parameter is ignored.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\fn void QInputDialog::doubleValueChanged(double value)
|
\fn void QInputDialog::doubleValueChanged(double value)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user