summaryrefslogtreecommitdiff
path: root/vcl/inc/unx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-12-02 12:00:22 +0200
committerTor Lillqvist <tml@collabora.com>2013-12-02 12:01:13 +0200
commit2ba0266f9a4f1369b8b42eb5aa821061e6793543 (patch)
tree302ce7ea6d7408fa79f9d57f780bafdfe08083cb /vcl/inc/unx
parent3b56738d88d881d023bdefda2222d99663f12b9f (diff)
Make include guards sane in vcl
We have a convention. Use it. Kill copypasta. Change-Id: I512e1c8e75b5da20b6756ffc88209a27674ad7c7
Diffstat (limited to 'vcl/inc/unx')
-rw-r--r--vcl/inc/unx/gtk/gtkobject.hxx2
-rw-r--r--vcl/inc/unx/salbmp.h8
-rw-r--r--vcl/inc/unx/saldata.hxx6
-rw-r--r--vcl/inc/unx/saldisp.hxx6
-rw-r--r--vcl/inc/unx/salframe.h17
-rw-r--r--vcl/inc/unx/salinst.h6
-rw-r--r--vcl/inc/unx/salmenu.h6
-rw-r--r--vcl/inc/unx/salobj.h6
-rw-r--r--vcl/inc/unx/saltimer.h4
-rw-r--r--vcl/inc/unx/salvd.h22
-rw-r--r--vcl/inc/unx/svsys.h6
11 files changed, 31 insertions, 58 deletions
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index d19e45d9d018..99fd9cb3f8a0 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -58,6 +58,6 @@ public:
virtual const SystemEnvData* GetSystemData() const;
};
-#endif // _SV_SALOBJ_H
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 4b72fcf3fe67..8a54fd987388 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -17,14 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALBMP_H
-#define _SV_SALBMP_H
+#ifndef INCLUDED_VCL_INC_UNX_SALBMP_H
+#define INCLUDED_VCL_INC_UNX_SALBMP_H
#include <prex.h>
#include <postx.h>
-#ifndef _SV_SALGTYPE
#include <vcl/salgtype.hxx>
-#endif
#include <unx/saldisp.hxx>
#include <salbmp.hxx>
#include <vclpluginapi.h>
@@ -245,6 +243,6 @@ public:
void ImplClear();
};
-#endif // _SV_SALBMP_HXX
+#endif // INCLUDED_VCL_INC_UNX_SALBMP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index e986f8cda221..f5890bc06e53 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALDATA_HXX
-#define _SV_SALDATA_HXX
+#ifndef INCLUDED_VCL_INC_UNX_SALDATA_HXX
+#define INCLUDED_VCL_INC_UNX_SALDATA_HXX
#include <prex.h>
#include <postx.h>
@@ -93,6 +93,6 @@ public:
X11SalData* GetX11SalData();
-#endif // _SV_SALDATA_HXX
+#endif // INCLUDED_VCL_INC_UNX_SALDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 531c608327a0..b98bcb22fc51 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALDISP_HXX
-#define _SV_SALDISP_HXX
+#ifndef INCLUDED_VCL_INC_UNX_SALDISP_HXX
+#define INCLUDED_VCL_INC_UNX_SALDISP_HXX
class SalDisplay;
class SalColormap;
@@ -416,6 +416,6 @@ namespace vcl_sal {
}
-#endif // _SV_SALDISP_HXX
+#endif // INCLUDED_VCL_INC_UNX_SALDISP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 5d3183975bff..eb11699a916d 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -16,8 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALFRAME_H
-#define _SV_SALFRAME_H
+
+#ifndef INCLUDED_VCL_INC_UNX_SALFRAME_H
+#define INCLUDED_VCL_INC_UNX_SALFRAME_H
#include <prex.h>
#include <postx.h>
@@ -269,16 +270,6 @@ public:
void setPendingSizeEvent();
};
-#ifdef _SV_SALDISP_HXX
-
-inline Display *X11SalFrame::GetXDisplay() const
-{ return pDisplay_->GetDisplay(); }
-
-inline XLIB_Window X11SalFrame::GetDrawable() const
-{ return GetWindow(); }
-
-#endif
-
-#endif // _SV_SALFRAME_H
+#endif // INCLUDED_VCL_INC_UNX_SALFRAME_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 53587591d6f1..d1645002ea0f 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALINST_H
-#define _SV_SALINST_H
+#ifndef INCLUDED_VCL_INC_UNX_SALINST_H
+#define INCLUDED_VCL_INC_UNX_SALINST_H
#include <tools/solar.h>
#include <osl/thread.hxx>
@@ -82,6 +82,6 @@ public:
virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService);
};
-#endif // _SV_SALINST_H
+#endif // INCLUDED_VCL_INC_UNX_SALINST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
index 289b5dfb16bd..7722a8f279ae 100644
--- a/vcl/inc/unx/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALMENU_H
-#define _SV_SALMENU_H
+#ifndef INCLUDED_VCL_INC_UNX_SALMENU_H
+#define INCLUDED_VCL_INC_UNX_SALMENU_H
#include <tools/solar.h>
#include <vcl/bitmap.hxx>
@@ -53,6 +53,6 @@ public:
virtual ~X11SalMenuItem();
};
-#endif // _SV_SALMENU_H
+#endif // INCLUDED_VCL_INC_UNX_SALMENU_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 96e557076c69..b644b1b9020c 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALOBJ_H
-#define _SV_SALOBJ_H
+#ifndef INCLUDED_VCL_INC_UNX_SALOBJ_H
+#define INCLUDED_VCL_INC_UNX_SALOBJ_H
#include <tools/solar.h>
#include <vcl/sysdata.hxx>
@@ -88,6 +88,6 @@ public:
virtual const SystemEnvData* GetSystemData() const;
};
-#endif // _SV_SALOBJ_H
+#endif // INCLUDED_VCL_INC_UNX_SALOBJ_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/saltimer.h b/vcl/inc/unx/saltimer.h
index e2bb1e49284a..f93acf889452 100644
--- a/vcl/inc/unx/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALTIMER_H
-#define _SV_SALTIMER_H
+#ifndef INCLUDED_VCL_INC_UNX_SALTIMER_H
+#define INCLUDED_VCL_INC_UNX_SALTIMER_H
#include <saltimer.hxx>
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index f50cdd1516d1..198bdf84dea9 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SALVD_H
-#define _SV_SALVD_H
+#ifndef INCLUDED_VCL_INC_UNX_SALVD_H
+#define INCLUDED_VCL_INC_UNX_SALVD_H
#include <prex.h>
#include <postx.h>
@@ -73,22 +73,6 @@ public:
virtual void GetSize( long& rWidth, long& rHeight );
};
-#ifdef _SV_SALDISP_HXX
-
-inline void X11SalVirtualDevice::InitGraphics( X11SalVirtualDevice *pVD )
-{ pGraphics_->Init( pVD ); }
-
-inline Display *X11SalVirtualDevice::GetXDisplay() const
-{ return pDisplay_->GetDisplay(); }
-
-inline SalDisplay *X11SalVirtualDevice::GetDisplay() const
-{ return pDisplay_; }
-
-inline sal_Bool X11SalVirtualDevice::IsDisplay() const
-{ return pDisplay_->IsDisplay(); }
-
-#endif
-
-#endif // _SV_SALVD_H
+#endif // INCLUDED_VCL_INC_UNX_SALVD_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/svsys.h b/vcl/inc/unx/svsys.h
index 40ad3e04e3d6..91775820798e 100644
--- a/vcl/inc/unx/svsys.h
+++ b/vcl/inc/unx/svsys.h
@@ -16,12 +16,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SV_SVSYS_H
-#define _SV_SVSYS_H
+#ifndef INCLUDED_VCL_INC_UNX_SVSYS_H
+#define INCLUDED_VCL_INC_UNX_SVSYS_H
#include <prex.h>
#include <postx.h>
-#endif // _SV_SVSYS_H
+#endif // INCLUDED_VCL_INC_UNX_SVSYS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */