Removed forwardDeclarations.hpp

common/forwardDeclarations.hpp

-/*
- * The CERN Tape Archive (CTA) project
- * Copyright (C) 2015  CERN
- *
- * 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 3 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, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-namespace cta {
-// Forward declarations for opaque references.
-namespace common {
-namespace admin {
-  class AdminHost;
-  class AdminUser;
-} // cta::common::admin
-namespace archiveNS {
-  class ArchiveFile;
-  class ArchiveDirIterator;
-  class ArchiveFileStatus;
-} // cta::common::archiveNS 
-namespace archiveRoute {
-  class ArchiveRoute;
-} // cta::common::archiveRoute
-} // cta::common
-class ArchiveToFileRequest;
-class ArchiveToTapeCopyRequest;
-class LogicalLibrary;
-class RetrieveRequestDump;
-class RetrieveToFileRequest;
-class SchedulerDatabase;
-class SecurityIdentity;
-class StorageClass;
-class Tape;
-class TapeMount;
-class TapeSession;
-class TapePool;
-class UserIdentity;
-} /// cta

scheduler/Scheduler.hpp

@@ -20,23 +20,13 @@
 
 #include "catalogue/Catalogue.hpp"
 
-#include "common/dataStructures/AdminHost.hpp"
-#include "common/dataStructures/AdminUser.hpp"
 #include "common/dataStructures/ArchiveFile.hpp"
-#include "common/dataStructures/ArchiveFileSummary.hpp"
 #include "common/dataStructures/ArchiveJob.hpp"
 #include "common/dataStructures/ArchiveRequest.hpp"
-#include "common/dataStructures/ArchiveRoute.hpp"
 #include "common/dataStructures/CancelRetrieveRequest.hpp"
-#include "common/dataStructures/Dedication.hpp"
-#include "common/dataStructures/DedicationType.hpp"
 #include "common/dataStructures/DeleteArchiveRequest.hpp"
-#include "common/dataStructures/DRData.hpp"
 #include "common/dataStructures/DriveState.hpp"
-#include "common/dataStructures/EntryLog.hpp"
 #include "common/dataStructures/ListStorageClassRequest.hpp"
-#include "common/dataStructures/LogicalLibrary.hpp"
-#include "common/dataStructures/MountType.hpp"
 #include "common/dataStructures/ReadTestResult.hpp"
 #include "common/dataStructures/RepackInfo.hpp"
 #include "common/dataStructures/RepackType.hpp"
@@ -44,14 +34,8 @@
 #include "common/dataStructures/RetrieveRequest.hpp"
 #include "common/dataStructures/SecurityIdentity.hpp"
 #include "common/dataStructures/StorageClass.hpp"
-#include "common/dataStructures/TapeFileLocation.hpp"
-#include "common/dataStructures/Tape.hpp"
-#include "common/dataStructures/TapePool.hpp"
 #include "common/dataStructures/TestSourceType.hpp"
 #include "common/dataStructures/UpdateFileInfoRequest.hpp"
-#include "common/dataStructures/MountGroup.hpp"
-#include "common/dataStructures/User.hpp"
-#include "common/dataStructures/UserIdentity.hpp"
 #include "common/dataStructures/VerifyInfo.hpp"
 #include "common/dataStructures/WriteTestResult.hpp"
 
@@ -59,8 +43,6 @@
 #include "scheduler/TapeMount.hpp"
 #include "scheduler/SchedulerDatabase.hpp"
 
-#include "common/forwardDeclarations.hpp"
-
 #include <list>
 #include <map>
 #include <memory>

scheduler/SchedulerDatabase.hpp

@@ -35,11 +35,44 @@
 #include "common/DriveState.hpp"
 #include "nameserver/NameServerTapeFile.hpp"
 #include "scheduler/MountType.hpp"
-#include "common/forwardDeclarations.hpp"
 #include "common/dataStructures/ArchiveRequest.hpp"
 #include "common/dataStructures/MountPolicy.hpp"
 
 namespace cta {
+// Forward declarations for opaque references.
+namespace common {
+namespace admin {
+  class AdminHost;
+  class AdminUser;
+} // cta::common::admin
+namespace archiveNS {
+  class ArchiveFile;
+  class ArchiveDirIterator;
+  class ArchiveFileStatus;
+} // cta::common::archiveNS
+namespace archiveRoute {
+  class ArchiveRoute;
+} // cta::common::archiveRoute
+} // cta::common
+class ArchiveToFileRequest;
+class ArchiveToTapeCopyRequest;
+class LogicalLibrary;
+class RetrieveRequestDump;
+class RetrieveToFileRequest;
+class SchedulerDatabase;
+class SecurityIdentity;
+class StorageClass;
+class Tape;
+class TapeMount;
+class TapeSession;
+class TapePool;
+class UserIdentity;
+} /// cta
+
+namespace cta {
+
+class ArchiveToFileRequest;
+
 /**
  * Abstract class defining the interface to the database of a tape resource
  * scheduler.