3 files changed, 8 insertions, 23 deletions

diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index 84cab48..c3cacce 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -1,137 +1,126 @@
 /*
                              This file is part of the Opie Project
 
                              Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
 #include <opie2/odebug.h>
 
 #include <signal.h>
 #include <stdio.h>
 
 OApplication* OApplication::_instance = 0;
 
 /**************************************************************************************************/
 /* OApplicationPrivate
 /**************************************************************************************************/
 
 class OApplicationPrivate
 {
   public:
     OApplicationPrivate() {};
     ~OApplicationPrivate() {};
 };
 
 /**************************************************************************************************/
 /* OApplication
 /**************************************************************************************************/
 
 
 OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
-#ifdef QWS
              :QPEApplication( argc, argv ),
-#else
-             :QApplication( argc, argv ),
-#endif
              _appname( rAppName ),
              _config( 0 )
 {
     init();
 }
 
 
 OApplication::~OApplication()
 {
     delete d;
     if ( _config )
         delete _config;
     OApplication::_instance = 0;
     // after deconstruction of the one-and-only application object,
     // the construction of another object is allowed
 }
 
 
 OConfig* OApplication::config()
 {
     if ( !_config )
     {
         _config = new OConfig( _appname );
     }
     return _config;
 }
 
 
 void OApplication::init()
 {
     d = new OApplicationPrivate();
     if ( !OApplication::_instance )
     {
         OApplication::_instance = this;
 
         /* register SIGSEGV handler to give programs an option
          * to exit gracefully, e.g. save or close devices or files.
         struct sigaction sa;
         sa.sa_handler = ( void (*)(int) ) &segv_handler;
         sa.sa_flags = SA_SIGINFO | SA_RESTART;
         sigemptyset(&sa.sa_mask);
         sigaction(SIGSEGV, &sa, NULL);
         */
     }
     else
     {
         qFatal( "OApplication: Can't create more than one OApplication object. Aborting." );
     }
 }
 
 
 void OApplication::showMainWidget( QWidget* widget, bool nomax )
 {
-#ifdef QWS
     QPEApplication::showMainWidget( widget, nomax );
-#else
-// tille: I am quit sure if this is the right way to do..
-    odDebug(nomax,7) << "ignoring nomax";
-    setMainWidget( widget );
-    widget->show();
-#endif
     widget->setCaption( _appname );
 }
 
 
 void OApplication::setTitle( const QString& title ) const
 {
     if ( mainWidget() )
     {
         if ( !title.isNull() )
             mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title );
         else
             mainWidget()->setCaption( _appname );
     }
 }
 
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h
index 3043910..72a659e 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -1,110 +1,105 @@
 /*
                              This file is part of the Opie Project
 
                              Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef OAPPLICATION_H
 #define OAPPLICATION_H
 
 #define oApp OApplication::oApplication()
 
-#ifdef QWS
+
 #include <qpe/qpeapplication.h>
-#else
-#include <qapplication.h>
-#endif
+
 
 class OApplicationPrivate;
 class OConfig;
 
-#ifdef QWS
+
 class OApplication : public QPEApplication
-#else 
-class OApplication : public QApplication
-#endif
 {
   Q_OBJECT
 
   public:
     /**
      * Constructor. Parses command-line arguments and sets the window caption.
      *
      * @param rAppName application name. Will be used for finding the
      * associated message, icon and configuration files
      *
      */
     OApplication( int& argc, char** argv, const QCString& rAppName );
     /**
      * Destructor. Destroys the application object and its children.
      */
     virtual ~OApplication();
     /**
      * @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.
      */
     static OApplication* oApplication() { return _instance; };
     /**
      * Returns the application name as given during creation.
      *
      * @returns a reference to the application name
      */
     const QCString& appName() const { return _appname; };
     /**
      * @returns the application session config object.
      *
      * @see OConfig
      */
     OConfig* config();
     /**
      * 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.
      *
      * @param title the title. If not given, resets caption to appname
      */
     virtual void setTitle( const QString& title = QString::null ) const;
 
   protected:
     void init();
 
   private:
     const QCString _appname;
     static OApplication* _instance;
     OConfig* _config;
     OApplicationPrivate* d;
 };
 
 #endif // OAPPLICATION_H
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index c8a291a..18c6986 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -1,38 +1,39 @@
 TEMPLATE    = lib
 CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
-HEADERS     = oapplication.h            \
-              oconfig.h                 \
+HEADERS     = oconfig.h                 \
               ocompletionbase.h         \
               ocompletion.h             \
               odebug.h                  \
               oglobal.h                 \
               oglobalsettings.h         \
               osortablevaluelist.h
               
-SOURCES     = oapplication.cpp          \
-              oconfig.cpp               \
+SOURCES     = oconfig.cpp               \
               ocompletionbase.cpp       \
               ocompletion.cpp           \
               odebug.cpp                \
               oglobal.cpp               \
               oglobalsettings.cpp      
               
 INTERFACES  =
 TARGET      = opiecore2
 VERSION     = 1.8.1
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 
 
 !contains( platform, x11 ) {
+  HEADERS    += oapplication.h
+  SOURCES    += oapplication.cpp
   LIBS        = -lqpe
   include ( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
+  message( NOT building oapplication for X11 )
   LIBS        = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
 }