Remove unnecessary std:: qualifiers

diff --git a/source/graphics/bmploader.cpp b/source/graphics/bmploader.cpp
index b85cce16b1d28392e1b4ad72c2b9724204405c2c..eb069a11dceea856174040ecf29427cbd36028f9 100644 (file)
--- a/source/graphics/bmploader.cpp
+++ b/source/graphics/bmploader.cpp
@@ -36,7 +36,7 @@ BmpLoader::BmpLoader(IO::Base &i, unsigned sb):
                throw invalid_argument("BmpLoader::BmpLoader");
 }
 
-bool BmpLoader::detect(const std::string &sig)
+bool BmpLoader::detect(const string &sig)
 {
        static const char bmp_sig[] = { 'B', 'M' };
        if(sig.size()<sizeof(bmp_sig))

diff --git a/source/graphics/devil/devilloader.cpp b/source/graphics/devil/devilloader.cpp
index 34e37ceeacefd865288622ed00d1532679ca74d6..8fbf59ccbee6150a44259437ac3f2fc78be5f02d 100644 (file)
--- a/source/graphics/devil/devilloader.cpp
+++ b/source/graphics/devil/devilloader.cpp
@@ -54,7 +54,7 @@ int tell(void *handle)
        return reinterpret_cast<Msp::IO::Seekable *>(handle)->tell();
 }
 
-std::string error_string(ILenum err)
+string error_string(ILenum err)
 {
        switch(err)
        {

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index fe88f4034f049cdc4b2f072938f9b6549d75d6f2..6a3196c91c94071850663b0522a830e24026dd05 100644 (file)
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -27,7 +27,7 @@ ImageLoader::~ImageLoader()
        delete source;
 }
 
-bool ImageLoader::detect_signature(const std::string &sig)
+bool ImageLoader::detect_signature(const string &sig)
 {
        Registry &registry = get_registry();
        for(const RegisterBase *r: registry.loaders)

diff --git a/source/graphics/png/pngloader.cpp b/source/graphics/png/pngloader.cpp
index 850bbf01c2162ae92306762a96d84bcbe626d30f..7842c1864a60c69072906be62f3957c19a6171cb 100644 (file)
--- a/source/graphics/png/pngloader.cpp
+++ b/source/graphics/png/pngloader.cpp
@@ -50,7 +50,7 @@ PngLoader::~PngLoader()
        delete priv;
 }
 
-bool PngLoader::detect(const std::string &sig)
+bool PngLoader::detect(const string &sig)
 {
        return !png_sig_cmp(reinterpret_cast<png_byte *>(const_cast<char*>(sig.data())), 0, sig.size());
 }

diff --git a/source/graphics/vkxlib/vulkancontext.cpp b/source/graphics/vkxlib/vulkancontext.cpp
index 439ece68a7d8643134b8e45288cacf0ad6f1e5ef..7026e3007aa738fb3284b418fed75002f43959c6 100644 (file)
--- a/source/graphics/vkxlib/vulkancontext.cpp
+++ b/source/graphics/vkxlib/vulkancontext.cpp
@@ -233,7 +233,7 @@ VulkanContext::~VulkanContext()
        delete priv;
 }
 
-void (*VulkanContext::_get_function(const std::string &name) const)()
+void (*VulkanContext::_get_function(const string &name) const)()
 {
        return vkGetInstanceProcAddr(priv->instance, name.c_str());
 }

diff --git a/source/graphics/vulkancontext.cpp b/source/graphics/vulkancontext.cpp
index b279c94f521eefea133a66572f480f56d9d827f3..5b2831aae3631080ae89716ab454e9368a6b3a51 100644 (file)
--- a/source/graphics/vulkancontext.cpp
+++ b/source/graphics/vulkancontext.cpp
@@ -26,7 +26,7 @@ void VulkanContext::platform_init(const VulkanOptions &)
 VulkanContext::~VulkanContext()
 { }
 
-void (*VulkanContext::_get_function(const std::string &) const)()
+void (*VulkanContext::_get_function(const string &) const)()
 {
        return 0;
 }

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 9e82627fce095289383efd30e31db52e6812f13f..edc6a12a0d48e2bd433e467a084b7c4ff689cdc6 100644 (file)
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -14,7 +14,7 @@ using namespace std;
 namespace {
 
 bool error_flag = false;
-std::string error_msg;
+string error_msg;
 
 int x_error_handler(Display *display, XErrorEvent *event)
 {

diff --git a/source/input/control.cpp b/source/input/control.cpp
index 17436a8ecbe761c45c025030ecb3dad6afbb21f2..2bb4104cbc83539352039fec982aff163c0c98ff 100644 (file)
--- a/source/input/control.cpp
+++ b/source/input/control.cpp
@@ -15,7 +15,7 @@ ControlSource::ControlSource(Device &d, ControlSrcType t, unsigned i):
        index(i)
 { }
 
-std::string ControlSource::str() const
+string ControlSource::str() const
 {
        if(type==BUTTON)
                return dev->get_button_name(index);

diff --git a/source/input/device.cpp b/source/input/device.cpp
index 87102f6513453e84a07bf362e8513e35c032c5ea..4aa8ce6b20fb0910d5d15e144de8d0d33a03b336 100644 (file)
--- a/source/input/device.cpp
+++ b/source/input/device.cpp
@@ -39,12 +39,12 @@ float Device::get_axis_value(unsigned axis) const
        return axes[axis];
 }
 
-std::string Device::get_button_name(unsigned btn) const
+string Device::get_button_name(unsigned btn) const
 {
        return format("Button %d", btn);
 }
 
-std::string Device::get_axis_name(unsigned axis) const
+string Device::get_axis_name(unsigned axis) const
 {
        return format("Axis %d", axis);
 }

diff --git a/source/input/hub.cpp b/source/input/hub.cpp
index 532512267a10f7ce4041921f49d12d76e058fad3..e7eb0fc115581a1400e603640103e57b620c5d0c 100644 (file)
--- a/source/input/hub.cpp
+++ b/source/input/hub.cpp
@@ -47,7 +47,7 @@ Device *Hub::find_subdevice(const string &n)
        return 0;
 }
 
-std::string Hub::get_button_name(unsigned btn) const
+string Hub::get_button_name(unsigned btn) const
 {
        unsigned dev_index = btn>>8;
        if(dev_index>=devices.size())
@@ -57,7 +57,7 @@ std::string Hub::get_button_name(unsigned btn) const
        return dev.get_name()+": "+dev.get_button_name(btn&0xFF);
 }
 
-std::string Hub::get_axis_name(unsigned axis) const
+string Hub::get_axis_name(unsigned axis) const
 {
        unsigned dev_index = axis>>8;
        if(dev_index>=devices.size())