aboutsummaryrefslogtreecommitdiff
path: root/src/corelib/core/mcomponentdata.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/core/mcomponentdata.h')
-rw-r--r--src/corelib/core/mcomponentdata.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/corelib/core/mcomponentdata.h b/src/corelib/core/mcomponentdata.h
index 589470d8..2207b447 100644
--- a/src/corelib/core/mcomponentdata.h
+++ b/src/corelib/core/mcomponentdata.h
@@ -83,15 +83,29 @@ public:
* an empty string is given (the default) the application binary file
* name is used.
*/
+ // \deprecated Ctor is deprecated for public usage and should be made protected during next API break.
MComponentData(int &argc, char **argv, const QString &appIdentifier = QString(), MApplicationService *service = 0);
explicit MComponentData(MApplicationService *service);
//! Cleans up any window system resources that were allocated by this application.
virtual ~MComponentData();
- //! returns the MComponentData instance
+ //! returns the MComponentData instance or 0 if no instance is created yet
+ /*!
+ * \see createInstance()
+ */
static MComponentData *instance();
+ //! returns the MComponentData instance
+ /*!
+ * always returns a MComponentData pointer
+ * if no instance was created yet, it creates a new instance and returns the pointer
+ * if an instance was already created it returns the pointer to the existing instance
+ * \see instance()
+ */
+ static MComponentData* createInstance(int &argc, char **argv, const QString &appIdentifier = QString(), MApplicationService *service = 0);
+ static MComponentData* createInstance(MApplicationService *service);
+
//! Target device name
static QString deviceName();
//! Software rendering command line option set