Commit a0324571 authored by Jan Möbius's avatar Jan Möbius
Browse files

Extra abstraction for argc argv

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@2599 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 80e32c95
...@@ -155,8 +155,8 @@ void segfaultHandling (int) { ...@@ -155,8 +155,8 @@ void segfaultHandling (int) {
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
OpenFlipper::Options::argc(argc); OpenFlipper::Options::argc(&argc);
OpenFlipper::Options::argv(argv); OpenFlipper::Options::argv(&argv);
// Only Install signal handler if not running in debug version, otherwise gdb will get confused // Only Install signal handler if not running in debug version, otherwise gdb will get confused
#ifndef DEBUG #ifndef DEBUG
......
...@@ -120,9 +120,9 @@ static bool enableBackup_ = true; ...@@ -120,9 +120,9 @@ static bool enableBackup_ = true;
/// Currently opening an ini file? /// Currently opening an ini file?
static bool openingIni_ = false; static bool openingIni_ = false;
static int argc_; static int* argc_;
static char ** argv_; static char *** argv_;
# if __WORDSIZE == 64 # if __WORDSIZE == 64
const bool is64 = true; const bool is64 = true;
...@@ -421,19 +421,19 @@ void openingIni(bool _openingIni ) { ...@@ -421,19 +421,19 @@ void openingIni(bool _openingIni ) {
openingIni_ = _openingIni; openingIni_ = _openingIni;
} }
int argc() { int* argc() {
return argc_; return argc_;
} }
char ** argv() { char *** argv() {
return argv_; return argv_;
} }
void argc( int _argc ) { void argc( int* _argc ) {
argc_ = _argc; argc_ = _argc;
} }
void argv( char** _argv) { void argv( char*** _argv) {
argv_ = _argv; argv_ = _argv;
} }
......
...@@ -433,19 +433,19 @@ bool iconDir(QString _dir); ...@@ -433,19 +433,19 @@ bool iconDir(QString _dir);
/// Get the argc parameter from the main application /// Get the argc parameter from the main application
DLLEXPORT DLLEXPORT
int argc(); int* argc();
/// Get the argv parameter from the main application /// Get the argv parameter from the main application
DLLEXPORT DLLEXPORT
char ** argv(); char *** argv();
/// Set the argc parameter from the main application ( Dont use it, only called from Core!!) /// Set the argc parameter from the main application ( Dont use it, only called from Core!!)
DLLEXPORT DLLEXPORT
void argc( int _argc ); void argc( int* _argc );
/// Set the argv parameter from the main application ( Dont use it, only called from Core!!) /// Set the argv parameter from the main application ( Dont use it, only called from Core!!)
DLLEXPORT DLLEXPORT
void argv( char** _argv); void argv( char*** _argv);
/** @} */ /** @} */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment