Merge branch 'master' into pre/V8_2_BR

[modules/gui.git] / tools / PyConsole / src / PyConsole_Editor.h

diff --git a/tools/PyConsole/src/PyConsole_Editor.h b/tools/PyConsole/src/PyConsole_Editor.h
index 01c35c92ec1d0a8c3d69757c924cebb6044558a1..cdf7078c79fb3b468fd320093dd44bc687762d31 100644 (file)
--- a/tools/PyConsole/src/PyConsole_Editor.h
+++ b/tools/PyConsole/src/PyConsole_Editor.h
@@ -27,6 +27,8 @@
 
 #include "PyConsole.h"
 
+#include "PyInterp_RefCounterObj.h"
+
 #include <QTextEdit>
 #include <QQueue>
 
@@ -96,7 +98,7 @@ protected:
   virtual QString getLogFileName();
 
 private:
-  void           init( PyConsole_Interp* );
+  void           init();
 
   void           multilinePaste( const QString& );
   void           multiLineProcessNextLine();
@@ -115,25 +117,25 @@ private:
   QString        banner() const;
   inline int     promptSize() const { return myPrompt.size(); }
 
-  PyConsole_Interp* myInterp;           //!< python interpreter
-  QString           myCommandBuffer;    //!< python command buffer
-  QString           myCurrentCommand;   //!< currently being printed command
-  QString           myPrompt;           //!< current command line prompt
-  int               myCmdInHistory;     //!< current history command index
-  QString           myLogFile;          //!< current output log
-  QStringList       myHistory;          //!< commands history buffer
-  QEventLoop*       myEventLoop;        //!< internal event loop
-  bool              myShowBanner;       //!< 'show banner' flag
-  QStringList       myQueue;            //!< python commands queue
-  bool              myIsSync;           //!< synchronous mode flag
-  bool              myIsSuppressOutput; //!< suppress output flag
-  bool              myMultiLinePaste;   //!< true when pasting several lines
-  QQueue<QString>   myMultiLineContent; //!< queue of lines being pasted
-  bool              myAutoCompletion;   //!< auto-completion mode flag
-  bool              myTabMode;          //!< flag that is \c true when editor performs completion
-  QString           myComplBeforePoint; //!< string on which the dir() command is executed
-  QString           myComplAfterPoint;  //!< string on which the results of the dir() are matched
-  int               myComplCursorPos;   //!< cursor position when <TAB> is hit
+  PyInterp_Auto<PyConsole_Interp> myInterp;           //!< python interpreter
+  QString                         myCommandBuffer;    //!< python command buffer
+  QString                         myCurrentCommand;   //!< currently being printed command
+  QString                         myPrompt;           //!< current command line prompt
+  int                             myCmdInHistory;     //!< current history command index
+  QString                         myLogFile;          //!< current output log
+  QStringList                     myHistory;          //!< commands history buffer
+  QEventLoop*                     myEventLoop;        //!< internal event loop
+  bool                            myShowBanner;       //!< 'show banner' flag
+  QStringList                     myQueue;            //!< python commands queue
+  bool                            myIsSync;           //!< synchronous mode flag
+  bool                            myIsSuppressOutput; //!< suppress output flag
+  bool                            myMultiLinePaste;   //!< true when pasting several lines
+  QQueue<QString>                 myMultiLineContent; //!< queue of lines being pasted
+  bool                            myAutoCompletion;   //!< auto-completion mode flag
+  bool                            myTabMode;          //!< flag that is \c true when editor performs completion
+  QString                         myComplBeforePoint; //!< string on which the dir() command is executed
+  QString                         myComplAfterPoint;  //!< string on which the results of the dir() are matched
+  int                             myComplCursorPos;   //!< cursor position when <TAB> is hit
 
   friend void PyConsole_CallbackStdout( void*, char* );
   friend void PyConsole_CallbackStderr( void*, char* );