[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kphotoalbum] /: Removed the (legacy?) .moc file includes.
From: Tobias Leupold <null () kde ! org>
Date: 2018-01-01 8:38:40
Message-ID: E1eVvcG-0004aO-UY () code ! kde ! org
[Download RAW message or body]
Git commit 62164a45f961541f29668b7f0aa866abe529ebe6 by Tobias Leupold.
Committed on 01/01/2018 at 08:30.
Pushed by tleupold into branch 'master'.
Removed the (legacy?) .moc file includes.
At the latest, Qt 5.9 complains about these when compiling. Also, the
"No relevant output generated" warning is gone with this.
M +2 -3 AnnotationDialog/DateEdit.cpp
M +2 -2 AnnotationDialog/DescriptionEdit.cpp
M +1 -3 AnnotationDialog/Dialog.cpp
M +1 -2 AnnotationDialog/ImagePreview.cpp
M +1 -2 AnnotationDialog/ListSelect.cpp
M +2 -2 AnnotationDialog/ShowSelectionOnlyManager.cpp
M +1 -2 BackgroundTaskManager/JobInterface.cpp
M +1 -3 Browser/BrowserWidget.cpp
M +2 -3 CategoryListView/DragableTreeWidget.cpp
M +2 -3 DB/Category.cpp
M +1 -2 DB/CategoryCollection.cpp
M +1 -2 DB/ImageDB.cpp
M +1 -2 DB/MemberMap.cpp
M +1 -2 DateBar/DateBarWidget.cpp
M +2 -3 DateBar/MouseHandler.cpp
M +1 -2 Exif/InfoDialog.cpp
M +2 -2 Exif/RangeWidget.cpp
M +1 -2 Exif/ReReadDialog.cpp
M +2 -3 Exif/SearchDialog.cpp
M +2 -2 Exif/TreeView.cpp
M +3 -2 HTMLGenerator/Generator.cpp
M +1 -2 HTMLGenerator/HTMLDialog.cpp
M +1 -2 ImageManager/ThumbnailBuilder.cpp
M +1 -5 ImportExport/Export.cpp
M +1 -2 ImportExport/ImportDialog.cpp
M +1 -2 ImportExport/ImportMatcher.cpp
M +1 -2 ImportExport/MiniViewer.cpp
M +1 -2 MainWindow/AutoStackImages.cpp
M +1 -3 MainWindow/CategoryImagePopup.cpp
M +1 -2 MainWindow/DeleteDialog.cpp
M +2 -3 MainWindow/DirtyIndicator.cpp
M +1 -2 MainWindow/DuplicateMerger/DuplicateMatch.cpp
M +1 -3 MainWindow/DuplicateMerger/DuplicateMerger.cpp
M +1 -2 MainWindow/DuplicateMerger/MergeToolTip.cpp
M +1 -3 MainWindow/ExternalPopup.cpp
M +2 -2 MainWindow/FeatureDialog.cpp
M +1 -2 MainWindow/ImageCounter.cpp
M +1 -2 MainWindow/InvalidDateFinder.cpp
M +2 -2 MainWindow/SearchBar.cpp
M +1 -2 MainWindow/SplashScreen.cpp
M +2 -2 MainWindow/TokenEditor.cpp
M +1 -2 MainWindow/WelcomeDialog.cpp
M +1 -3 MainWindow/Window.cpp
M +1 -2 Plugins/Interface.cpp
M +1 -2 Settings/SettingsData.cpp
M +1 -2 Settings/SettingsDialog.cpp
M +1 -2 Settings/ViewerSizeConfig.cpp
M +1 -3 ThumbnailView/GridResizeSlider.cpp
M +2 -2 ThumbnailView/SelectionInteraction.cpp
M +1 -2 ThumbnailView/ThumbnailToolTip.cpp
M +2 -2 ThumbnailView/ThumbnailWidget.cpp
M +3 -2 Viewer/AbstractDisplay.cpp
M +1 -2 Viewer/CategoryImageConfig.cpp
M +1 -2 Viewer/ImageDisplay.cpp
M +1 -2 Viewer/InfoBox.cpp
M +1 -2 Viewer/SpeedDisplay.cpp
M +1 -2 Viewer/TextDisplay.cpp
M +1 -2 Viewer/VideoDisplay.cpp
M +1 -2 Viewer/ViewerWidget.cpp
M +1 -2 XMLDB/Database.cpp
M +1 -2 XMLDB/XMLCategory.cpp
M +2 -2 XMLDB/XMLCategoryCollection.cpp
https://commits.kde.org/kphotoalbum/62164a45f961541f29668b7f0aa866abe529ebe6
diff --git a/AnnotationDialog/DateEdit.cpp b/AnnotationDialog/DateEdit.cpp
index 0be6aa81..1ed18372 100644
--- a/AnnotationDialog/DateEdit.cpp
+++ b/AnnotationDialog/DateEdit.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
/**
* A date editing widget that consists of an editable combo box.
* The combo box contains the date in text form, and clicking the combo
@@ -46,8 +47,6 @@
#include <QMouseEvent>
#include <QVBoxLayout>
-#include "DateEdit.moc"
-
AnnotationDialog::DateEdit::DateEdit( bool isStartEdit, QWidget *parent )
: QComboBox( parent ),
m_defaultValue( QDate::currentDate() ),
diff --git a/AnnotationDialog/DescriptionEdit.cpp \
b/AnnotationDialog/DescriptionEdit.cpp index dd746fa2..3658ad0e 100644
--- a/AnnotationDialog/DescriptionEdit.cpp
+++ b/AnnotationDialog/DescriptionEdit.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tobias Leupold <tobias.leupold@web.de>
+/* Copyright (C) 2014-2018 Tobias Leupold <tobias.leupold@gmx.de>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "DescriptionEdit.h"
#include <QKeyEvent>
@@ -35,5 +36,4 @@ void AnnotationDialog::DescriptionEdit::keyPressEvent(QKeyEvent \
*event) }
}
-#include "DescriptionEdit.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/AnnotationDialog/Dialog.cpp b/AnnotationDialog/Dialog.cpp
index dcfffdfc..642164a5 100644
--- a/AnnotationDialog/Dialog.cpp
+++ b/AnnotationDialog/Dialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2017 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -1751,6 +1751,4 @@ void AnnotationDialog::Dialog::mapLoadingFinished(bool \
mapHasImages, bool allIma }
#endif
-#include "Dialog.moc"
-
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/AnnotationDialog/ImagePreview.cpp b/AnnotationDialog/ImagePreview.cpp
index 34d90b62..4bcd3d55 100644
--- a/AnnotationDialog/ImagePreview.cpp
+++ b/AnnotationDialog/ImagePreview.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -701,5 +701,4 @@ void ImagePreview::recognizeArea(ResizableFrame *area)
#endif // HAVE_KFACE
-#include "ImagePreview.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/AnnotationDialog/ListSelect.cpp b/AnnotationDialog/ListSelect.cpp
index 45c87e78..c3bd1945 100644
--- a/AnnotationDialog/ListSelect.cpp
+++ b/AnnotationDialog/ListSelect.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -874,5 +874,4 @@ void AnnotationDialog::ListSelect::deselectTag(QString tag)
matchingTags.first()->setCheckState(0, Qt::Unchecked);
}
-#include "ListSelect.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/AnnotationDialog/ShowSelectionOnlyManager.cpp \
b/AnnotationDialog/ShowSelectionOnlyManager.cpp index a2307026..8bd691a5 100644
--- a/AnnotationDialog/ShowSelectionOnlyManager.cpp
+++ b/AnnotationDialog/ShowSelectionOnlyManager.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "ShowSelectionOnlyManager.h"
AnnotationDialog::ShowSelectionOnlyManager& \
AnnotationDialog::ShowSelectionOnlyManager::instance() @@ -50,5 +51,4 @@ void \
AnnotationDialog::ShowSelectionOnlyManager::unlimitFromSelection() }
}
-#include "ShowSelectionOnlyManager.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/BackgroundTaskManager/JobInterface.cpp \
b/BackgroundTaskManager/JobInterface.cpp index 7739482c..254c9072 100644
--- a/BackgroundTaskManager/JobInterface.cpp
+++ b/BackgroundTaskManager/JobInterface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2012-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -65,5 +65,4 @@ void BackgroundTaskManager::JobInterface::dependedJobCompleted()
BackgroundTaskManager::JobManager::instance()->addJob(this);
}
-#include "JobInterface.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Browser/BrowserWidget.cpp b/Browser/BrowserWidget.cpp
index 721d9e1e..c82e67c5 100644
--- a/Browser/BrowserWidget.cpp
+++ b/Browser/BrowserWidget.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -477,6 +477,4 @@ void Browser::BrowserWidget::handleResizeEvent( QMouseEvent* \
event ) }
}
-#include "BrowserWidget.moc"
-
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/CategoryListView/DragableTreeWidget.cpp \
b/CategoryListView/DragableTreeWidget.cpp index f5e4ee4f..34097bc8 100644
--- a/CategoryListView/DragableTreeWidget.cpp
+++ b/CategoryListView/DragableTreeWidget.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "DragableTreeWidget.h"
#include "DB/Category.h"
#include "CheckDropItem.h"
@@ -89,6 +90,4 @@ void \
CategoryListView::DragableTreeWidget::dragMoveEvent(QDragMoveEvent *event) \
event->ignore(); }
-
-#include "DragableTreeWidget.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/DB/Category.cpp b/DB/Category.cpp
index db53a35a..8f343a1f 100644
--- a/DB/Category.cpp
+++ b/DB/Category.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "Category.h"
#include <kmessagebox.h>
#include <QDir>
@@ -186,6 +187,4 @@ QString DB::Category::fileForCategoryImage( const QString& \
category, QString mem return fileName;
}
-
-#include "Category.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/DB/CategoryCollection.cpp b/DB/CategoryCollection.cpp
index 5065d608..bd8a81af 100644
--- a/DB/CategoryCollection.cpp
+++ b/DB/CategoryCollection.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -29,5 +29,4 @@ void CategoryCollection::itemRemoved( const QString& item )
emit itemRemoved( static_cast<Category*>( const_cast<QObject*>( sender() ) ), \
item ); }
-#include "CategoryCollection.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/DB/ImageDB.cpp b/DB/ImageDB.cpp
index 8d217c95..6262d8b4 100644
--- a/DB/ImageDB.cpp
+++ b/DB/ImageDB.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -191,5 +191,4 @@ DB::FileName ImageDB::findFirstItemInRange(const \
DB::FileNameList& images,
* \brief Rename category in media items stored in database.
*/
-#include "ImageDB.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/DB/MemberMap.cpp b/DB/MemberMap.cpp
index 83747e59..bf09a59d 100644
--- a/DB/MemberMap.cpp
+++ b/DB/MemberMap.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -339,5 +339,4 @@ void DB::MemberMap::setLoading( bool b )
m_loading = b;
}
-#include "MemberMap.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/DateBar/DateBarWidget.cpp b/DateBar/DateBarWidget.cpp
index 8ad333d9..aa335cdb 100644
--- a/DateBar/DateBarWidget.cpp
+++ b/DateBar/DateBarWidget.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -846,5 +846,4 @@ void DateBar::DateBarWidget::wheelEvent( QWheelEvent * e )
scroll(-1);
}
-#include "DateBarWidget.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/DateBar/MouseHandler.cpp b/DateBar/MouseHandler.cpp
index c1f531db..b8bf2b85 100644
--- a/DateBar/MouseHandler.cpp
+++ b/DateBar/MouseHandler.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "MouseHandler.h"
#include <DB/ImageDateCollection.h>
#include "DateBarWidget.h"
@@ -222,6 +223,4 @@ bool DateBar::SelectionHandler::hasSelection() const
return min().isValid();
}
-
-#include "MouseHandler.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Exif/InfoDialog.cpp b/Exif/InfoDialog.cpp
index e6ee039f..5ac6c06f 100644
--- a/Exif/InfoDialog.cpp
+++ b/Exif/InfoDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2016 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -122,5 +122,4 @@ void Exif::InfoDialog::enterEvent(QEvent *)
m_grid->setFocus();
}
-#include "InfoDialog.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Exif/RangeWidget.cpp b/Exif/RangeWidget.cpp
index a13d8b15..8de5e669 100644
--- a/Exif/RangeWidget.cpp
+++ b/Exif/RangeWidget.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "RangeWidget.h"
#include <qlabel.h>
#include <KComboBox>
@@ -95,5 +96,4 @@ Exif::SearchInfo::Range Exif::RangeWidget::range() const
return result;
}
-#include "RangeWidget.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Exif/ReReadDialog.cpp b/Exif/ReReadDialog.cpp
index 67d402fe..532da2c8 100644
--- a/Exif/ReReadDialog.cpp
+++ b/Exif/ReReadDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -143,5 +143,4 @@ void Exif::ReReadDialog::warnAboutDates( bool b )
m_date->setChecked( false );
}
-#include "ReReadDialog.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Exif/SearchDialog.cpp b/Exif/SearchDialog.cpp
index 56c0b8ab..610d53e4 100644
--- a/Exif/SearchDialog.cpp
+++ b/Exif/SearchDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "SearchDialog.h"
#include <KLocalizedString>
#include <qlayout.h>
@@ -428,6 +429,4 @@ void Exif::SearchDialog::toFocalLengthChanged( int val )
m_fromFocalLength->setValue( val );
}
-
-#include "SearchDialog.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Exif/TreeView.cpp b/Exif/TreeView.cpp
index 30117f39..6667f30f 100644
--- a/Exif/TreeView.cpp
+++ b/Exif/TreeView.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "Exif/TreeView.h"
#include "Utilities/StringSet.h"
#include <qmap.h>
@@ -98,5 +99,4 @@ void Exif::TreeView::reload()
item->setExpanded( true );
}
-#include "TreeView.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/HTMLGenerator/Generator.cpp b/HTMLGenerator/Generator.cpp
index 6d7ec45a..635c9e9c 100644
--- a/HTMLGenerator/Generator.cpp
+++ b/HTMLGenerator/Generator.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2016 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "Generator.h"
#include <sys/types.h>
@@ -786,5 +787,5 @@ QString HTMLGenerator::Generator::populateDescription( \
QList<DB::CategoryPtr> ca
return description;
}
-#include "Generator.moc"
+
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/HTMLGenerator/HTMLDialog.cpp b/HTMLGenerator/HTMLDialog.cpp
index fe6d02cc..a569cd52 100644
--- a/HTMLGenerator/HTMLDialog.cpp
+++ b/HTMLGenerator/HTMLDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2016 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -654,5 +654,4 @@ Setup HTMLGenerator::HTMLDialog::setup() const
return setup;
}
-#include "HTMLDialog.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/ImageManager/ThumbnailBuilder.cpp b/ImageManager/ThumbnailBuilder.cpp
index c9694b4a..9f58466b 100644
--- a/ImageManager/ThumbnailBuilder.cpp
+++ b/ImageManager/ThumbnailBuilder.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -128,5 +128,4 @@ void ImageManager::ThumbnailBuilder::requestCanceled()
m_statusBar->setProgress( ++m_count );
}
-#include "ThumbnailBuilder.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/ImportExport/Export.cpp b/ImportExport/Export.cpp
index 599f5f5e..b1ed89a4 100644
--- a/ImportExport/Export.cpp
+++ b/ImportExport/Export.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -407,8 +407,4 @@ void Export::showUsageDialog()
KMessageBox::information( nullptr, txt, i18n("How to Use the Export File"), \
QString::fromLatin1("export_how_to_use_the_export_file") ); }
-
-
-
-#include "Export.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/ImportExport/ImportDialog.cpp b/ImportExport/ImportDialog.cpp
index c1f179cf..a68e9b6f 100644
--- a/ImportExport/ImportDialog.cpp
+++ b/ImportExport/ImportDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2016 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -401,5 +401,4 @@ void ImportExport::ImportDialog::possiblyAddMD5CheckPage()
}
}
-#include "ImportDialog.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/ImportExport/ImportMatcher.cpp b/ImportExport/ImportMatcher.cpp
index 74562984..82b1a6ff 100644
--- a/ImportExport/ImportMatcher.cpp
+++ b/ImportExport/ImportMatcher.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -127,5 +127,4 @@ ImportExport::CategoryMatchSetting \
ImportExport::ImportMatcher::settings() return res;
}
-#include "ImportMatcher.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/ImportExport/MiniViewer.cpp b/ImportExport/MiniViewer.cpp
index c69f65a0..ccec1e78 100644
--- a/ImportExport/MiniViewer.cpp
+++ b/ImportExport/MiniViewer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -70,5 +70,4 @@ MiniViewer::MiniViewer( QWidget* parent ): QDialog( parent )
vlay->addWidget( box );
}
-#include "MiniViewer.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/AutoStackImages.cpp b/MainWindow/AutoStackImages.cpp
index 01eecec0..71fcae06 100644
--- a/MainWindow/AutoStackImages.cpp
+++ b/MainWindow/AutoStackImages.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Miika Turkia <miika.turkia@gmail.com>
+/* Copyright (C) 2010-2018 Miika Turkia <miika.turkia@gmail.com>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -324,5 +324,4 @@ void AutoStackImages::accept()
MainWindow::Window::theMainWindow()->showThumbNails(toBeShown);
}
-#include "AutoStackImages.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/CategoryImagePopup.cpp b/MainWindow/CategoryImagePopup.cpp
index f2e79c3b..5841248c 100644
--- a/MainWindow/CategoryImagePopup.cpp
+++ b/MainWindow/CategoryImagePopup.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -24,7 +24,6 @@
#include "DB/CategoryCollection.h"
#include "Viewer/CategoryImageConfig.h"
-
void MainWindow::CategoryImagePopup::populate( const QImage& image, const \
DB::FileName& imageName ) {
clear();
@@ -83,5 +82,4 @@ MainWindow::CategoryImagePopup::CategoryImagePopup( QWidget* parent \
)
connect(this, &CategoryImagePopup::triggered, this, \
&CategoryImagePopup::slotExecuteService); }
-#include "CategoryImagePopup.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/DeleteDialog.cpp b/MainWindow/DeleteDialog.cpp
index 589f4301..cd8b2cd1 100644
--- a/MainWindow/DeleteDialog.cpp
+++ b/MainWindow/DeleteDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -106,5 +106,4 @@ void DeleteDialog::deleteImages()
reject();
}
-#include "DeleteDialog.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/DirtyIndicator.cpp b/MainWindow/DirtyIndicator.cpp
index 37806eda..d0fe6bf7 100644
--- a/MainWindow/DirtyIndicator.cpp
+++ b/MainWindow/DirtyIndicator.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "DirtyIndicator.h"
#include <kiconloader.h>
#include <QPixmap>
@@ -89,6 +90,4 @@ bool MainWindow::DirtyIndicator::isAutoSaveDirty() const
return s_autoSaveDirty;
}
-
-#include "DirtyIndicator.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/DuplicateMerger/DuplicateMatch.cpp \
b/MainWindow/DuplicateMerger/DuplicateMatch.cpp index 2d6a7c51..9c3bfbe8 100644
--- a/MainWindow/DuplicateMerger/DuplicateMatch.cpp
+++ b/MainWindow/DuplicateMerger/DuplicateMatch.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2012 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright 2012-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -160,5 +160,4 @@ bool DuplicateMatch::eventFilter(QObject* obj, QEvent* event)
} // namespace MainWindow
-#include "DuplicateMatch.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/DuplicateMerger/DuplicateMerger.cpp \
b/MainWindow/DuplicateMerger/DuplicateMerger.cpp index 55767f3d..2e04807c 100644
--- a/MainWindow/DuplicateMerger/DuplicateMerger.cpp
+++ b/MainWindow/DuplicateMerger/DuplicateMerger.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2012-2016 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright 2012-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -202,6 +202,4 @@ void DuplicateMerger::tellThatNoDuplicatesWereFound()
} // namespace MainWindow
-#include "DuplicateMerger.moc"
-
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/DuplicateMerger/MergeToolTip.cpp \
b/MainWindow/DuplicateMerger/MergeToolTip.cpp index 0e9142c8..7267792f 100644
--- a/MainWindow/DuplicateMerger/MergeToolTip.cpp
+++ b/MainWindow/DuplicateMerger/MergeToolTip.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2012 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright 2012-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -48,5 +48,4 @@ void MergeToolTip::placeWindow()
} // namespace MainWindow
-#include "MergeToolTip.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/ExternalPopup.cpp b/MainWindow/ExternalPopup.cpp
index 1dd79908..80967083 100644
--- a/MainWindow/ExternalPopup.cpp
+++ b/MainWindow/ExternalPopup.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -208,6 +208,4 @@ bool operator<( const QPair<QString,QPixmap>& a, const \
QPair<QString,QPixmap>& b return a.first < b.first;
}
-
-#include "ExternalPopup.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/FeatureDialog.cpp b/MainWindow/FeatureDialog.cpp
index d76343da..9bccd3f1 100644
--- a/MainWindow/FeatureDialog.cpp
+++ b/MainWindow/FeatureDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include <config-kpa-kipi.h>
#include <config-kpa-kgeomap.h>
#include "FeatureDialog.h"
@@ -242,5 +243,4 @@ QStringList MainWindow::FeatureDialog::supportedVideoMimeTypes()
return Phonon::BackendCapabilities::availableMimeTypes();
}
-#include "FeatureDialog.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/ImageCounter.cpp b/MainWindow/ImageCounter.cpp
index 5c6a6ae1..2279ccb2 100644
--- a/MainWindow/ImageCounter.cpp
+++ b/MainWindow/ImageCounter.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -50,5 +50,4 @@ void MainWindow::ImageCounter::showBrowserMatches(uint matches )
setText( i18np( "1 match", "%1 matches", matches ) );
}
-#include "ImageCounter.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/InvalidDateFinder.cpp b/MainWindow/InvalidDateFinder.cpp
index 7a9c07f5..5925dfce 100644
--- a/MainWindow/InvalidDateFinder.cpp
+++ b/MainWindow/InvalidDateFinder.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -146,5 +146,4 @@ void InvalidDateFinder::accept()
Window::theMainWindow()->showThumbNails( toBeShown );
}
-#include "InvalidDateFinder.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/SearchBar.cpp b/MainWindow/SearchBar.cpp
index e14d9905..f1f3be9a 100644
--- a/MainWindow/SearchBar.cpp
+++ b/MainWindow/SearchBar.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "SearchBar.h"
#include <QLineEdit>
#include <kmainwindow.h>
@@ -87,5 +88,4 @@ void MainWindow::SearchBar::setLineEditEnabled(bool b)
m_edit->setFocus();
}
-#include "SearchBar.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/SplashScreen.cpp b/MainWindow/SplashScreen.cpp
index 722c491b..e923da20 100644
--- a/MainWindow/SplashScreen.cpp
+++ b/MainWindow/SplashScreen.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -72,5 +72,4 @@ void MainWindow::SplashScreen::drawContents( QPainter * painter )
painter->restore();
}
-#include "SplashScreen.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/TokenEditor.cpp b/MainWindow/TokenEditor.cpp
index e8aeec91..525fd633 100644
--- a/MainWindow/TokenEditor.cpp
+++ b/MainWindow/TokenEditor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "TokenEditor.h"
#include <qlayout.h>
#include <QGridLayout>
@@ -135,5 +136,4 @@ void TokenEditor::accept()
QDialog::accept();
}
-#include "TokenEditor.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/WelcomeDialog.cpp b/MainWindow/WelcomeDialog.cpp
index 52463800..8aded087 100644
--- a/MainWindow/WelcomeDialog.cpp
+++ b/MainWindow/WelcomeDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -208,5 +208,4 @@ void MainWindow::WelcomeDialog::checkFeatures()
}
}
-#include "WelcomeDialog.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/MainWindow/Window.cpp b/MainWindow/Window.cpp
index 2877cce7..3cde687f 100644
--- a/MainWindow/Window.cpp
+++ b/MainWindow/Window.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -1980,6 +1980,4 @@ Browser::PositionBrowserWidget* \
MainWindow::Window::createPositionBrowser() }
#endif
-
-#include "Window.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Plugins/Interface.cpp b/Plugins/Interface.cpp
index fa8f1a63..45b1045a 100644
--- a/Plugins/Interface.cpp
+++ b/Plugins/Interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -215,5 +215,4 @@ void Plugins::Interface::failedKDEPreview(const KFileItem& item)
emit gotThumbnail(item.url(), QPixmap());
}
-#include "Interface.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Settings/SettingsData.cpp b/Settings/SettingsData.cpp
index 7bf366a6..cbfea9c0 100644
--- a/Settings/SettingsData.cpp
+++ b/Settings/SettingsData.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -17,7 +17,6 @@
*/
#include "SettingsData.h"
-#include "SettingsData.moc"
#include <stdlib.h>
diff --git a/Settings/SettingsDialog.cpp b/Settings/SettingsDialog.cpp
index 88d75d05..6680fc31 100644
--- a/Settings/SettingsDialog.cpp
+++ b/Settings/SettingsDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -180,5 +180,4 @@ void Settings::SettingsDialog::keyPressEvent(QKeyEvent*)
// This prevents the dialog to be closed if the ENTER key is pressed anywhere
}
-#include "SettingsDialog.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Settings/ViewerSizeConfig.cpp b/Settings/ViewerSizeConfig.cpp
index 097284b5..8c51e099 100644
--- a/Settings/ViewerSizeConfig.cpp
+++ b/Settings/ViewerSizeConfig.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -76,5 +76,4 @@ bool Settings::ViewerSizeConfig::launchFullScreen() const
return m_fullScreen->isChecked();
}
-#include "ViewerSizeConfig.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/ThumbnailView/GridResizeSlider.cpp b/ThumbnailView/GridResizeSlider.cpp
index 18448e77..9786caac 100644
--- a/ThumbnailView/GridResizeSlider.cpp
+++ b/ThumbnailView/GridResizeSlider.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Johannes Zarl <johannes@zarl.at>
+/* Copyright (C) 2015-2018 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -193,6 +193,4 @@ void \
ThumbnailView::GridResizeSlider::calculateNewThumbnailSize(int perRowDiffer \
model()->updateVisibleRowInfo(); }
-#include "GridResizeSlider.moc"
-
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/ThumbnailView/SelectionInteraction.cpp \
b/ThumbnailView/SelectionInteraction.cpp index ea106904..a2a7a380 100644
--- a/ThumbnailView/SelectionInteraction.cpp
+++ b/ThumbnailView/SelectionInteraction.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "SelectionInteraction.h"
#include <QApplication>
@@ -81,5 +82,4 @@ bool ThumbnailView::SelectionInteraction::isDragging() const
return m_dragInProgress;
}
-#include "SelectionInteraction.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/ThumbnailView/ThumbnailToolTip.cpp b/ThumbnailView/ThumbnailToolTip.cpp
index ac6e5c57..145e6edc 100644
--- a/ThumbnailView/ThumbnailToolTip.cpp
+++ b/ThumbnailView/ThumbnailToolTip.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -118,5 +118,4 @@ void ThumbnailView::ThumbnailToolTip::placeWindow()
move( pos );
}
-#include "ThumbnailToolTip.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/ThumbnailView/ThumbnailWidget.cpp b/ThumbnailView/ThumbnailWidget.cpp
index 87c04479..9ee5628e 100644
--- a/ThumbnailView/ThumbnailWidget.cpp
+++ b/ThumbnailView/ThumbnailWidget.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2011 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "ThumbnailWidget.h"
#include <QScrollBar>
#include <QTimer>
@@ -24,7 +25,6 @@
#include "ThumbnailFactory.h"
#include "ThumbnailModel.h"
#include "CellGeometry.h"
-#include "ThumbnailWidget.moc"
#include <math.h>
#include <KLocalizedString>
diff --git a/Viewer/AbstractDisplay.cpp b/Viewer/AbstractDisplay.cpp
index dafa46ef..fae9a66f 100644
--- a/Viewer/AbstractDisplay.cpp
+++ b/Viewer/AbstractDisplay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,13 +15,14 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "AbstractDisplay.h"
#include <Settings/SettingsData.h>
#include <DB/ImageInfo.h>
+
Viewer::AbstractDisplay::AbstractDisplay( QWidget* parent )
:QWidget( parent ), m_info( nullptr )
{
}
-#include "AbstractDisplay.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Viewer/CategoryImageConfig.cpp b/Viewer/CategoryImageConfig.cpp
index 7f04fd4f..34247810 100644
--- a/Viewer/CategoryImageConfig.cpp
+++ b/Viewer/CategoryImageConfig.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -193,5 +193,4 @@ void Viewer::CategoryImageConfig::show()
QDialog::show();
}
-#include "CategoryImageConfig.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Viewer/ImageDisplay.cpp b/Viewer/ImageDisplay.cpp
index a24fb12f..eb846801 100644
--- a/Viewer/ImageDisplay.cpp
+++ b/Viewer/ImageDisplay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -731,5 +731,4 @@ void Viewer::ImageDisplay::hideEvent(QHideEvent *)
m_viewHandler->hideEvent();
}
-#include "ImageDisplay.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Viewer/InfoBox.cpp b/Viewer/InfoBox.cpp
index acc40b08..864ef2f1 100644
--- a/Viewer/InfoBox.cpp
+++ b/Viewer/InfoBox.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2014 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -344,5 +344,4 @@ void Viewer::InfoBox::updateMapForCurrentImage(DB::FileName)
}
#endif
-#include "InfoBox.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Viewer/SpeedDisplay.cpp b/Viewer/SpeedDisplay.cpp
index 58c6438d..5853ae48 100644
--- a/Viewer/SpeedDisplay.cpp
+++ b/Viewer/SpeedDisplay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -88,5 +88,4 @@ void Viewer::SpeedDisplay::setAlphaChannel(int alpha)
hide();
}
-#include "SpeedDisplay.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Viewer/TextDisplay.cpp b/Viewer/TextDisplay.cpp
index adad0b99..def04907 100644
--- a/Viewer/TextDisplay.cpp
+++ b/Viewer/TextDisplay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2010 Jan Kundrat <jkt@gentoo.org>
+/* Copyright (C) 2007-2018 Jan Kundrat <jkt@gentoo.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -53,5 +53,4 @@ void Viewer::TextDisplay::setText( const QString text )
m_text->setText( text );
}
-#include "TextDisplay.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Viewer/VideoDisplay.cpp b/Viewer/VideoDisplay.cpp
index 643f593f..80ee704d 100644
--- a/Viewer/VideoDisplay.cpp
+++ b/Viewer/VideoDisplay.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -220,5 +220,4 @@ void Viewer::VideoDisplay::setVideoWidgetSize()
m_slider->resize( width(), m_slider->sizeHint().height() );
}
-#include "VideoDisplay.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/Viewer/ViewerWidget.cpp b/Viewer/ViewerWidget.cpp
index 0a759468..c593081b 100644
--- a/Viewer/ViewerWidget.cpp
+++ b/Viewer/ViewerWidget.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -1533,5 +1533,4 @@ void Viewer::ViewerWidget::copyTo()
}
}
-#include "ViewerWidget.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/XMLDB/Database.cpp b/XMLDB/Database.cpp
index 705bdd80..362ec8cf 100644
--- a/XMLDB/Database.cpp
+++ b/XMLDB/Database.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2014 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -26,7 +26,6 @@
#include "DB/ImageInfo.h"
#include "DB/ImageInfoPtr.h"
#include "DB/CategoryCollection.h"
-#include "Database.moc"
#include "XMLCategory.h"
#include <QExplicitlySharedDataPointer>
#include "XMLImageDateCollection.h"
diff --git a/XMLDB/XMLCategory.cpp b/XMLDB/XMLCategory.cpp
index 56e4bcb6..a7baf212 100644
--- a/XMLDB/XMLCategory.cpp
+++ b/XMLDB/XMLCategory.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -213,5 +213,4 @@ QDate XMLDB::XMLCategory::birthDate(const QString &item) const
return m_birthDates[item];
}
-#include "XMLCategory.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
diff --git a/XMLDB/XMLCategoryCollection.cpp b/XMLDB/XMLCategoryCollection.cpp
index 44c170f4..75481ac1 100644
--- a/XMLDB/XMLCategoryCollection.cpp
+++ b/XMLDB/XMLCategoryCollection.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2018 Jesper K. Pedersen <blackie@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -15,6 +15,7 @@
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
+
#include "XMLCategoryCollection.h"
#include <QList>
@@ -106,5 +107,4 @@ void XMLDB::XMLCategoryCollection::initIdMap()
}
}
-#include "XMLCategoryCollection.moc"
// vi:expandtab:tabstop=4 shiftwidth=4:
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic