From df24dede80b41ec24063f8169f5f53ef95866cc2 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Wed, 30 Jul 2008 21:24:19 +0000 Subject: [PATCH] * rename InterfaceUtils.h/cpp to BlockingWindow.h/cpp and adjust includes git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26691 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../libs/print/libprint/{InterfaceUtils.h => BlockingWindow.h} | 0 headers/libs/print/libprint/Preview.h | 2 +- src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.h | 2 +- src/add-ons/print/drivers/pdf/source/DocInfoWindow.h | 2 +- src/add-ons/print/drivers/pdf/source/FontsWindow.cpp | 2 +- src/add-ons/print/drivers/pdf/source/JobSetupWindow.h | 2 +- src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp | 2 +- src/add-ons/print/drivers/pdf/source/PageSetupWindow.h | 2 +- src/add-ons/print/drivers/pdf/source/PrinterSetupWindow.h | 2 +- src/add-ons/print/drivers/pdf/source/StatusWindow.h | 2 +- src/add-ons/print/drivers/preview/JobSetupWindow.h | 2 +- src/add-ons/print/drivers/preview/PageSetupWindow.h | 2 +- src/add-ons/print/drivers/preview/Preview.h | 2 +- src/add-ons/print/drivers/preview/PrinterDriver.cpp | 3 +-- src/add-ons/print/drivers/preview/PrinterDriver.h | 3 ++- .../print/libprint/{InterfaceUtils.cpp => BlockingWindow.cpp} | 2 +- src/libs/print/libprint/Jamfile | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) rename headers/libs/print/libprint/{InterfaceUtils.h => BlockingWindow.h} (100%) rename src/libs/print/libprint/{InterfaceUtils.cpp => BlockingWindow.cpp} (99%) diff --git a/headers/libs/print/libprint/InterfaceUtils.h b/headers/libs/print/libprint/BlockingWindow.h similarity index 100% rename from headers/libs/print/libprint/InterfaceUtils.h rename to headers/libs/print/libprint/BlockingWindow.h diff --git a/headers/libs/print/libprint/Preview.h b/headers/libs/print/libprint/Preview.h index 1e83d0f09b..311eed9dc2 100644 --- a/headers/libs/print/libprint/Preview.h +++ b/headers/libs/print/libprint/Preview.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include #include "PrintJobReader.h" -#include "InterfaceUtils.h" +#include "BlockingWindow.h" class PreviewPage { int32 fPage; diff --git a/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.h b/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.h index 7ea631d943..e60693be3d 100644 --- a/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.h +++ b/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.h @@ -33,7 +33,7 @@ THE SOFTWARE. #define ADVANCED_SETTINGS_WINDOW_H -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include "PrinterDriver.h" diff --git a/src/add-ons/print/drivers/pdf/source/DocInfoWindow.h b/src/add-ons/print/drivers/pdf/source/DocInfoWindow.h index 0f16e96e11..f6d7454ebb 100644 --- a/src/add-ons/print/drivers/pdf/source/DocInfoWindow.h +++ b/src/add-ons/print/drivers/pdf/source/DocInfoWindow.h @@ -32,7 +32,7 @@ THE SOFTWARE. #define DOCINFOWINDOW_H -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include diff --git a/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp b/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp index d1835bb192..4cdffcbfea 100644 --- a/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp +++ b/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp @@ -31,7 +31,7 @@ THE SOFTWARE. #include #include -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include "FontsWindow.h" #include "Fonts.h" diff --git a/src/add-ons/print/drivers/pdf/source/JobSetupWindow.h b/src/add-ons/print/drivers/pdf/source/JobSetupWindow.h index 8c870ee674..e95e70918a 100644 --- a/src/add-ons/print/drivers/pdf/source/JobSetupWindow.h +++ b/src/add-ons/print/drivers/pdf/source/JobSetupWindow.h @@ -33,7 +33,7 @@ THE SOFTWARE. #define JOBSETUPWINDOW_H #include -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include "PrintUtils.h" class JobSetupWindow : public HWindow diff --git a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp index 0f9f98acd5..a4be8537eb 100644 --- a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp +++ b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp @@ -36,7 +36,7 @@ THE SOFTWARE. #include "AdvancedSettingsWindow.h" #include "Fonts.h" #include "FontsWindow.h" -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include "MarginView.h" #include "PrinterDriver.h" #include "pdflib.h" // for pageFormat constants diff --git a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.h b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.h index 44a9946279..005cbf209e 100644 --- a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.h +++ b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.h @@ -33,7 +33,7 @@ THE SOFTWARE. #define PAGESETUPWINDOW_H -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include diff --git a/src/add-ons/print/drivers/pdf/source/PrinterSetupWindow.h b/src/add-ons/print/drivers/pdf/source/PrinterSetupWindow.h index 55720556f3..b1fffcd80f 100644 --- a/src/add-ons/print/drivers/pdf/source/PrinterSetupWindow.h +++ b/src/add-ons/print/drivers/pdf/source/PrinterSetupWindow.h @@ -33,7 +33,7 @@ THE SOFTWARE. #define PRINTERSETUPWINDOW_H #include -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include "PrintUtils.h" class PrinterSetupWindow : public HWindow diff --git a/src/add-ons/print/drivers/pdf/source/StatusWindow.h b/src/add-ons/print/drivers/pdf/source/StatusWindow.h index 4e953612a1..8bd7358d51 100644 --- a/src/add-ons/print/drivers/pdf/source/StatusWindow.h +++ b/src/add-ons/print/drivers/pdf/source/StatusWindow.h @@ -36,7 +36,7 @@ THE SOFTWARE. //class PrinterDriver; #include "PrinterDriver.h" -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include "PrintUtils.h" class StatusWindow : public HWindow diff --git a/src/add-ons/print/drivers/preview/JobSetupWindow.h b/src/add-ons/print/drivers/preview/JobSetupWindow.h index 6cf26c1b68..6b912769bd 100644 --- a/src/add-ons/print/drivers/preview/JobSetupWindow.h +++ b/src/add-ons/print/drivers/preview/JobSetupWindow.h @@ -13,7 +13,7 @@ #define JOBSETUPWINDOW_H -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include "PrintUtils.h" diff --git a/src/add-ons/print/drivers/preview/PageSetupWindow.h b/src/add-ons/print/drivers/preview/PageSetupWindow.h index 0387e388cb..8d311dc2f6 100644 --- a/src/add-ons/print/drivers/preview/PageSetupWindow.h +++ b/src/add-ons/print/drivers/preview/PageSetupWindow.h @@ -14,7 +14,7 @@ #define PAGESETUPWINDOW_H -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include "PrintUtils.h" diff --git a/src/add-ons/print/drivers/preview/Preview.h b/src/add-ons/print/drivers/preview/Preview.h index f26cd1a005..8d4705a2b6 100644 --- a/src/add-ons/print/drivers/preview/Preview.h +++ b/src/add-ons/print/drivers/preview/Preview.h @@ -7,7 +7,7 @@ * Hartmut Reh * julun */ -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include "PrintJobReader.h" diff --git a/src/add-ons/print/drivers/preview/PrinterDriver.cpp b/src/add-ons/print/drivers/preview/PrinterDriver.cpp index 80143159ee..117e3ecdbc 100644 --- a/src/add-ons/print/drivers/preview/PrinterDriver.cpp +++ b/src/add-ons/print/drivers/preview/PrinterDriver.cpp @@ -10,11 +10,10 @@ */ #include "PrinterDriver.h" -#include "PrintJobReader.h" - #include "JobSetupWindow.h" #include "PageSetupWindow.h" +#include "PrintJobReader.h" #include diff --git a/src/add-ons/print/drivers/preview/PrinterDriver.h b/src/add-ons/print/drivers/preview/PrinterDriver.h index c5d476f44d..342e7f00f2 100644 --- a/src/add-ons/print/drivers/preview/PrinterDriver.h +++ b/src/add-ons/print/drivers/preview/PrinterDriver.h @@ -13,10 +13,11 @@ #define PRINTERDRIVER_H -#include "InterfaceUtils.h" +#include "BlockingWindow.h" class BFile; +class BlockingWindow; class BNode; class BMessage; diff --git a/src/libs/print/libprint/InterfaceUtils.cpp b/src/libs/print/libprint/BlockingWindow.cpp similarity index 99% rename from src/libs/print/libprint/InterfaceUtils.cpp rename to src/libs/print/libprint/BlockingWindow.cpp index 4f233b02da..82cb54620e 100644 --- a/src/libs/print/libprint/InterfaceUtils.cpp +++ b/src/libs/print/libprint/BlockingWindow.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. */ -#include "InterfaceUtils.h" +#include "BlockingWindow.h" #include diff --git a/src/libs/print/libprint/Jamfile b/src/libs/print/libprint/Jamfile index 1ad0c2b7fe..eff7e76e80 100644 --- a/src/libs/print/libprint/Jamfile +++ b/src/libs/print/libprint/Jamfile @@ -7,12 +7,12 @@ SubDirHdrs [ FDirName $(HAIKU_TOP) headers libs print libprint ] ; StaticLibrary libprint.a : AboutBox.cpp AddPrinterDlg.cpp + BlockingWindow.cpp DbgMsg.cpp DialogWindow.cpp GraphicsDriver.cpp Halftone.cpp HalftoneView.cpp - InterfaceUtils.cpp JSDSlider.cpp JobData.cpp JobSetupDlg.cpp