vcl2gnumake: #i116589# header cleanup: linux,solaris,macos

2 files changed, 39 insertions, 41 deletions

diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index af15ad73e19d..6707cf5f4c47 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -19,15 +19,15 @@ vc	vcl\win\source\app						nmake	-	w	vc__appw vc_inc NULL
 vc	vcl\win\source\gdi						nmake	-	w	vc__gdiw vc_inc NULL
 vc	vcl\win\source\window					nmake	-	w	vc__winw vc_inc NULL
 vc	vcl\win\source\src						nmake	-	w	vc__srcw vc_inc NULL
-vc  vcl\unx\source\plugadapt				nmake	-	u	vc__plug vc_inc NULL
-vc  vcl\unx\source\desktopdetect			nmake	-	u	vc__desk vc_inc NULL
-vc	vcl\unx\source\app						nmake	-	u	vc__appu vc_inc NULL
-vc	vcl\unx\source\dtrans					nmake	-	u	vc__dtru vc_inc NULL
-vc	vcl\unx\source\fontmanager				nmake	-	u	vc__ftmu vc_inc NULL
-vc	vcl\unx\source\gdi						nmake	-	u	vc__gdiu vc_inc NULL
-vc	vcl\unx\source\printer   				nmake	-	u	vc__prnu vc_inc NULL
-vc	vcl\unx\source\printergfx  				nmake	-	u	vc__prgu vc_inc NULL
-vc	vcl\unx\source\window					nmake	-	u	vc__winu vc_inc NULL
+vc  vcl\unx\generic\plugadapt				nmake	-	u	vc__plug vc_inc NULL
+vc  vcl\unx\generic\desktopdetect			nmake	-	u	vc__desk vc_inc NULL
+vc	vcl\unx\generic\app						nmake	-	u	vc__appu vc_inc NULL
+vc	vcl\unx\generic\dtrans					nmake	-	u	vc__dtru vc_inc NULL
+vc	vcl\unx\generic\fontmanager				nmake	-	u	vc__ftmu vc_inc NULL
+vc	vcl\unx\generic\gdi						nmake	-	u	vc__gdiu vc_inc NULL
+vc	vcl\unx\generic\printer   				nmake	-	u	vc__prnu vc_inc NULL
+vc	vcl\unx\generic\printergfx  				nmake	-	u	vc__prgu vc_inc NULL
+vc	vcl\unx\generic\window					nmake	-	u	vc__winu vc_inc NULL
 vc  vcl\unx\gtk\a11y						nmake   -   u   vc__gtky vc_inc NULL
 vc  vcl\unx\gtk\app							nmake   -   u   vc__gtka vc_inc NULL
 vc  vcl\unx\gtk\window						nmake   -   u   vc__gtkw vc_inc NULL
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index 307064f7555d..ba5949b00fad 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -10,34 +10,44 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 ..\%__SRC%\lib\ivcl.lib %_DEST%\lib%_EXT%\ivcl.lib
 ..\%__SRC%\misc\vcl?????.map %_DEST%\bin%_EXT%\vcl?????.map
+..\%__SRC%\misc\vcl.component %_DEST%\xml%_EXT%\vcl.component
 ..\%__SRC%\obj\salmain.obj %_DEST%\lib%_EXT%\salmain.obj
 ..\%__SRC%\obj\salmain.o %_DEST%\lib%_EXT%\salmain.o
 
+..\inc\vcl\ImageListProvider.hxx %_DEST%\inc%_EXT%\vcl\ImageListProvider.hxx
+..\inc\vcl\abstdlg.hxx %_DEST%\inc%_EXT%\vcl\abstdlg.hxx
 ..\inc\vcl\accel.hxx %_DEST%\inc%_EXT%\vcl\accel.hxx
 ..\inc\vcl\alpha.hxx %_DEST%\inc%_EXT%\vcl\alpha.hxx
 ..\inc\vcl\animate.hxx %_DEST%\inc%_EXT%\vcl\animate.hxx
 ..\inc\vcl\apptypes.hxx %_DEST%\inc%_EXT%\vcl\apptypes.hxx
 ..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx
+..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx
 ..\inc\vcl\bitmap.hxx %_DEST%\inc%_EXT%\vcl\bitmap.hxx
 ..\inc\vcl\bitmapex.hxx %_DEST%\inc%_EXT%\vcl\bitmapex.hxx
 ..\inc\vcl\bmpacc.hxx %_DEST%\inc%_EXT%\vcl\bmpacc.hxx
 ..\inc\vcl\btndlg.hxx %_DEST%\inc%_EXT%\vcl\btndlg.hxx
 ..\inc\vcl\button.hxx %_DEST%\inc%_EXT%\vcl\button.hxx
+..\inc\vcl\canvastools.hxx %_DEST%\inc%_EXT%\vcl\canvastools.hxx
 ..\inc\vcl\cmdevt.h %_DEST%\inc%_EXT%\vcl\cmdevt.h
 ..\inc\vcl\cmdevt.hxx %_DEST%\inc%_EXT%\vcl\cmdevt.hxx
 ..\inc\vcl\combobox.h %_DEST%\inc%_EXT%\vcl\combobox.h
 ..\inc\vcl\combobox.hxx %_DEST%\inc%_EXT%\vcl\combobox.hxx
+..\inc\vcl\configsettings.hxx %_DEST%\inc%_EXT%\vcl\configsettings.hxx
+..\inc\vcl\controllayout.hxx %_DEST%\inc%_EXT%\vcl\controllayout.hxx
 ..\inc\vcl\ctrl.hxx %_DEST%\inc%_EXT%\vcl\ctrl.hxx
 ..\inc\vcl\cursor.hxx %_DEST%\inc%_EXT%\vcl\cursor.hxx
 ..\inc\vcl\cvtgrf.hxx %_DEST%\inc%_EXT%\vcl\cvtgrf.hxx
 ..\inc\vcl\cvtsvm.hxx %_DEST%\inc%_EXT%\vcl\cvtsvm.hxx
 ..\inc\vcl\decoview.hxx %_DEST%\inc%_EXT%\vcl\decoview.hxx
 ..\inc\vcl\dialog.hxx %_DEST%\inc%_EXT%\vcl\dialog.hxx
+..\inc\vcl\dllapi.h %_DEST%\inc%_EXT%\vcl\dllapi.h
+..\inc\vcl\dndhelp.hxx %_DEST%\inc%_EXT%\vcl\dndhelp.hxx
 ..\inc\vcl\dockingarea.hxx %_DEST%\inc%_EXT%\vcl\dockingarea.hxx
 ..\inc\vcl\dockwin.hxx %_DEST%\inc%_EXT%\vcl\dockwin.hxx
-..\inc\vcl\dllapi.h %_DEST%\inc%_EXT%\vcl\dllapi.h
 ..\inc\vcl\edit.hxx %_DEST%\inc%_EXT%\vcl\edit.hxx
 ..\inc\vcl\event.hxx %_DEST%\inc%_EXT%\vcl\event.hxx
+..\inc\vcl\evntpost.hxx %_DEST%\inc%_EXT%\vcl\evntpost.hxx
+..\inc\vcl\extoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\extoutdevdata.hxx
 ..\inc\vcl\field.hxx %_DEST%\inc%_EXT%\vcl\field.hxx
 ..\inc\vcl\fixbrd.hxx %_DEST%\inc%_EXT%\vcl\fixbrd.hxx
 ..\inc\vcl\fixed.hxx %_DEST%\inc%_EXT%\vcl\fixed.hxx
@@ -45,24 +55,30 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\inc\vcl\fntstyle.hxx %_DEST%\inc%_EXT%\vcl\fntstyle.hxx
 ..\inc\vcl\font.hxx %_DEST%\inc%_EXT%\vcl\font.hxx
 ..\inc\vcl\fontcvt.hxx %_DEST%\inc%_EXT%\vcl\fontcvt.hxx
+..\inc\vcl\fontmanager.hxx %_DEST%\inc%_EXT%\vcl\fontmanager.hxx
 ..\inc\vcl\gdimtf.hxx %_DEST%\inc%_EXT%\vcl\gdimtf.hxx
 ..\inc\vcl\gfxlink.hxx %_DEST%\inc%_EXT%\vcl\gfxlink.hxx
 ..\inc\vcl\gradient.hxx %_DEST%\inc%_EXT%\vcl\gradient.hxx
 ..\inc\vcl\graph.h %_DEST%\inc%_EXT%\vcl\graph.h
 ..\inc\vcl\graph.hxx %_DEST%\inc%_EXT%\vcl\graph.hxx
+..\inc\vcl\graphictools.hxx %_DEST%\inc%_EXT%\vcl\graphictools.hxx
 ..\inc\vcl\group.hxx %_DEST%\inc%_EXT%\vcl\group.hxx
 ..\inc\vcl\hatch.hxx %_DEST%\inc%_EXT%\vcl\hatch.hxx
 ..\inc\vcl\help.hxx %_DEST%\inc%_EXT%\vcl\help.hxx
+..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx
+..\inc\vcl\i18nhelp.hxx %_DEST%\inc%_EXT%\vcl\i18nhelp.hxx
 ..\inc\vcl\image.hxx %_DEST%\inc%_EXT%\vcl\image.hxx
 ..\inc\vcl\imagerepository.hxx %_DEST%\inc%_EXT%\vcl\imagerepository.hxx
 ..\inc\vcl\imgctrl.hxx %_DEST%\inc%_EXT%\vcl\imgctrl.hxx
 ..\inc\vcl\impdel.hxx %_DEST%\inc%_EXT%\vcl\impdel.hxx
 ..\inc\vcl\inputctx.hxx %_DEST%\inc%_EXT%\vcl\inputctx.hxx
+..\inc\vcl\introwin.hxx %_DEST%\inc%_EXT%\vcl\introwin.hxx
 ..\inc\vcl\javachild.hxx %_DEST%\inc%_EXT%\vcl\javachild.hxx
+..\inc\vcl\jobdata.hxx %_DEST%\inc%_EXT%\vcl\jobdata.hxx
 ..\inc\vcl\jobset.hxx %_DEST%\inc%_EXT%\vcl\jobset.hxx
-..\unx\inc\kde_headers.h %_DEST%\inc%_EXT%\vcl\kde_headers.h
 ..\inc\vcl\keycod.hxx %_DEST%\inc%_EXT%\vcl\keycod.hxx
 ..\inc\vcl\keycodes.hxx %_DEST%\inc%_EXT%\vcl\keycodes.hxx
+..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx
 ..\inc\vcl\lineinfo.hxx %_DEST%\inc%_EXT%\vcl\lineinfo.hxx
 ..\inc\vcl\longcurr.hxx %_DEST%\inc%_EXT%\vcl\longcurr.hxx
 ..\inc\vcl\lstbox.h %_DEST%\inc%_EXT%\vcl\lstbox.h
@@ -71,27 +87,31 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\inc\vcl\menu.hxx %_DEST%\inc%_EXT%\vcl\menu.hxx
 ..\inc\vcl\menubtn.hxx %_DEST%\inc%_EXT%\vcl\menubtn.hxx
 ..\inc\vcl\metaact.hxx %_DEST%\inc%_EXT%\vcl\metaact.hxx
-..\inc\vcl\graphictools.hxx %_DEST%\inc%_EXT%\vcl\graphictools.hxx
 ..\inc\vcl\metric.hxx %_DEST%\inc%_EXT%\vcl\metric.hxx
 ..\inc\vcl\mnemonic.hxx %_DEST%\inc%_EXT%\vcl\mnemonic.hxx
 ..\inc\vcl\mnemonicengine.hxx %_DEST%\inc%_EXT%\vcl\mnemonicengine.hxx
-..\inc\vcl\quickselectionengine.hxx %_DEST%\inc%_EXT%\vcl\quickselectionengine.hxx
 ..\inc\vcl\morebtn.hxx %_DEST%\inc%_EXT%\vcl\morebtn.hxx
 ..\inc\vcl\msgbox.hxx %_DEST%\inc%_EXT%\vcl\msgbox.hxx
 ..\inc\vcl\octree.hxx %_DEST%\inc%_EXT%\vcl\octree.hxx
 ..\inc\vcl\oldprintadaptor.hxx %_DEST%\inc%_EXT%\vcl\oldprintadaptor.hxx
 ..\inc\vcl\outdev.hxx %_DEST%\inc%_EXT%\vcl\outdev.hxx
+..\inc\vcl\pdfextoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\pdfextoutdevdata.hxx
+..\inc\vcl\pdfwriter.hxx %_DEST%\inc%_EXT%\vcl\pdfwriter.hxx
+..\inc\vcl\pngread.hxx %_DEST%\inc%_EXT%\vcl\pngread.hxx
+..\inc\vcl\pngwrite.hxx %_DEST%\inc%_EXT%\vcl\pngwrite.hxx
 ..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx
 ..\inc\vcl\popupmenuwindow.hxx %_DEST%\inc%_EXT%\vcl\popupmenuwindow.hxx
+..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx
 ..\inc\vcl\print.hxx %_DEST%\inc%_EXT%\vcl\print.hxx
+..\inc\vcl\printerinfomanager.hxx %_DEST%\inc%_EXT%\vcl\printerinfomanager.hxx
 ..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx
 ..\inc\vcl\ptrstyle.hxx %_DEST%\inc%_EXT%\vcl\ptrstyle.hxx
+..\inc\vcl\quickselectionengine.hxx %_DEST%\inc%_EXT%\vcl\quickselectionengine.hxx
 ..\inc\vcl\regband.hxx %_DEST%\inc%_EXT%\vcl\regband.hxx
 ..\inc\vcl\region.hxx %_DEST%\inc%_EXT%\vcl\region.hxx
 ..\inc\vcl\salbtype.hxx %_DEST%\inc%_EXT%\vcl\salbtype.hxx
 ..\inc\vcl\salctype.hxx %_DEST%\inc%_EXT%\vcl\salctype.hxx
 ..\inc\vcl\salgtype.hxx %_DEST%\inc%_EXT%\vcl\salgtype.hxx
-..\inc\vcl\salstype.hxx %_DEST%\inc%_EXT%\vcl\salstype.hxx
 ..\inc\vcl\salnativewidgets.hxx %_DEST%\inc%_EXT%\vcl\salnativewidgets.hxx
 ..\inc\vcl\scrbar.hxx %_DEST%\inc%_EXT%\vcl\scrbar.hxx
 ..\inc\vcl\seleng.hxx %_DEST%\inc%_EXT%\vcl\seleng.hxx
@@ -106,6 +126,7 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\inc\vcl\splitwin.hxx %_DEST%\inc%_EXT%\vcl\splitwin.hxx
 ..\inc\vcl\status.hxx %_DEST%\inc%_EXT%\vcl\status.hxx
 ..\inc\vcl\stdtext.hxx %_DEST%\inc%_EXT%\vcl\stdtext.hxx
+..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx
 ..\inc\vcl\sv.h %_DEST%\inc%_EXT%\vcl\sv.h
 ..\inc\vcl\svapp.hxx %_DEST%\inc%_EXT%\vcl\svapp.hxx
 ..\inc\vcl\symbol.hxx %_DEST%\inc%_EXT%\vcl\symbol.hxx
@@ -116,41 +137,18 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\inc\vcl\tabdlg.hxx %_DEST%\inc%_EXT%\vcl\tabdlg.hxx
 ..\inc\vcl\tabpage.hxx %_DEST%\inc%_EXT%\vcl\tabpage.hxx
 ..\inc\vcl\taskpanelist.hxx %_DEST%\inc%_EXT%\vcl\taskpanelist.hxx
+..\inc\vcl\threadex.hxx %_DEST%\inc%_EXT%\vcl\threadex.hxx
 ..\inc\vcl\timer.hxx %_DEST%\inc%_EXT%\vcl\timer.hxx
 ..\inc\vcl\toolbox.hxx %_DEST%\inc%_EXT%\vcl\toolbox.hxx
+..\inc\vcl\unohelp.hxx %_DEST%\inc%_EXT%\vcl\unohelp.hxx
+..\inc\vcl\unohelp2.hxx %_DEST%\inc%_EXT%\vcl\unohelp2.hxx
 ..\inc\vcl\unowrap.hxx %_DEST%\inc%_EXT%\vcl\unowrap.hxx
-..\inc\vcl\canvastools.hxx %_DEST%\inc%_EXT%\vcl\canvastools.hxx
 ..\inc\vcl\vclenum.hxx %_DEST%\inc%_EXT%\vcl\vclenum.hxx
 ..\inc\vcl\vclevent.hxx %_DEST%\inc%_EXT%\vcl\vclevent.hxx
 ..\inc\vcl\virdev.hxx %_DEST%\inc%_EXT%\vcl\virdev.hxx
 ..\inc\vcl\waitobj.hxx %_DEST%\inc%_EXT%\vcl\waitobj.hxx
 ..\inc\vcl\wall.hxx %_DEST%\inc%_EXT%\vcl\wall.hxx
 ..\inc\vcl\window.hxx %_DEST%\inc%_EXT%\vcl\window.hxx
-..\inc\vcl\wrkwin.hxx %_DEST%\inc%_EXT%\vcl\wrkwin.hxx
-..\inc\vcl\threadex.hxx %_DEST%\inc%_EXT%\vcl\threadex.hxx
-..\inc\vcl\evntpost.hxx %_DEST%\inc%_EXT%\vcl\evntpost.hxx
-..\inc\vcl\unohelp.hxx %_DEST%\inc%_EXT%\vcl\unohelp.hxx
-..\inc\vcl\unohelp2.hxx %_DEST%\inc%_EXT%\vcl\unohelp2.hxx
-..\inc\vcl\i18nhelp.hxx %_DEST%\inc%_EXT%\vcl\i18nhelp.hxx
-..\inc\vcl\dndhelp.hxx %_DEST%\inc%_EXT%\vcl\dndhelp.hxx
-..\inc\vcl\pdfwriter.hxx %_DEST%\inc%_EXT%\vcl\pdfwriter.hxx
-..\inc\vcl\controllayout.hxx %_DEST%\inc%_EXT%\vcl\controllayout.hxx
-..\inc\vcl\introwin.hxx %_DEST%\inc%_EXT%\vcl\introwin.hxx
-..\inc\vcl\abstdlg.hxx %_DEST%\inc%_EXT%\vcl\abstdlg.hxx
-..\inc\vcl\extoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\extoutdevdata.hxx
-..\inc\vcl\pdfextoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\pdfextoutdevdata.hxx
-..\inc\vcl\pngread.hxx %_DEST%\inc%_EXT%\vcl\pngread.hxx
-..\inc\vcl\pngwrite.hxx %_DEST%\inc%_EXT%\vcl\pngwrite.hxx
-..\inc\vcl\configsettings.hxx %_DEST%\inc%_EXT%\vcl\configsettings.hxx
-..\inc\vcl\ImageListProvider.hxx %_DEST%\inc%_EXT%\vcl\ImageListProvider.hxx
-..\inc\vcl\fontmanager.hxx %_DEST%\inc%_EXT%\vcl\fontmanager.hxx
-..\inc\vcl\printerinfomanager.hxx %_DEST%\inc%_EXT%\vcl\printerinfomanager.hxx
-..\inc\vcl\jobdata.hxx %_DEST%\inc%_EXT%\vcl\jobdata.hxx
-..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx
-..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx
-..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx
-..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx
-..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx
 ..\inc\vcl\wpropset.hxx %_DEST%\inc%_EXT%\vcl\wpropset.hxx
-..\%__SRC%\misc\vcl.component %_DEST%\xml%_EXT%\vcl.component
+..\inc\vcl\wrkwin.hxx %_DEST%\inc%_EXT%\vcl\wrkwin.hxx