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
@@ -55,5 +55,5 @@ class OApplicationPrivate
 
 OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
-             :OpieApplication( argc, argv ),
+             :QPEApplication( argc, argv ),
              _appname( rAppName ),
              _config( 0 )
@@ -109,5 +109,5 @@ void OApplication::init()
 void OApplication::showMainWidget( QWidget* widget, bool nomax )
 {
-    OpieApplication::showMainWidget( widget, nomax );
+    QPEApplication::showMainWidget( widget, nomax );
     widget->setCaption( _appname );
 }
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
@@ -35,5 +35,5 @@
 
 
-#include "opieapplication.h"
+#include <qpe/qpeapplication.h>
 
 
@@ -42,5 +42,5 @@ class OConfig;
 
 
-class OApplication : public OpieApplication
+class OApplication : public QPEApplication
 {
   Q_OBJECT
@@ -93,9 +93,4 @@ class OApplication : public OpieApplication
     virtual void setTitle( const QString& title = QString::null ) const;
 
-    /**
-     * see qpeDir()
-     */
-    static QString opieDir() {return qpeDir();};
-
   protected:
     void init();
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
@@ -42,5 +42,5 @@ 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() )