summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dietrich-de@nokia.com>2012-08-16 18:39:53 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-20 16:42:06 +0200
commit3a888a7182ea8428f8a6ed3fdded70e3c6c6816b (patch)
tree7a12ec0ce122825fd97a9e884d3c1199b7397db3 /src/widgets
parentb9ef4a9c3047228ec007ac81ff0a304f8cc274b7 (diff)
Remove dialogs doc related warnings
Change-Id: I79a771d18913237d894ca1a5aeaa07586106c645 Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/dialogs/qcolordialog.cpp5
-rw-r--r--src/widgets/dialogs/qerrormessage.cpp6
-rw-r--r--src/widgets/dialogs/qfiledialog.cpp2
-rw-r--r--src/widgets/dialogs/qfontdialog.cpp27
-rw-r--r--src/widgets/dialogs/qinputdialog.cpp35
5 files changed, 3 insertions, 72 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index 7a4c30f399..d589156c1e 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -1658,15 +1658,12 @@ static const Qt::WindowFlags DefaultWindowFlags =
during the execution of the program. Use setCustomColor() to set
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
how to use QColorDialog as well as other built-in Qt dialogs.
\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}
*/
/*!
diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp
index 47f79e17aa..664fd8b423 100644
--- a/src/widgets/dialogs/qerrormessage.cpp
+++ b/src/widgets/dialogs/qerrormessage.cpp
@@ -407,12 +407,6 @@ void QErrorMessagePrivate::retranslateStrings()
#endif
}
-/*!
- \fn void QErrorMessage::message(const QString & message)
-
- Use showMessage(\a message) instead.
-*/
-
QT_END_NAMESPACE
#endif // QT_NO_ERRORMESSAGE
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 5b49aec243..b47c5546da 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -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
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}
*/
diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index b13e87b4de..b51853db65 100644
--- a/src/widgets/dialogs/qfontdialog.cpp
+++ b/src/widgets/dialogs/qfontdialog.cpp
@@ -131,7 +131,7 @@ static const Qt::WindowFlags DefaultWindowFlags =
\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}
*/
@@ -1027,31 +1027,6 @@ bool QFontDialogPrivate::canBeNativeDialog() const
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
#include "qfontdialog.moc"
diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp
index 828763541b..a5f5d6b7b9 100644
--- a/src/widgets/dialogs/qinputdialog.cpp
+++ b/src/widgets/dialogs/qinputdialog.cpp
@@ -1331,41 +1331,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)
This signal is emitted whenever the double value changes in the dialog.