Clean up Python features

[modules/gui.git] / src / PyConsole / PyConsole_Interp.h

diff --git a/src/PyConsole/PyConsole_Interp.h b/src/PyConsole/PyConsole_Interp.h
index 14c8404a3847f1d66220154281ef0570ab7d8704..4275c350f6aa590fad518deb6551ec4ea5414ba1 100644 (file)
--- a/src/PyConsole/PyConsole_Interp.h
+++ b/src/PyConsole/PyConsole_Interp.h
@@ -19,19 +19,21 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  File   : PyConsole_Interp.h
-//  Author : Nicolas REJNERI, Adrien BRUNETON
+// File   : PyConsole_Interp.h
+// Author : Nicolas REJNERI (OPEN CASCADE), Adrien BRUNETON (CEA/DEN), Vadim SANDLER (OPEN CASCADE)
 
 #ifndef PYCONSOLE_INTERP_H
 #define PYCONSOLE_INTERP_H
 
 #include "PyConsole.h"
-#include "PyInterp_Interp.h"   /// !!! WARNING !!! THIS INCLUDE MUST BE VERY FIRST !!!
+#include "PyInterp_Interp.h"
 
 #include <QStringList>
 
 class PYCONSOLE_EXPORT PyConsole_Interp : public PyInterp_Interp
 {
+  friend class PyConsole_CompletionCommand;
+
 public:
   PyConsole_Interp();
   ~PyConsole_Interp();
@@ -39,11 +41,9 @@ public:
   virtual int afterRun();
   virtual int beforeRun();
 
-  virtual QStringList getLastMatches() const;
-  virtual QString getDocStr() const;
-
-  virtual int runDirCommand(const QString&, const QString&);
-  virtual void clearCompletion();
+private:
+  bool runDirCommand( const QString&, const QString&, QStringList&, QString& );
+  bool runDirAndExtract( const QString&, const QString&, QStringList&, bool = true ) const;
 };
 
 #endif // PYCONSOLE_INTERP_H