author | tille <tille> | 2003-09-03 15:49:02 (UTC) |
---|---|---|
committer | tille <tille> | 2003-09-03 15:49:02 (UTC) |
commit | 9bcca67b731d0cf3c10092ec31234d5d03cef5cd (patch) (side-by-side diff) | |
tree | 5f19d096cf0def032215201f725594f46436a850 /libopie2/opiecore | |
parent | fa6baf2326a520cde75f1178bab51c9fc3f6cec3 (diff) | |
download | opie-9bcca67b731d0cf3c10092ec31234d5d03cef5cd.zip opie-9bcca67b731d0cf3c10092ec31234d5d03cef5cd.tar.gz opie-9bcca67b731d0cf3c10092ec31234d5d03cef5cd.tar.bz2 |
more compatibility stuff
-rw-r--r-- | libopie2/opiecore/oapplication.h | 5 | ||||
-rw-r--r-- | libopie2/opiecore/opieapplication.cpp | 22 | ||||
-rw-r--r-- | libopie2/opiecore/opieapplication.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/opieconfig.h | 3 |
4 files changed, 31 insertions, 1 deletions
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index da5b905..a3f2201 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h @@ -94,2 +94,7 @@ class OApplication : public OpieApplication + /** + * see qpeDir() + */ + static QString opieDir() {return qpeDir();}; + protected: diff --git a/libopie2/opiecore/opieapplication.cpp b/libopie2/opiecore/opieapplication.cpp index 7ff7b44..ae27b25 100644 --- a/libopie2/opiecore/opieapplication.cpp +++ b/libopie2/opiecore/opieapplication.cpp @@ -30,2 +30,3 @@ +#include <opie2/odebug.h> @@ -44,2 +45,3 @@ void OpieApplication::showMainWidget( QWidget* widget, bool nomax ) { + if (nomax) odebug << "ignoring nomax"; setMainWidget( widget ); @@ -48 +50,21 @@ void OpieApplication::showMainWidget( QWidget* widget, bool nomax ) #endif + +#ifndef QWS +QString OpieApplication::qpeDir() +{ + const char * base = getenv( "OPIEDIR" ); + if ( base ) + return QString( base ) + "/"; + + return QString( "../" ); +} +#endif + + +#ifndef QWS +void OpieApplication::showMainDocumentWidget( QWidget* widget, bool nomax) +{ + showMainWidget(widget,nomax); +} +#endif + diff --git a/libopie2/opiecore/opieapplication.h b/libopie2/opiecore/opieapplication.h index a864ee9..29e2e9d 100644 --- a/libopie2/opiecore/opieapplication.h +++ b/libopie2/opiecore/opieapplication.h @@ -51,2 +51,4 @@ class OpieApplication void showMainWidget( QWidget* widget, bool nomax=false ); + void showMainDocumentWidget( QWidget* widget, bool nomax=false ); + static QString qpeDir(); #endif diff --git a/libopie2/opiecore/opieconfig.h b/libopie2/opiecore/opieconfig.h index 011ac86..e3eaec0 100644 --- a/libopie2/opiecore/opieconfig.h +++ b/libopie2/opiecore/opieconfig.h @@ -57,3 +57,4 @@ class OpieConfig void setGroup( const QString& key); - bool hasKey ( const QString & key ) const; + bool hasKey ( const QString & key ) const; + void write() {}; // FIXME: did not find the docu... what shall I do here? #endif |