[REF] Replacing OsiriXAPI references by HorosAPI

horosproject · Jun 1, 2016 · a5a562a · a5a562a
1 parent b753157
commit a5a562a
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 32 deletions.
diff --git a/Horos.xcodeproj/project.pbxproj b/Horos.xcodeproj/project.pbxproj
@@ -11673,7 +11673,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /usr/bin/perl;
-			shellScript = "#!/usr/bin/perl\n\nuse strict;\nuse File::Copy;\nuse File::Basename;\nmy $destination = \"$ENV{TARGET_BUILD_DIR}/$ENV{PUBLIC_HEADERS_FOLDER_PATH}\";\n\nmkdir $destination unless -d $destination;\nopen OsiriX_h, \">\", \"$destination/OsiriX.h\" or die $!;\n\nprint OsiriX_h \"#ifndef __OsiriX_API\\n#define __OsiriX_API\\n\\n\";\n\n\n# TODO TODO TODO\n# -------------------------------------------------------------------------------------------------- #\n\n# \"$ENV{PROJECT_DIR}/cocoahttpserver\",\n# \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/config\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmsr\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmdata\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/ofstd\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmnet,\n# \"$ENV{PROJECT_DIR}/nitrogen/Sources\", \"$ENV{PROJECT_DIR}/nitrogen/Sources/JSON\"\n\n# -------------------------------------------------------------------------------------------------- #\n\n\nmy @fromdirs = ( $ENV{PROJECT_DIR});\n\nforeach my $root (@fromdirs) {\n    opendir(DIR, $root);\n    \n    my @files = readdir(DIR);\n    foreach (@files) {\n        my $filename = $_;\n        next unless -f \"$root/$filename\" && $filename =~ /\\.h$/s;\n        my @args = ( \"cp\", \"-fp\", \"$root/$filename\", \"$destination/\".(basename $filename) );\n        system(@args) == 0 or die \"Copy failed: $?\";\n        print OsiriX_h \"#include <OsiriXAPI/$filename>\\n\";\n    }\n    \n    closedir(DIR);\n}\n\nprint OsiriX_h \"\\n#endif\\n\";\nclose OsiriX_h;\n\n\n\nmy @fromdirs = ( \"$ENV{PROJECT_DIR}/Binaries/VTKHeaders\" );\n\nforeach my $root (@fromdirs) {\n    my @args = ( \"cp\", \"-Rfp\", \"$root\", \"$destination/\" );\n    system(@args) == 0 or die \"Copy failed: $?\";\n}\n\n\n\nchdir \"$ENV{TARGET_BUILD_DIR}/$ENV{FULL_PRODUCT_NAME}\";\nsymlink \"Versions/Current/Headers\", \"Headers\";\n\nexit 0;";
+			shellScript = "#!/usr/bin/perl\n\nuse strict;\nuse File::Copy;\nuse File::Basename;\nmy $destination = \"$ENV{TARGET_BUILD_DIR}/$ENV{PUBLIC_HEADERS_FOLDER_PATH}\";\n\nmkdir $destination unless -d $destination;\nopen OsiriX_h, \">\", \"$destination/OsiriX.h\" or die $!;\n\nprint OsiriX_h \"#ifndef __OsiriX_API\\n#define __OsiriX_API\\n\\n\";\n\n\n# TODO TODO TODO\n# -------------------------------------------------------------------------------------------------- #\n\n# \"$ENV{PROJECT_DIR}/cocoahttpserver\",\n# \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/config\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmsr\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmdata\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/ofstd\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmnet,\n\n# -------------------------------------------------------------------------------------------------- #\n\n\nmy @fromdirs = ( \"$ENV{PROJECT_DIR}/nitrogen/Sources\", \"$ENV{PROJECT_DIR}/nitrogen/Sources/JSON\", $ENV{PROJECT_DIR} );\n\nforeach my $root (@fromdirs) {\n    opendir(DIR, $root);\n    \n    my @files = readdir(DIR);\n    foreach (@files) {\n        my $filename = $_;\n        next unless -f \"$root/$filename\" && $filename =~ /\\.h$/s;\n        my @args = ( \"cp\", \"-fp\", \"$root/$filename\", \"$destination/\".(basename $filename) );\n        system(@args) == 0 or die \"Copy failed: $?\";\n        print OsiriX_h \"#include <OsiriXAPI/$filename>\\n\";\n    }\n    \n    closedir(DIR);\n}\n\nprint OsiriX_h \"\\n#endif\\n\";\nclose OsiriX_h;\n\n\n\nmy @fromdirs = ( \"$ENV{PROJECT_DIR}/Binaries/VTKHeaders\" );\n\nforeach my $root (@fromdirs) {\n    my @args = ( \"cp\", \"-Rfp\", \"$root\", \"$destination/\" );\n    system(@args) == 0 or die \"Copy failed: $?\";\n}\n\n\n\nchdir \"$ENV{TARGET_BUILD_DIR}/$ENV{FULL_PRODUCT_NAME}\";\nsymlink \"Versions/Current/Headers\", \"Headers\";\n\nexit 0;";
 		};
 		9966A1961AE099A400F2D81A /* Code Signing */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -11701,7 +11701,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /usr/bin/perl;
-			shellScript = "#!/usr/bin/perl\n\nuse strict;\nuse File::Copy;\nuse File::Basename;\nmy $destination = \"$ENV{TARGET_BUILD_DIR}/$ENV{PUBLIC_HEADERS_FOLDER_PATH}\";\n\nmkdir $destination unless -d $destination;\nopen Horos_h, \">\", \"$destination/Horos.h\" or die $!;\n\nprint Horos_h \"#ifndef __Horos_API\\n#define __Horos_API\\n\\n\";\n\n\n# TODO TODO TODO\n# -------------------------------------------------------------------------------------------------- #\n\n# \"$ENV{PROJECT_DIR}/cocoahttpserver\",\n# \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/config\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmsr\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmdata\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/ofstd\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmnet,\n# \"$ENV{PROJECT_DIR}/nitrogen/Sources\", \"$ENV{PROJECT_DIR}/nitrogen/Sources/JSON\"\n\n# -------------------------------------------------------------------------------------------------- #\n\n\nmy @fromdirs = ( $ENV{PROJECT_DIR});\n\nforeach my $root (@fromdirs) {\n\topendir(DIR, $root);\n\t\n\tmy @files = readdir(DIR);\n\tforeach (@files) {\n\t\tmy $filename = $_;\n\t\tnext unless -f \"$root/$filename\" && $filename =~ /\\.h$/s;\n\t\tmy @args = ( \"cp\", \"-fp\", \"$root/$filename\", \"$destination/\".(basename $filename) );\n\t\tsystem(@args) == 0 or die \"Copy failed: $?\";\n\t\tprint Horos_h \"#include <HorosAPI/$filename>\\n\";\n\t}\n\t\n\tclosedir(DIR);\n}\n\nprint Horos_h \"\\n#endif\\n\";\nclose Horos_h;\n\n\n\n\nmy @fromdirs = ( \"$ENV{PROJECT_DIR}/Binaries/VTKHeaders\" );\n\nforeach my $root (@fromdirs) {\n    my @args = ( \"cp\", \"-Rfp\", \"$root\", \"$destination/\" );\n    system(@args) == 0 or die \"Copy failed: $?\";\n}\n\n\n\n\nchdir \"$ENV{TARGET_BUILD_DIR}/$ENV{FULL_PRODUCT_NAME}\";\nsymlink \"Versions/Current/Headers\", \"Headers\";\n\nexit 0;\n\n";
+			shellScript = "#!/usr/bin/perl\n\nuse strict;\nuse File::Copy;\nuse File::Basename;\nmy $destination = \"$ENV{TARGET_BUILD_DIR}/$ENV{PUBLIC_HEADERS_FOLDER_PATH}\";\n\nmkdir $destination unless -d $destination;\nopen Horos_h, \">\", \"$destination/Horos.h\" or die $!;\n\nprint Horos_h \"#ifndef __Horos_API\\n#define __Horos_API\\n\\n\";\n\n\n# TODO TODO TODO\n# -------------------------------------------------------------------------------------------------- #\n\n# \"$ENV{PROJECT_DIR}/cocoahttpserver\",\n# \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/config\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmsr\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmdata\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/ofstd\", \"$ENV{PROJECT_DIR}/Binaries/dcmtk-source/dcmnet,\n\n# -------------------------------------------------------------------------------------------------- #\n\n\nmy @fromdirs = ( \"$ENV{PROJECT_DIR}/nitrogen/Sources\", \"$ENV{PROJECT_DIR}/nitrogen/Sources/JSON\", $ENV{PROJECT_DIR} );\n\nforeach my $root (@fromdirs) {\n\topendir(DIR, $root);\n\t\n\tmy @files = readdir(DIR);\n\tforeach (@files) {\n\t\tmy $filename = $_;\n\t\tnext unless -f \"$root/$filename\" && $filename =~ /\\.h$/s;\n\t\tmy @args = ( \"cp\", \"-fp\", \"$root/$filename\", \"$destination/\".(basename $filename) );\n\t\tsystem(@args) == 0 or die \"Copy failed: $?\";\n\t\tprint Horos_h \"#include <HorosAPI/$filename>\\n\";\n\t}\n\t\n\tclosedir(DIR);\n}\n\nprint Horos_h \"\\n#endif\\n\";\nclose Horos_h;\n\n\n\n\nmy @fromdirs = ( \"$ENV{PROJECT_DIR}/Binaries/VTKHeaders\" );\n\nforeach my $root (@fromdirs) {\n    my @args = ( \"cp\", \"-Rfp\", \"$root\", \"$destination/\" );\n    system(@args) == 0 or die \"Copy failed: $?\";\n}\n\n\n\n\nchdir \"$ENV{TARGET_BUILD_DIR}/$ENV{FULL_PRODUCT_NAME}\";\nsymlink \"Versions/Current/Headers\", \"Headers\";\n\nexit 0;\n\n";
 		};
 		ABF307FB1443330100BBC96A /* Copy odt2pdf script */ = {
 			isa = PBXShellScriptBuildPhase;

diff --git a/Preference Panes/OSIAutoroutingPreferencePane/OSIAutoroutingPreferencePanePref.m b/Preference Panes/OSIAutoroutingPreferencePane/OSIAutoroutingPreferencePanePref.m
@@ -33,8 +33,8 @@ This file is part of the Horos Project (www.horosproject.org)
 
 #import <OsiriX/DCMObject.h>
 #import "OSIAutoroutingPreferencePanePref.h"
-#import <OsiriXAPI/NSPreferencePane+OsiriX.h>
-#import <OsiriXAPI/AppController.h>
+#import <HorosAPI/NSPreferencePane+OsiriX.h>
+#import <HorosAPI/AppController.h>
 
 #define CURRENTVERSION 1
 

diff --git a/Preference Panes/OSICustomImageAnnotations/OSICustomImageAnnotations.m b/Preference Panes/OSICustomImageAnnotations/OSICustomImageAnnotations.m
@@ -32,7 +32,7 @@ This file is part of the Horos Project (www.horosproject.org)
  ============================================================================*/
 
 #import "OSICustomImageAnnotations.h"
-#import <OsiriXAPI/NSPreferencePane+OsiriX.h>
+#import <HorosAPI/NSPreferencePane+OsiriX.h>
 
 NSComparisonResult  compareViewTags(id firstView, id secondView, void * context);
 NSComparisonResult  compareViewTags(id firstView, id secondView, void * context)

diff --git a/Preference Panes/OSIDatabasePreferencePane/OSIDatabasePreferencePanePref.m b/Preference Panes/OSIDatabasePreferencePane/OSIDatabasePreferencePanePref.m
@@ -32,11 +32,11 @@ This file is part of the Horos Project (www.horosproject.org)
  ============================================================================*/
 
 #import "OSIDatabasePreferencePanePref.h"
-#import <OsiriXAPI/PluginManager.h>
-#import <OsiriXAPI/BrowserController.h>
-#import <OsiriXAPI/PreferencesWindowController+DCMTK.h>
+#import <HorosAPI/PluginManager.h>
+#import <HorosAPI/BrowserController.h>
+#import <HorosAPI/PreferencesWindowController+DCMTK.h>
 #import <OsiriX/DCMAbstractSyntaxUID.h>
-#import <OsiriXAPI/BrowserControllerDCMTKCategory.h>
+#import <HorosAPI/BrowserControllerDCMTKCategory.h>
 #import "DicomDatabase.h"
 #import "dicomFile.h"
 #import "WaitRendering.h"

diff --git a/Preference Panes/OSIGeneralPreferencePane/OSIGeneralPreferencePanePref.m b/Preference Panes/OSIGeneralPreferencePane/OSIGeneralPreferencePanePref.m
@@ -33,10 +33,10 @@ This file is part of the Horos Project (www.horosproject.org)
 
 
 #import "OSIGeneralPreferencePanePref.h"
-#import <OsiriXAPI/NSPreferencePane+OsiriX.h>
-#import <OsiriXAPI/AppController.h>
-#import <OsiriXAPI/DefaultsOsiriX.h>
-#import <OsiriXAPI/N2Debug.h>
+#import <HorosAPI/NSPreferencePane+OsiriX.h>
+#import <HorosAPI/AppController.h>
+#import <HorosAPI/DefaultsOsiriX.h>
+#import <HorosAPI/N2Debug.h>
 
 static NSArray *languagesToMoveWhenQuitting = nil;
 

diff --git a/Preference Panes/OSIHangingPreferencePane/OSIHangingPreferencePanePref.m b/Preference Panes/OSIHangingPreferencePane/OSIHangingPreferencePanePref.m
@@ -34,7 +34,7 @@ This file is part of the Horos Project (www.horosproject.org)
 #import "WindowLayoutManager.h"
 #import "OSIHangingPreferencePanePref.h"
 #import "NSArray+N2.h"
-#import <OsiriXAPI/NSPreferencePane+OsiriX.h>
+#import <HorosAPI/NSPreferencePane+OsiriX.h>
 #import "Notifications.h"
 #import "AppController.h"
 

diff --git a/Preference Panes/OSIListenerPreferencePane/OSIListenerPreferencePanePref.h b/Preference Panes/OSIListenerPreferencePane/OSIListenerPreferencePanePref.h
@@ -33,7 +33,7 @@
 
 #import <PreferencePanes/PreferencePanes.h>
 
-#import <OsiriXAPI/DICOMTLS.h>
+#import <HorosAPI/DICOMTLS.h>
 
 @interface OSIListenerPreferencePanePref : NSPreferencePane 
 {

diff --git a/Preference Panes/OSIListenerPreferencePane/OSIListenerPreferencePanePref.mm b/Preference Panes/OSIListenerPreferencePane/OSIListenerPreferencePanePref.mm
@@ -32,13 +32,13 @@ This file is part of the Horos Project (www.horosproject.org)
  ============================================================================*/
 
 #import "OSIListenerPreferencePanePref.h"
-#import <OsiriXAPI/DefaultsOsiriX.h>
-#import <OsiriXAPI/BrowserController.h>
-#import <OsiriXAPI/NSUserDefaultsController+OsiriX.h>
+#import <HorosAPI/DefaultsOsiriX.h>
+#import <HorosAPI/BrowserController.h>
+#import <HorosAPI/NSUserDefaultsController+OsiriX.h>
 //#import "DDKeychain.h"
 #import <SecurityInterface/SFChooseIdentityPanel.h>
-#import <OsiriXAPI/WebPortal.h>
-#import <OsiriXAPI/WebPortalDatabase.h>
+#import <HorosAPI/WebPortal.h>
+#import <HorosAPI/WebPortalDatabase.h>
 #import "NSAppleScript+N2.h"
 
 #include <netdb.h>

diff --git a/Preference Panes/OSILocationsPreferencePane/OSILocationsPreferencePanePref.h b/Preference Panes/OSILocationsPreferencePane/OSILocationsPreferencePanePref.h
@@ -34,10 +34,10 @@
 #import <PreferencePanes/PreferencePanes.h>
 #import <SecurityInterface/SFChooseIdentityPanel.h>
 #import <SecurityInterface/SFCertificateView.h>
-#import <OsiriXAPI/DNDArrayController.h>
+#import <HorosAPI/DNDArrayController.h>
 #import <WebKit/WebKit.h>
 
-#import <OsiriXAPI/DICOMTLS.h>
+#import <HorosAPI/DICOMTLS.h>
 
 @interface OSILocationsPreferencePanePref : NSPreferencePane 
 {

diff --git a/Preference Panes/OSILocationsPreferencePane/ServerTableView.m b/Preference Panes/OSILocationsPreferencePane/ServerTableView.m
@@ -32,7 +32,7 @@ This file is part of the Horos Project (www.horosproject.org)
  ============================================================================*/
 
 #import "ServerTableView.h"
-#import <OsiriXAPI/DNDArrayController.h>
+#import <HorosAPI/DNDArrayController.h>
 #import "OSILocationsPreferencePanePref.h"
 
 @implementation ServerTableView

diff --git a/Preference Panes/OSIWebSharingPreferencePane/OSIWebSharingPreferencePanePref.mm b/Preference Panes/OSIWebSharingPreferencePane/OSIWebSharingPreferencePanePref.mm
@@ -35,15 +35,15 @@ This file is part of the Horos Project (www.horosproject.org)
 #import <SecurityInterface/SFCertificateView.h>
 #import "WebPortalUser.h"
 #import "OSIWebSharingPreferencePanePref.h"
-#import <OsiriXAPI/DefaultsOsiriX.h>
-#import <OsiriXAPI/NSUserDefaults+OsiriX.h>
-#import <OsiriXAPI/BrowserController.h>
-#import <OsiriXAPI/AppController.h>
-#import <OsiriXAPI/NSFileManager+N2.h>
-#import <OsiriXAPI/WebPortal.h>
-#import <OsiriXAPI/WebPortalDatabase.h>
-#import <OsiriXAPI/DicomDatabase.h>
-#import <OsiriXAPI/DicomStudy.h>
+#import <HorosAPI/DefaultsOsiriX.h>
+#import <HorosAPI/NSUserDefaults+OsiriX.h>
+#import <HorosAPI/BrowserController.h>
+#import <HorosAPI/AppController.h>
+#import <HorosAPI/NSFileManager+N2.h>
+#import <HorosAPI/WebPortal.h>
+#import <HorosAPI/WebPortalDatabase.h>
+#import <HorosAPI/DicomDatabase.h>
+#import <HorosAPI/DicomStudy.h>
 
 #import "DDKeychain.h"
 #import "url.h"