diff --git a/applets/comic/stripselector.cpp b/applets/comic/stripselector.cpp
index 8a71182ab..579e22072 100644
--- a/applets/comic/stripselector.cpp
+++ b/applets/comic/stripselector.cpp
@@ -1,180 +1,177 @@
 /***************************************************************************
  *   Copyright (C) 2012 Matthias Fuchs <mat69@gmx.net>                     *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
 #include "stripselector.h"
 #include "stripselector_p.h"
 #include "comicdata.h"
 
 #include <KDatePicker>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QInputDialog>
 #include <QSpinBox>
 #include <KLocalizedString>
 
 #include <QScopedPointer>
 #include <QTimer>
 #include <QLabel>
 #include <QVBoxLayout>
 
 //NOTE based on GotoPageDialog KDE/kdegraphics/okular/part.cpp
 //BEGIN choose a strip dialog
 class ChooseStripNumDialog : public QDialog
 {
     public:
         ChooseStripNumDialog(QWidget *parent, int current, int min, int max)
             : QDialog( parent )
         {
             setWindowTitle(i18n("Go to Strip"));
 
             QVBoxLayout *topLayout = new QVBoxLayout(this);
             topLayout->setMargin(0);
             numInput = new QSpinBox(this);
             numInput->setRange(min, max);
             numInput->setValue(current);
 
             QLabel *label = new QLabel(i18n("&Strip Number:"), this);
             label->setBuddy(numInput);
             topLayout->addWidget(label);
             topLayout->addWidget(numInput) ;
             // A little bit extra space
             topLayout->addStretch(10);
 
             QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
             buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
             connect(buttonBox, &QDialogButtonBox::accepted, this, &ChooseStripNumDialog::accept);
             connect(buttonBox, &QDialogButtonBox::rejected, this, &ChooseStripNumDialog::reject);
             topLayout->addWidget(buttonBox);
 
             numInput->setFocus();
         }
 
         int getStripNumber() const
         {
             return numInput->value();
         }
 
     protected:
         QSpinBox *numInput;
 };
 //END choose a strip dialog
 
 StripSelector::StripSelector(QObject *parent)
   : QObject(parent)
 {
 }
 
 StripSelector::~StripSelector()
 {
 }
 
 StripSelector *StripSelectorFactory::create(IdentifierType type)
 {
     switch (type) {
         case Number:
             return new NumberStripSelector();
         case Date:
             return new DateStripSelector();
         case String:
             return new StringStripSelector();
     }
 
     return nullptr;
 }
 
 
 StringStripSelector::StringStripSelector(QObject *parent)
   : StripSelector(parent)
 {
 }
 
 StringStripSelector::~StringStripSelector()
 {
 }
 
 void StringStripSelector::select(const ComicData &currentStrip)
 {
     bool ok;
     const QString strip = QInputDialog::getText(nullptr, i18n("Go to Strip"), i18n("Strip identifier:"), QLineEdit::Normal,
                                                  currentStrip.current(), &ok);
     if (ok) {
         emit stripChosen(strip);
     }
     deleteLater();
 }
 
 NumberStripSelector::NumberStripSelector(QObject *parent)
   : StripSelector(parent)
 {
 }
 
 NumberStripSelector::~NumberStripSelector()
 {
 }
 
 void NumberStripSelector::select(const ComicData &currentStrip)
 {
     QScopedPointer<ChooseStripNumDialog> pageDialog(new ChooseStripNumDialog(nullptr, currentStrip.current().toInt(),
                                                     currentStrip.firstStripNum(), currentStrip.maxStripNum()));
     if (pageDialog->exec() == QDialog::Accepted) {
         emit stripChosen(QString::number(pageDialog->getStripNumber()));
     }
     deleteLater();
 }
 
 DateStripSelector::DateStripSelector(QObject *parent)
   : StripSelector(parent)
 {
 }
 
 DateStripSelector::~DateStripSelector()
 {
 }
 
 void DateStripSelector::select(const ComicData &currentStrip)
 {
     mFirstIdentifierSuffix = currentStrip.first();
 
     KDatePicker *calendar = new KDatePicker;
     calendar->setAttribute(Qt::WA_DeleteOnClose);//to have destroyed emitted upon closing
     calendar->setMinimumSize(calendar->sizeHint());
     calendar->setDate(QDate::fromString(currentStrip.current(), QStringLiteral("yyyy-MM-dd")));
 
     connect(calendar, &KDatePicker::dateSelected, this, &DateStripSelector::slotChosenDay);
     connect(calendar, &KDatePicker::dateEntered, this, &DateStripSelector::slotChosenDay);
 
     // only delete this if the dialog got closed
     connect(calendar, &KDatePicker::destroyed, this, &DateStripSelector::deleteLater);
     calendar->show();
 }
 
 void DateStripSelector::slotChosenDay(const QDate &date)
 {
     if (date <= QDate::currentDate()) {
         QDate temp = QDate::fromString(mFirstIdentifierSuffix, QStringLiteral("yyyy-MM-dd"));
         // only update if date >= first strip date, or if there is no first
         // strip date
         if (temp.isValid() || date >= temp) {
             emit stripChosen(date.toString(QStringLiteral("yyyy-MM-dd")));
         }
     }
 }
-
-#include "moc_stripselector.cpp"
-#include "moc_stripselector_p.cpp"