From b0678ed3e22b9858c5e8e77f7895706d2e37861c Mon Sep 17 00:00:00 2001 From: Michael Pfeiffer Date: Tue, 18 Aug 2009 18:56:21 +0000 Subject: [PATCH] Removed PrintTransportAddOn.cpp from libprintutils.a. Use kits/print/PrintTransportAddOn.cpp in transport add-ons. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32499 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../print/transports/parallel_port/Jamfile | 2 ++ .../parallel_port/PrintTransportAddOn.cpp | 32 ------------------- .../print/transports/serial_port/Jamfile | 2 ++ .../serial_port/PrintTransportAddOn.cpp | 32 ------------------- src/add-ons/print/transports/usb_port/Jamfile | 2 ++ .../usb_port/PrintTransportAddOn.cpp | 32 ------------------- src/kits/print/Jamfile | 1 - 7 files changed, 6 insertions(+), 97 deletions(-) delete mode 100644 src/add-ons/print/transports/parallel_port/PrintTransportAddOn.cpp delete mode 100644 src/add-ons/print/transports/serial_port/PrintTransportAddOn.cpp delete mode 100644 src/add-ons/print/transports/usb_port/PrintTransportAddOn.cpp diff --git a/src/add-ons/print/transports/parallel_port/Jamfile b/src/add-ons/print/transports/parallel_port/Jamfile index 9fa208a197..8c60d06050 100644 --- a/src/add-ons/print/transports/parallel_port/Jamfile +++ b/src/add-ons/print/transports/parallel_port/Jamfile @@ -4,6 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders print ; +SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ; + Addon Parallel\ Port : ParallelTransport.cpp PrintTransportAddOn.cpp diff --git a/src/add-ons/print/transports/parallel_port/PrintTransportAddOn.cpp b/src/add-ons/print/transports/parallel_port/PrintTransportAddOn.cpp deleted file mode 100644 index 9ab4efbaf1..0000000000 --- a/src/add-ons/print/transports/parallel_port/PrintTransportAddOn.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "PrintTransportAddOn.h" - -// We don't support multiple instances of the same transport add-on -static BDataIO* gTransport = NULL; - -extern "C" _EXPORT BDataIO *init_transport(BMessage *msg) -{ - if (msg == NULL || gTransport != NULL) - return NULL; - - const char *spool_path = msg->FindString("printer_file"); - - if (spool_path && *spool_path != '\0') { - BDirectory printer(spool_path); - - if (printer.InitCheck() == B_OK) { - gTransport = instantiate_transport(&printer, msg); - return gTransport; - }; - }; - - return NULL; -} - -extern "C" _EXPORT void exit_transport() -{ - if (gTransport) { - delete gTransport; - gTransport = NULL; - } -} - diff --git a/src/add-ons/print/transports/serial_port/Jamfile b/src/add-ons/print/transports/serial_port/Jamfile index 168e9caef6..dc3cef572f 100644 --- a/src/add-ons/print/transports/serial_port/Jamfile +++ b/src/add-ons/print/transports/serial_port/Jamfile @@ -4,6 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders print ; +SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ; + Addon Serial\ Port : SerialTransport.cpp PrintTransportAddOn.cpp diff --git a/src/add-ons/print/transports/serial_port/PrintTransportAddOn.cpp b/src/add-ons/print/transports/serial_port/PrintTransportAddOn.cpp deleted file mode 100644 index 9ab4efbaf1..0000000000 --- a/src/add-ons/print/transports/serial_port/PrintTransportAddOn.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "PrintTransportAddOn.h" - -// We don't support multiple instances of the same transport add-on -static BDataIO* gTransport = NULL; - -extern "C" _EXPORT BDataIO *init_transport(BMessage *msg) -{ - if (msg == NULL || gTransport != NULL) - return NULL; - - const char *spool_path = msg->FindString("printer_file"); - - if (spool_path && *spool_path != '\0') { - BDirectory printer(spool_path); - - if (printer.InitCheck() == B_OK) { - gTransport = instantiate_transport(&printer, msg); - return gTransport; - }; - }; - - return NULL; -} - -extern "C" _EXPORT void exit_transport() -{ - if (gTransport) { - delete gTransport; - gTransport = NULL; - } -} - diff --git a/src/add-ons/print/transports/usb_port/Jamfile b/src/add-ons/print/transports/usb_port/Jamfile index c548cabe26..276f4e43ae 100644 --- a/src/add-ons/print/transports/usb_port/Jamfile +++ b/src/add-ons/print/transports/usb_port/Jamfile @@ -4,6 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UsePrivateHeaders print ; +SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits print ] ; + Addon USB\ Port : USBTransport.cpp PrintTransportAddOn.cpp diff --git a/src/add-ons/print/transports/usb_port/PrintTransportAddOn.cpp b/src/add-ons/print/transports/usb_port/PrintTransportAddOn.cpp deleted file mode 100644 index 9ab4efbaf1..0000000000 --- a/src/add-ons/print/transports/usb_port/PrintTransportAddOn.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "PrintTransportAddOn.h" - -// We don't support multiple instances of the same transport add-on -static BDataIO* gTransport = NULL; - -extern "C" _EXPORT BDataIO *init_transport(BMessage *msg) -{ - if (msg == NULL || gTransport != NULL) - return NULL; - - const char *spool_path = msg->FindString("printer_file"); - - if (spool_path && *spool_path != '\0') { - BDirectory printer(spool_path); - - if (printer.InitCheck() == B_OK) { - gTransport = instantiate_transport(&printer, msg); - return gTransport; - }; - }; - - return NULL; -} - -extern "C" _EXPORT void exit_transport() -{ - if (gTransport) { - delete gTransport; - gTransport = NULL; - } -} - diff --git a/src/kits/print/Jamfile b/src/kits/print/Jamfile index 800573bc47..e22f485944 100644 --- a/src/kits/print/Jamfile +++ b/src/kits/print/Jamfile @@ -12,5 +12,4 @@ StaticLibrary libprintutils.a : PicturePrinter.cpp PrintTransport.cpp PictureIterator.cpp - PrintTransportAddOn.cpp ;