[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [okteta/frameworks] program: Do not crash on OS X
From:       Harald Fernengel <harry () kdevelop ! org>
Date:       2014-03-19 10:23:02
Message-ID: E1WQDeI-0006qY-G4 () scm ! kde ! org
[Download RAW message or body]

Git commit 592f275d296abcfaa98bfa981f4eeec663c64330 by Harald Fernengel.
Committed on 19/03/2014 at 10:22.
Pushed by harald into branch 'frameworks'.

Do not crash on OS X

QApplication expects a reference to argc, passing a temporary leads
to a crash later on

M  +1    -1    program/program.cpp
M  +1    -1    program/program.h

http://commits.kde.org/okteta/592f275d296abcfaa98bfa981f4eeec663c64330

diff --git a/program/program.cpp b/program/program.cpp
index c72f377..3455089 100644
--- a/program/program.cpp
+++ b/program/program.cpp
@@ -60,7 +60,7 @@ namespace Kasten
 // static const char OffsetOptionId[] = "offset";
 // static const char OffsetOptionShortId[] = "o";
 
-OktetaProgram::OktetaProgram( int argc, char* argv[] )
+OktetaProgram::OktetaProgram( int &argc, char* argv[] )
   : mApp( argc, argv )
 {
 #ifndef QT_NO_DEBUG
diff --git a/program/program.h b/program/program.h
index 54a49d4..c97e2a4 100644
--- a/program/program.h
+++ b/program/program.h
@@ -41,7 +41,7 @@ class ByteArrayViewProfileManager;
 class OktetaProgram
 {
   public:
-    OktetaProgram( int argc, char* argv[] );
+    OktetaProgram( int &argc, char* argv[] );
     ~OktetaProgram();
 
   public:
[prev in list] [next in list] [prev in thread] [next in thread]