summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oapplication.cpp4
-rw-r--r--libopie2/opiecore/oapplication.h9
-rw-r--r--libopie2/opieui/oresource.cpp2
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
@@ -53,9 +53,9 @@ class OApplicationPrivate
53/**************************************************************************************************/ 53/**************************************************************************************************/
54 54
55 55
56OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) 56OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
57 :OpieApplication( argc, argv ), 57 :QPEApplication( argc, argv ),
58 _appname( rAppName ), 58 _appname( rAppName ),
59 _config( 0 ) 59 _config( 0 )
60{ 60{
61 init(); 61 init();
@@ -107,9 +107,9 @@ void OApplication::init()
107 107
108 108
109void OApplication::showMainWidget( QWidget* widget, bool nomax ) 109void OApplication::showMainWidget( QWidget* widget, bool nomax )
110{ 110{
111 OpieApplication::showMainWidget( widget, nomax ); 111 QPEApplication::showMainWidget( widget, nomax );
112 widget->setCaption( _appname ); 112 widget->setCaption( _appname );
113} 113}
114 114
115 115
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
@@ -33,16 +33,16 @@
33 33
34#define oApp OApplication::oApplication() 34#define oApp OApplication::oApplication()
35 35
36 36
37#include "opieapplication.h" 37#include <qpe/qpeapplication.h>
38 38
39 39
40class OApplicationPrivate; 40class OApplicationPrivate;
41class OConfig; 41class OConfig;
42 42
43 43
44class OApplication : public OpieApplication 44class OApplication : public QPEApplication
45{ 45{
46 Q_OBJECT 46 Q_OBJECT
47 47
48 public: 48 public:
@@ -91,13 +91,8 @@ class OApplication : public OpieApplication
91 * @param title the title. If not given, resets caption to appname 91 * @param title the title. If not given, resets caption to appname
92 */ 92 */
93 virtual void setTitle( const QString& title = QString::null ) const; 93 virtual void setTitle( const QString& title = QString::null ) const;
94 94
95 /**
96 * see qpeDir()
97 */
98 static QString opieDir() {return qpeDir();};
99
100 protected: 95 protected:
101 void init(); 96 void init();
102 97
103 private: 98 private:
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
@@ -40,9 +40,9 @@ namespace Resource
40 40
41QPixmap loadPixmap( const QString& pix ) 41QPixmap loadPixmap( const QString& pix )
42{ 42{
43 QString filename; 43 QString filename;
44 filename.sprintf( "%s/%s.png", (const char*) oApp->opieDir(), (const char*) pix ); 44 filename.sprintf( "%s/%s.png", (const char*) oApp->qpeDir(), (const char*) pix );
45 QPixmap pixmap( filename ); 45 QPixmap pixmap( filename );
46 if ( pixmap.isNull() ) 46 if ( pixmap.isNull() )
47 { 47 {
48 odebug << "libopie2 resource: can't find pixmap " << filename << oendl;; 48 odebug << "libopie2 resource: can't find pixmap " << filename << oendl;;