| -rw-r--r-- | libopie2/opiecore/oapplication.cpp | 4 | ||||
| -rw-r--r-- | libopie2/opiecore/oapplication.h | 9 | ||||
| -rw-r--r-- | libopie2/opieui/oresource.cpp | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp index 12f33cc..c3cacce 100644 --- a/libopie2/opiecore/oapplication.cpp +++ b/libopie2/opiecore/oapplication.cpp @@ -49,17 +49,17 @@ class OApplicationPrivate }; /**************************************************************************************************/ /* OApplication /**************************************************************************************************/ OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) - :OpieApplication( argc, argv ), + :QPEApplication( argc, argv ), _appname( rAppName ), _config( 0 ) { init(); } OApplication::~OApplication() @@ -103,17 +103,17 @@ void OApplication::init() { qFatal( "OApplication: Can't create more than one OApplication object. Aborting." ); } } void OApplication::showMainWidget( QWidget* widget, bool nomax ) { - OpieApplication::showMainWidget( widget, nomax ); + QPEApplication::showMainWidget( widget, nomax ); widget->setCaption( _appname ); } void OApplication::setTitle( const QString& title ) const { if ( mainWidget() ) { diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index a3f2201..72a659e 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h @@ -29,24 +29,24 @@ */ #ifndef OAPPLICATION_H #define OAPPLICATION_H #define oApp OApplication::oApplication() -#include "opieapplication.h" +#include <qpe/qpeapplication.h> class OApplicationPrivate; class OConfig; -class OApplication : public OpieApplication +class OApplication : public QPEApplication { Q_OBJECT public: /** * Constructor. Parses command-line arguments and sets the window caption. * * @param rAppName application name. Will be used for finding the @@ -87,21 +87,16 @@ class OApplication : public OpieApplication /** * 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; - /** - * see qpeDir() - */ - static QString opieDir() {return qpeDir();}; - protected: void init(); private: const QCString _appname; static OApplication* _instance; OConfig* _config; OApplicationPrivate* d; diff --git a/libopie2/opieui/oresource.cpp b/libopie2/opieui/oresource.cpp index d97307f..03b9d51 100644 --- a/libopie2/opieui/oresource.cpp +++ b/libopie2/opieui/oresource.cpp @@ -36,17 +36,17 @@ #ifdef QWS namespace Resource { QPixmap loadPixmap( const QString& pix ) { QString filename; - filename.sprintf( "%s/%s.png", (const char*) oApp->opieDir(), (const char*) pix ); + filename.sprintf( "%s/%s.png", (const char*) oApp->qpeDir(), (const char*) pix ); QPixmap pixmap( filename ); if ( pixmap.isNull() ) { odebug << "libopie2 resource: can't find pixmap " << filename << oendl;; } return pixmap; }; |