From kde-commits Sat Mar 31 22:19:00 2007 From: Albert Astals Cid Date: Sat, 31 Mar 2007 22:19:00 +0000 To: kde-commits Subject: KDE/kdelibs/kdeui/findreplace Message-Id: <1175379540.223214.25678.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=117537940614849 SVN commit 648651 by aacid: make findExtension() and replaceExtension() const remove some ptr that are not needed to be kept These clases still have lots of members outside the d-ptr M +58 -60 kfinddialog.cpp M +1 -6 kfinddialog.h M +11 -9 kreplacedialog.cpp M +1 -1 kreplacedialog.h --- trunk/KDE/kdelibs/kdeui/findreplace/kfinddialog.cpp #648650:648651 @@ -40,21 +40,23 @@ class KFindDialog::KFindDialogPrivate { public: - KFindDialogPrivate() : m_regexpDialog(0), - m_regexpDialogQueryDone(false), - m_enabled(KFind::WholeWordsOnly | KFind::FromCursor | KFind::SelectedText | KFind::CaseSensitive | KFind::FindBackwards | KFind::RegularExpression), m_initialShowDone(false) {} - QDialog* m_regexpDialog; - bool m_regexpDialogQueryDone; - long m_enabled; // uses Options to define which search options are enabled - bool m_initialShowDone; + KFindDialogPrivate() : regexpDialog(0), + regexpDialogQueryDone(false), + enabled(KFind::WholeWordsOnly | KFind::FromCursor | KFind::SelectedText | KFind::CaseSensitive | KFind::FindBackwards | KFind::RegularExpression), + initialShowDone(false), + findExtension(0) + {} + QDialog *regexpDialog; + bool regexpDialogQueryDone; + long enabled; // uses Options to define which search options are enabled + bool initialShowDone; QStringList findStrings; QString pattern; + QWidget *findExtension; }; KFindDialog::KFindDialog(QWidget *parent, const char *name, long options, const QStringList &findStrings, bool hasSelection) : KDialog(parent), - m_findExtension (0), - m_replaceExtension (0), d(new KFindDialogPrivate) { setObjectName( name ); @@ -70,8 +72,6 @@ KFindDialog::KFindDialog(bool modal, QWidget *parent, const char *name, long options, const QStringList &findStrings, bool hasSelection) : KDialog(parent), - m_findExtension (0), - m_replaceExtension (0), d(new KFindDialogPrivate) { setObjectName( name ); @@ -87,8 +87,6 @@ KFindDialog::KFindDialog(QWidget *parent, const char *name, bool /*forReplace*/) : KDialog(parent), - m_findExtension (0), - m_replaceExtension (0), d(new KFindDialogPrivate) { setObjectName( name ); @@ -105,15 +103,15 @@ delete d; } -QWidget *KFindDialog::findExtension() +QWidget *KFindDialog::findExtension() const { - if (!m_findExtension) + if (!d->findExtension) { - m_findExtension = new QWidget(m_findGrp); - m_findLayout->addWidget(m_findExtension, 3, 0, 1, 2); + d->findExtension = new QWidget(m_findGrp); + m_findLayout->addWidget(d->findExtension, 3, 0, 1, 2); } - return m_findExtension; + return d->findExtension; } QStringList KFindDialog::findHistory() const @@ -140,7 +138,7 @@ m_findLayout->setSpacing( KDialog::spacingHint() ); // m_findLayout->setMargin( KDialog::marginHint() ); - m_findLabel = new QLabel(i18n("&Text to find:"), m_findGrp); + QLabel *findLabel = new QLabel(i18n("&Text to find:"), m_findGrp); m_find = new KHistoryCombo(true, m_findGrp); m_find->setMaxCount(10); m_find->setDuplicatesEnabled(false); @@ -148,7 +146,7 @@ m_regExpItem = new QPushButton(i18n("&Edit..."), m_findGrp); m_regExpItem->setEnabled(false); - m_findLayout->addWidget(m_findLabel, 0, 0); + m_findLayout->addWidget(findLabel, 0, 0); m_findLayout->addWidget(m_find, 1, 0, 1, 2); m_findLayout->addWidget(m_regExp, 2, 0); m_findLayout->addWidget(m_regExpItem, 2, 1); @@ -160,7 +158,7 @@ m_replaceLayout->setSpacing( KDialog::spacingHint() ); // m_replaceLayout->setMargin( KDialog::marginHint() ); - m_replaceLabel = new QLabel(i18n("Replace&ment text:"), m_replaceGrp); + QLabel *replaceLabel = new QLabel(i18n("Replace&ment text:"), m_replaceGrp); m_replace = new KHistoryCombo(true, m_replaceGrp); m_replace->setMaxCount(10); m_replace->setDuplicatesEnabled(false); @@ -168,30 +166,30 @@ m_backRefItem = new QPushButton(i18n("Insert Place&holder"), m_replaceGrp); m_backRefItem->setEnabled(false); - m_replaceLayout->addWidget(m_replaceLabel, 0, 0); + m_replaceLayout->addWidget(replaceLabel, 0, 0); m_replaceLayout->addWidget(m_replace, 1, 0, 1, 2); m_replaceLayout->addWidget(m_backRef, 2, 0); m_replaceLayout->addWidget(m_backRefItem, 2, 1); topLayout->addWidget(m_replaceGrp); - m_optionGrp = new QGroupBox(i18n("Options"), page); + QGroupBox *optionGrp = new QGroupBox(i18n("Options"), page); // m_optionGrp->layout()->setMargin(KDialog::marginHint()); - optionsLayout = new QGridLayout(m_optionGrp); + optionsLayout = new QGridLayout(optionGrp); optionsLayout->setSpacing( KDialog::spacingHint() ); // optionsLayout->setMargin( KDialog::marginHint() ); - m_caseSensitive = new QCheckBox(i18n("C&ase sensitive"), m_optionGrp); - m_wholeWordsOnly = new QCheckBox(i18n("&Whole words only"), m_optionGrp); - m_fromCursor = new QCheckBox(i18n("From c&ursor"), m_optionGrp); - m_findBackwards = new QCheckBox(i18n("Find &backwards"), m_optionGrp); - m_selectedText = new QCheckBox(i18n("&Selected text"), m_optionGrp); + m_caseSensitive = new QCheckBox(i18n("C&ase sensitive"), optionGrp); + m_wholeWordsOnly = new QCheckBox(i18n("&Whole words only"), optionGrp); + m_fromCursor = new QCheckBox(i18n("From c&ursor"), optionGrp); + m_findBackwards = new QCheckBox(i18n("Find &backwards"), optionGrp); + m_selectedText = new QCheckBox(i18n("&Selected text"), optionGrp); setHasSelection( hasSelection ); // If we have a selection, we make 'find in selection' default // and if we don't, then the option has to be unchecked, obviously. m_selectedText->setChecked( hasSelection ); slotSelectedTextToggled( hasSelection ); - m_promptOnReplace = new QCheckBox(i18n("&Prompt on replace"), m_optionGrp); + m_promptOnReplace = new QCheckBox(i18n("&Prompt on replace"), optionGrp); m_promptOnReplace->setChecked( true ); optionsLayout->addWidget(m_caseSensitive, 0, 0); @@ -200,7 +198,7 @@ optionsLayout->addWidget(m_findBackwards, 0, 1); optionsLayout->addWidget(m_selectedText, 1, 1); optionsLayout->addWidget(m_promptOnReplace, 2, 1); - topLayout->addWidget(m_optionGrp); + topLayout->addWidget(optionGrp); // We delay creation of these until needed. m_patterns = 0; @@ -238,8 +236,8 @@ setTabOrder(m_selectedText, m_promptOnReplace); // buddies - m_findLabel->setBuddy(m_find); - m_replaceLabel->setBuddy(m_replace); + findLabel->setBuddy(m_find); + replaceLabel->setBuddy(m_replace); if (!forReplace) { @@ -309,9 +307,9 @@ void KFindDialog::showEvent( QShowEvent *e ) { - if ( !d->m_initialShowDone ) + if ( !d->initialShowDone ) { - d->m_initialShowDone = true; // only once + d->initialShowDone = true; // only once kDebug() << "showEvent\n"; if (!d->findStrings.isEmpty()) setFindHistory(d->findStrings); @@ -371,8 +369,8 @@ void KFindDialog::setHasSelection(bool hasSelection) { - if (hasSelection) d->m_enabled |= KFind::SelectedText; - else d->m_enabled &= ~KFind::SelectedText; + if (hasSelection) d->enabled |= KFind::SelectedText; + else d->enabled &= ~KFind::SelectedText; m_selectedText->setEnabled( hasSelection ); if ( !hasSelection ) { @@ -384,15 +382,15 @@ void KFindDialog::slotSelectedTextToggled(bool selec) { // From cursor doesn't make sense if we have a selection - m_fromCursor->setEnabled( !selec && (d->m_enabled & KFind::FromCursor) ); + m_fromCursor->setEnabled( !selec && (d->enabled & KFind::FromCursor) ); if ( selec ) // uncheck if disabled m_fromCursor->setChecked( false ); } void KFindDialog::setHasCursor(bool hasCursor) { - if (hasCursor) d->m_enabled |= KFind::FromCursor; - else d->m_enabled &= ~KFind::FromCursor; + if (hasCursor) d->enabled |= KFind::FromCursor; + else d->enabled &= ~KFind::FromCursor; m_fromCursor->setEnabled( hasCursor ); m_fromCursor->setChecked( hasCursor && (options() & KFind::FromCursor) ); } @@ -400,8 +398,8 @@ void KFindDialog::setSupportsBackwardsFind( bool supports ) { // ########## Shouldn't this hide the checkbox instead? - if (supports) d->m_enabled |= KFind::FindBackwards; - else d->m_enabled &= ~KFind::FindBackwards; + if (supports) d->enabled |= KFind::FindBackwards; + else d->enabled &= ~KFind::FindBackwards; m_findBackwards->setEnabled( supports ); m_findBackwards->setChecked( supports && (options() & KFind::FindBackwards) ); } @@ -409,8 +407,8 @@ void KFindDialog::setSupportsCaseSensitiveFind( bool supports ) { // ########## This should hide the checkbox instead - if (supports) d->m_enabled |= KFind::CaseSensitive; - else d->m_enabled &= ~KFind::CaseSensitive; + if (supports) d->enabled |= KFind::CaseSensitive; + else d->enabled &= ~KFind::CaseSensitive; m_caseSensitive->setEnabled( supports ); m_caseSensitive->setChecked( supports && (options() & KFind::CaseSensitive) ); } @@ -418,8 +416,8 @@ void KFindDialog::setSupportsWholeWordsFind( bool supports ) { // ########## This should hide the checkbox instead - if (supports) d->m_enabled |= KFind::WholeWordsOnly; - else d->m_enabled &= ~KFind::WholeWordsOnly; + if (supports) d->enabled |= KFind::WholeWordsOnly; + else d->enabled &= ~KFind::WholeWordsOnly; m_wholeWordsOnly->setEnabled( supports ); m_wholeWordsOnly->setChecked( supports && (options() & KFind::WholeWordsOnly) ); } @@ -427,39 +425,39 @@ void KFindDialog::setSupportsRegularExpressionFind( bool supports ) { // ########## This should hide the checkbox instead - if (supports) d->m_enabled |= KFind::RegularExpression; - else d->m_enabled &= ~KFind::RegularExpression; + if (supports) d->enabled |= KFind::RegularExpression; + else d->enabled &= ~KFind::RegularExpression; m_regExp->setEnabled( supports ); m_regExp->setChecked( supports && (options() & KFind::RegularExpression) ); } void KFindDialog::setOptions(long options) { - m_caseSensitive->setChecked((d->m_enabled & KFind::CaseSensitive) && (options & KFind::CaseSensitive)); - m_wholeWordsOnly->setChecked((d->m_enabled & KFind::WholeWordsOnly) && (options & KFind::WholeWordsOnly)); - m_fromCursor->setChecked((d->m_enabled & KFind::FromCursor) && (options & KFind::FromCursor)); - m_findBackwards->setChecked((d->m_enabled & KFind::FindBackwards) && (options & KFind::FindBackwards)); - m_selectedText->setChecked((d->m_enabled & KFind::SelectedText) && (options & KFind::SelectedText)); - m_regExp->setChecked((d->m_enabled & KFind::RegularExpression) && (options & KFind::RegularExpression)); + m_caseSensitive->setChecked((d->enabled & KFind::CaseSensitive) && (options & KFind::CaseSensitive)); + m_wholeWordsOnly->setChecked((d->enabled & KFind::WholeWordsOnly) && (options & KFind::WholeWordsOnly)); + m_fromCursor->setChecked((d->enabled & KFind::FromCursor) && (options & KFind::FromCursor)); + m_findBackwards->setChecked((d->enabled & KFind::FindBackwards) && (options & KFind::FindBackwards)); + m_selectedText->setChecked((d->enabled & KFind::SelectedText) && (options & KFind::SelectedText)); + m_regExp->setChecked((d->enabled & KFind::RegularExpression) && (options & KFind::RegularExpression)); } // Create a popup menu with a list of regular expression terms, to help the user // compose a regular expression search pattern. void KFindDialog::showPatterns() { - if ( !d->m_regexpDialogQueryDone ) + if ( !d->regexpDialogQueryDone ) { - d->m_regexpDialog = KServiceTypeTrader::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor", QString(), this ); - d->m_regexpDialogQueryDone = true; + d->regexpDialog = KServiceTypeTrader::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor", QString(), this ); + d->regexpDialogQueryDone = true; } - if ( d->m_regexpDialog ) + if ( d->regexpDialog ) { - KRegExpEditorInterface *iface = dynamic_cast( d->m_regexpDialog ); + KRegExpEditorInterface *iface = dynamic_cast( d->regexpDialog ); assert( iface ); iface->setRegExp( pattern() ); - if ( d->m_regexpDialog->exec() == QDialog::Accepted ) + if ( d->regexpDialog->exec() == QDialog::Accepted ) setPattern( iface->regExp() ); } else // No complete regexp-editor available, bring up the old popupmenu --- trunk/KDE/kdelibs/kdeui/findreplace/kfinddialog.h #648650:648651 @@ -213,7 +213,7 @@ * and is positioned immediately below the regular expression support * widgets for the pattern string. */ - QWidget *findExtension(); + QWidget *findExtension() const; Q_SIGNALS: /** @@ -243,14 +243,11 @@ private: QGroupBox *m_findGrp; - QLabel *m_findLabel; KHistoryCombo *m_find; QCheckBox *m_regExp; QPushButton *m_regExpItem; QGridLayout *m_findLayout; - QWidget *m_findExtension; - QGroupBox *m_optionGrp; QCheckBox *m_wholeWordsOnly; QCheckBox *m_fromCursor; QCheckBox *m_selectedText; @@ -274,12 +271,10 @@ void init( bool forReplace, const QStringList &findStrings, bool hasSelection ); QGroupBox *m_replaceGrp; - QLabel *m_replaceLabel; KHistoryCombo *m_replace; QCheckBox* m_backRef; QPushButton* m_backRefItem; QGridLayout *m_replaceLayout; - QWidget *m_replaceExtension; QCheckBox* m_promptOnReplace; --- trunk/KDE/kdelibs/kdeui/findreplace/kreplacedialog.cpp #648650:648651 @@ -38,9 +38,11 @@ */ class KReplaceDialog::KReplaceDialogPrivate { public: - KReplaceDialogPrivate() : m_initialShowDone(false) {} + KReplaceDialogPrivate() : initialShowDone(false) {} + QStringList replaceStrings; - bool m_initialShowDone; + bool initialShowDone; + QWidget *replaceExtension; }; KReplaceDialog::KReplaceDialog(QWidget *parent, const char *name, long options, const QStringList &findStrings, const QStringList &replaceStrings, bool hasSelection) : @@ -59,9 +61,9 @@ void KReplaceDialog::showEvent( QShowEvent *e ) { - if ( !d->m_initialShowDone ) + if ( !d->initialShowDone ) { - d->m_initialShowDone = true; // only once + d->initialShowDone = true; // only once if (!d->replaceStrings.isEmpty()) { @@ -85,15 +87,15 @@ return options; } -QWidget *KReplaceDialog::replaceExtension() +QWidget *KReplaceDialog::replaceExtension() const { - if (!m_replaceExtension) + if (!d->replaceExtension) { - m_replaceExtension = new QWidget(m_replaceGrp); - m_replaceLayout->addWidget(m_replaceExtension, 3, 0, 1, 2); + d->replaceExtension = new QWidget(m_replaceGrp); + m_replaceLayout->addWidget(d->replaceExtension, 3, 0, 1, 2); } - return m_replaceExtension; + return d->replaceExtension; } QString KReplaceDialog::replacement() const --- trunk/KDE/kdelibs/kdeui/findreplace/kreplacedialog.h #648650:648651 @@ -133,7 +133,7 @@ * and is positioned immediately the regular expression support widgets * for the replacement string. */ - QWidget *replaceExtension(); + QWidget *replaceExtension() const; protected Q_SLOTS: