[Libreoffice-commits] core.git: extensions/source i18npool/source lingucomponent/source shell/qa solenv/gcc-wrappers vcl/workben
Collabora (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jul 23 08:32:46 UTC 2021
extensions/source/ole/ole2uno.hxx | 1
extensions/source/ole/oleobjw.hxx | 3 --
extensions/source/ole/servprov.hxx | 3 --
extensions/source/ole/unoobjw.hxx | 3 --
i18npool/source/localedata/LocaleNode.cxx | 1
i18npool/source/localedata/LocaleNode.hxx | 1
lingucomponent/source/languageguessing/guess.hxx | 10 +++-----
lingucomponent/source/languageguessing/guesslang.cxx | 1
lingucomponent/source/languageguessing/simpleguesser.hxx | 18 ++++++---------
shell/qa/zip/testzipimpl.cxx | 4 +--
shell/qa/zip/testzipimpl.hxx | 4 ---
solenv/gcc-wrappers/g++.cxx | 2 +
solenv/gcc-wrappers/gcc.cxx | 2 +
solenv/gcc-wrappers/wrapper.cxx | 2 +
solenv/gcc-wrappers/wrapper.hxx | 8 ++----
vcl/workben/win/dnd/transferable.hxx | 1
16 files changed, 29 insertions(+), 35 deletions(-)
New commits:
commit 2d04d7cc559445d8c1559af6af6d981d9f682db4
Author: Collabora <l.lunak at collabora.com>
AuthorDate: Thu Jul 15 12:18:49 2021 +0200
Commit: Luboš Luňák <l.lunak at collabora.com>
CommitDate: Fri Jul 23 10:32:08 2021 +0200
do not use "using namespace std" in headers
It's a bad style, doing that in headers can affect many source files
(especially with PCH used).
Change-Id: Ic9091a1d018e74606c9fa95df71a55faaa93d4ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119011
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index ca166415fa74..5fcf2fd96ad8 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -45,7 +45,6 @@ using namespace com::sun::star::registry;
using namespace com::sun::star::reflection;
using namespace com::sun::star::beans;
using namespace osl;
-using namespace std;
VARTYPE getVarType(const Any& val);
/* creates a Type object for a given type name.
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 97ba2f0be8f0..d1a1d0ed81fc 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -41,12 +41,11 @@
#include "unoconversionutilities.hxx"
#include "windata.hxx"
using namespace cppu;
-using namespace std;
using namespace com::sun::star::lang;
using namespace com::sun::star::bridge;
using namespace com::sun::star::bridge::oleautomation;
-typedef std::unordered_map<OUString, pair<DISPID, unsigned short>> DispIdMap;
+typedef std::unordered_map<OUString, std::pair<DISPID, unsigned short>> DispIdMap;
typedef std::unordered_multimap<OUString, unsigned int> TLBFuncIndexMap;
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 6b9275da17ad..8871f28cf7a0 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -30,7 +30,6 @@
using namespace com::sun::star::bridge;
using namespace cppu;
-using namespace std;
/// @throws Exception
Reference< XInterface> ConverterProvider_CreateInstance2( const Reference<XMultiServiceFactory> & xSMgr);
@@ -176,7 +175,7 @@ public:
protected:
bool provideInstance(std::function<const Reference<XInterface>()> xInstFunction, GUID const * guid);
- list< OneInstanceOleWrapper* > m_wrapperList;
+ std::list< OneInstanceOleWrapper* > m_wrapperList;
Reference< XBridgeSupplier2 > m_bridgeSupplier;
Reference<XMultiServiceFactory> m_smgr;
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index 9b3c6b6b751c..845724d819ae 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -40,7 +40,6 @@
#define DISPID_GET_STRUCT_FUNC -102
#define DISPID_CREATE_TYPE_FUNC -103
-using namespace std;
using namespace cppu;
using namespace com::sun::star::bridge;
using namespace com::sun::star::script;
@@ -196,7 +195,7 @@ protected:
Reference<XExactName> m_xExactName;
Reference<XInterface> m_xOrigin;
NameToIdMap m_nameToDispIdMap;
- vector<MemberInfo> m_MemberInfos;
+ std::vector<MemberInfo> m_MemberInfos;
// This member is used to determine the default value
// denoted by DISPID_VALUE (0). For proper results in JavaScript
// we have to return the default value when we write an object
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 942e03271029..0ae5978a75f5 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -41,6 +41,7 @@ typedef ::o3tl::sorted_vector< OUString > NameSet;
typedef ::o3tl::sorted_vector< sal_Int16 > ValueSet;
namespace cssi = ::com::sun::star::i18n;
+using namespace std;
LocaleNode::LocaleNode (const OUString& name, const Reference< XAttributeList > & attr)
: aName(name)
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 9706948419bf..bdd3eb62762e 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -28,7 +28,6 @@
namespace com::sun::star::xml::sax { class XAttributeList; }
-using namespace ::std;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
diff --git a/lingucomponent/source/languageguessing/guess.hxx b/lingucomponent/source/languageguessing/guess.hxx
index e68d852a53a6..627033d3ab7f 100644
--- a/lingucomponent/source/languageguessing/guess.hxx
+++ b/lingucomponent/source/languageguessing/guess.hxx
@@ -28,8 +28,6 @@
#include <string>
-using namespace std;
-
class Guess final {
public:
@@ -43,12 +41,12 @@ class Guess final {
*/
Guess(const char * guess_str);
- const string& GetLanguage() const { return language_str;}
- const string& GetCountry() const { return country_str;}
+ const std::string& GetLanguage() const { return language_str;}
+ const std::string& GetCountry() const { return country_str;}
private:
- string language_str;
- string country_str;
+ std::string language_str;
+ std::string country_str;
};
#endif
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index f04e0b3956d5..dfece0efe4e5 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -46,6 +46,7 @@
#include <textcat.h>
#endif
+using namespace ::std;
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star;
diff --git a/lingucomponent/source/languageguessing/simpleguesser.hxx b/lingucomponent/source/languageguessing/simpleguesser.hxx
index ac9ef7a3a3a7..d6b88d1d67b9 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.hxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.hxx
@@ -27,8 +27,6 @@
#define MAX_STRING_LENGTH_TO_ANALYSE 200
-using namespace std;
-
class SimpleGuesser final
{
public:
@@ -50,7 +48,7 @@ public:
* @param char* text is the text to analyze
* @return the list of guess
*/
- vector<Guess> GuessLanguage(const char* text);
+ std::vector<Guess> GuessLanguage(const char* text);
/**
* Analyze a text and return the most probable language of the text
@@ -63,31 +61,31 @@ public:
* List all available languages (possibly to be in guesses)
* @return the list of languages
*/
- vector<Guess> GetAvailableLanguages();
+ std::vector<Guess> GetAvailableLanguages();
/**
* List all languages (possibly in guesses or not)
* @return the list of languages
*/
- vector<Guess> GetAllManagedLanguages();
+ std::vector<Guess> GetAllManagedLanguages();
/**
* List all Unavailable languages (disable for any reason)
* @return the list of languages
*/
- vector<Guess> GetUnavailableLanguages();
+ std::vector<Guess> GetUnavailableLanguages();
/**
* Mark a language enabled
* @param string lang the language to enable (build like language-COUNTRY-encoding)
*/
- void EnableLanguage(const string& lang);
+ void EnableLanguage(const std::string& lang);
/**
* Mark a language disabled
* @param string lang the language to disable (build like language-COUNTRY-encoding)
*/
- void DisableLanguage(const string& lang);
+ void DisableLanguage(const std::string& lang);
/**
* Load a new DB of fingerprints
@@ -101,10 +99,10 @@ private:
void* h;
//Is used to select languages into the fingerprints DB, the mask is used to indicate if we want enabled disabled or both
- vector<Guess> GetManagedLanguages(const char mask);
+ std::vector<Guess> GetManagedLanguages(const char mask);
//Like getManagedLanguages, this function enable or disable a language and it depends of the mask
- void XableLanguage(const string& lang, char mask);
+ void XableLanguage(const std::string& lang, char mask);
};
#endif
diff --git a/shell/qa/zip/testzipimpl.cxx b/shell/qa/zip/testzipimpl.cxx
index e669b6a8b40d..e39408f98496 100644
--- a/shell/qa/zip/testzipimpl.cxx
+++ b/shell/qa/zip/testzipimpl.cxx
@@ -48,8 +48,8 @@ TestZipImpl::~TestZipImpl() {}
bool TestZipImpl::test_directory()
{
ZipFile::DirectoryPtr_t contents = zipFile.GetDirectory();
- vector<string>& stringVector = *contents;
- sort(stringVector.begin(), stringVector.end());
+ std::vector<std::string>& stringVector = *contents;
+ std::sort(stringVector.begin(), stringVector.end());
return expectedContents == stringVector;
}
diff --git a/shell/qa/zip/testzipimpl.hxx b/shell/qa/zip/testzipimpl.hxx
index ae1ff8cedd72..cdea8b209549 100644
--- a/shell/qa/zip/testzipimpl.hxx
+++ b/shell/qa/zip/testzipimpl.hxx
@@ -26,13 +26,11 @@
#include <algorithm>
#include <sal/types.h>
-using namespace std;
-
class TestZipImpl
{
private:
ZipFile zipFile;
- vector<string> expectedContents;
+ std::vector<std::string> expectedContents;
public:
explicit TestZipImpl(StreamInterface* stream);
diff --git a/solenv/gcc-wrappers/g++.cxx b/solenv/gcc-wrappers/g++.cxx
index 2f99d4606ac7..ae7dcb6be796 100644
--- a/solenv/gcc-wrappers/g++.cxx
+++ b/solenv/gcc-wrappers/g++.cxx
@@ -9,6 +9,8 @@
#include "wrapper.hxx"
+using namespace std;
+
int main(int argc, char* argv[])
{
vector<string> rawargs(argv + 1, argv + argc);
diff --git a/solenv/gcc-wrappers/gcc.cxx b/solenv/gcc-wrappers/gcc.cxx
index 8accb8216a11..a51d64ff39fa 100644
--- a/solenv/gcc-wrappers/gcc.cxx
+++ b/solenv/gcc-wrappers/gcc.cxx
@@ -9,6 +9,8 @@
#include "wrapper.hxx"
+using namespace std;
+
int main(int argc, char* argv[])
{
vector<string> rawargs(argv + 1, argv + argc);
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 22a1b9488212..a03b1dddee90 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -15,6 +15,8 @@
#define BUFLEN 2048
+using namespace std;
+
string getexe(string exename, bool maybeempty) {
char* cmdbuf;
size_t cmdlen;
diff --git a/solenv/gcc-wrappers/wrapper.hxx b/solenv/gcc-wrappers/wrapper.hxx
index 208d9b82c449..e4a4bb3bbeb5 100644
--- a/solenv/gcc-wrappers/wrapper.hxx
+++ b/solenv/gcc-wrappers/wrapper.hxx
@@ -14,15 +14,13 @@
#include <iostream>
#include <vector>
-using namespace std;
-
-string getexe(string exename, bool maybeempty = false);
+std::string getexe(std::string exename, bool maybeempty = false);
void setupccenv();
-string processccargs(vector<string> rawargs, string& env_prefix, bool& verbose);
+std::string processccargs(std::vector<std::string> rawargs, std::string& env_prefix, bool& verbose);
-int startprocess(string command, string args, bool verbose);
+int startprocess(std::string command, std::string args, bool verbose);
#endif // INCLUDED_SOLENV_GCC_WRAPPERS_WRAPPER_HXX
diff --git a/vcl/workben/win/dnd/transferable.hxx b/vcl/workben/win/dnd/transferable.hxx
index fef9cda50635..c1606cab8648 100644
--- a/vcl/workben/win/dnd/transferable.hxx
+++ b/vcl/workben/win/dnd/transferable.hxx
@@ -57,7 +57,6 @@
// namespaces
-using namespace ::std;
using namespace ::cppu;
using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::datatransfer::clipboard;
More information about the Libreoffice-commits
mailing list