summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-05-01 18:55:39 (UTC)
committer mickeyl <mickeyl>2003-05-01 18:55:39 (UTC)
commit8266da96576ad43a768da37000cef4e8eba000ac (patch) (side-by-side diff)
tree904f07a06eb9e18e650c123bad8e901a5da56bf1
parent95e533a6ac257d3b95cd8905660008fb7dcd33f1 (diff)
downloadopie-8266da96576ad43a768da37000cef4e8eba000ac.zip
opie-8266da96576ad43a768da37000cef4e8eba000ac.tar.gz
opie-8266da96576ad43a768da37000cef4e8eba000ac.tar.bz2
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 :-)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oapplication.cpp13
-rw-r--r--libopie2/opiecore/oapplication.h116
2 files changed, 43 insertions, 86 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
@@ -29,96 +29,85 @@
*/
#include <opie2/oapplication.h>
#include <opie2/oconfig.h>
OApplication* OApplication::_instance = 0;
/**************************************************************************************************/
/* OApplicationPrivate
/**************************************************************************************************/
class OApplicationPrivate
{
public:
OApplicationPrivate() {};
~OApplicationPrivate() {};
};
/**************************************************************************************************/
/* OApplication
/**************************************************************************************************/
OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
- :OApplicationBaseClass( argc, argv ),
+ :QPEApplication( argc, argv ),
_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;
}
else
{
qFatal( "OApplication: Can't create more than one OApplication object. Aborting." );
}
}
-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 );
}
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 8326847..94ac488 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -12,123 +12,91 @@
 - .   .-<_>     .<> 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()
-// 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
+#include <qpe/qpeapplication.h>
class OApplicationPrivate;
class OConfig;
-class OApplication: public OApplicationBaseClass
+class OApplication: public QPEApplication
{
-// Q_OBJECT would fail -zecke
+ 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
- *
- */
+ /**
+ * 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.
- */
+ /**
+ * Destructor. Destroys the application object and its children.
+ */
virtual ~OApplication();
-
- /**
- * Returns the current 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
- */
+ /**
+ * @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 const OApplication* oApplication() { return _instance; };
-
- /**
- * Returns the application name as given during creation.
- *
- * @return A reference to the application name
- */
+ /**
+ * 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.
- *
- * @return A pointer to the application's instance specific
- * @ref OConfig object.
- * @see OConfig
- */
+ /**
+ * @returns the application session config 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.
- *
- * @param title the title. If not given, resets caption to appname
- */
+ /**
+ * 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;
- //virtual void setTitle() const;
protected:
void init();
private:
const QCString _appname;
static OApplication* _instance;
OConfig* _config;
OApplicationPrivate* d;
};
#endif // OAPPLICATION_H