Mercurial > hg > orthanc

changeset 5591:043c8016ed6a find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing standalone OrthancServer/Sources/Search/LabelsConstraint.h
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 03 May 2024 18:30:29 +0200
parents 8b32213af23e
children 1e2631b8b9af
files OrthancServer/Sources/Database/FindRequest.h OrthancServer/Sources/Search/ISqlLookupFormatter.h OrthancServer/Sources/Search/LabelsConstraint.h
diffstat 3 files changed, 11 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Sources/Database/FindRequest.h	Fri May 03 18:17:53 2024 +0200
+++ b/OrthancServer/Sources/Database/FindRequest.h	Fri May 03 18:30:29 2024 +0200
@@ -23,11 +23,11 @@
 #pragma once
 
 #include "../../../OrthancFramework/Sources/DicomFormat/DicomTag.h"
+#include "../Search/DatabaseConstraint.h"
+#include "../Search/DicomTagConstraint.h"
+#include "../Search/ISqlLookupFormatter.h"
 #include "../ServerEnumerations.h"
 #include "OrthancIdentifiers.h"
-#include "../Search/DicomTagConstraint.h"
-#include "../Search/LabelsConstraint.h"
-#include "../Search/DatabaseConstraint.h"
 
 #include <deque>
 #include <map>
--- a/OrthancServer/Sources/Search/ISqlLookupFormatter.h	Fri May 03 18:17:53 2024 +0200
+++ b/OrthancServer/Sources/Search/ISqlLookupFormatter.h	Fri May 03 18:30:29 2024 +0200
@@ -24,7 +24,6 @@
 
 #if ORTHANC_BUILDING_SERVER_LIBRARY == 1
 #  include "../../../OrthancFramework/Sources/Enumerations.h"
-#  include "../Search/LabelsConstraint.h"
 #else
 #  include <Enumerations.h>
 #endif
@@ -35,7 +34,14 @@
 namespace Orthanc
 {
   class DatabaseConstraint;
-  
+
+  enum LabelsConstraint
+  {
+    LabelsConstraint_All,
+    LabelsConstraint_Any,
+    LabelsConstraint_None
+  };
+
   // This class is also used by the "orthanc-databases" project
   class ISqlLookupFormatter : public boost::noncopyable
   {
--- a/OrthancServer/Sources/Search/LabelsConstraint.h	Fri May 03 18:17:53 2024 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/**
- * Orthanc - A Lightweight, RESTful DICOM Store
- * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2024 Osimis S.A., Belgium
- * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
- *
- * 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 Orthanc
-{
-  enum LabelsConstraint
-  {
-    LabelsConstraint_All,
-    LabelsConstraint_Any,
-    LabelsConstraint_None
-  };
-}
\ No newline at end of file