From a4ce6914f356f14202965d32b7d1cd8894c0a365 Mon Sep 17 00:00:00 2001
From: Filipe Marques <eagle.software3@gmail.com>
Date: Fri, 6 Mar 2015 15:24:24 +0000
Subject: [PATCH] Adding Camel Case convention
---
src/Mhwd.cpp | 6 +++---
src/Mhwd.hpp | 2 +-
src/Printer.cpp | 6 +++---
src/Printer.hpp | 2 +-
src/main.cpp | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/Mhwd.cpp b/src/Mhwd.cpp
index 0e0e792..d6cfb92 100644
--- a/src/Mhwd.cpp
+++ b/src/Mhwd.cpp
@@ -718,10 +718,10 @@ bool Mhwd::runScript(std::shared_ptr<Config> config, MHWD::TRANSACTIONTYPE opera
}
}
-void Mhwd::set_version_mhwd(std::string version_of_software, std::string year_copyright)
+void Mhwd::setVersionMhwd(std::string versionOfSoftware, std::string yearCopyright)
{
- version_ = version_of_software;
- year_ = year_copyright;
+ version_ = versionOfSoftware;
+ year_ = yearCopyright;
}
void Mhwd::tryToParseCmdLineOptions(int argc, char* argv[], bool& autoConfigureNonFreeDriver,
diff --git a/src/Mhwd.hpp b/src/Mhwd.hpp
index bbac0da..c2344b2 100644
--- a/src/Mhwd.hpp
+++ b/src/Mhwd.hpp
@@ -50,7 +50,7 @@ class Mhwd
public:
Mhwd();
~Mhwd() = default;
- void set_version_mhwd(std::string version_of_software, std::string year_copyright);
+ void setVersionMhwd(std::string versionOfSoftware, std::string yearCopyright);
int launch(int argc, char *argv[]);
private:
diff --git a/src/Printer.cpp b/src/Printer.cpp
index 7778877..3baeed1 100644
--- a/src/Printer.cpp
+++ b/src/Printer.cpp
@@ -100,10 +100,10 @@ void Printer::printHelp() const
<< " --pmroot <path>\t\t\tset package manager root\n" << std::endl;
}
-void Printer::printVersion(std::string version_mhwd, std::string year_copy) const
+void Printer::printVersion(std::string versionMhwd, std::string yearCopy) const
{
- std::cout << "Manjaro Hardware Detection version "<< version_mhwd <<"\n\n"
- << "Copyright (C) "<< year_copy <<" Manjaro Linux Developers\n"
+ std::cout << "Manjaro Hardware Detection version "<< versionMhwd <<"\n\n"
+ << "Copyright (C) "<< yearCopy <<" Manjaro Linux Developers\n"
<< "This is free software licensed under GNU GPL v.3\n"
<< "There is NO warranty; not even for MERCHANTABILITY or \n"
<< "FITNESS FOR A PARTICULAR PURPOSE.\n"
diff --git a/src/Printer.hpp b/src/Printer.hpp
index b987a0e..0cbb172 100644
--- a/src/Printer.hpp
+++ b/src/Printer.hpp
@@ -40,7 +40,7 @@ public:
void printWarning(std::string warningMsg) const;
void printMessage(MHWD::MESSAGETYPE type, std::string str) const;
void printHelp() const;
- void printVersion(std::string version_mhwd, std::string year_copy) const;
+ void printVersion(std::string versionMhwd, std::string yearCopy) const;
void listDevices(const std::vector<std::shared_ptr<Device>>& devices, std::string typeOfDevice) const;
void listConfigs(const std::vector<std::shared_ptr<Config>>& configs,
std::string header) const;
diff --git a/src/main.cpp b/src/main.cpp
index 56aeec1..fdc0b88 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
try
{
Mhwd mhwd;
- mhwd.set_version_mhwd("0.5.1","2012 2013 2014 2015");
+ mhwd.setVersionMhwd("0.5.1","2012 2013 2014 2015");
return mhwd.launch(argc, argv);
}
catch(...)
--
GitLab