diff --git a/DB/NewImageFinder.h b/DB/NewImageFinder.h index 539d7b64..98505fc0 100644 --- a/DB/NewImageFinder.h +++ b/DB/NewImageFinder.h @@ -1,56 +1,55 @@ /* Copyright (C) 2003-2010 Jesper K. Pedersen 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef NEWIMAGEFINDER_H #define NEWIMAGEFINDER_H #include "ImageInfo.h" #include "ImageInfoPtr.h" namespace DB { class MD5Map; -class IdList; class FileNameList; class NewImageFinder { public: bool findImages(); bool calculateMD5sums(const DB::FileNameList& list, DB::MD5Map* map, bool* wasCanceled=nullptr); protected: void searchForNewFiles( const DB::FileNameSet& loadedFiles, QString directory ); void setupFileVersionDetection(); void loadExtraFiles(); void loadExtraFile( const DB::FileName& name, DB::MediaType type ); void markUnTagged( ImageInfoPtr info ); bool handleIfImageHasBeenMoved( const DB::FileName& newFileName, const MD5& sum ); private: typedef QList< QPair< DB::FileName, DB::MediaType > > LoadList; LoadList m_pendingLoad; QString m_modifiedFileCompString; QRegExp m_modifiedFileComponent; QStringList m_originalFileComponents; }; } #endif /* NEWIMAGEFINDER_H */ // vi:expandtab:tabstop=4 shiftwidth=4: diff --git a/ImportExport/XMLHandler.h b/ImportExport/XMLHandler.h index 83ba97fc..9f758253 100644 --- a/ImportExport/XMLHandler.h +++ b/ImportExport/XMLHandler.h @@ -1,53 +1,52 @@ /* Copyright (C) 2003-2010 Jesper K. Pedersen 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef XMLHANDLER_H #define XMLHANDLER_H #include #include #include #include #include #include "Export.h" // ImageFileLocation namespace Utilities { class UniqFilenameMapper; } -namespace DB { class IdList; } namespace ImportExport { class XMLHandler { public: QByteArray createIndexXML( const DB::FileNameList& images, const QString& baseUrl, ImageFileLocation location, Utilities::UniqFilenameMapper* nameMap); protected: QDomElement save( QDomDocument doc, const DB::ImageInfoPtr& info ); void writeCategories( QDomDocument doc, QDomElement elm, const DB::ImageInfoPtr& info ); }; } #endif /* XMLHANDLER_H */ // vi:expandtab:tabstop=4 shiftwidth=4: