remove stupid approach to encapsulate X11/Embedded differences into OApplication

thanks to zecke reminding me (once again) that moc does not preprocess...
if I ever forget it again, I owe you a beer :-)

2 files changed, 8 insertions, 51 deletions

diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index ce26420..7a6c174 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -50,7 +50,7 @@ class OApplicationPrivate
 
 
 OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
-             :OApplicationBaseClass( argc, argv ),
+             :QPEApplication( argc, argv ),
              _appname( rAppName ),
              _config( 0 )
 {
@@ -93,20 +93,9 @@ void OApplication::init()
 }
 
 
-void OApplication::setMainWidget( QWidget* widget )
-{
-    showMainWidget( widget );
-}
-
-
 void OApplication::showMainWidget( QWidget* widget, bool nomax )
 {
-    #ifdef Q_WS_QWS
     QPEApplication::showMainWidget( widget, nomax );
-    #else
-    QApplication::setMainWidget( widget );
-    widget->show();
-    #endif
     widget->setCaption( _appname );
 }
 
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
@@ -33,25 +33,16 @@
 
 #define oApp OApplication::oApplication()
 
-// 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
 
 class OApplicationPrivate;
 class OConfig;
 
-class OApplication: public OApplicationBaseClass
+class OApplication: public QPEApplication
 {
-// Q_OBJECT would fail -zecke 
-  public:
+  Q_OBJECT
 
+  public:
    /**
     * Constructor. Parses command-line arguments and sets the window caption.
     *
@@ -64,54 +55,32 @@ class OApplication: public OApplicationBaseClass
     * Destructor. Destroys the application object and its children.
     */
     virtual ~OApplication();
-
    /**
-    * Returns the current application object.
+     * @returns the process-wide application object
     *
     * This is similar to the global @ref QApplication pointer qApp. It
     * allows access to the single global OApplication object, since
     * more than one cannot be created in the same application. It
     * saves you the trouble of having to pass the pointer explicitly
     * to every function that may require it.
-    *
-    * @return the current application object
     */
     static const OApplication* oApplication() { return _instance; };
-
    /**
     * Returns the application name as given during creation.
     *
-    * @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
     */
     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 );
-
    /**
     * Set the application title. The application title will be concatenated
     * to the application name given in the constructor.
@@ -119,7 +88,6 @@ class OApplication: public OApplicationBaseClass
     * @param title the title. If not given, resets caption to appname
     */
     virtual void setTitle( const QString& title = QString::null ) const;
-    //virtual void setTitle() const;
 
   protected:
     void init();