Diffstat (limited to 'libopie2/opiecore/oapplication.h') (more/less context) (show whitespace changes)
| -rw-r--r-- | libopie2/opiecore/oapplication.h | 46 |
1 files changed, 7 insertions, 39 deletions
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index 8326847..94ac488 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h @@ -35,12 +35,3 @@ -// the below stuff will fail with moc because moc does not pre process headers -// This will make usage of signal and slots hard inside QPEApplication -zecke - -#ifdef QWS #include <qpe/qpeapplication.h> - #define OApplicationBaseClass QPEApplication -#else - #include <qapplication.h> - #define OApplicationBaseClass QApplication -#endif @@ -49,7 +40,7 @@ class OConfig; -class OApplication: public OApplicationBaseClass +class OApplication: public QPEApplication { -// Q_OBJECT would fail -zecke - public: + Q_OBJECT + public: /** @@ -66,5 +57,4 @@ class OApplication: public OApplicationBaseClass virtual ~OApplication(); - /** - * Returns the current application object. + * @returns the process-wide application object * @@ -75,7 +65,4 @@ class OApplication: public OApplicationBaseClass * to every function that may require it. - * - * @return the current application object */ static const OApplication* oApplication() { return _instance; }; - /** @@ -83,11 +70,8 @@ class OApplication: public OApplicationBaseClass * - * @return A reference to the application name + * @returns a reference to the application name */ const QCString& appName() const { return _appname; }; - /** - * Returns the application session config object. + * @returns the application session config object. * - * @return A pointer to the application's instance specific - * @ref OConfig object. * @see OConfig @@ -95,21 +79,6 @@ class OApplication: public OApplicationBaseClass OConfig* config(); - /** - * Sets the main widget - reimplemented to call showMainWidget() - * on Qt/Embedded. - * - * @param mainWidget the widget to become the main widget - * @see QWidget object - */ - virtual void setMainWidget( QWidget *mainWidget ); - - /** - * Shows the main widget - reimplemented to call setMainWidget() - * on platforms other than Qt/Embedded. - * - * @param mainWidget the widget to become the main widget - * @see QWidget object + * Shows the main @a widget and sets the name of the application as window caption. */ virtual void showMainWidget( QWidget* widget, bool nomax = false ); - /** @@ -121,3 +90,2 @@ class OApplication: public OApplicationBaseClass virtual void setTitle( const QString& title = QString::null ) const; - //virtual void setTitle() const; |