From 1984bb05de38a6f4b23b422f1d4156670d493ba1 Mon Sep 17 00:00:00 2001 From: Alexandre Vicenzi Date: Wed, 29 Jan 2014 21:54:21 -0200 Subject: fdo#63154 Removed unused solar.h ref. in vcl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I038c941559a275c43c2be7d5453ca4c37390f343 Reviewed-on: https://gerrit.libreoffice.org/7733 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/vcl/abstdlg.hxx | 3 --- include/vcl/accel.hxx | 7 +------ include/vcl/apptypes.hxx | 5 ----- include/vcl/btndlg.hxx | 10 ---------- include/vcl/cursor.hxx | 1 - include/vcl/decoview.hxx | 9 --------- include/vcl/dockingarea.hxx | 4 ---- include/vcl/fntstyle.hxx | 9 --------- include/vcl/graph.h | 9 --------- include/vcl/introwin.hxx | 7 +------ include/vcl/jobset.hxx | 6 ------ include/vcl/keycod.hxx | 6 ------ include/vcl/keycodes.hxx | 9 --------- include/vcl/menubtn.hxx | 11 +---------- include/vcl/msgbox.hxx | 22 +--------------------- include/vcl/pointr.hxx | 5 ----- include/vcl/ptrstyle.hxx | 6 ------ include/vcl/region.hxx | 5 ----- include/vcl/salgtype.hxx | 21 --------------------- include/vcl/slider.hxx | 5 ----- include/vcl/spin.h | 2 -- include/vcl/split.hxx | 5 ----- include/vcl/splitwin.hxx | 17 ----------------- include/vcl/stdtext.hxx | 9 --------- include/vcl/syschild.hxx | 5 ----- include/vcl/tabctrl.hxx | 9 --------- include/vcl/tabdlg.hxx | 5 ----- include/vcl/toolbox.hxx | 16 +--------------- include/vcl/unowrap.hxx | 3 +-- include/vcl/vclenum.hxx | 19 +------------------ include/vcl/virdev.hxx | 7 +------ include/vcl/waitobj.hxx | 5 ----- include/vcl/wall.hxx | 11 +---------- 33 files changed, 9 insertions(+), 264 deletions(-) diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index 89ec5d3d6cc3..fa69831d7fa3 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -20,7 +20,6 @@ #define INCLUDED_VCL_ABSTDLG_HXX #include -#include #include class Window; @@ -64,8 +63,6 @@ public: virtual bool IsRecommendToOpenReadonly() const = 0; }; -//------------------------------------------------------------- - class VCL_DLLPUBLIC VclAbstractDialogFactory { public: diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index c206e35d00d8..44f5041b3756 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -20,20 +20,15 @@ #ifndef INCLUDED_VCL_ACCEL_HXX #define INCLUDED_VCL_ACCEL_HXX -#include -#include #include #include #include #include +#include class ImplAccelData; class ImplAccelEntry; -// --------------- -// - Accelerator - -// --------------- - class VCL_DLLPUBLIC Accelerator : public Resource { friend class ImplAccelManager; diff --git a/include/vcl/apptypes.hxx b/include/vcl/apptypes.hxx index d2de42b8708e..5a22c1c0bc69 100644 --- a/include/vcl/apptypes.hxx +++ b/include/vcl/apptypes.hxx @@ -20,14 +20,9 @@ #ifndef INCLUDED_VCL_APPTYPES_HXX #define INCLUDED_VCL_APPTYPES_HXX -#include #include #include -// --------------------- -// - Application-Types - -// --------------------- - #define EXC_RSCNOTLOADED ((sal_uInt16)0x0100) #define EXC_SYSOBJNOTCREATED ((sal_uInt16)0x0200) #define EXC_SYSTEM ((sal_uInt16)0x0300) diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 4d631dfdd2fd..0239157302c2 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -21,18 +21,12 @@ #define INCLUDED_VCL_BTNDLG_HXX #include - -#include #include #include struct ImplBtnDlgItem; class PushButton; -// ---------------------- -// - ButtonDialog-Types - -// ---------------------- - #define BUTTONDIALOG_BUTTON_NOTFOUND ((sal_uInt16)0xFFFF) #define BUTTONDIALOG_DEFBUTTON ((sal_uInt16)0x0001) @@ -41,10 +35,6 @@ class PushButton; #define BUTTONDIALOG_HELPBUTTON ((sal_uInt16)0x0008) #define BUTTONDIALOG_FOCUSBUTTON ((sal_uInt16)0x0010) -// ---------------- -// - ButtonDialog - -// ---------------- - class VCL_DLLPUBLIC ButtonDialog : public Dialog { private: diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index fb82f0599bbb..42d741b84d14 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -22,7 +22,6 @@ #include #include -#include #include struct ImplCursorData; diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx index 0f8234a7633e..8cff366e3f89 100644 --- a/include/vcl/decoview.hxx +++ b/include/vcl/decoview.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_DECOVIEW_HXX #define INCLUDED_VCL_DECOVIEW_HXX -#include #include #include @@ -29,10 +28,6 @@ class Point; class Color; class OutputDevice; -// ------------------------ -// - DecorationView-Types - -// ------------------------ - // Flags for DrawSymbol() #define SYMBOL_DRAW_MONO ((sal_uInt16)0x0001) #define SYMBOL_DRAW_DISABLE ((sal_uInt16)0x0002) @@ -72,10 +67,6 @@ class OutputDevice; #define BUTTON_DRAW_NOTEXT ((sal_uInt16)0x2000) #define BUTTON_DRAW_NOIMAGE ((sal_uInt16)0x4000) -// ------------------ -// - DecorationView - -// ------------------ - class VCL_DLLPUBLIC DecorationView { private: diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index 01a8cff4f162..3ba3f8077bb1 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -20,14 +20,10 @@ #ifndef INCLUDED_VCL_DOCKINGAREA_HXX #define INCLUDED_VCL_DOCKINGAREA_HXX -#include #include -// ------------------------------------------ // A simple container for docked toolbars // - its main purpose is theming support -// ------------------------------------------ - class VCL_DLLPUBLIC DockingAreaWindow : public Window { class ImplData; diff --git a/include/vcl/fntstyle.hxx b/include/vcl/fntstyle.hxx index d0cc557dec8f..643d5d227a36 100644 --- a/include/vcl/fntstyle.hxx +++ b/include/vcl/fntstyle.hxx @@ -20,13 +20,8 @@ #ifndef INCLUDED_VCL_FNTSTYLE_HXX #define INCLUDED_VCL_FNTSTYLE_HXX -#include #include -// -------------- -// - Font enums - -// -------------- - #ifndef ENUM_FONTRELIEF_DECLARED #define ENUM_FONTRELIEF_DECLARED @@ -34,10 +29,6 @@ enum FontRelief { RELIEF_NONE, RELIEF_EMBOSSED, RELIEF_ENGRAVED, FontRelief_FORC #endif -// -------------- -// - Font types - -// -------------- - typedef sal_uInt8 FontKerning; #define KERNING_FONTSPECIFIC ((FontKerning)0x01) #define KERNING_ASIAN ((FontKerning)0x02) diff --git a/include/vcl/graph.h b/include/vcl/graph.h index 509ea467f674..abc7aa50275a 100644 --- a/include/vcl/graph.h +++ b/include/vcl/graph.h @@ -21,13 +21,8 @@ #define INCLUDED_VCL_GRAPH_H #include -#include #include -// --------------- -// - GraphicType - -// --------------- - enum GraphicType { GRAPHIC_NONE, @@ -36,10 +31,6 @@ enum GraphicType GRAPHIC_DEFAULT }; -// ----------------- -// - GraphicReader - -// ----------------- - class ReaderData; class VCL_DLLPUBLIC GraphicReader diff --git a/include/vcl/introwin.hxx b/include/vcl/introwin.hxx index 59be750d9fe7..dcc247830039 100644 --- a/include/vcl/introwin.hxx +++ b/include/vcl/introwin.hxx @@ -20,14 +20,9 @@ #ifndef INCLUDED_VCL_INTROWIN_HXX #define INCLUDED_VCL_INTROWIN_HXX -#include +#include #include #include -#include - -// -------------- -// - IntroWindow - -// -------------- class VCL_DLLPUBLIC IntroWindow : public WorkWindow { diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx index 1732ae920b25..fb0f8ba8e8f9 100644 --- a/include/vcl/jobset.hxx +++ b/include/vcl/jobset.hxx @@ -20,18 +20,12 @@ #ifndef INCLUDED_VCL_JOBSET_HXX #define INCLUDED_VCL_JOBSET_HXX -#include #include #include - class SvStream; struct ImplJobSetup; -// ------------ -// - JobSetup - -// ------------ - class VCL_DLLPUBLIC JobSetup { friend class Printer; diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index 533499573fab..7b547ae811c3 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -21,19 +21,13 @@ #define INCLUDED_VCL_KEYCOD_HXX #include -#include #include #include #include - #include class Window; -// ----------- -// - KeyCode - -// ----------- - class VCL_DLLPUBLIC KeyCode { private: diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx index b6a1b4ad44d4..964456115248 100644 --- a/include/vcl/keycodes.hxx +++ b/include/vcl/keycodes.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_KEYCODES_HXX #define INCLUDED_VCL_KEYCODES_HXX -#include #include #undef DELETE #include @@ -165,18 +164,10 @@ #define MODKEY_MOD2 (MODKEY_LMOD2|MODKEY_RMOD2) #define MODKEY_MOD3 (MODKEY_LMOD3|MODKEY_RMOD3) -// --------------- -// - Mouse-Types - -// --------------- - #define MOUSE_LEFT ((sal_uInt16)0x0001) #define MOUSE_MIDDLE ((sal_uInt16)0x0002) #define MOUSE_RIGHT ((sal_uInt16)0x0004) -// ------------------- -// - Indicator-Types - -// ------------------- - #define INDICATOR_CAPSLOCK 0x0001 #define INDICATOR_NUMLOCK 0x0002 #define INDICATOR_SCROLLLOCK 0x0004 diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 3855948adbfc..bce98e96f1f7 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -20,25 +20,16 @@ #ifndef INCLUDED_VCL_MENUBTN_HXX #define INCLUDED_VCL_MENUBTN_HXX -#include -#include #include +#include class Timer; class PopupMenu; class VclBuilder; class VclSimpleEvent; -// -------------------- -// - MenuButton-Types - -// -------------------- - #define MENUBUTTON_MENUMODE_TIMED ((sal_uInt16)0x0001) -// -------------- -// - MenuButton - -// -------------- - class VCL_DLLPUBLIC MenuButton : public PushButton { private: diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index b1387f00ce59..081141b56cbc 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -20,19 +20,15 @@ #ifndef INCLUDED_VCL_MSGBOX_HXX #define INCLUDED_VCL_MSGBOX_HXX -#include #include #include #include #include + class VclMultiLineEdit; class FixedImage; class CheckBox; -// ----------- -// - MessBox - -// ----------- - class VCL_DLLPUBLIC MessBox : public ButtonDialog { protected: @@ -74,10 +70,6 @@ public: virtual Size GetOptimalSize() const; }; -// ----------- -// - InfoBox - -// ----------- - class VCL_DLLPUBLIC InfoBox : public MessBox { private: @@ -92,10 +84,6 @@ public: static Image GetStandardImage(); }; -// -------------- -// - WarningBox - -// -------------- - class VCL_DLLPUBLIC WarningBox : public MessBox { private: @@ -111,10 +99,6 @@ public: static Image GetStandardImage(); }; -// ------------ -// - ErrorBox - -// ------------ - class VCL_DLLPUBLIC ErrorBox : public MessBox { private: @@ -128,10 +112,6 @@ public: static Image GetStandardImage(); }; -// ------------ -// - QueryBox - -// ------------ - class VCL_DLLPUBLIC QueryBox : public MessBox { private: diff --git a/include/vcl/pointr.hxx b/include/vcl/pointr.hxx index 2af80e686954..44f7430b44a7 100644 --- a/include/vcl/pointr.hxx +++ b/include/vcl/pointr.hxx @@ -20,16 +20,11 @@ #ifndef INCLUDED_VCL_POINTR_HXX #define INCLUDED_VCL_POINTR_HXX -#include #include #include class Point; -// ----------- -// - Pointer - -// ----------- - class VCL_DLLPUBLIC Pointer { PointerStyle meStyle; diff --git a/include/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx index 4b3c22cec35a..ece5af232b86 100644 --- a/include/vcl/ptrstyle.hxx +++ b/include/vcl/ptrstyle.hxx @@ -20,12 +20,6 @@ #ifndef INCLUDED_VCL_PTRSTYLE_HXX #define INCLUDED_VCL_PTRSTYLE_HXX -#include - -// ----------------- -// - Pointer-Types - -// ----------------- - typedef sal_uInt16 PointerStyle; #define POINTER_ARROW ((PointerStyle)0) diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index 7daa349d79d9..d3eec642c8aa 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VCL_REGION_HXX #include -#include #include #include @@ -32,15 +31,11 @@ class RegionBand; class Polygon; class PolyPolygon; -////////////////////////////////////////////////////////////////////////////// - typedef boost::shared_ptr< RegionBand > RegionBandPtr; typedef boost::shared_ptr< PolyPolygon > PolyPolygonPtr; typedef boost::shared_ptr< basegfx::B2DPolyPolygon > B2DPolyPolygonPtr; typedef std::vector< Rectangle > RectangleVector; -////////////////////////////////////////////////////////////////////////////// - class VCL_DLLPUBLIC Region { private: diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx index 95a1f8b99589..dc219047f48f 100644 --- a/include/vcl/salgtype.hxx +++ b/include/vcl/salgtype.hxx @@ -20,21 +20,12 @@ #ifndef INCLUDED_VCL_SALGTYPE_HXX #define INCLUDED_VCL_SALGTYPE_HXX -#include - -// ------------ -// - SalColor - -// ------------ - typedef sal_uInt32 SalColor; #define MAKE_SALCOLOR( r, g, b ) ((SalColor)(((sal_uInt32)((sal_uInt8)(b))))|(((sal_uInt32)((sal_uInt8)(g)))<<8)|(((sal_uInt32)((sal_uInt8)(r)))<<16)) #define SALCOLOR_RED( n ) ((sal_uInt8)((n)>>16)) #define SALCOLOR_GREEN( n ) ((sal_uInt8)(((sal_uInt16)(n)) >> 8)) #define SALCOLOR_BLUE( n ) ((sal_uInt8)(n)) #define SALCOLOR_NONE (~(SalColor)0) -// ------------ -// - SalPoint - -// ------------ // must equal to class Point struct SalPoint @@ -45,10 +36,6 @@ struct SalPoint typedef const SalPoint* PCONSTSALPOINT; -// -------------- -// - SalTwoRect - -// -------------- - struct SalTwoRect { long mnSrcX; @@ -61,19 +48,11 @@ struct SalTwoRect long mnDestHeight; }; -// --------------- -// - SalROPColor - -// --------------- - typedef sal_uInt16 SalROPColor; #define SAL_ROP_0 ((SalROPColor)0) #define SAL_ROP_1 ((SalROPColor)1) #define SAL_ROP_INVERT ((SalROPColor)2) -// ------------- -// - SalInvert - -// ------------- - typedef sal_uInt16 SalInvert; #define SAL_INVERT_HIGHLIGHT ((SalInvert)0x0001) #define SAL_INVERT_50 ((SalInvert)0x0002) diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index 8a9804c27640..ef24221db227 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -20,16 +20,11 @@ #ifndef INCLUDED_VCL_SLIDER_HXX #define INCLUDED_VCL_SLIDER_HXX -#include #include #include // for enum ScrollType #include -// ---------- -// - Slider - -// ---------- - class VCL_DLLPUBLIC Slider : public Control { private: diff --git a/include/vcl/spin.h b/include/vcl/spin.h index be6d11ab25ef..a53e04b54d37 100644 --- a/include/vcl/spin.h +++ b/include/vcl/spin.h @@ -20,8 +20,6 @@ #ifndef INCLUDED_VCL_SPIN_H #define INCLUDED_VCL_SPIN_H -#include - class Rectangle; class OutputDevice; diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index c5b97a775417..3e868828f402 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -20,16 +20,11 @@ #ifndef INCLUDED_VCL_SPLIT_HXX #define INCLUDED_VCL_SPLIT_HXX -#include #include #include #define SPLITTER_DEFAULTSTEPSIZE 0xFFFF -// ------------ -// - Splitter - -// ------------ - class VCL_DLLPUBLIC Splitter : public Window { private: diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 65fe65bfae35..07f3407f46ce 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -20,40 +20,23 @@ #ifndef INCLUDED_VCL_SPLITWIN_HXX #define INCLUDED_VCL_SPLITWIN_HXX -#include #include #include class Wallpaper; struct ImplSplitSet; -// ----------------------- -// - SplitWindowItemBits - -// ----------------------- - typedef sal_uInt16 SplitWindowItemBits; -// ------------------------------- -// - Bits fuer SplitWindow-Items - -// ------------------------------- - #define SWIB_FIXED ((SplitWindowItemBits)0x0001) #define SWIB_RELATIVESIZE ((SplitWindowItemBits)0x0002) #define SWIB_PERCENTSIZE ((SplitWindowItemBits)0x0004) #define SWIB_COLSET ((SplitWindowItemBits)0x0008) #define SWIB_INVISIBLE ((SplitWindowItemBits)0x0010) -// --------------------- -// - SplitWindow-Types - -// --------------------- - #define SPLITWINDOW_APPEND ((sal_uInt16)0xFFFF) #define SPLITWINDOW_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) -// --------------- -// - SplitWindow - -// --------------- - class VCL_DLLPUBLIC SplitWindow : public DockingWindow { private: diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx index 76a5e7454813..cfd865c748c0 100644 --- a/include/vcl/stdtext.hxx +++ b/include/vcl/stdtext.hxx @@ -21,25 +21,16 @@ #define INCLUDED_VCL_STDTEXT_HXX #include -#include #include class Window; -// ------------------ -// - Standard-Texte - -// ------------------ - #define STANDARD_TEXT_FIRST STANDARD_TEXT_SERVICE_NOT_AVAILABLE #define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0) #define STANDARD_TEXT_LAST STANDARD_TEXT_SERVICE_NOT_AVAILABLE OUString VCL_DLLPUBLIC GetStandardText(sal_uInt16 nStdText); -// ------------------------------------- -// - Hilfsmethoden fuer Standard-Texte - -// ------------------------------------- - void VCL_DLLPUBLIC ShowServiceNotAvailableError(Window* pParent, const OUString& rServiceName, bool bError); #endif // INCLUDED_VCL_STDTEXT_HXX diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx index 6c57f312911b..0238da24333b 100644 --- a/include/vcl/syschild.hxx +++ b/include/vcl/syschild.hxx @@ -20,17 +20,12 @@ #ifndef INCLUDED_VCL_SYSCHILD_HXX #define INCLUDED_VCL_SYSCHILD_HXX -#include #include #include struct SystemEnvData; struct SystemWindowData; -// --------------------- -// - SystemChildWindow - -// --------------------- - class VCL_DLLPUBLIC SystemChildWindow : public Window { private: diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 263e64891e91..f084cde28f8d 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_TABCTRL_HXX #define INCLUDED_VCL_TABCTRL_HXX -#include #include #include @@ -30,19 +29,11 @@ class TabPage; class PushButton; class ListBox; -// -------------------- -// - TabControl-Types - -// -------------------- - #ifndef TAB_APPEND #define TAB_APPEND ((sal_uInt16)0xFFFF) #define TAB_PAGE_NOTFOUND ((sal_uInt16)0xFFFF) #endif /* !TAB_APPEND */ -// -------------- -// - TabControl - -// -------------- - class VCL_DLLPUBLIC TabControl : public Control { private: diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index ebf8a6c92a2d..27651d8209dc 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -20,17 +20,12 @@ #ifndef INCLUDED_VCL_TABDLG_HXX #define INCLUDED_VCL_TABDLG_HXX -#include #include #include class FixedLine; class TabControl; -// ---------------------- -// - TabDialog - -// ---------------------- - class VCL_DLLPUBLIC TabDialog : public Dialog { private: diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index e7668b857af9..ff42380414d3 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_TOOLBOX_HXX #define INCLUDED_VCL_TOOLBOX_HXX -#include +#include #include #include #include @@ -28,8 +28,6 @@ #include #include -#include - class UserDrawEvent; struct ImplToolItem; @@ -43,10 +41,6 @@ namespace vcl class IImageListProvider; } -// ------------------------- -// - ToolBoxCustomizeEvent - -// ------------------------- - #define TOOLBOX_CUSTOMIZE_RESIZE ((sal_uInt16)0xFFFE) class VCL_DLLPUBLIC ToolBoxCustomizeEvent @@ -96,10 +90,6 @@ inline sal_Bool ToolBoxCustomizeEvent::IsResized() const return sal_False; } -// ----------------- -// - ToolBox-Types - -// ----------------- - #define TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) #define TOOLBOX_APPEND ((sal_uInt16)0xFFFF) @@ -130,10 +120,6 @@ struct ImplToolSize sal_uInt16 mnLines; }; -// ----------- -// - ToolBox - -// ----------- - class VCL_DLLPUBLIC ToolBox : public DockingWindow { friend class FloatingWindow; diff --git a/include/vcl/unowrap.hxx b/include/vcl/unowrap.hxx index 86b3f8e5ddbc..fd0e9794fe63 100644 --- a/include/vcl/unowrap.hxx +++ b/include/vcl/unowrap.hxx @@ -20,9 +20,8 @@ #ifndef INCLUDED_VCL_UNOWRAP_HXX #define INCLUDED_VCL_UNOWRAP_HXX -#include -#include #include +#include class XWindowPeer; class XToolkit; diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index 74e28c67af24..e5d3fbdafe46 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -20,27 +20,20 @@ #ifndef INCLUDED_VCL_VCLENUM_HXX #define INCLUDED_VCL_VCLENUM_HXX +#include #include -#include #include -#include - -// ------------------------------------------------------------ enum ExtTimeFieldFormat { EXTTIMEF_24H_SHORT, EXTTIMEF_24H_LONG, EXTTIMEF_12H_SHORT, EXTTIMEF_12H_LONG, EXTTIMEF_DURATION_SHORT, EXTTIMEF_DURATION_LONG }; -// ------------------------------------------------------------ - enum ExtDateFieldFormat { XTDATEF_SYSTEM_SHORT, XTDATEF_SYSTEM_SHORT_YY, XTDATEF_SYSTEM_SHORT_YYYY, XTDATEF_SYSTEM_LONG, XTDATEF_SHORT_DDMMYY, XTDATEF_SHORT_MMDDYY, XTDATEF_SHORT_YYMMDD, XTDATEF_SHORT_DDMMYYYY, XTDATEF_SHORT_MMDDYYYY, XTDATEF_SHORT_YYYYMMDD, XTDATEF_SHORT_YYMMDD_DIN5008, XTDATEF_SHORT_YYYYMMDD_DIN5008, ExtDateFieldFormat_FORCE_EQUAL_SIZE=SAL_MAX_ENUM }; -// ------------------------------------------------------------ - enum GradientStyle { GradientStyle_LINEAR = 0, @@ -52,8 +45,6 @@ enum GradientStyle GradientStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM }; -// ------------------------------------------------------------ - // to avoid conflicts with enum's declared otherwise #define HATCH_SINGLE HatchStyle_SINGLE #define HATCH_DOUBLE HatchStyle_DOUBLE @@ -68,8 +59,6 @@ enum HatchStyle HatchStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM }; -// ------------------------------------------------------------ - // to avoid conflicts with enum's declared otherwise #define LINE_NONE LineStyle_NONE #define LINE_SOLID LineStyle_SOLID @@ -84,20 +73,14 @@ enum LineStyle LineStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM }; -// ------------------------------------------------------------ - enum RasterOp { ROP_OVERPAINT, ROP_XOR, ROP_0, ROP_1, ROP_INVERT }; -// ------------------------------------------------------------ - enum FontAutoHint { AUTOHINT_DONTKNOW, AUTOHINT_FALSE, AUTOHINT_TRUE }; enum FontHinting { HINTING_DONTKNOW, HINTING_FALSE, HINTING_TRUE }; enum FontHintStyle { HINT_NONE, HINT_SLIGHT, HINT_MEDIUM, HINT_FULL }; -// ------------------------------------------------------------ - typedef sal_uInt32 sal_UCS4; // TODO: this should be moved to rtl enum OutDevSupportType { OutDevSupport_TransparentRect, OutDevSupport_B2DClip, OutDevSupport_B2DDraw }; diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 3509dc34b32a..a15e0573ccf6 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -20,14 +20,9 @@ #ifndef INCLUDED_VCL_VIRDEV_HXX #define INCLUDED_VCL_VIRDEV_HXX -#include +#include #include #include -#include - -// ----------------- -// - VirtualDevice - -// ----------------- class SalVirtualDevice; struct SystemGraphicsData; diff --git a/include/vcl/waitobj.hxx b/include/vcl/waitobj.hxx index 0cabd6252003..2ef2f69f0ee9 100644 --- a/include/vcl/waitobj.hxx +++ b/include/vcl/waitobj.hxx @@ -20,14 +20,9 @@ #ifndef INCLUDED_VCL_WAITOBJ_HXX #define INCLUDED_VCL_WAITOBJ_HXX -#include #include #include -// -------------- -// - WaitObject - -// -------------- - class VCL_DLLPUBLIC WaitObject { private: diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index 46cfbb7c6d77..f7a46080e50e 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -20,19 +20,14 @@ #ifndef INCLUDED_VCL_WALL_HXX #define INCLUDED_VCL_WALL_HXX -#include -#include #include #include +#include class Gradient; class BitmapEx; class ImplWallpaper; -// ------------------- -// - Wallpaper-Types - -// ------------------- - #define WALLPAPER_NULL WallpaperStyle_NULL #define WALLPAPER_TILE WallpaperStyle_TILE #define WALLPAPER_CENTER WallpaperStyle_CENTER @@ -72,10 +67,6 @@ enum WallpaperStyle #endif -// ------------- -// - Wallpaper - -// ------------- - class VCL_DLLPUBLIC Wallpaper { private: -- cgit v1.2.3