From kde-commits Mon Sep 03 15:05:00 2018 From: Michael Reeves Date: Mon, 03 Sep 2018 15:05:00 +0000 To: kde-commits Subject: [kdiff3] src: strip unused parameter Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=153598713003194 Git commit ff5adaf6ce08ecb4aae47bba6ed48148729af5cc by Michael Reeves. Committed on 03/09/2018 at 15:04. Pushed by mreeves into branch 'master'. strip unused parameter M +121 -122 src/optiondialog.cpp https://commits.kde.org/kdiff3/ff5adaf6ce08ecb4aae47bba6ed48148729af5cc diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index b02fd30..2d8be34 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -68,9 +68,8 @@ void OptionDialog::addOptionItem(OptionItem* p) class OptionItem { public: - OptionItem(OptionDialog* pOptionDialog, const QString& saveName) + OptionItem(const QString& saveName) { - Q_ASSERT(pOptionDialog !=3D nullptr); m_saveName =3D saveName; m_bPreserved =3D false; } @@ -106,8 +105,8 @@ template class OptionItemT : public OptionItem { public: - OptionItemT(OptionDialog* pOptionDialog, const QString& saveName) - : OptionItem(pOptionDialog, saveName) + OptionItemT(const QString& saveName) + : OptionItem(saveName) { } = @@ -123,8 +122,8 @@ class OptionCheckBox : public QCheckBox, public OptionI= temT { public: OptionCheckBox(QString text, bool bDefaultVal, const QString& saveName= , bool* pbVar, - QWidget* pParent, OptionDialog* pOD) - : QCheckBox(text, pParent), OptionItemT(pOD, saveName) + QWidget* pParent) + : QCheckBox(text, pParent), OptionItemT(saveName) { m_pVar =3D pbVar; m_defaultVal =3D bDefaultVal; @@ -143,8 +142,8 @@ class OptionRadioButton : public QRadioButton, public O= ptionItemT { public: OptionRadioButton(QString text, bool bDefaultVal, const QString& saveN= ame, bool* pbVar, - QWidget* pParent, OptionDialog* pOD) - : QRadioButton(text, pParent), OptionItemT(pOD, saveName) + QWidget* pParent) + : QRadioButton(text, pParent), OptionItemT(saveName) { m_pVar =3D pbVar; m_defaultVal =3D bDefaultVal; @@ -163,14 +162,14 @@ template class OptionT : public OptionItemT { public: - OptionT(const T& defaultVal, const QString& saveName, T* pVar, OptionD= ialog* pOD) - : OptionItemT(pOD, saveName) + OptionT(const T& defaultVal, const QString& saveName, T* pVar) + : OptionItemT(saveName) { this->m_pVar =3D pVar; *this->m_pVar =3D defaultVal; } - OptionT(const QString& saveName, T* pVar, OptionDialog* pOD) - : OptionItemT(pOD, saveName) + OptionT(const QString& saveName, T* pVar) + : OptionItemT(saveName) { this->m_pVar =3D pVar; } @@ -210,7 +209,7 @@ FontChooser::FontChooser(QWidget* pParent) : QGroupBox(pParent) { QVBoxLayout* pLayout =3D new QVBoxLayout(this); - m_pLabel =3D new QLabel(QString(), this); + m_pLabel =3D new QLabel(QString()); pLayout->addWidget(m_pLabel); = QChar visualTab(0x2192); @@ -224,7 +223,7 @@ FontChooser::FontChooser(QWidget* pParent) m_pExampleTextEdit->setReadOnly(true); pLayout->addWidget(m_pExampleTextEdit); = - m_pSelectFont =3D new QPushButton(i18n("Change Font"), this); + m_pSelectFont =3D new QPushButton(i18n("Change Font")); m_pSelectFont->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); connect(m_pSelectFont, SIGNAL(clicked()), this, SLOT(slotSelectFont())= ); pLayout->addWidget(m_pSelectFont); @@ -256,8 +255,8 @@ void FontChooser::slotSelectFont() class OptionFontChooser : public FontChooser, public OptionItemT { public: - OptionFontChooser(const QFont& defaultVal, const QString& saveName, QF= ont* pVar, QWidget* pParent, OptionDialog* pOD) : FontChooser(pParent), - = OptionItemT(pOD, s= aveName) + OptionFontChooser(const QFont& defaultVal, const QString& saveName, QF= ont* pVar, QWidget* pParent) : FontChooser(pParent), + = OptionItemT(saveNa= me) { m_pVar =3D pVar; *m_pVar =3D defaultVal; @@ -276,8 +275,8 @@ class OptionFontChooser : public FontChooser, public Op= tionItemT class OptionColorButton : public KColorButton, public OptionItemT { public: - OptionColorButton(QColor defaultVal, const QString& saveName, QColor* = pVar, QWidget* pParent, OptionDialog* pOD) - : KColorButton(pParent), OptionItemT(pOD, saveName) + OptionColorButton(QColor defaultVal, const QString& saveName, QColor* = pVar, QWidget* pParent) + : KColorButton(pParent), OptionItemT(saveName) { m_pVar =3D pVar; m_defaultVal =3D defaultVal; @@ -296,8 +295,8 @@ class OptionLineEdit : public QComboBox, public OptionI= temT { public: OptionLineEdit(const QString& defaultVal, const QString& saveName, QSt= ring* pVar, - QWidget* pParent, OptionDialog* pOD) - : QComboBox(pParent), OptionItemT(pOD, saveName) + QWidget* pParent) + : QComboBox(pParent), OptionItemT(saveName) { setMinimumWidth(50); setEditable(true); @@ -353,8 +352,8 @@ class OptionIntEdit : public QLineEdit, public OptionIt= emT { public: OptionIntEdit(int defaultVal, const QString& saveName, int* pVar, int = rangeMin, int rangeMax, - QWidget* pParent, OptionDialog* pOD) - : QLineEdit(pParent), OptionItemT(pOD, saveName) + QWidget* pParent) + : QLineEdit(pParent), OptionItemT(saveName) { m_pVar =3D pVar; m_defaultVal =3D defaultVal; @@ -391,8 +390,8 @@ class OptionComboBox : public QComboBox, public OptionI= tem { public: OptionComboBox(int defaultVal, const QString& saveName, int* pVarNum, - QWidget* pParent, OptionDialog* pOD) - : QComboBox(pParent), OptionItem(pOD, saveName) + QWidget* pParent) + : QComboBox(pParent), OptionItem(saveName) { setMinimumWidth(50); m_pVarNum =3D pVarNum; @@ -401,8 +400,8 @@ class OptionComboBox : public QComboBox, public OptionI= tem setEditable(false); } OptionComboBox(int defaultVal, const QString& saveName, QString* pVarS= tr, - QWidget* pParent, OptionDialog* pOD) - : QComboBox(pParent), OptionItem(pOD, saveName) + QWidget* pParent) + : QComboBox(pParent), OptionItem(saveName) { m_pVarNum =3D nullptr; m_pVarStr =3D pVarStr; @@ -500,8 +499,8 @@ class OptionEncodingComboBox : public QComboBox, public= OptionItem = public: OptionEncodingComboBox(const QString& saveName, QTextCodec** ppVarCode= c, - QWidget* pParent, OptionDialog* pOD) - : QComboBox(pParent), OptionItem(pOD, saveName) + QWidget* pParent) + : QComboBox(pParent), OptionItem(saveName) { m_ppVarCodec =3D ppVarCodec; insertCodec(i18n("Unicode, 8 bit"), QTextCodec::codecForName("UTF-= 8")); @@ -657,31 +656,31 @@ OptionDialog::~OptionDialog(void) void OptionDialog::setupOtherOptions() { //TODO move to Options class - addOptionItem(new OptionToggleAction(false, "AutoAdvance", &m_options.= m_bAutoAdvance, this)); - addOptionItem(new OptionToggleAction(true, "ShowWhiteSpaceCharacters",= &m_options.m_bShowWhiteSpaceCharacters, this)); - addOptionItem(new OptionToggleAction(true, "ShowWhiteSpace", &m_option= s.m_bShowWhiteSpace, this)); - addOptionItem(new OptionToggleAction(false, "ShowLineNumbers", &m_opti= ons.m_bShowLineNumbers, this)); - addOptionItem(new OptionToggleAction(true, "HorizDiffWindowSplitting",= &m_options.m_bHorizDiffWindowSplitting, this)); - addOptionItem(new OptionToggleAction(false, "WordWrap", &m_options.m_b= WordWrap, this)); + addOptionItem(new OptionToggleAction(false, "AutoAdvance", &m_options.= m_bAutoAdvance)); + addOptionItem(new OptionToggleAction(true, "ShowWhiteSpaceCharacters",= &m_options.m_bShowWhiteSpaceCharacters)); + addOptionItem(new OptionToggleAction(true, "ShowWhiteSpace", &m_option= s.m_bShowWhiteSpace)); + addOptionItem(new OptionToggleAction(false, "ShowLineNumbers", &m_opti= ons.m_bShowLineNumbers)); + addOptionItem(new OptionToggleAction(true, "HorizDiffWindowSplitting",= &m_options.m_bHorizDiffWindowSplitting)); + addOptionItem(new OptionToggleAction(false, "WordWrap", &m_options.m_b= WordWrap)); = - addOptionItem(new OptionToggleAction(true, "ShowIdenticalFiles", &m_op= tions.m_bDmShowIdenticalFiles, this)); + addOptionItem(new OptionToggleAction(true, "ShowIdenticalFiles", &m_op= tions.m_bDmShowIdenticalFiles)); = - addOptionItem(new OptionToggleAction(true, "Show Toolbar", &m_options.= m_bShowToolBar, this)); - addOptionItem(new OptionToggleAction(true, "Show Statusbar", &m_option= s.m_bShowStatusBar, this)); + addOptionItem(new OptionToggleAction(true, "Show Toolbar", &m_options.= m_bShowToolBar)); + addOptionItem(new OptionToggleAction(true, "Show Statusbar", &m_option= s.m_bShowStatusBar)); = /* TODO manage toolbar positioning */ - addOptionItem(new OptionNum( Qt::TopToolBarArea, "ToolBarPos", (int*)&= m_options.m_toolBarPos, this )); - addOptionItem(new OptionSize(QSize(600, 400), "Geometry", &m_options.m= _geometry, this)); - addOptionItem(new OptionPoint(QPoint(0, 22), "Position", &m_options.m_= position, this)); - addOptionItem(new OptionToggleAction(false, "WindowStateMaximised", &m= _options.m_bMaximised, this)); - - addOptionItem(new OptionStringList("RecentAFiles", &m_options.m_recent= AFiles, this)); - addOptionItem(new OptionStringList("RecentBFiles", &m_options.m_recent= BFiles, this)); - addOptionItem(new OptionStringList("RecentCFiles", &m_options.m_recent= CFiles, this)); - addOptionItem(new OptionStringList("RecentOutputFiles", &m_options.m_r= ecentOutputFiles, this)); - addOptionItem(new OptionStringList("RecentEncodings", &m_options.m_rec= entEncodings, this)); + addOptionItem(new OptionNum( Qt::TopToolBarArea, "ToolBarPos", (int*)&= m_options.m_toolBarPos)); + addOptionItem(new OptionSize(QSize(600, 400), "Geometry", &m_options.m= _geometry)); + addOptionItem(new OptionPoint(QPoint(0, 22), "Position", &m_options.m_= position)); + addOptionItem(new OptionToggleAction(false, "WindowStateMaximised", &m= _options.m_bMaximised)); + + addOptionItem(new OptionStringList("RecentAFiles", &m_options.m_recent= AFiles)); + addOptionItem(new OptionStringList("RecentBFiles", &m_options.m_recent= BFiles)); + addOptionItem(new OptionStringList("RecentCFiles", &m_options.m_recent= CFiles)); + addOptionItem(new OptionStringList("RecentOutputFiles", &m_options.m_r= ecentOutputFiles)); + addOptionItem(new OptionStringList("RecentEncodings", &m_options.m_rec= entEncodings)); } = void OptionDialog::setupFontPage(void) @@ -705,12 +704,12 @@ void OptionDialog::setupFontPage(void) ; static QFont defaultAppFont =3D QApplication::font(); = - OptionFontChooser* pAppFontChooser =3D new OptionFontChooser(defaultAp= pFont, "ApplicationFont", &m_options.m_appFont, page, this); + OptionFontChooser* pAppFontChooser =3D new OptionFontChooser(defaultAp= pFont, "ApplicationFont", &m_options.m_appFont, page); addOptionItem(pAppFontChooser); topLayout->addWidget(pAppFontChooser); pAppFontChooser->setTitle(i18n("Application font")); = - OptionFontChooser* pFontChooser =3D new OptionFontChooser(defaultFont,= "Font", &m_options.m_font, page, this); + OptionFontChooser* pFontChooser =3D new OptionFontChooser(defaultFont,= "Font", &m_options.m_font, page); addOptionItem(pFontChooser); topLayout->addWidget(pFontChooser); pFontChooser->setTitle(i18n("File view font")); @@ -757,7 +756,7 @@ void OptionDialog::setupColorPage(void) label->setFont(f); ++line; = - OptionColorButton* pFgColor =3D new OptionColorButton(Qt::black, "FgCo= lor", &m_options.m_fgColor, page, this); + OptionColorButton* pFgColor =3D new OptionColorButton(Qt::black, "FgCo= lor", &m_options.m_fgColor, page); label =3D new QLabel(i18n("Foreground color:"), page); label->setBuddy(pFgColor); addOptionItem(pFgColor); @@ -765,7 +764,7 @@ void OptionDialog::setupColorPage(void) gbox->addWidget(pFgColor, line, 1); ++line; = - OptionColorButton* pBgColor =3D new OptionColorButton(Qt::white, "BgCo= lor", &m_options.m_bgColor, page, this); + OptionColorButton* pBgColor =3D new OptionColorButton(Qt::white, "BgCo= lor", &m_options.m_bgColor, page); label =3D new QLabel(i18n("Background color:"), page); label->setBuddy(pBgColor); addOptionItem(pBgColor); @@ -775,7 +774,7 @@ void OptionDialog::setupColorPage(void) ++line; = OptionColorButton* pDiffBgColor =3D new OptionColorButton( - bLowColor ? QColor(Qt::lightGray) : qRgb(224, 224, 224), "DiffBgCo= lor", &m_options.m_diffBgColor, page, this); + bLowColor ? QColor(Qt::lightGray) : qRgb(224, 224, 224), "DiffBgCo= lor", &m_options.m_diffBgColor, page); label =3D new QLabel(i18n("Diff background color:"), page); label->setBuddy(pDiffBgColor); addOptionItem(pDiffBgColor); @@ -784,7 +783,7 @@ void OptionDialog::setupColorPage(void) ++line; = OptionColorButton* pColorA =3D new OptionColorButton( - bLowColor ? qRgb(0, 0, 255) : qRgb(0, 0, 200) /*blue*/, "ColorA", = &m_options.m_colorA, page, this); + bLowColor ? qRgb(0, 0, 255) : qRgb(0, 0, 200) /*blue*/, "ColorA", = &m_options.m_colorA, page); label =3D new QLabel(i18n("Color A:"), page); label->setBuddy(pColorA); addOptionItem(pColorA); @@ -793,7 +792,7 @@ void OptionDialog::setupColorPage(void) ++line; = OptionColorButton* pColorB =3D new OptionColorButton( - bLowColor ? qRgb(0, 128, 0) : qRgb(0, 150, 0) /*green*/, "ColorB",= &m_options.m_colorB, page, this); + bLowColor ? qRgb(0, 128, 0) : qRgb(0, 150, 0) /*green*/, "ColorB",= &m_options.m_colorB, page); label =3D new QLabel(i18n("Color B:"), page); label->setBuddy(pColorB); addOptionItem(pColorB); @@ -802,7 +801,7 @@ void OptionDialog::setupColorPage(void) ++line; = OptionColorButton* pColorC =3D new OptionColorButton( - bLowColor ? qRgb(128, 0, 128) : qRgb(150, 0, 150) /*magenta*/, "Co= lorC", &m_options.m_colorC, page, this); + bLowColor ? qRgb(128, 0, 128) : qRgb(150, 0, 150) /*magenta*/, "Co= lorC", &m_options.m_colorC, page); label =3D new QLabel(i18n("Color C:"), page); label->setBuddy(pColorC); addOptionItem(pColorC); @@ -810,7 +809,7 @@ void OptionDialog::setupColorPage(void) gbox->addWidget(pColorC, line, 1); ++line; = - OptionColorButton* pColorForConflict =3D new OptionColorButton(Qt::red= , "ColorForConflict", &m_options.m_colorForConflict, page, this); + OptionColorButton* pColorForConflict =3D new OptionColorButton(Qt::red= , "ColorForConflict", &m_options.m_colorForConflict, page); label =3D new QLabel(i18n("Conflict color:"), page); label->setBuddy(pColorForConflict); addOptionItem(pColorForConflict); @@ -819,7 +818,7 @@ void OptionDialog::setupColorPage(void) ++line; = OptionColorButton* pColor =3D new OptionColorButton( - bLowColor ? qRgb(192, 192, 192) : qRgb(220, 220, 100), "CurrentRan= geBgColor", &m_options.m_currentRangeBgColor, page, this); + bLowColor ? qRgb(192, 192, 192) : qRgb(220, 220, 100), "CurrentRan= geBgColor", &m_options.m_currentRangeBgColor, page); label =3D new QLabel(i18n("Current range background color:"), page); label->setBuddy(pColor); addOptionItem(pColor); @@ -828,7 +827,7 @@ void OptionDialog::setupColorPage(void) ++line; = pColor =3D new OptionColorButton( - bLowColor ? qRgb(255, 255, 0) : qRgb(255, 255, 150), "CurrentRange= DiffBgColor", &m_options.m_currentRangeDiffBgColor, page, this); + bLowColor ? qRgb(255, 255, 0) : qRgb(255, 255, 150), "CurrentRange= DiffBgColor", &m_options.m_currentRangeDiffBgColor, page); label =3D new QLabel(i18n("Current range diff background color:"), pag= e); label->setBuddy(pColor); addOptionItem(pColor); @@ -836,7 +835,7 @@ void OptionDialog::setupColorPage(void) gbox->addWidget(pColor, line, 1); ++line; = - pColor =3D new OptionColorButton(qRgb(0xff, 0xd0, 0x80), "ManualAlignm= entRangeColor", &m_options.m_manualHelpRangeColor, page, this); + pColor =3D new OptionColorButton(qRgb(0xff, 0xd0, 0x80), "ManualAlignm= entRangeColor", &m_options.m_manualHelpRangeColor, page); label =3D new QLabel(i18n("Color for manually aligned difference range= s:"), page); label->setBuddy(pColor); addOptionItem(pColor); @@ -849,7 +848,7 @@ void OptionDialog::setupColorPage(void) label->setFont(f); ++line; = - pColor =3D new OptionColorButton(qRgb(0, 0xd0, 0), "NewestFileColor", = &m_options.m_newestFileColor, page, this); + pColor =3D new OptionColorButton(qRgb(0, 0xd0, 0), "NewestFileColor", = &m_options.m_newestFileColor, page); label =3D new QLabel(i18n("Newest file color:"), page); label->setBuddy(pColor); addOptionItem(pColor); @@ -859,7 +858,7 @@ void OptionDialog::setupColorPage(void) label->setToolTip(dirColorTip); ++line; = - pColor =3D new OptionColorButton(qRgb(0xf0, 0, 0), "OldestFileColor", = &m_options.m_oldestFileColor, page, this); + pColor =3D new OptionColorButton(qRgb(0xf0, 0, 0), "OldestFileColor", = &m_options.m_oldestFileColor, page); label =3D new QLabel(i18n("Oldest file color:"), page); label->setBuddy(pColor); addOptionItem(pColor); @@ -868,7 +867,7 @@ void OptionDialog::setupColorPage(void) label->setToolTip(dirColorTip); ++line; = - pColor =3D new OptionColorButton(qRgb(0xc0, 0xc0, 0), "MidAgeFileColor= ", &m_options.m_midAgeFileColor, page, this); + pColor =3D new OptionColorButton(qRgb(0xc0, 0xc0, 0), "MidAgeFileColor= ", &m_options.m_midAgeFileColor, page); label =3D new QLabel(i18n("Middle age file color:"), page); label->setBuddy(pColor); addOptionItem(pColor); @@ -877,7 +876,7 @@ void OptionDialog::setupColorPage(void) label->setToolTip(dirColorTip); ++line; = - pColor =3D new OptionColorButton(qRgb(0, 0, 0), "MissingFileColor", &m= _options.m_missingFileColor, page, this); + pColor =3D new OptionColorButton(qRgb(0, 0, 0), "MissingFileColor", &m= _options.m_missingFileColor, page); label =3D new QLabel(i18n("Color for missing files:"), page); label->setBuddy(pColor); addOptionItem(pColor); @@ -906,7 +905,7 @@ void OptionDialog::setupEditPage(void) QLabel* label; int line =3D 0; = - OptionCheckBox* pReplaceTabs =3D new OptionCheckBox(i18n("Tab inserts = spaces"), false, "ReplaceTabs", &m_options.m_bReplaceTabs, page, this); + OptionCheckBox* pReplaceTabs =3D new OptionCheckBox(i18n("Tab inserts = spaces"), false, "ReplaceTabs", &m_options.m_bReplaceTabs, page); addOptionItem(pReplaceTabs); gbox->addWidget(pReplaceTabs, line, 0, 1, 2); pReplaceTabs->setToolTip(i18n( @@ -914,7 +913,7 @@ void OptionDialog::setupEditPage(void) "Off: A tab character will be inserted.")); ++line; = - OptionIntEdit* pTabSize =3D new OptionIntEdit(8, "TabSize", &m_options= .m_tabSize, 1, 100, page, this); + OptionIntEdit* pTabSize =3D new OptionIntEdit(8, "TabSize", &m_options= .m_tabSize, 1, 100, page); label =3D new QLabel(i18n("Tab size:"), page); label->setBuddy(pTabSize); addOptionItem(pTabSize); @@ -922,14 +921,14 @@ void OptionDialog::setupEditPage(void) gbox->addWidget(pTabSize, line, 1); ++line; = - OptionCheckBox* pAutoIndentation =3D new OptionCheckBox(i18n("Auto ind= entation"), true, "AutoIndentation", &m_options.m_bAutoIndentation, page, t= his); + OptionCheckBox* pAutoIndentation =3D new OptionCheckBox(i18n("Auto ind= entation"), true, "AutoIndentation", &m_options.m_bAutoIndentation, page); gbox->addWidget(pAutoIndentation, line, 0, 1, 2); addOptionItem(pAutoIndentation); pAutoIndentation->setToolTip(i18n( "On: The indentation of the previous line is used for a new line.\= n")); ++line; = - OptionCheckBox* pAutoCopySelection =3D new OptionCheckBox(i18n("Auto c= opy selection"), false, "AutoCopySelection", &m_options.m_bAutoCopySelectio= n, page, this); + OptionCheckBox* pAutoCopySelection =3D new OptionCheckBox(i18n("Auto c= opy selection"), false, "AutoCopySelection", &m_options.m_bAutoCopySelectio= n, page); gbox->addWidget(pAutoCopySelection, line, 0, 1, 2); addOptionItem(pAutoCopySelection); pAutoCopySelection->setToolTip(i18n( @@ -940,7 +939,7 @@ void OptionDialog::setupEditPage(void) label =3D new QLabel(i18n("Line end style:"), page); gbox->addWidget(label, line, 0); = - OptionComboBox* pLineEndStyle =3D new OptionComboBox(eLineEndStyleAuto= Detect, "LineEndStyle", (int*)&m_options.m_lineEndStyle, page, this); + OptionComboBox* pLineEndStyle =3D new OptionComboBox(eLineEndStyleAuto= Detect, "LineEndStyle", (int*)&m_options.m_lineEndStyle, page); gbox->addWidget(pLineEndStyle, line, 1); addOptionItem(pLineEndStyle); pLineEndStyle->insertItem(eLineEndStyleUnix, "Unix"); @@ -984,7 +983,7 @@ void OptionDialog::setupDiffPage(void) ); ++line; */ - OptionCheckBox* pIgnoreNumbers =3D new OptionCheckBox(i18n("Ignore num= bers (treat as white space)"), false, "IgnoreNumbers", &m_options.m_bIgnore= Numbers, page, this); + OptionCheckBox* pIgnoreNumbers =3D new OptionCheckBox(i18n("Ignore num= bers (treat as white space)"), false, "IgnoreNumbers", &m_options.m_bIgnore= Numbers, page); gbox->addWidget(pIgnoreNumbers, line, 0, 1, 2); addOptionItem(pIgnoreNumbers); pIgnoreNumbers->setToolTip(i18n( @@ -992,13 +991,13 @@ void OptionDialog::setupDiffPage(void) "Might help to compare files with numeric data.")); ++line; = - OptionCheckBox* pIgnoreComments =3D new OptionCheckBox(i18n("Ignore C/= C++ comments (treat as white space)"), false, "IgnoreComments", &m_options.= m_bIgnoreComments, page, this); + OptionCheckBox* pIgnoreComments =3D new OptionCheckBox(i18n("Ignore C/= C++ comments (treat as white space)"), false, "IgnoreComments", &m_options.= m_bIgnoreComments, page); gbox->addWidget(pIgnoreComments, line, 0, 1, 2); addOptionItem(pIgnoreComments); pIgnoreComments->setToolTip(i18n("Treat C/C++ comments like white spac= e.")); ++line; = - OptionCheckBox* pIgnoreCase =3D new OptionCheckBox(i18n("Ignore case (= treat as white space)"), false, "IgnoreCase", &m_options.m_bIgnoreCase, pag= e, this); + OptionCheckBox* pIgnoreCase =3D new OptionCheckBox(i18n("Ignore case (= treat as white space)"), false, "IgnoreCase", &m_options.m_bIgnoreCase, pag= e); gbox->addWidget(pIgnoreCase, line, 0, 1, 2); addOptionItem(pIgnoreCase); pIgnoreCase->setToolTip(i18n( @@ -1007,7 +1006,7 @@ void OptionDialog::setupDiffPage(void) = label =3D new QLabel(i18n("Preprocessor command:"), page); gbox->addWidget(label, line, 0); - OptionLineEdit* pLE =3D new OptionLineEdit("", "PreProcessorCmd", &m_o= ptions.m_PreProcessorCmd, page, this); + OptionLineEdit* pLE =3D new OptionLineEdit("", "PreProcessorCmd", &m_o= ptions.m_PreProcessorCmd, page); gbox->addWidget(pLE, line, 1); addOptionItem(pLE); label->setToolTip(i18n("User defined pre-processing. (See the docs for= details.)")); @@ -1015,13 +1014,13 @@ void OptionDialog::setupDiffPage(void) = label =3D new QLabel(i18n("Line-matching preprocessor command:"), page= ); gbox->addWidget(label, line, 0); - pLE =3D new OptionLineEdit("", "LineMatchingPreProcessorCmd", &m_optio= ns.m_LineMatchingPreProcessorCmd, page, this); + pLE =3D new OptionLineEdit("", "LineMatchingPreProcessorCmd", &m_optio= ns.m_LineMatchingPreProcessorCmd, page); gbox->addWidget(pLE, line, 1); addOptionItem(pLE); label->setToolTip(i18n("This pre-processor is only used during line ma= tching.\n(See the docs for details.)")); ++line; = - OptionCheckBox* pTryHard =3D new OptionCheckBox(i18n("Try hard (slower= )"), true, "TryHard", &m_options.m_bTryHard, page, this); + OptionCheckBox* pTryHard =3D new OptionCheckBox(i18n("Try hard (slower= )"), true, "TryHard", &m_options.m_bTryHard, page); gbox->addWidget(pTryHard, line, 0, 1, 2); addOptionItem(pTryHard); pTryHard->setToolTip(i18n( @@ -1029,7 +1028,7 @@ void OptionDialog::setupDiffPage(void) "The analysis of big files will be much slower.")); ++line; = - OptionCheckBox* pDiff3AlignBC =3D new OptionCheckBox(i18n("Align B and= C for 3 input files"), false, "Diff3AlignBC", &m_options.m_bDiff3AlignBC, = page, this); + OptionCheckBox* pDiff3AlignBC =3D new OptionCheckBox(i18n("Align B and= C for 3 input files"), false, "Diff3AlignBC", &m_options.m_bDiff3AlignBC, = page); gbox->addWidget(pDiff3AlignBC, line, 0, 1, 2); addOptionItem(pDiff3AlignBC); pDiff3AlignBC->setToolTip(i18n( @@ -1061,7 +1060,7 @@ void OptionDialog::setupMergePage(void) = label =3D new QLabel(i18n("Auto advance delay (ms):"), page); gbox->addWidget(label, line, 0); - OptionIntEdit* pAutoAdvanceDelay =3D new OptionIntEdit(500, "AutoAdvan= ceDelay", &m_options.m_autoAdvanceDelay, 0, 2000, page, this); + OptionIntEdit* pAutoAdvanceDelay =3D new OptionIntEdit(500, "AutoAdvan= ceDelay", &m_options.m_autoAdvanceDelay, 0, 2000, page); gbox->addWidget(pAutoAdvanceDelay, line, 1); addOptionItem(pAutoAdvanceDelay); label->setToolTip(i18n( @@ -1069,7 +1068,7 @@ void OptionDialog::setupMergePage(void) "for the specified time, before jumping to the next conflict. Rang= e: 0-2000 ms")); ++line; = - OptionCheckBox* pShowInfoDialogs =3D new OptionCheckBox(i18n("Show inf= o dialogs"), true, "ShowInfoDialogs", &m_options.m_bShowInfoDialogs, page, = this); + OptionCheckBox* pShowInfoDialogs =3D new OptionCheckBox(i18n("Show inf= o dialogs"), true, "ShowInfoDialogs", &m_options.m_bShowInfoDialogs, page); gbox->addWidget(pShowInfoDialogs, line, 0, 1, 2); addOptionItem(pShowInfoDialogs); pShowInfoDialogs->setToolTip(i18n("Show a dialog with information abou= t the number of conflicts.")); @@ -1077,7 +1076,7 @@ void OptionDialog::setupMergePage(void) = label =3D new QLabel(i18n("White space 2-file merge default:"), page); gbox->addWidget(label, line, 0); - OptionComboBox* pWhiteSpace2FileMergeDefault =3D new OptionComboBox(0,= "WhiteSpace2FileMergeDefault", &m_options.m_whiteSpace2FileMergeDefault, p= age, this); + OptionComboBox* pWhiteSpace2FileMergeDefault =3D new OptionComboBox(0,= "WhiteSpace2FileMergeDefault", &m_options.m_whiteSpace2FileMergeDefault, p= age); gbox->addWidget(pWhiteSpace2FileMergeDefault, line, 1); addOptionItem(pWhiteSpace2FileMergeDefault); pWhiteSpace2FileMergeDefault->insertItem(0, i18n("Manual Choice")); @@ -1090,7 +1089,7 @@ void OptionDialog::setupMergePage(void) = label =3D new QLabel(i18n("White space 3-file merge default:"), page); gbox->addWidget(label, line, 0); - OptionComboBox* pWhiteSpace3FileMergeDefault =3D new OptionComboBox(0,= "WhiteSpace3FileMergeDefault", &m_options.m_whiteSpace3FileMergeDefault, p= age, this); + OptionComboBox* pWhiteSpace3FileMergeDefault =3D new OptionComboBox(0,= "WhiteSpace3FileMergeDefault", &m_options.m_whiteSpace3FileMergeDefault, p= age); gbox->addWidget(pWhiteSpace3FileMergeDefault, line, 1); addOptionItem(pWhiteSpace3FileMergeDefault); pWhiteSpace3FileMergeDefault->insertItem(0, i18n("Manual Choice")); @@ -1112,7 +1111,7 @@ void OptionDialog::setupMergePage(void) = label =3D new QLabel(i18n("Auto merge regular expression:"), page); gbox->addWidget(label, line, 0); - m_pAutoMergeRegExpLineEdit =3D new OptionLineEdit(".*\\$(Version|H= eader|Date|Author).*\\$.*", "AutoMergeRegExp", &m_options.m_autoMergeRegExp= , page, this); + m_pAutoMergeRegExpLineEdit =3D new OptionLineEdit(".*\\$(Version|H= eader|Date|Author).*\\$.*", "AutoMergeRegExp", &m_options.m_autoMergeRegExp= , page); gbox->addWidget(m_pAutoMergeRegExpLineEdit, line, 1); addOptionItem(m_pAutoMergeRegExpLineEdit); s_autoMergeRegExpToolTip =3D i18n("Regular expression for lines wh= ere KDiff3 should automatically choose one source.\n" @@ -1121,7 +1120,7 @@ void OptionDialog::setupMergePage(void) label->setToolTip(s_autoMergeRegExpToolTip); ++line; = - OptionCheckBox* pAutoMergeRegExp =3D new OptionCheckBox(i18n("Run = regular expression auto merge on merge start"), false, "RunRegExpAutoMergeO= nMergeStart", &m_options.m_bRunRegExpAutoMergeOnMergeStart, page, this); + OptionCheckBox* pAutoMergeRegExp =3D new OptionCheckBox(i18n("Run = regular expression auto merge on merge start"), false, "RunRegExpAutoMergeO= nMergeStart", &m_options.m_bRunRegExpAutoMergeOnMergeStart, page); addOptionItem(pAutoMergeRegExp); gbox->addWidget(pAutoMergeRegExp, line, 0, 1, 2); pAutoMergeRegExp->setToolTip(i18n("Run the merge for auto merge re= gular expressions\n" @@ -1139,7 +1138,7 @@ void OptionDialog::setupMergePage(void) = label =3D new QLabel(i18n("History start regular expression:"), pa= ge); gbox->addWidget(label, line, 0); - m_pHistoryStartRegExpLineEdit =3D new OptionLineEdit(".*\\$Log.*\\= $.*", "HistoryStartRegExp", &m_options.m_historyStartRegExp, page, this); + m_pHistoryStartRegExpLineEdit =3D new OptionLineEdit(".*\\$Log.*\\= $.*", "HistoryStartRegExp", &m_options.m_historyStartRegExp, page); gbox->addWidget(m_pHistoryStartRegExpLineEdit, line, 1); addOptionItem(m_pHistoryStartRegExpLineEdit); s_historyStartRegExpToolTip =3D i18n("Regular expression for the s= tart of the version control history entry.\n" @@ -1158,7 +1157,7 @@ void OptionDialog::setupMergePage(void) "([0-9][0-9][0-9][0-9]) " // year "([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\s+(.*)"; // time, = name = - m_pHistoryEntryStartRegExpLineEdit =3D new OptionLineEdit(historyE= ntryStartDefault, "HistoryEntryStartRegExp", &m_options.m_historyEntryStart= RegExp, page, this); + m_pHistoryEntryStartRegExpLineEdit =3D new OptionLineEdit(historyE= ntryStartDefault, "HistoryEntryStartRegExp", &m_options.m_historyEntryStart= RegExp, page); gbox->addWidget(m_pHistoryEntryStartRegExpLineEdit, line, 1); addOptionItem(m_pHistoryEntryStartRegExpLineEdit); s_historyEntryStartRegExpToolTip =3D i18n("A version control histo= ry entry consists of several lines.\n" @@ -1169,7 +1168,7 @@ void OptionDialog::setupMergePage(void) label->setToolTip(s_historyEntryStartRegExpToolTip); ++line; = - m_pHistoryMergeSorting =3D new OptionCheckBox(i18n("History merge = sorting"), false, "HistoryMergeSorting", &m_options.m_bHistoryMergeSorting,= page, this); + m_pHistoryMergeSorting =3D new OptionCheckBox(i18n("History merge = sorting"), false, "HistoryMergeSorting", &m_options.m_bHistoryMergeSorting,= page); gbox->addWidget(m_pHistoryMergeSorting, line, 0, 1, 2); addOptionItem(m_pHistoryMergeSorting); m_pHistoryMergeSorting->setToolTip(i18n("Sort version control hist= ory by a key.")); @@ -1184,7 +1183,7 @@ void OptionDialog::setupMergePage(void) = label =3D new QLabel(i18n("History entry start sort key order:"), = page); gbox->addWidget(label, line, 0); - m_pHistorySortKeyOrderLineEdit =3D new OptionLineEdit(defaultSortK= eyOrder, "HistoryEntryStartSortKeyOrder", &m_options.m_historyEntryStartSor= tKeyOrder, page, this); + m_pHistorySortKeyOrderLineEdit =3D new OptionLineEdit(defaultSortK= eyOrder, "HistoryEntryStartSortKeyOrder", &m_options.m_historyEntryStartSor= tKeyOrder, page); gbox->addWidget(m_pHistorySortKeyOrderLineEdit, line, 1); addOptionItem(m_pHistorySortKeyOrderLineEdit); s_historyEntryStartSortKeyOrderToolTip =3D i18n("Each pair of pare= ntheses used in the regular expression for the history start entry\n" @@ -1198,13 +1197,13 @@ void OptionDialog::setupMergePage(void) connect(m_pHistoryMergeSorting, &OptionCheckBox::toggled, m_pHisto= rySortKeyOrderLineEdit, &OptionLineEdit::setEnabled); ++line; = - m_pHistoryAutoMerge =3D new OptionCheckBox(i18n("Merge version con= trol history on merge start"), false, "RunHistoryAutoMergeOnMergeStart", &m= _options.m_bRunHistoryAutoMergeOnMergeStart, page, this); + m_pHistoryAutoMerge =3D new OptionCheckBox(i18n("Merge version con= trol history on merge start"), false, "RunHistoryAutoMergeOnMergeStart", &m= _options.m_bRunHistoryAutoMergeOnMergeStart, page); addOptionItem(m_pHistoryAutoMerge); gbox->addWidget(m_pHistoryAutoMerge, line, 0, 1, 2); m_pHistoryAutoMerge->setToolTip(i18n("Run version control history = automerge on merge start.")); ++line; = - OptionIntEdit* pMaxNofHistoryEntries =3D new OptionIntEdit(-1, "Ma= xNofHistoryEntries", &m_options.m_maxNofHistoryEntries, -1, 1000, page, thi= s); + OptionIntEdit* pMaxNofHistoryEntries =3D new OptionIntEdit(-1, "Ma= xNofHistoryEntries", &m_options.m_maxNofHistoryEntries, -1, 1000, page); label =3D new QLabel(i18n("Max number of history entries:"), page); gbox->addWidget(label, line, 0); gbox->addWidget(pMaxNofHistoryEntries, line, 1); @@ -1220,7 +1219,7 @@ void OptionDialog::setupMergePage(void) = label =3D new QLabel(i18n("Irrelevant merge command:"), page); gbox->addWidget(label, line, 0); - OptionLineEdit* pLE =3D new OptionLineEdit("", "IrrelevantMergeCmd", &= m_options.m_IrrelevantMergeCmd, page, this); + OptionLineEdit* pLE =3D new OptionLineEdit("", "IrrelevantMergeCmd", &= m_options.m_IrrelevantMergeCmd, page); gbox->addWidget(pLE, line, 1); addOptionItem(pLE); label->setToolTip(i18n("If specified this script is run after automerg= e\n" @@ -1229,7 +1228,7 @@ void OptionDialog::setupMergePage(void) ++line; = OptionCheckBox* pAutoSaveAndQuit =3D new OptionCheckBox(i18n("Auto sav= e and quit on merge without conflicts"), false, - "AutoSaveAndQuit= OnMergeWithoutConflicts", &m_options.m_bAutoSaveAndQuitOnMergeWithoutConfli= cts, page, this); + "AutoSaveAndQuit= OnMergeWithoutConflicts", &m_options.m_bAutoSaveAndQuitOnMergeWithoutConfli= cts, page); gbox->addWidget(pAutoSaveAndQuit, line, 0, 1, 2); addOptionItem(pAutoSaveAndQuit); pAutoSaveAndQuit->setToolTip(i18n("If KDiff3 was started for a file-me= rge from the command line and all\n" @@ -1256,14 +1255,14 @@ void OptionDialog::setupDirectoryMergePage(void) topLayout->addLayout(gbox); int line =3D 0; = - OptionCheckBox* pRecursiveDirs =3D new OptionCheckBox(i18n("Recursive = directories"), true, "RecursiveDirs", &m_options.m_bDmRecursiveDirs, page, = this); + OptionCheckBox* pRecursiveDirs =3D new OptionCheckBox(i18n("Recursive = directories"), true, "RecursiveDirs", &m_options.m_bDmRecursiveDirs, page); gbox->addWidget(pRecursiveDirs, line, 0, 1, 2); addOptionItem(pRecursiveDirs); pRecursiveDirs->setToolTip(i18n("Whether to analyze subdirectories or = not.")); ++line; QLabel* label =3D new QLabel(i18n("File pattern(s):"), page); gbox->addWidget(label, line, 0); - OptionLineEdit* pFilePattern =3D new OptionLineEdit("*", "FilePattern"= , &m_options.m_DmFilePattern, page, this); + OptionLineEdit* pFilePattern =3D new OptionLineEdit("*", "FilePattern"= , &m_options.m_DmFilePattern, page); gbox->addWidget(pFilePattern, line, 1); addOptionItem(pFilePattern); label->setToolTip(i18n( @@ -1274,7 +1273,7 @@ void OptionDialog::setupDirectoryMergePage(void) = label =3D new QLabel(i18n("File-anti-pattern(s):"), page); gbox->addWidget(label, line, 0); - OptionLineEdit* pFileAntiPattern =3D new OptionLineEdit("*.orig;*.o;*.= obj;*.rej;*.bak", "FileAntiPattern", &m_options.m_DmFileAntiPattern, page, = this); + OptionLineEdit* pFileAntiPattern =3D new OptionLineEdit("*.orig;*.o;*.= obj;*.rej;*.bak", "FileAntiPattern", &m_options.m_DmFileAntiPattern, page); gbox->addWidget(pFileAntiPattern, line, 1); addOptionItem(pFileAntiPattern); label->setToolTip(i18n( @@ -1285,7 +1284,7 @@ void OptionDialog::setupDirectoryMergePage(void) = label =3D new QLabel(i18n("Dir-anti-pattern(s):"), page); gbox->addWidget(label, line, 0); - OptionLineEdit* pDirAntiPattern =3D new OptionLineEdit("CVS;.deps;.svn= ;.hg;.git", "DirAntiPattern", &m_options.m_DmDirAntiPattern, page, this); + OptionLineEdit* pDirAntiPattern =3D new OptionLineEdit("CVS;.deps;.svn= ;.hg;.git", "DirAntiPattern", &m_options.m_DmDirAntiPattern, page); gbox->addWidget(pDirAntiPattern, line, 1); addOptionItem(pDirAntiPattern); label->setToolTip(i18n( @@ -1294,7 +1293,7 @@ void OptionDialog::setupDirectoryMergePage(void) "Several Patterns can be specified by using the separator: ';'")); ++line; = - OptionCheckBox* pUseCvsIgnore =3D new OptionCheckBox(i18n("Use .cvsign= ore"), false, "UseCvsIgnore", &m_options.m_bDmUseCvsIgnore, page, this); + OptionCheckBox* pUseCvsIgnore =3D new OptionCheckBox(i18n("Use .cvsign= ore"), false, "UseCvsIgnore", &m_options.m_bDmUseCvsIgnore, page); gbox->addWidget(pUseCvsIgnore, line, 0, 1, 2); addOptionItem(pUseCvsIgnore); pUseCvsIgnore->setToolTip(i18n( @@ -1302,7 +1301,7 @@ void OptionDialog::setupDirectoryMergePage(void) "Via local \".cvsignore\" files this can be directory specific.")); ++line; = - OptionCheckBox* pFindHidden =3D new OptionCheckBox(i18n("Find hidden f= iles and directories"), true, "FindHidden", &m_options.m_bDmFindHidden, pag= e, this); + OptionCheckBox* pFindHidden =3D new OptionCheckBox(i18n("Find hidden f= iles and directories"), true, "FindHidden", &m_options.m_bDmFindHidden, pag= e); gbox->addWidget(pFindHidden, line, 0, 1, 2); addOptionItem(pFindHidden); #if defined(Q_OS_WIN) @@ -1312,7 +1311,7 @@ void OptionDialog::setupDirectoryMergePage(void) #endif ++line; = - OptionCheckBox* pFollowFileLinks =3D new OptionCheckBox(i18n("Follow f= ile links"), false, "FollowFileLinks", &m_options.m_bDmFollowFileLinks, pag= e, this); + OptionCheckBox* pFollowFileLinks =3D new OptionCheckBox(i18n("Follow f= ile links"), false, "FollowFileLinks", &m_options.m_bDmFollowFileLinks, pag= e); gbox->addWidget(pFollowFileLinks, line, 0, 1, 2); addOptionItem(pFollowFileLinks); pFollowFileLinks->setToolTip(i18n( @@ -1320,7 +1319,7 @@ void OptionDialog::setupDirectoryMergePage(void) "Off: Compare the links.")); ++line; = - OptionCheckBox* pFollowDirLinks =3D new OptionCheckBox(i18n("Follow di= rectory links"), false, "FollowDirLinks", &m_options.m_bDmFollowDirLinks, p= age, this); + OptionCheckBox* pFollowDirLinks =3D new OptionCheckBox(i18n("Follow di= rectory links"), false, "FollowDirLinks", &m_options.m_bDmFollowDirLinks, p= age); gbox->addWidget(pFollowDirLinks, line, 0, 1, 2); addOptionItem(pFollowDirLinks); pFollowDirLinks->setToolTip(i18n( @@ -1333,7 +1332,7 @@ void OptionDialog::setupDirectoryMergePage(void) #else bool bCaseSensitiveFilenameComparison =3D true; #endif - OptionCheckBox* pCaseSensitiveFileNames =3D new OptionCheckBox(i18n("C= ase sensitive filename comparison"), bCaseSensitiveFilenameComparison, "Cas= eSensitiveFilenameComparison", &m_options.m_bDmCaseSensitiveFilenameCompari= son, page, this); + OptionCheckBox* pCaseSensitiveFileNames =3D new OptionCheckBox(i18n("C= ase sensitive filename comparison"), bCaseSensitiveFilenameComparison, "Cas= eSensitiveFilenameComparison", &m_options.m_bDmCaseSensitiveFilenameCompari= son, page); gbox->addWidget(pCaseSensitiveFileNames, line, 0, 1, 2); addOptionItem(pCaseSensitiveFileNames); pCaseSensitiveFileNames->setToolTip(i18n( @@ -1341,7 +1340,7 @@ void OptionDialog::setupDirectoryMergePage(void) "Set this option if the case of the names must match. (Default for= Windows is off, otherwise on.)")); ++line; = - OptionCheckBox* pUnfoldSubdirs =3D new OptionCheckBox(i18n("Unfold all= subdirectories on load"), false, "UnfoldSubdirs", &m_options.m_bDmUnfoldSu= bdirs, page, this); + OptionCheckBox* pUnfoldSubdirs =3D new OptionCheckBox(i18n("Unfold all= subdirectories on load"), false, "UnfoldSubdirs", &m_options.m_bDmUnfoldSu= bdirs, page); gbox->addWidget(pUnfoldSubdirs, line, 0, 1, 2); addOptionItem(pUnfoldSubdirs); pUnfoldSubdirs->setToolTip(i18n( @@ -1349,7 +1348,7 @@ void OptionDialog::setupDirectoryMergePage(void) "Off: Leave subdirectories folded.")); ++line; = - OptionCheckBox* pSkipDirStatus =3D new OptionCheckBox(i18n("Skip direc= tory status report"), false, "SkipDirStatus", &m_options.m_bDmSkipDirStatus= , page, this); + OptionCheckBox* pSkipDirStatus =3D new OptionCheckBox(i18n("Skip direc= tory status report"), false, "SkipDirStatus", &m_options.m_bDmSkipDirStatus= , page); gbox->addWidget(pSkipDirStatus, line, 0, 1, 2); addOptionItem(pSkipDirStatus); pSkipDirStatus->setToolTip(i18n( @@ -1362,32 +1361,32 @@ void OptionDialog::setupDirectoryMergePage(void) = QVBoxLayout* pBGLayout =3D new QVBoxLayout(pBG); = - OptionRadioButton* pBinaryComparison =3D new OptionRadioButton(i18n("B= inary comparison"), true, "BinaryComparison", &m_options.m_bDmBinaryCompari= son, pBG, this); + OptionRadioButton* pBinaryComparison =3D new OptionRadioButton(i18n("B= inary comparison"), true, "BinaryComparison", &m_options.m_bDmBinaryCompari= son, pBG); addOptionItem(pBinaryComparison); pBinaryComparison->setToolTip(i18n("Binary comparison of each file. (D= efault)")); pBGLayout->addWidget(pBinaryComparison); = - OptionRadioButton* pFullAnalysis =3D new OptionRadioButton(i18n("Full = analysis"), false, "FullAnalysis", &m_options.m_bDmFullAnalysis, pBG, this); + OptionRadioButton* pFullAnalysis =3D new OptionRadioButton(i18n("Full = analysis"), false, "FullAnalysis", &m_options.m_bDmFullAnalysis, pBG); addOptionItem(pFullAnalysis); pFullAnalysis->setToolTip(i18n("Do a full analysis and show statistics= information in extra columns.\n" "(Slower than a binary comparison, much= slower for binary files.)")); pBGLayout->addWidget(pFullAnalysis); = - OptionRadioButton* pTrustDate =3D new OptionRadioButton(i18n("Trust th= e size and modification date (unsafe)"), false, "TrustDate", &m_options.m_b= DmTrustDate, pBG, this); + OptionRadioButton* pTrustDate =3D new OptionRadioButton(i18n("Trust th= e size and modification date (unsafe)"), false, "TrustDate", &m_options.m_b= DmTrustDate, pBG); addOptionItem(pTrustDate); pTrustDate->setToolTip(i18n("Assume that files are equal if the modifi= cation date and file length are equal.\n" "Files with equal contents but different m= odification dates will appear as different.\n" "Useful for big directories or slow networ= ks.")); pBGLayout->addWidget(pTrustDate); = - OptionRadioButton* pTrustDateFallbackToBinary =3D new OptionRadioButto= n(i18n("Trust the size and date, but use binary comparison if date does not= match (unsafe)"), false, "TrustDateFallbackToBinary", &m_options.m_bDmTrus= tDateFallbackToBinary, pBG, this); + OptionRadioButton* pTrustDateFallbackToBinary =3D new OptionRadioButto= n(i18n("Trust the size and date, but use binary comparison if date does not= match (unsafe)"), false, "TrustDateFallbackToBinary", &m_options.m_bDmTrus= tDateFallbackToBinary, pBG); addOptionItem(pTrustDateFallbackToBinary); pTrustDateFallbackToBinary->setToolTip(i18n("Assume that files are equ= al if the modification date and file length are equal.\n" "If the dates are not equa= l but the sizes are, use binary comparison.\n" "Useful for big directorie= s or slow networks.")); pBGLayout->addWidget(pTrustDateFallbackToBinary); = - OptionRadioButton* pTrustSize =3D new OptionRadioButton(i18n("Trust th= e size (unsafe)"), false, "TrustSize", &m_options.m_bDmTrustSize, pBG, this= ); + OptionRadioButton* pTrustSize =3D new OptionRadioButton(i18n("Trust th= e size (unsafe)"), false, "TrustSize", &m_options.m_bDmTrustSize, pBG); addOptionItem(pTrustSize); pTrustSize->setToolTip(i18n("Assume that files are equal if their file= lengths are equal.\n" "Useful for big directories or slow networ= ks when the date is modified during download.")); @@ -1396,7 +1395,7 @@ void OptionDialog::setupDirectoryMergePage(void) ++line; = // Some two Dir-options: Affects only the default actions. - OptionCheckBox* pSyncMode =3D new OptionCheckBox(i18n("Synchronize dir= ectories"), false, "SyncMode", &m_options.m_bDmSyncMode, page, this); + OptionCheckBox* pSyncMode =3D new OptionCheckBox(i18n("Synchronize dir= ectories"), false, "SyncMode", &m_options.m_bDmSyncMode, page); addOptionItem(pSyncMode); gbox->addWidget(pSyncMode, line, 0, 1, 2); pSyncMode->setToolTip(i18n( @@ -1406,7 +1405,7 @@ void OptionDialog::setupDirectoryMergePage(void) ++line; = // Allow white-space only differences to be considered equal - OptionCheckBox* pWhiteSpaceDiffsEqual =3D new OptionCheckBox(i18n("Whi= te space differences considered equal"), true, "WhiteSpaceEqual", &m_option= s.m_bDmWhiteSpaceEqual, page, this); + OptionCheckBox* pWhiteSpaceDiffsEqual =3D new OptionCheckBox(i18n("Whi= te space differences considered equal"), true, "WhiteSpaceEqual", &m_option= s.m_bDmWhiteSpaceEqual, page); addOptionItem(pWhiteSpaceDiffsEqual); gbox->addWidget(pWhiteSpaceDiffsEqual, line, 0, 1, 2); pWhiteSpaceDiffsEqual->setToolTip(i18n( @@ -1416,7 +1415,7 @@ void OptionDialog::setupDirectoryMergePage(void) pWhiteSpaceDiffsEqual->setEnabled(false); ++line; = - OptionCheckBox* pCopyNewer =3D new OptionCheckBox(i18n("Copy newer ins= tead of merging (unsafe)"), false, "CopyNewer", &m_options.m_bDmCopyNewer, = page, this); + OptionCheckBox* pCopyNewer =3D new OptionCheckBox(i18n("Copy newer ins= tead of merging (unsafe)"), false, "CopyNewer", &m_options.m_bDmCopyNewer, = page); addOptionItem(pCopyNewer); gbox->addWidget(pCopyNewer, line, 0, 1, 2); pCopyNewer->setToolTip(i18n( @@ -1425,7 +1424,7 @@ void OptionDialog::setupDirectoryMergePage(void) "Only effective when comparing two directories.")); ++line; = - OptionCheckBox* pCreateBakFiles =3D new OptionCheckBox(i18n("Backup fi= les (.orig)"), true, "CreateBakFiles", &m_options.m_bDmCreateBakFiles, page= , this); + OptionCheckBox* pCreateBakFiles =3D new OptionCheckBox(i18n("Backup fi= les (.orig)"), true, "CreateBakFiles", &m_options.m_bDmCreateBakFiles, page= ); gbox->addWidget(pCreateBakFiles, line, 0, 1, 2); addOptionItem(pCreateBakFiles); pCreateBakFiles->setToolTip(i18n( @@ -1520,7 +1519,7 @@ void OptionDialog::setupRegionalPage(void) = QLabel* label; = - m_pSameEncoding =3D new OptionCheckBox(i18n("Use the same encoding for= everything:"), true, "SameEncoding", &m_options.m_bSameEncoding, page, thi= s); + m_pSameEncoding =3D new OptionCheckBox(i18n("Use the same encoding for= everything:"), true, "SameEncoding", &m_options.m_bSameEncoding, page); addOptionItem(m_pSameEncoding); gbox->addWidget(m_pSameEncoding, line, 0, 1, 2); m_pSameEncoding->setToolTip(i18n( @@ -1534,7 +1533,7 @@ void OptionDialog::setupRegionalPage(void) = label =3D new QLabel(i18n("File Encoding for A:"), page); gbox->addWidget(label, line, 0); - m_pEncodingAComboBox =3D new OptionEncodingComboBox("EncodingForA", &m= _options.m_pEncodingA, page, this); + m_pEncodingAComboBox =3D new OptionEncodingComboBox("EncodingForA", &m= _options.m_pEncodingA, page); addOptionItem(m_pEncodingAComboBox); gbox->addWidget(m_pEncodingAComboBox, line, 1); = @@ -1542,7 +1541,7 @@ void OptionDialog::setupRegionalPage(void) "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detect= ed.\n" "If the file is not Unicode then the selected encoding will be use= d as fallback.\n" "(Unicode detection depends on the first bytes of a file.)"); - m_pAutoDetectUnicodeA =3D new OptionCheckBox(i18n("Auto Detect Unicode= "), true, "AutoDetectUnicodeA", &m_options.m_bAutoDetectUnicodeA, page, thi= s); + m_pAutoDetectUnicodeA =3D new OptionCheckBox(i18n("Auto Detect Unicode= "), true, "AutoDetectUnicodeA", &m_options.m_bAutoDetectUnicodeA, page); gbox->addWidget(m_pAutoDetectUnicodeA, line, 2); addOptionItem(m_pAutoDetectUnicodeA); m_pAutoDetectUnicodeA->setToolTip(autoDetectToolTip); @@ -1550,10 +1549,10 @@ void OptionDialog::setupRegionalPage(void) = label =3D new QLabel(i18n("File Encoding for B:"), page); gbox->addWidget(label, line, 0); - m_pEncodingBComboBox =3D new OptionEncodingComboBox("EncodingForB", &m= _options.m_pEncodingB, page, this); + m_pEncodingBComboBox =3D new OptionEncodingComboBox("EncodingForB", &m= _options.m_pEncodingB, page); addOptionItem(m_pEncodingBComboBox); gbox->addWidget(m_pEncodingBComboBox, line, 1); - m_pAutoDetectUnicodeB =3D new OptionCheckBox(i18n("Auto Detect Unicode= "), true, "AutoDetectUnicodeB", &m_options.m_bAutoDetectUnicodeB, page, thi= s); + m_pAutoDetectUnicodeB =3D new OptionCheckBox(i18n("Auto Detect Unicode= "), true, "AutoDetectUnicodeB", &m_options.m_bAutoDetectUnicodeB, page); addOptionItem(m_pAutoDetectUnicodeB); gbox->addWidget(m_pAutoDetectUnicodeB, line, 2); m_pAutoDetectUnicodeB->setToolTip(autoDetectToolTip); @@ -1561,10 +1560,10 @@ void OptionDialog::setupRegionalPage(void) = label =3D new QLabel(i18n("File Encoding for C:"), page); gbox->addWidget(label, line, 0); - m_pEncodingCComboBox =3D new OptionEncodingComboBox("EncodingForC", &m= _options.m_pEncodingC, page, this); + m_pEncodingCComboBox =3D new OptionEncodingComboBox("EncodingForC", &m= _options.m_pEncodingC, page); addOptionItem(m_pEncodingCComboBox); gbox->addWidget(m_pEncodingCComboBox, line, 1); - m_pAutoDetectUnicodeC =3D new OptionCheckBox(i18n("Auto Detect Unicode= "), true, "AutoDetectUnicodeC", &m_options.m_bAutoDetectUnicodeC, page, thi= s); + m_pAutoDetectUnicodeC =3D new OptionCheckBox(i18n("Auto Detect Unicode= "), true, "AutoDetectUnicodeC", &m_options.m_bAutoDetectUnicodeC, page); addOptionItem(m_pAutoDetectUnicodeC); gbox->addWidget(m_pAutoDetectUnicodeC, line, 2); m_pAutoDetectUnicodeC->setToolTip(autoDetectToolTip); @@ -1572,10 +1571,10 @@ void OptionDialog::setupRegionalPage(void) = label =3D new QLabel(i18n("File Encoding for Merge Output and Saving:"= ), page); gbox->addWidget(label, line, 0); - m_pEncodingOutComboBox =3D new OptionEncodingComboBox("EncodingForOutp= ut", &m_options.m_pEncodingOut, page, this); + m_pEncodingOutComboBox =3D new OptionEncodingComboBox("EncodingForOutp= ut", &m_options.m_pEncodingOut, page); addOptionItem(m_pEncodingOutComboBox); gbox->addWidget(m_pEncodingOutComboBox, line, 1); - m_pAutoSelectOutEncoding =3D new OptionCheckBox(i18n("Auto Select"), t= rue, "AutoSelectOutEncoding", &m_options.m_bAutoSelectOutEncoding, page, th= is); + m_pAutoSelectOutEncoding =3D new OptionCheckBox(i18n("Auto Select"), t= rue, "AutoSelectOutEncoding", &m_options.m_bAutoSelectOutEncoding, page); addOptionItem(m_pAutoSelectOutEncoding); gbox->addWidget(m_pAutoSelectOutEncoding, line, 2); m_pAutoSelectOutEncoding->setToolTip(i18n( @@ -1584,7 +1583,7 @@ void OptionDialog::setupRegionalPage(void) ++line; label =3D new QLabel(i18n("File Encoding for Preprocessor Files:"), pa= ge); gbox->addWidget(label, line, 0); - m_pEncodingPPComboBox =3D new OptionEncodingComboBox("EncodingForPP", = &m_options.m_pEncodingPP, page, this); + m_pEncodingPPComboBox =3D new OptionEncodingComboBox("EncodingForPP", = &m_options.m_pEncodingPP, page); addOptionItem(m_pEncodingPPComboBox); gbox->addWidget(m_pEncodingPPComboBox, line, 1); ++line; @@ -1594,7 +1593,7 @@ void OptionDialog::setupRegionalPage(void) connect(m_pAutoDetectUnicodeA, &OptionCheckBox::toggled, this, &Option= Dialog::slotEncodingChanged); connect(m_pAutoSelectOutEncoding, &OptionCheckBox::toggled, this, &Opt= ionDialog::slotEncodingChanged); = - OptionCheckBox* pRightToLeftLanguage =3D new OptionCheckBox(i18n("Righ= t To Left Language"), false, "RightToLeftLanguage", &m_options.m_bRightToLe= ftLanguage, page, this); + OptionCheckBox* pRightToLeftLanguage =3D new OptionCheckBox(i18n("Righ= t To Left Language"), false, "RightToLeftLanguage", &m_options.m_bRightToLe= ftLanguage, page); addOptionItem(pRightToLeftLanguage); gbox->addWidget(pRightToLeftLanguage, line, 0, 1, 2); pRightToLeftLanguage->setToolTip(i18n( @@ -1624,7 +1623,7 @@ void OptionDialog::setupIntegrationPage(void) QLabel* label; label =3D new QLabel(i18n("Command line options to ignore:"), page); gbox->addWidget(label, line, 0); - OptionLineEdit* pIgnorableCmdLineOptions =3D new OptionLineEdit("-u;-q= uery;-html;-abort", "IgnorableCmdLineOptions", &m_options.m_ignorableCmdLin= eOptions, page, this); + OptionLineEdit* pIgnorableCmdLineOptions =3D new OptionLineEdit("-u;-q= uery;-html;-abort", "IgnorableCmdLineOptions", &m_options.m_ignorableCmdLin= eOptions, page); gbox->addWidget(pIgnorableCmdLineOptions, line, 1, 1, 2); addOptionItem(pIgnorableCmdLineOptions); label->setToolTip(i18n( @@ -1633,7 +1632,7 @@ void OptionDialog::setupIntegrationPage(void) "This will suppress the \"Unknown option\" error.")); ++line; = - OptionCheckBox* pEscapeKeyQuits =3D new OptionCheckBox(i18n("Quit also= via Escape key"), false, "EscapeKeyQuits", &m_options.m_bEscapeKeyQuits, p= age, this); + OptionCheckBox* pEscapeKeyQuits =3D new OptionCheckBox(i18n("Quit also= via Escape key"), false, "EscapeKeyQuits", &m_options.m_bEscapeKeyQuits, p= age); gbox->addWidget(pEscapeKeyQuits, line, 0, 1, 2); addOptionItem(pEscapeKeyQuits); pEscapeKeyQuits->setToolTip(i18n(