Make local functions static

thomasjfox · thomasjfox · commit 1ef1143609e3 · 2015-01-05T01:25:49.000+01:00
diff --git a/gui/main.cpp b/gui/main.cpp
@@ -35,9 +35,9 @@
 #include "translationhandler.h"
 
 
-void ShowUsage();
-void ShowVersion();
-bool CheckArgs(const QStringList &args);
+static void ShowUsage();
+static void ShowVersion();
+static bool CheckArgs(const QStringList &args);
 
 int main(int argc, char *argv[])
 {
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
 
 // Check only arguments needing action before GUI is shown.
 // Rest of the arguments are handled in MainWindow::HandleCLIParams()
-bool CheckArgs(const QStringList &args)
+static bool CheckArgs(const QStringList &args)
 {
     if (args.contains("-h") || args.contains("--help")) {
         ShowUsage();
@@ -95,7 +95,7 @@ bool CheckArgs(const QStringList &args)
     return true;
 }
 
-void ShowUsage()
+static void ShowUsage()
 {
     QString helpMessage = MainWindow::tr(
                               "Cppcheck GUI.\n\n"
@@ -120,7 +120,7 @@ void ShowUsage()
 #endif
 }
 
-void ShowVersion()
+static void ShowVersion()
 {
 #if defined(_WIN32)
     AboutDialog *dlg = new AboutDialog(CppCheck::version(), CppCheck::extraVersion(), 0);
diff --git a/lib/checkio.cpp b/lib/checkio.cpp
@@ -490,7 +490,7 @@ static bool findFormat(unsigned int arg, const Token *firstArg,
 }
 
 // Utility function returning whether iToTest equals iTypename or iOptionalPrefix+iTypename
-inline bool typesMatch(const std::string& iToTest, const std::string& iTypename, const std::string& iOptionalPrefix = "std::")
+static inline bool typesMatch(const std::string& iToTest, const std::string& iTypename, const std::string& iOptionalPrefix = "std::")
 {
     return (iToTest == iTypename) || (iToTest == iOptionalPrefix + iTypename);
 }

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@`
`35`	`35`	`#include "translationhandler.h"`
`36`	`36`
`37`	`37`
`38`		`-void ShowUsage();`
`39`		`-void ShowVersion();`
`40`		`-bool CheckArgs(const QStringList &args);`
	`38`	`+static void ShowUsage();`
	`39`	`+static void ShowVersion();`
	`40`	`+static bool CheckArgs(const QStringList &args);`
`41`	`41`
`42`	`42`	`int main(int argc, char *argv[])`
`43`	`43`	`{`
`@@ -82,7 +82,7 @@ int main(int argc, char *argv[])`
`82`	`82`
`83`	`83`	`// Check only arguments needing action before GUI is shown.`
`84`	`84`	`// Rest of the arguments are handled in MainWindow::HandleCLIParams()`
`85`		`-bool CheckArgs(const QStringList &args)`
	`85`	`+static bool CheckArgs(const QStringList &args)`
`86`	`86`	`{`
`87`	`87`	`if (args.contains("-h") \|\| args.contains("--help")) {`
`88`	`88`	`ShowUsage();`
`@@ -95,7 +95,7 @@ bool CheckArgs(const QStringList &args)`
`95`	`95`	`return true;`
`96`	`96`	`}`
`97`	`97`
`98`		`-void ShowUsage()`
	`98`	`+static void ShowUsage()`
`99`	`99`	`{`
`100`	`100`	`QString helpMessage = MainWindow::tr(`
`101`	`101`	`"Cppcheck GUI.\n\n"`
`@@ -120,7 +120,7 @@ void ShowUsage()`
`120`	`120`	`#endif`
`121`	`121`	`}`
`122`	`122`
`123`		`-void ShowVersion()`
	`123`	`+static void ShowVersion()`
`124`	`124`	`{`
`125`	`125`	`#if defined(_WIN32)`
`126`	`126`	`AboutDialog *dlg = new AboutDialog(CppCheck::version(), CppCheck::extraVersion(), 0);`
Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ static bool findFormat(unsigned int arg, const Token *firstArg,`
`490`	`490`	`}`
`491`	`491`
`492`	`492`	`// Utility function returning whether iToTest equals iTypename or iOptionalPrefix+iTypename`
`493`		`-inline bool typesMatch(const std::string& iToTest, const std::string& iTypename, const std::string& iOptionalPrefix = "std::")`
	`493`	`+static inline bool typesMatch(const std::string& iToTest, const std::string& iTypename, const std::string& iOptionalPrefix = "std::")`
`494`	`494`	`{`
`495`	`495`	`return (iToTest == iTypename) \|\| (iToTest == iOptionalPrefix + iTypename);`
`496`	`496`	`}`