[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] (no subject)
From: |
Greg Chicares |
Subject: |
[lmi-commits] (no subject) |
Date: |
Sat, 4 Jun 2016 23:47:27 +0000 (UTC) |
branch: master
commit 84f49206e5e8765d6d46b39d417ae067cece418e
Author: Vadim Zeitlin <address@hidden>
Date: Sat Jun 4 16:16:34 2016 +0200
Avoid warnings about shadowing wxApp::argc and argv
These warnings, given by MSVC 2015 by default, are harmless, but still
annoying, so get rid of function parameters with the same names as wxApp
class
members and just use the latter ones directly from ProcessCommandLine().
---
skeleton.cpp | 4 ++--
skeleton.hpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/skeleton.cpp b/skeleton.cpp
index f6b9607..6d3600a 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -686,7 +686,7 @@ bool Skeleton::OnInit()
wxLog::SetActiveTarget(new DebugStderrLog);
#endif // defined __WXMSW__
- if(false == ProcessCommandLine(argc, argv))
+ if(false == ProcessCommandLine())
{
return false;
}
@@ -1191,7 +1191,7 @@ void Skeleton::UponWindowTileVertically(wxCommandEvent&)
#endif // !wxCHECK_VERSION(2,6,0)
}
-bool Skeleton::ProcessCommandLine(int argc, char* argv[])
+bool Skeleton::ProcessCommandLine()
{
// TRICKY !! Some long options are aliased to unlikely octal values.
static Option long_options[] =
diff --git a/skeleton.hpp b/skeleton.hpp
index fa89409..148ffcc 100644
--- a/skeleton.hpp
+++ b/skeleton.hpp
@@ -129,7 +129,7 @@ class Skeleton
virtual int OnExit ();
virtual void OnUnhandledException ();
- bool ProcessCommandLine(int argc, char* argv[]);
+ bool ProcessCommandLine();
void OpenCommandLineFiles(std::vector<std::string> const& files);
void UpdateViews();