From 5a7e8389f0720f1872f36af401c6b3af7968b7ea Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Sat, 14 Jul 2012 02:03:56 +0200
Subject: hrc cleanup: Remove include guards from src files

Change-Id: I7d52837f4058bab1bb5a0137788521d12834d519
---
 uui/source/alreadyopen.src       | 2 --
 uui/source/filechanged.src       | 2 --
 uui/source/fltdlg.src            | 5 -----
 uui/source/ids.src               | 2 --
 uui/source/lockfailed.src        | 2 --
 uui/source/logindlg.src          | 5 -----
 uui/source/masterpasscrtdlg.src  | 4 ----
 uui/source/masterpassworddlg.src | 4 ----
 uui/source/nameclashdlg.src      | 5 -----
 uui/source/openlocked.src        | 2 --
 uui/source/passworddlg.src       | 4 ----
 uui/source/passworderrs.src      | 2 --
 uui/source/sslwarndlg.src        | 5 -----
 uui/source/trylater.src          | 2 --
 uui/source/unknownauthdlg.src    | 4 ----
 15 files changed, 50 deletions(-)

(limited to 'uui')

diff --git a/uui/source/alreadyopen.src b/uui/source/alreadyopen.src
index ae3c45baf817..60cb2df4169c 100644
--- a/uui/source/alreadyopen.src
+++ b/uui/source/alreadyopen.src
@@ -18,9 +18,7 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
 
 String STR_ALREADYOPEN_TITLE
 {
diff --git a/uui/source/filechanged.src b/uui/source/filechanged.src
index 84ab58d97515..c8c367277ab7 100644
--- a/uui/source/filechanged.src
+++ b/uui/source/filechanged.src
@@ -18,9 +18,7 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
 
 String STR_FILECHANGED_TITLE
 {
diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src
index 29ef9c2ac155..cc7640609665 100644
--- a/uui/source/fltdlg.src
+++ b/uui/source/fltdlg.src
@@ -18,13 +18,8 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include "ids.hrc"
-#endif
-
-#ifndef UUI_FLTDLG_HRC
 #include "fltdlg.hrc"
-#endif
 
 ModalDialog DLG_FILTER_SELECT
 {
diff --git a/uui/source/ids.src b/uui/source/ids.src
index d19264eec56a..244626477668 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -18,9 +18,7 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include "ids.hrc"
-#endif
 
 String RID_KEEP_PASSWORD
 {
diff --git a/uui/source/lockfailed.src b/uui/source/lockfailed.src
index f0974bfe7ba5..761ececab943 100644
--- a/uui/source/lockfailed.src
+++ b/uui/source/lockfailed.src
@@ -18,9 +18,7 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
 
 String STR_LOCKFAILED_TITLE
 {
diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src
index 11521c0d5c51..ea3de7043c04 100644
--- a/uui/source/logindlg.src
+++ b/uui/source/logindlg.src
@@ -18,13 +18,8 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include "ids.hrc"
-#endif
-
-#ifndef UUI_LOGINDLG_HRC
 #include "logindlg.hrc"
-#endif
 
 ModalDialog DLG_UUI_LOGIN
 {
diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src
index 1f4053d03e4a..e3b1990caade 100644
--- a/uui/source/masterpasscrtdlg.src
+++ b/uui/source/masterpasscrtdlg.src
@@ -18,12 +18,8 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
-#ifndef UUI_MASTERPASSCRTDLG_HRC
 #include <masterpasscrtdlg.hrc>
-#endif
 
 ModalDialog DLG_UUI_MASTERPASSWORD_CRT
 {
diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src
index 8e0c8600d4da..53690b4e198c 100644
--- a/uui/source/masterpassworddlg.src
+++ b/uui/source/masterpassworddlg.src
@@ -18,12 +18,8 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
-#ifndef UUI_MASTERPASSWORDDLG_HRC
 #include <masterpassworddlg.hrc>
-#endif
 
 ModalDialog DLG_UUI_MASTERPASSWORD
 {
diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src
index f9fb4e932536..abec1a72efc5 100644
--- a/uui/source/nameclashdlg.src
+++ b/uui/source/nameclashdlg.src
@@ -18,13 +18,8 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include "ids.hrc"
-#endif
-
-#ifndef UUI_NAMECLASHDLG_HRC
 #include "nameclashdlg.hrc"
-#endif
 
 #define DLG_WIDTH       250
 #define DLG_HEIGTH       75
diff --git a/uui/source/openlocked.src b/uui/source/openlocked.src
index 79d4623aef95..b6dcafe8528e 100644
--- a/uui/source/openlocked.src
+++ b/uui/source/openlocked.src
@@ -18,9 +18,7 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
 
 String STR_OPENLOCKED_TITLE
 {
diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
index a062c86df537..29f4557a69c0 100644
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.src
@@ -18,12 +18,8 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
-#ifndef UUI_PASSWORDDLG_HRC
 #include <passworddlg.hrc>
-#endif
 
 ModalDialog DLG_UUI_PASSWORD
 {
diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src
index e11dd6f85b48..a557b8343022 100644
--- a/uui/source/passworderrs.src
+++ b/uui/source/passworderrs.src
@@ -18,9 +18,7 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
 
 String STR_ERROR_PASSWORD_TO_OPEN_WRONG
 {
diff --git a/uui/source/sslwarndlg.src b/uui/source/sslwarndlg.src
index 3c916eb6c9fc..8ae04a750f8e 100644
--- a/uui/source/sslwarndlg.src
+++ b/uui/source/sslwarndlg.src
@@ -17,13 +17,8 @@
  */
 #define __RSC
 
-
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
-#ifndef UUI_SSLWARN_HRC
 #include <sslwarndlg.hrc>
-#endif
 
 ModalDialog DLG_UUI_SSLWARN
 {
diff --git a/uui/source/trylater.src b/uui/source/trylater.src
index 13da2b8b764d..cf0b2649d401 100644
--- a/uui/source/trylater.src
+++ b/uui/source/trylater.src
@@ -18,9 +18,7 @@
 
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
 
 String STR_TRYLATER_TITLE
 {
diff --git a/uui/source/unknownauthdlg.src b/uui/source/unknownauthdlg.src
index a607eb08fbae..9a562cd424e5 100644
--- a/uui/source/unknownauthdlg.src
+++ b/uui/source/unknownauthdlg.src
@@ -17,12 +17,8 @@
  */
 #define __RSC
 
-#ifndef UUI_IDS_HRC
 #include <ids.hrc>
-#endif
-#ifndef UUI_UNKNOWNAUTH_HRC
 #include <unknownauthdlg.hrc>
-#endif
 
 ModalDialog DLG_UUI_UNKNOWNAUTH
 {
-- 
cgit