diff options
author | jan iversen <jani@documentfoundation.org> | 2016-03-23 17:12:11 +0100 |
---|---|---|
committer | jan iversen <jani@documentfoundation.org> | 2016-03-23 17:20:15 +0100 |
commit | 11231f9179db9821effc884e8adade48fdf89938 (patch) | |
tree | 4590559f7d249e1647fd05fff9753e19c431a56a /l10ntools/inc | |
parent | a5728dca0926ccad4f87e62da76483565d70d649 (diff) |
genlang, removed clang problems
The clang plugin does not not like
for (<foo>;<foo>;<foo>) ;
(most compilers do not complain, when using the ' ')
Also a virtual destructor need "override" in the
implementing class.
Change-Id: Ib99702f11dbd24595935594ee97c136c8e604aff
Diffstat (limited to 'l10ntools/inc')
-rw-r--r-- | l10ntools/inc/gConv.hxx | 2 | ||||
-rw-r--r-- | l10ntools/inc/gConvPo.hxx | 3 | ||||
-rw-r--r-- | l10ntools/inc/gConvProp.hxx | 2 | ||||
-rw-r--r-- | l10ntools/inc/gConvSrc.hxx | 2 | ||||
-rw-r--r-- | l10ntools/inc/gConvTree.hxx | 4 | ||||
-rw-r--r-- | l10ntools/inc/gConvUi.hxx | 6 | ||||
-rw-r--r-- | l10ntools/inc/gConvUlf.hxx | 5 | ||||
-rw-r--r-- | l10ntools/inc/gConvXcs.hxx | 6 | ||||
-rw-r--r-- | l10ntools/inc/gConvXcu.hxx | 9 | ||||
-rw-r--r-- | l10ntools/inc/gConvXhp.hxx | 6 | ||||
-rw-r--r-- | l10ntools/inc/gConvXrm.hxx | 6 |
11 files changed, 39 insertions, 12 deletions
diff --git a/l10ntools/inc/gConv.hxx b/l10ntools/inc/gConv.hxx index d51f2bf9a808..86d84a74fdc0 100644 --- a/l10ntools/inc/gConv.hxx +++ b/l10ntools/inc/gConv.hxx @@ -65,6 +65,6 @@ class convert_gen bool createDir(const string& sDir, const string& sFile); private: ofstream mcOutputFile; - bool checkAccess(string& sFile); + static bool checkAccess(string& sFile); }; #endif diff --git a/l10ntools/inc/gConvPo.hxx b/l10ntools/inc/gConvPo.hxx index 69c62d025922..31c037d107b5 100644 --- a/l10ntools/inc/gConvPo.hxx +++ b/l10ntools/inc/gConvPo.hxx @@ -16,7 +16,6 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef GCONPO_HXX #define GCONPO_HXX #include "gConv.hxx" @@ -31,7 +30,7 @@ class convert_po : public convert_gen convert_po(l10nMem& crMemory); - ~convert_po() {}; + ~convert_po() override {}; void startLook (); void setValue (char *syyText, int iLineCnt); diff --git a/l10ntools/inc/gConvProp.hxx b/l10ntools/inc/gConvProp.hxx index b9e5b7c7a30f..d65531ec5d2a 100644 --- a/l10ntools/inc/gConvProp.hxx +++ b/l10ntools/inc/gConvProp.hxx @@ -26,7 +26,7 @@ class convert_prop : public convert_gen { public: convert_prop(l10nMem& crMemory) : convert_gen(crMemory) {}; - ~convert_prop() {}; + ~convert_prop() override {}; private: void doExecute() override; diff --git a/l10ntools/inc/gConvSrc.hxx b/l10ntools/inc/gConvSrc.hxx index dd41895b4483..65bd5eb6daba 100644 --- a/l10ntools/inc/gConvSrc.hxx +++ b/l10ntools/inc/gConvSrc.hxx @@ -28,7 +28,7 @@ class convert_src : public convert_gen bool mbExpectValue; convert_src(l10nMem& crMemory); - ~convert_src() {}; + ~convert_src() override {}; void setValue (char *syyText, char *sbuildValue); void setLang (char *syyText, bool bEnUs); diff --git a/l10ntools/inc/gConvTree.hxx b/l10ntools/inc/gConvTree.hxx index fff9248d836b..bd9adb38d65e 100644 --- a/l10ntools/inc/gConvTree.hxx +++ b/l10ntools/inc/gConvTree.hxx @@ -21,6 +21,8 @@ #include "gConv.hxx" +extern int treelex(void); + class convert_tree : public convert_gen { @@ -40,7 +42,7 @@ class convert_tree : public convert_gen } STATE_VAL; convert_tree(l10nMem& crMemory); - ~convert_tree(); + ~convert_tree() override; void setString(char *yytext); void setState(char *yytext, STATE_TAG eNewStateTag, STATE_VAL eNewStateVAL, char *sModule); diff --git a/l10ntools/inc/gConvUi.hxx b/l10ntools/inc/gConvUi.hxx index ffc9531a7855..be4a443e136e 100644 --- a/l10ntools/inc/gConvUi.hxx +++ b/l10ntools/inc/gConvUi.hxx @@ -22,11 +22,15 @@ +extern int uilex(void); + + + class convert_ui : public convert_gen { public: convert_ui(l10nMem& crMemory); - ~convert_ui() {}; + ~convert_ui() override {}; private: diff --git a/l10ntools/inc/gConvUlf.hxx b/l10ntools/inc/gConvUlf.hxx index 7053059d1888..85902e4bba0f 100644 --- a/l10ntools/inc/gConvUlf.hxx +++ b/l10ntools/inc/gConvUlf.hxx @@ -22,11 +22,14 @@ +extern int ulflex(void); + + class convert_ulf : public convert_gen { public: convert_ulf(l10nMem& crMemory) : convert_gen(crMemory) {}; - ~convert_ulf() {}; + ~convert_ulf() override {}; void setKey(char *syyText); void setText(char *syyText, bool bIsEnUs); diff --git a/l10ntools/inc/gConvXcs.hxx b/l10ntools/inc/gConvXcs.hxx index c7bedede084a..407ff61a375e 100644 --- a/l10ntools/inc/gConvXcs.hxx +++ b/l10ntools/inc/gConvXcs.hxx @@ -22,11 +22,15 @@ +extern int xcslex(void); + + + class convert_xcs : public convert_gen { public: convert_xcs(l10nMem& crMemory); - ~convert_xcs() {}; + ~convert_xcs() override {}; void setKey(char *syyText); void unsetKey(char *syyText); diff --git a/l10ntools/inc/gConvXcu.hxx b/l10ntools/inc/gConvXcu.hxx index c222eaca2c43..1bdde9fc30e8 100644 --- a/l10ntools/inc/gConvXcu.hxx +++ b/l10ntools/inc/gConvXcu.hxx @@ -22,14 +22,21 @@ +extern int xculex(void); + + + class xcu_stack_entry; + + + class convert_xcu : public convert_gen { public: bool mbNoCollectingData; convert_xcu(l10nMem& crMemory); - ~convert_xcu() {}; + ~convert_xcu() override {}; void pushKey(char *syyText); void popKey(char *syyText); diff --git a/l10ntools/inc/gConvXhp.hxx b/l10ntools/inc/gConvXhp.hxx index ef39822cb926..480280acd8af 100644 --- a/l10ntools/inc/gConvXhp.hxx +++ b/l10ntools/inc/gConvXhp.hxx @@ -22,11 +22,15 @@ +extern int xhplex(void); + + + class convert_xhp : public convert_gen { public: convert_xhp(l10nMem& crMemory); - ~convert_xhp(); + ~convert_xhp() override; void setString(char *yytext); void openTag(char *yytext); diff --git a/l10ntools/inc/gConvXrm.hxx b/l10ntools/inc/gConvXrm.hxx index 60b063f64762..8aa808814547 100644 --- a/l10ntools/inc/gConvXrm.hxx +++ b/l10ntools/inc/gConvXrm.hxx @@ -22,12 +22,16 @@ +extern int xrmlex(void); + + + class convert_xrm : public convert_gen { public: bool mbNoCollectingData; convert_xrm(l10nMem& crMemory); - ~convert_xrm() {}; + ~convert_xrm() override {}; void setId(char *yytext); void setLang(char *yytext); |