From kde-commits Wed Aug 17 17:02:39 2016 From: Tobias Leupold Date: Wed, 17 Aug 2016 17:02:39 +0000 To: kde-commits Subject: [kphotoalbum] Exif: Formatting. Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=147145336917126 Git commit 1d71e4a06964a57a94c9dd41b80c43ed9cac317f by Tobias Leupold. Committed on 17/08/2016 at 17:02. Pushed by tleupold into branch 'master'. Formatting. M +11 -8 Exif/InfoDialog.cpp M +14 -4 Exif/InfoDialog.h http://commits.kde.org/kphotoalbum/1d71e4a06964a57a94c9dd41b80c43ed9cac317f diff --git a/Exif/InfoDialog.cpp b/Exif/InfoDialog.cpp index 2567405..9db72ca 100644 --- a/Exif/InfoDialog.cpp +++ b/Exif/InfoDialog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2010 Jesper K. Pedersen +/* Copyright (C) 2003-2016 Jesper K. Pedersen = This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -15,20 +15,23 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "Exif/InfoDialog.h" + #include +#include +#include +#include +#include +#include + #include + +#include "DB/ImageDB.h" +#include "Exif/InfoDialog.h" #include "Exif/Info.h" -#include -#include -#include -#include #include "ImageManager/AsyncLoader.h" #include "ImageManager/ImageRequest.h" -#include "DB/ImageDB.h" #include "Settings/SettingsData.h" #include "Grid.h" -#include = using Utilities::StringSet; = diff --git a/Exif/InfoDialog.h b/Exif/InfoDialog.h index a028c96..f5f8b96 100644 --- a/Exif/InfoDialog.h +++ b/Exif/InfoDialog.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2010 Jesper K. Pedersen +/* Copyright (C) 2003-2016 Jesper K. Pedersen = This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -15,22 +15,31 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + #ifndef INFODIALOG_H #define INFODIALOG_H + #include -#include "Utilities/Set.h" + +#include "DB/FileName.h" #include "ImageManager/ImageClientInterface.h" -#include +#include "Utilities/Set.h" + class QComboBox; class QLineEdit; class QLabel; class QKeyEvent; class QResizeEvent; = -namespace DB { class Id; } +namespace DB { + +class Id; + +} = namespace Exif { + class Grid; = class InfoDialog : public QDialog, public ImageManager::ImageClientInterfa= ce { @@ -52,6 +61,7 @@ private: QComboBox* m_iptcCharset; Grid* m_grid; QLabel* m_fileNameLabel; + }; = }