From kde-commits  Fri Dec 09 07:22:41 2016
From: Montel Laurent <montel () kde ! org>
Date: Fri, 09 Dec 2016 07:22:41 +0000
To: kde-commits
Subject: [korganizer] src/dialog: Clean up. Minor optimizaton
Message-Id: <E1cFFVx-0001XZ-TU () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=148126817104564

Git commit 2b9fe2628e5bbc91d660fa67da97156c641057c5 by Montel Laurent.
Committed on 09/12/2016 at 07:22.
Pushed by mlaurent into branch 'master'.

Clean up. Minor optimizaton

M  +0    -52   src/dialog/exportwebdialog.cpp
M  +0    -6    src/dialog/exportwebdialog.h
M  +5    -3    src/dialog/filtereditdialog.cpp

https://commits.kde.org/korganizer/2b9fe2628e5bbc91d660fa67da97156c641057c5

diff --git a/src/dialog/exportwebdialog.cpp b/src/dialog/exportwebdialog.cpp
index 8f147f9e..5b472001 100644
--- a/src/dialog/exportwebdialog.cpp
+++ b/src/dialog/exportwebdialog.cpp
@@ -59,10 +59,6 @@ ExportWebDialog::ExportWebDialog(KOrg::HTMLExportSetting=
s *settings, QWidget *pa
     setupGeneralPage();
     setupEventPage();
     setupTodoPage();
-// Disabled bacause the functionality is not yet implemented.
-//  setupJournalPage();
-//  setupFreeBusyPage();
-//  setupAdvancedPage();
 =

     connect(mExportButton, &QPushButton::clicked, this, &ExportWebDialog::=
slotOk);
     connect(button(QDialogButtonBox::Cancel), &QPushButton::clicked, this,=
 &ExportWebDialog::reject);
@@ -240,54 +236,6 @@ void ExportWebDialog::setupEventPage()
 =

     topLayout->addStretch(1);
 }
-/*
-void ExportWebDialog::setupJournalPage()
-{
-  mJournalPage =3D addPage(i18n("Journal"));
-  QVBoxLayout *topLayout =3D new QVBoxLayout( mJournalPage );
-  topLayout->setSpacing( 10 );
-
-  QHBox *hbox =3D new QHBox( mJournalPage );
-  topLayout->addWidget( hbox );
-  addWidString( mSettings->journalTitleItem(), hbox );
-
-  QVBox *vbox =3D new QVBox( mJournalPage );
-  topLayout->addWidget( vbox );
-//  addWidBool( mSettings->eventExcludeConfidentialItem(), vbox );
-
-  topLayout->addStretch(1);
-}
-
-void ExportWebDialog::setupFreeBusyPage()
-{
-  mFreeBusyPage =3D addPage(i18n("Free/Busy"));
-  QVBoxLayout *topLayout =3D new QVBoxLayout( mFreeBusyPage );
-  topLayout->setSpacing( 10 );
-
-  QHBox *hbox =3D new QHBox( mFreeBusyPage );
-  topLayout->addWidget( hbox );
-  addWidString( mSettings->journalTitleItem(), hbox );
-
-  QVBox *vbox =3D new QVBox( mFreeBusyPage );
-  topLayout->addWidget( vbox );
-//  addWidBool( mSettings->eventExcludeConfidentialItem(), vbox );
-
-  topLayout->addStretch(1);
-}
-
-void ExportWebDialog::setupAdvancedPage()
-{
-  mAdvancedPage =3D addPage(i18n("Advanced"));
-  QVBoxLayout *topLayout =3D new QVBoxLayout( mAdvancedPage );
-  topLayout->setSpacing( 10 );
-
-  QVBox *vbox =3D new QVBox( mAdvancedPage );
-  topLayout->addWidget( vbox );
-//  addWidBool( mSettings->eventExcludeConfidentialItem(), vbox );
-
-  topLayout->addStretch(1);
-}
-*/
 =

 void ExportWebDialog::updateState()
 {
diff --git a/src/dialog/exportwebdialog.h b/src/dialog/exportwebdialog.h
index 55bd8353..bec835c8 100644
--- a/src/dialog/exportwebdialog.h
+++ b/src/dialog/exportwebdialog.h
@@ -50,9 +50,6 @@ protected:
     void setupGeneralPage();
     void setupEventPage();
     void setupTodoPage();
-//    void setupJournalPage();
-//    void setupFreeBusyPage();
-//    void setupAdvancedPage();
 =

 public Q_SLOTS:
     void setDefaults();
@@ -80,9 +77,6 @@ private:
     QFrame *mGeneralPage;
     QFrame *mEventPage;
     QFrame *mTodoPage;
-//    QFrame *mJournalPage;
-//    QFrame *mFreeBusyPage;
-//    QFrame *mAdvancedPage;
     QGroupBox *mDateRangeGroup;
     QCheckBox *mMonthViewCheckBox;
     QCheckBox *mEventListCheckBox;
diff --git a/src/dialog/filtereditdialog.cpp b/src/dialog/filtereditdialog.=
cpp
index 341aab07..fce8c7c4 100644
--- a/src/dialog/filtereditdialog.cpp
+++ b/src/dialog/filtereditdialog.cpp
@@ -46,8 +46,9 @@ FilterEditDialog::FilterEditDialog(QList<KCalCore::CalFil=
ter *> *filters, QWidge
     : QDialog(parent)
 {
     setWindowTitle(i18nc("@title::window", "Edit Calendar Filters"));
-    QDialogButtonBox *buttonBox =3D new QDialogButtonBox(QDialogButtonBox:=
:Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply);
     QVBoxLayout *mainLayout =3D new QVBoxLayout(this);
+
+    QDialogButtonBox *buttonBox =3D new QDialogButtonBox(QDialogButtonBox:=
:Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply, this);
     mOkButton =3D buttonBox->button(QDialogButtonBox::Ok);
     mApplyButton =3D buttonBox->button(QDialogButtonBox::Apply);
     mOkButton->setDefault(true);
@@ -130,7 +131,8 @@ void FilterEdit::updateFilterList()
         Q_EMIT(dataConsistent(false));
     } else {
         QList<KCalCore::CalFilter *>::iterator i;
-        for (i =3D mFilters->begin(); i !=3D mFilters->end(); ++i) {
+        QList<KCalCore::CalFilter *>::iterator end(mFilters->end());
+        for (i =3D mFilters->begin(); i !=3D end; ++i) {
             if (*i) {
                 mRulesList->addItem((*i)->name());
             }
@@ -143,7 +145,7 @@ void FilterEdit::updateFilterList()
         }
         Q_EMIT(dataConsistent(true));
     }
-    if (mFilters && mFilters->count() > 0 && !mCurrent) {
+    if (mFilters && !mFilters->isEmpty() && !mCurrent) {
         filterSelected(mFilters->at(0));
     }
     if (mFilters) {