Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: format and indent

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-04-30 21:45:09 +03:00
parent 53dc9fede5
commit aebe72a932
2 changed files with 179 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

350
kdeui/dialogs/kmessagebox.cpp
View file

@ -438,25 +438,27 @@ int KMessageBox::questionYesNoListWId(WId parent_id, const QString &text,
QWidget* parent = QWidget::find( parent_id ); QWidget* parent = QWidget::find( parent_id );
KDialog *dialog = new KDialog(parent, Qt::Dialog); KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Question") : caption ); dialog->setCaption(caption.isEmpty() ? i18n("Question") : caption);
dialog->setButtons( KDialog::Yes | KDialog::No ); dialog->setButtons(KDialog::Yes | KDialog::No);
dialog->setObjectName( "questionYesNo" ); dialog->setObjectName("questionYesNo");
dialog->setButtonGuiItem( KDialog::Yes, buttonYes ); dialog->setButtonGuiItem(KDialog::Yes, buttonYes);
dialog->setButtonGuiItem( KDialog::No, buttonNo ); dialog->setButtonGuiItem(KDialog::No, buttonNo);
dialog->setDefaultButton( KDialog::Yes ); dialog->setDefaultButton(KDialog::Yes);
dialog->setEscapeButton( KDialog::No ); dialog->setEscapeButton(KDialog::No);
applyOptions( dialog, options ); applyOptions(dialog, options);
if ( options & KMessageBox::PlainCaption ) { if (options & KMessageBox::PlainCaption) {
dialog->setWindowTitle( caption ); dialog->setWindowTitle(caption);
} }
if ( parent == NULL && parent_id ) { if (parent == NULL && parent_id) {
KWindowSystem::setMainWindow( dialog, parent_id ); KWindowSystem::setMainWindow(dialog, parent_id);
} }
bool checkboxResult = false; bool checkboxResult = false;
const int result = createKMessageBox(dialog, QMessageBox::Information, text, strlist, const int result = createKMessageBox(
dontAskAgainName.isEmpty() ? QString() : i18n("Do not ask again"), dialog, QMessageBox::Information, text, strlist,
&checkboxResult, options); dontAskAgainName.isEmpty() ? QString() : i18n("Do not ask again"),
&checkboxResult, options
);
res = (result==KDialog::Yes ? Yes : No); res = (result==KDialog::Yes ? Yes : No);
if (checkboxResult) { if (checkboxResult) {
@ -499,28 +501,29 @@ int KMessageBox::questionYesNoCancelWId(WId parent_id,
QWidget* parent = QWidget::find( parent_id ); QWidget* parent = QWidget::find( parent_id );
KDialog *dialog= new KDialog(parent, Qt::Dialog); KDialog *dialog= new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Question") : caption ); dialog->setCaption(caption.isEmpty() ? i18n("Question") : caption);
dialog->setButtons( KDialog::Yes | KDialog::No | KDialog::Cancel ); dialog->setButtons(KDialog::Yes | KDialog::No | KDialog::Cancel);
dialog->setObjectName( "questionYesNoCancel" ); dialog->setObjectName("questionYesNoCancel");
dialog->setButtonGuiItem( KDialog::Yes, buttonYes ); dialog->setButtonGuiItem(KDialog::Yes, buttonYes);
dialog->setButtonGuiItem( KDialog::No, buttonNo ); dialog->setButtonGuiItem(KDialog::No, buttonNo);
dialog->setButtonGuiItem( KDialog::Cancel, buttonCancel ); dialog->setButtonGuiItem(KDialog::Cancel, buttonCancel);
dialog->setDefaultButton( KDialog::Yes ); dialog->setDefaultButton(KDialog::Yes);
applyOptions( dialog, options ); applyOptions(dialog, options);
if ( options & KMessageBox::PlainCaption ) { if (options & KMessageBox::PlainCaption) {
dialog->setWindowTitle( caption ); dialog->setWindowTitle(caption);
} }
if ( parent == NULL && parent_id ) { if (parent == NULL && parent_id) {
KWindowSystem::setMainWindow( dialog, parent_id ); KWindowSystem::setMainWindow(dialog, parent_id);
} }
bool checkboxResult = false; bool checkboxResult = false;
const int result = createKMessageBox(dialog, QMessageBox::Information, const int result = createKMessageBox(
text, QStringList(), dialog, QMessageBox::Information,
dontAskAgainName.isEmpty() ? QString() : i18n("Do not ask again"), text, QStringList(),
&checkboxResult, options); dontAskAgainName.isEmpty() ? QString() : i18n("Do not ask again"),
&checkboxResult, options
if ( result == KDialog::Yes ) { );
if (result == KDialog::Yes) {
res = Yes; res = Yes;
} else if ( result == KDialog::No ) { } else if ( result == KDialog::No ) {
res = No; res = No;
@ -585,27 +588,29 @@ int KMessageBox::warningYesNoListWId(WId parent_id, const QString &text,
I18N_FILTER_BUTTON_NO(buttonNo_, buttonNo) I18N_FILTER_BUTTON_NO(buttonNo_, buttonNo)
I18N_POST_BUTTON_FILTER I18N_POST_BUTTON_FILTER
QWidget* parent = QWidget::find( parent_id ); QWidget* parent = QWidget::find(parent_id);
KDialog *dialog = new KDialog(parent, Qt::Dialog); KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Warning") : caption ); dialog->setCaption(caption.isEmpty() ? i18n("Warning") : caption);
dialog->setButtons( KDialog::Yes | KDialog::No ); dialog->setButtons(KDialog::Yes | KDialog::No);
dialog->setObjectName( "warningYesNoList" ); dialog->setObjectName("warningYesNoList");
dialog->setButtonGuiItem( KDialog::Yes, buttonYes ); dialog->setButtonGuiItem(KDialog::Yes, buttonYes);
dialog->setButtonGuiItem( KDialog::No, buttonNo ); dialog->setButtonGuiItem(KDialog::No, buttonNo);
dialog->setDefaultButton( KDialog::No ); dialog->setDefaultButton(KDialog::No);
dialog->setEscapeButton( KDialog::No ); dialog->setEscapeButton(KDialog::No);
applyOptions( dialog, options ); applyOptions(dialog, options);
if ( options & KMessageBox::PlainCaption ) { if (options & KMessageBox::PlainCaption) {
dialog->setWindowTitle( caption ); dialog->setWindowTitle(caption);
} }
if ( parent == NULL && parent_id ) { if (parent == NULL && parent_id) {
KWindowSystem::setMainWindow( dialog, parent_id ); KWindowSystem::setMainWindow(dialog, parent_id);
} }
bool checkboxResult = false; bool checkboxResult = false;
const int result = createKMessageBox(dialog, QMessageBox::Warning, text, strlist, const int result = createKMessageBox(
dontAskAgainName.isEmpty() ? QString() : i18n("Do not ask again"), dialog, QMessageBox::Warning, text, strlist,
&checkboxResult, options); dontAskAgainName.isEmpty() ? QString() : i18n("Do not ask again"),
&checkboxResult, options
);
res = (result==KDialog::Yes ? Yes : No); res = (result==KDialog::Yes ? Yes : No);
if (checkboxResult) { if (checkboxResult) {
@ -667,27 +672,28 @@ int KMessageBox::warningContinueCancelListWId(WId parent_id, const QString &text
QWidget* parent = QWidget::find( parent_id ); QWidget* parent = QWidget::find( parent_id );
KDialog *dialog = new KDialog(parent, Qt::Dialog); KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Warning") : caption ); dialog->setCaption( caption.isEmpty() ? i18n("Warning") : caption);
dialog->setButtons( KDialog::Yes | KDialog::No ); dialog->setButtons( KDialog::Yes | KDialog::No );
dialog->setObjectName( "warningYesNo" ); dialog->setObjectName("warningYesNo" );
dialog->setButtonGuiItem( KDialog::Yes, buttonContinue ); dialog->setButtonGuiItem(KDialog::Yes, buttonContinue);
dialog->setButtonGuiItem( KDialog::No, buttonCancel ); dialog->setButtonGuiItem(KDialog::No, buttonCancel);
dialog->setDefaultButton( KDialog::Yes ); dialog->setDefaultButton(KDialog::Yes);
dialog->setEscapeButton( KDialog::No ); dialog->setEscapeButton(KDialog::No);
applyOptions( dialog, options ); applyOptions(dialog, options);
if ( options & KMessageBox::PlainCaption ) { if (options & KMessageBox::PlainCaption) {
dialog->setWindowTitle( caption ); dialog->setWindowTitle(caption);
} }
if ( parent == NULL && parent_id ) { if (parent == NULL && parent_id) {
KWindowSystem::setMainWindow( dialog, parent_id ); KWindowSystem::setMainWindow(dialog, parent_id);
} }
bool checkboxResult = false; bool checkboxResult = false;
const int result = createKMessageBox(dialog, QMessageBox::Warning, text, strlist, const int result = createKMessageBox(
dontAskAgainName.isEmpty() ? QString() : i18n("Do not ask again"), dialog, QMessageBox::Warning, text, strlist,
&checkboxResult, options); dontAskAgainName.isEmpty() ? QString() : i18n("Do not ask again"),
&checkboxResult, options
if ( result != KDialog::Yes ) { );
if (result != KDialog::Yes) {
return Cancel; return Cancel;
} }
if (checkboxResult) { if (checkboxResult) {
@ -754,27 +760,28 @@ int KMessageBox::warningYesNoCancelListWId(WId parent_id, const QString &text,
QWidget* parent = QWidget::find( parent_id ); QWidget* parent = QWidget::find( parent_id );
KDialog *dialog = new KDialog(parent, Qt::Dialog); KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Warning") : caption ); dialog->setCaption(caption.isEmpty() ? i18n("Warning") : caption);
dialog->setButtons( KDialog::Yes | KDialog::No | KDialog::Cancel ); dialog->setButtons(KDialog::Yes | KDialog::No | KDialog::Cancel);
dialog->setObjectName( "warningYesNoCancel" ); dialog->setObjectName("warningYesNoCancel" );
dialog->setButtonGuiItem( KDialog::Yes, buttonYes ); dialog->setButtonGuiItem(KDialog::Yes, buttonYes);
dialog->setButtonGuiItem( KDialog::No, buttonNo ); dialog->setButtonGuiItem(KDialog::No, buttonNo);
dialog->setButtonGuiItem( KDialog::Cancel, buttonCancel ); dialog->setButtonGuiItem(KDialog::Cancel, buttonCancel);
dialog->setDefaultButton( KDialog::Yes ); dialog->setDefaultButton(KDialog::Yes);
applyOptions( dialog, options ); applyOptions(dialog, options );
if ( options & KMessageBox::PlainCaption ) { if (options & KMessageBox::PlainCaption) {
dialog->setWindowTitle( caption ); dialog->setWindowTitle(caption);
} }
if ( parent == NULL && parent_id ) { if (parent == NULL && parent_id) {
KWindowSystem::setMainWindow( dialog, parent_id ); KWindowSystem::setMainWindow(dialog, parent_id);
} }
bool checkboxResult = false; bool checkboxResult = false;
const int result = createKMessageBox(dialog, QMessageBox::Warning, text, strlist, const int result = createKMessageBox(
dontAskAgainName.isEmpty() ? QString() : i18n("Do not ask again"), dialog, QMessageBox::Warning, text, strlist,
&checkboxResult, options); dontAskAgainName.isEmpty() ? QString() : i18n("Do not ask again"),
&checkboxResult, options
if ( result == KDialog::Yes ) { );
if (result == KDialog::Yes) {
res = Yes; res = Yes;
} else if ( result == KDialog::No ) { } else if ( result == KDialog::No ) {
res = No; res = No;
@ -788,85 +795,82 @@ int KMessageBox::warningYesNoCancelListWId(WId parent_id, const QString &text,
return res; return res;
} }
void KMessageBox::error(QWidget *parent, const QString &text, void KMessageBox::error(QWidget *parent, const QString &text, const QString &caption,
const QString &caption, Options options) Options options)
{ {
return errorListWId( parent ? parent->effectiveWinId() : 0, text, QStringList(), caption, options ); return errorListWId( parent ? parent->effectiveWinId() : 0, text, QStringList(), caption, options );
} }
void KMessageBox::errorWId(WId parent_id, const QString &text, void KMessageBox::errorWId(WId parent_id, const QString &text, const QString &caption,
const QString &caption, Options options) Options options)
{ {
errorListWId( parent_id, text, QStringList(), caption, options ); errorListWId(parent_id, text, QStringList(), caption, options);
} }
void KMessageBox::errorList(QWidget *parent, const QString &text, const QStringList &strlist, void KMessageBox::errorList(QWidget *parent, const QString &text, const QStringList &strlist,
const QString &caption, Options options) const QString &caption, Options options)
{ {
return errorListWId( parent ? parent->effectiveWinId() : 0, text, strlist, caption, options ); return errorListWId(parent ? parent->effectiveWinId() : 0, text, strlist, caption, options);
} }
void KMessageBox::errorListWId(WId parent_id, const QString &text, const QStringList &strlist, void KMessageBox::errorListWId(WId parent_id, const QString &text, const QStringList &strlist,
const QString &caption, Options options) const QString &caption, Options options)
{ {
QWidget* parent = QWidget::find( parent_id ); QWidget* parent = QWidget::find(parent_id);
KDialog *dialog = new KDialog(parent, Qt::Dialog); KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Error") : caption ); dialog->setCaption(caption.isEmpty() ? i18n("Error") : caption);
dialog->setButtons( KDialog::Ok ); dialog->setButtons(KDialog::Ok);
dialog->setObjectName( "error" ); dialog->setObjectName("error");
dialog->setDefaultButton( KDialog::Ok ); dialog->setDefaultButton(KDialog::Ok);
dialog->setEscapeButton( KDialog::Ok ); dialog->setEscapeButton(KDialog::Ok);
applyOptions( dialog, options ); applyOptions(dialog, options);
if ( options & KMessageBox::PlainCaption ) { if (options & KMessageBox::PlainCaption) {
dialog->setWindowTitle( caption ); dialog->setWindowTitle(caption);
} }
if ( parent == NULL && parent_id ) { if (parent == NULL && parent_id) {
KWindowSystem::setMainWindow( dialog, parent_id ); KWindowSystem::setMainWindow(dialog, parent_id);
} }
createKMessageBox(dialog, QMessageBox::Critical, text, strlist, QString(), 0, options); createKMessageBox(dialog, QMessageBox::Critical, text, strlist, QString(), 0, options);
} }
void void KMessageBox::detailedError(QWidget *parent, const QString &text,
KMessageBox::detailedError(QWidget *parent, const QString &text, const QString &details,
const QString &details, const QString &caption, Options options)
const QString &caption, Options options)
{ {
return detailedErrorWId( parent ? parent->effectiveWinId() : 0, text, details, caption, options ); return detailedErrorWId( parent ? parent->effectiveWinId() : 0, text, details, caption, options );
} }
void KMessageBox::detailedErrorWId(WId parent_id, const QString &text, void KMessageBox::detailedErrorWId(WId parent_id, const QString &text,
const QString &details, const QString &details,
const QString &caption, Options options) const QString &caption, Options options)
{ {
QWidget* parent = QWidget::find( parent_id ); QWidget* parent = QWidget::find( parent_id );
KDialog *dialog = new KDialog(parent, Qt::Dialog); KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Error") : caption ); dialog->setCaption(caption.isEmpty() ? i18n("Error") : caption);
dialog->setButtons( KDialog::Ok | KDialog::Details ); dialog->setButtons(KDialog::Ok | KDialog::Details);
dialog->setObjectName( "error" ); dialog->setObjectName("error");
dialog->setDefaultButton( KDialog::Ok ); dialog->setDefaultButton(KDialog::Ok);
dialog->setEscapeButton( KDialog::Ok ); dialog->setEscapeButton(KDialog::Ok);
applyOptions( dialog, options ); applyOptions(dialog, options);
if ( options & KMessageBox::PlainCaption ) { if (options & KMessageBox::PlainCaption) {
dialog->setWindowTitle( caption ); dialog->setWindowTitle(caption);
} }
if ( parent == NULL && parent_id ) { if (parent == NULL && parent_id) {
KWindowSystem::setMainWindow( dialog, parent_id ); KWindowSystem::setMainWindow(dialog, parent_id);
} }
createKMessageBox(dialog, QMessageBox::Critical, text, QStringList(), QString(), 0, options, details); createKMessageBox(dialog, QMessageBox::Critical, text, QStringList(), QString(), 0, options, details);
} }
void KMessageBox::queuedDetailedError(QWidget *parent, const QString &text, void KMessageBox::queuedDetailedError(QWidget *parent, const QString &text, const QString &details,
const QString &details, const QString &caption)
const QString &caption)
{ {
return queuedDetailedErrorWId( parent ? parent->effectiveWinId() : 0, text, details, caption ); return queuedDetailedErrorWId(parent ? parent->effectiveWinId() : 0, text, details, caption);
} }
void KMessageBox::queuedDetailedErrorWId(WId parent_id, const QString &text, void KMessageBox::queuedDetailedErrorWId(WId parent_id, const QString &text,
const QString &details, const QString &details, const QString &caption)
const QString &caption)
{ {
KMessageBox_queue = true; KMessageBox_queue = true;
(void) detailedErrorWId(parent_id, text, details, caption); (void) detailedErrorWId(parent_id, text, details, caption);
@ -874,82 +878,82 @@ void KMessageBox::queuedDetailedErrorWId(WId parent_id, const QString &text,
} }
void KMessageBox::sorry(QWidget *parent, const QString &text, void KMessageBox::sorry(QWidget *parent, const QString &text, const QString &caption,
const QString &caption, Options options) Options options)
{ {
return sorryWId( parent ? parent->effectiveWinId() : 0, text, caption, options ); return sorryWId(parent ? parent->effectiveWinId() : 0, text, caption, options);
} }
void KMessageBox::sorryWId(WId parent_id, const QString &text, void KMessageBox::sorryWId(WId parent_id, const QString &text, const QString &caption,
const QString &caption, Options options) Options options)
{ {
QWidget* parent = QWidget::find( parent_id ); QWidget* parent = QWidget::find(parent_id);
KDialog *dialog = new KDialog(parent, Qt::Dialog); KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Sorry") : caption ); dialog->setCaption(caption.isEmpty() ? i18n("Sorry") : caption);
dialog->setButtons( KDialog::Ok ); dialog->setButtons(KDialog::Ok);
dialog->setObjectName( "sorry" ); dialog->setObjectName("sorry");
dialog->setDefaultButton( KDialog::Ok ); dialog->setDefaultButton(KDialog::Ok);
dialog->setEscapeButton( KDialog::Ok ); dialog->setEscapeButton(KDialog::Ok);
applyOptions( dialog, options ); applyOptions(dialog, options);
if ( options & KMessageBox::PlainCaption ) { if (options & KMessageBox::PlainCaption) {
dialog->setWindowTitle( caption ); dialog->setWindowTitle(caption);
} }
if ( parent == NULL && parent_id ) { if (parent == NULL && parent_id) {
KWindowSystem::setMainWindow( dialog, parent_id ); KWindowSystem::setMainWindow(dialog, parent_id);
} }
createKMessageBox(dialog, QMessageBox::Warning, text, QStringList(), QString(), 0, options); createKMessageBox(dialog, QMessageBox::Warning, text, QStringList(), QString(), 0, options);
} }
void KMessageBox::detailedSorry(QWidget *parent, const QString &text, void KMessageBox::detailedSorry(QWidget *parent, const QString &text, const QString &details,
const QString &details, const QString &caption, Options options)
const QString &caption, Options options)
{ {
return detailedSorryWId( parent ? parent->effectiveWinId() : 0, text, details, caption, options ); return detailedSorryWId(parent ? parent->effectiveWinId() : 0, text, details, caption, options);
} }
void KMessageBox::detailedSorryWId(WId parent_id, const QString &text, void KMessageBox::detailedSorryWId(WId parent_id, const QString &text, const QString &details,
const QString &details, const QString &caption, Options options)
const QString &caption, Options options)
{ {
QWidget* parent = QWidget::find( parent_id ); QWidget* parent = QWidget::find( parent_id );
KDialog *dialog = new KDialog(parent, Qt::Dialog); KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Sorry") : caption ); dialog->setCaption(caption.isEmpty() ? i18n("Sorry") : caption);
dialog->setButtons( KDialog::Ok | KDialog::Details ); dialog->setButtons(KDialog::Ok | KDialog::Details);
dialog->setObjectName( "sorry" ); dialog->setObjectName("sorry");
dialog->setDefaultButton( KDialog::Ok ); dialog->setDefaultButton(KDialog::Ok);
dialog->setEscapeButton( KDialog::Ok ); dialog->setEscapeButton(KDialog::Ok);
applyOptions( dialog, options ); applyOptions(dialog, options);
if ( options & KMessageBox::PlainCaption ) { if (options & KMessageBox::PlainCaption) {
dialog->setWindowTitle( caption ); dialog->setWindowTitle(caption);
} }
if ( parent == NULL && parent_id ) { if (parent == NULL && parent_id) {
KWindowSystem::setMainWindow( dialog, parent_id ); KWindowSystem::setMainWindow(dialog, parent_id);
} }
createKMessageBox(dialog, QMessageBox::Warning, text, QStringList(), QString(), 0, options, details); createKMessageBox(dialog, QMessageBox::Warning, text, QStringList(), QString(), 0, options, details);
} }
void KMessageBox::information(QWidget *parent,const QString &text, void KMessageBox::information(QWidget *parent,const QString &text, const QString &caption,
const QString &caption, const QString &dontShowAgainName, Options options) const QString &dontShowAgainName, Options options)
{ {
informationList(parent, text, QStringList(), caption, dontShowAgainName, options); informationList(parent, text, QStringList(), caption, dontShowAgainName, options);
} }
void KMessageBox::informationWId(WId parent_id,const QString &text, void KMessageBox::informationWId(WId parent_id,const QString &text, const QString &caption,
const QString &caption, const QString &dontShowAgainName, Options options) const QString &dontShowAgainName, Options options)
{ {
informationListWId(parent_id, text, QStringList(), caption, dontShowAgainName, options); informationListWId(parent_id, text, QStringList(), caption, dontShowAgainName, options);
} }
void KMessageBox::informationList(QWidget *parent,const QString &text, const QStringList & strlist, void KMessageBox::informationList(QWidget *parent,const QString &text, const QStringList & strlist,
const QString &caption, const QString &dontShowAgainName, Options options) const QString &caption, const QString &dontShowAgainName, Options options)
{ {
return informationListWId( parent ? parent->effectiveWinId() : 0, text, strlist, caption, return informationListWId(
dontShowAgainName, options ); parent ? parent->effectiveWinId() : 0, text, strlist, caption,
dontShowAgainName, options
);
} }
void KMessageBox::informationListWId(WId parent_id,const QString &text, const QStringList & strlist, void KMessageBox::informationListWId(WId parent_id,const QString &text, const QStringList &strlist,
const QString &caption, const QString &dontShowAgainName, Options options) const QString &caption, const QString &dontShowAgainName, Options options)
{ {
if (!shouldBeShownContinue(dontShowAgainName)) { if (!shouldBeShownContinue(dontShowAgainName)) {
@ -963,7 +967,7 @@ void KMessageBox::informationListWId(WId parent_id,const QString &text, const QS
dialog->setObjectName("information"); dialog->setObjectName("information");
dialog->setDefaultButton(KDialog::Ok); dialog->setDefaultButton(KDialog::Ok);
dialog->setEscapeButton(KDialog::Ok); dialog->setEscapeButton(KDialog::Ok);
applyOptions( dialog, options ); applyOptions(dialog, options);
if (options & KMessageBox::PlainCaption) { if (options & KMessageBox::PlainCaption) {
dialog->setWindowTitle(caption); dialog->setWindowTitle(caption);
} }
@ -1015,8 +1019,8 @@ void KMessageBox::enableMessage(const QString &dontShowAgainName)
config->sync(); config->sync();
} }
void KMessageBox::about(QWidget *parent, const QString &text, void KMessageBox::about(QWidget *parent, const QString &text, const QString &caption,
const QString &caption, Options options) Options options)
{ {
QString _caption = caption; QString _caption = caption;
if (_caption.isEmpty()) { if (_caption.isEmpty()) {
@ -1024,12 +1028,12 @@ void KMessageBox::about(QWidget *parent, const QString &text,
} }
KDialog *dialog = new KDialog(parent, Qt::Dialog); KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption ); dialog->setCaption(caption);
dialog->setButtons( KDialog::Ok ); dialog->setButtons(KDialog::Ok);
dialog->setObjectName( "about" ); dialog->setObjectName("about");
applyOptions( dialog, options ); applyOptions(dialog, options);
dialog->setDefaultButton( KDialog::Ok ); dialog->setDefaultButton(KDialog::Ok);
dialog->setEscapeButton( KDialog::Ok ); dialog->setEscapeButton(KDialog::Ok);
if (qApp->windowIcon().isNull()) { if (qApp->windowIcon().isNull()) {
QPixmap ret = QMessageBox::standardIcon(QMessageBox::Information); QPixmap ret = QMessageBox::standardIcon(QMessageBox::Information);
dialog->setWindowIcon(ret); dialog->setWindowIcon(ret);

6
plasma/abstracttoolbox.h
View file

@ -54,8 +54,7 @@ public:
Q_ENUMS(ToolType) Q_ENUMS(ToolType)
explicit AbstractToolBox(Containment *parent); explicit AbstractToolBox(Containment *parent);
explicit AbstractToolBox(QObject *parent = 0, explicit AbstractToolBox(QObject *parent = 0, const QVariantList &args = QVariantList());
const QVariantList &args = QVariantList());
~AbstractToolBox(); ~AbstractToolBox();
/** /**
@ -78,8 +77,7 @@ public:
* *
* @since 4.6 * @since 4.6
*/ */
static KPluginInfo::List listToolBoxInfo(const QString static KPluginInfo::List listToolBoxInfo(const QString &parentApp = QString());
&parentApp = QString());
/** /**
* create a toolbox tool from the given action * create a toolbox tool from the given action