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
@@ -51,13 +51,13 @@ class OApplicationPrivate
 /**************************************************************************************************/
 /* OApplication
 /**************************************************************************************************/
 
 
 OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
-             :OpieApplication( argc, argv ),
+             :QPEApplication( argc, argv ),
              _appname( rAppName ),
              _config( 0 )
 {
     init();
 }
 
@@ -105,13 +105,13 @@ void OApplication::init()
     }
 }
 
 
 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
 {
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
@@ -31,20 +31,20 @@
 #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.
@@ -89,17 +89,12 @@ class OApplication : public OpieApplication
      * 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;
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
@@ -38,13 +38,13 @@
 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;