Rolling back previous integration from KALLISTO team (virtual initialize() method...

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 2a150abccfe997e64ebad972702a703832e7ee32..555cdd9f8f7eb77ab9cad29c87c603fbe29ee901 100755 (executable)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -91,18 +91,18 @@ CAM_Application::~CAM_Application()
 }
 
 /*! 
-  \brief Initializes an application.
+  \brief Start an application.
 
   Load all modules, if "auto loading" flag has been set to \c true.
 
   \sa CAM_Application()
 */
-void CAM_Application::initialize()
+void CAM_Application::start()
 {
-  STD_Application::initialize();
-
   if ( myAutoLoad )
     loadModules();
+
+  STD_Application::start();
 }
 
 /*!

diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h
index 3313c5a4d921282e8963bd8abb1b698b0f694ebf..e04876078828f40beca4e04cd631d960e0f7a3ea 100755 (executable)
--- a/src/CAM/CAM_Application.h
+++ b/src/CAM/CAM_Application.h
@@ -45,6 +45,8 @@ public:
   CAM_Application( const bool = true );
   virtual ~CAM_Application();
 
+  virtual void        start();
+
   CAM_Module*         activeModule() const;
   CAM_Module*         module( const QString& ) const;
 
@@ -68,7 +70,6 @@ public:
   virtual void        createEmptyStudy();
 
 protected:
-  virtual void        initialize();  
   virtual SUIT_Study* createNewStudy();
   virtual void        updateCommandsStatus();
 

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index 1b32120880d02005b1acada3302c8f89e3d5cd53..645206233ccd2389f0f4800c81f2e3bd7ea84e4e 100755 (executable)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -78,11 +78,9 @@ QString STD_Application::applicationName() const
   return QString( "StdApplication" );
 }
 
-/*!Prepare STD_Application*/
-void STD_Application::initialize()
+/*!Start STD_Application*/
+void STD_Application::start()
 {
-  SUIT_Application::initialize();
-  
   createActions();
 
   updateDesktopTitle();
@@ -90,15 +88,7 @@ void STD_Application::initialize()
   setEditEnabled( myEditEnabled );
 
   loadPreferences();
-}
 
-/*!Start STD_Application*/
-void STD_Application::start()
-{
-  // san: Need this simple implementation, as some applications
-  // call STD_Application::start() explicitly
-  // so we need to provide at least some implementation at this level
-  // to avoid link errors
   SUIT_Application::start();
 }
 

diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h
index 3db33af3f2fe78dd9b967573ba0bc9b32fa4df09..5c12b4b65a4a38c569e495d7faec744113c52b58 100755 (executable)
--- a/src/STD/STD_Application.h
+++ b/src/STD/STD_Application.h
@@ -141,7 +141,6 @@ protected:
   enum { CloseCancel, CloseSave, CloseDiscard };
 
 protected:
-  virtual void          initialize();  
   virtual void          createActions();
   virtual void          updateCommandsStatus();
 

diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx
index c9d410ac1f63d32c4dbc1ee80fdaa77a62d028dd..ead59e4c4205280b7d1aacc51b1b6ac3be421fab 100755 (executable)
--- a/src/SUIT/SUIT_Application.cxx
+++ b/src/SUIT/SUIT_Application.cxx
@@ -117,19 +117,10 @@ QString SUIT_Application::applicationVersion() const
 */
 void SUIT_Application::start()
 {
-  initialize();
-  
   if ( desktop() )
     desktop()->show();
 }
 
-/*!
-  Prepares the contents of the application's main widget, does nothing by default.
-*/
-void SUIT_Application::initialize()
-{
-}
-
 /*!
   Opens document into active Study. If Study is empty - creates it.
   \param theFileName - name of document file

diff --git a/src/SUIT/SUIT_Application.h b/src/SUIT/SUIT_Application.h
index 6fb1b891774b922ab9f94c1d48086799099643d2..f20dc56330d901e26552e2e12a4dd84c2e3df7f6 100755 (executable)
--- a/src/SUIT/SUIT_Application.h
+++ b/src/SUIT/SUIT_Application.h
@@ -124,9 +124,6 @@ protected:
   //! Creates a new Study instance. Must be redefined in new application according to its Study type.
   virtual SUIT_Study*   createNewStudy();
   virtual void          setActiveStudy( SUIT_Study* );
-
-  //! Prepares the contents of the application's main widget, does nothing by default.
-  virtual void          initialize();  
   
   /** @name Create tool functions*/ //@{
   int                   createTool( const QString& );