author | mickeyl <mickeyl> | 2003-12-02 15:29:06 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-02 15:29:06 (UTC) |
commit | e215d4b2bc542b557913ba3dcd57fd20a5a2a0fe (patch) (unidiff) | |
tree | 8bb36647649cebf7c204ce58adcb820f4f0c19d6 /libopie2 | |
parent | 7a7683d435cfbb4fa2d6ed99fd4a94d388402aec (diff) | |
download | opie-e215d4b2bc542b557913ba3dcd57fd20a5a2a0fe.zip opie-e215d4b2bc542b557913ba3dcd57fd20a5a2a0fe.tar.gz opie-e215d4b2bc542b557913ba3dcd57fd20a5a2a0fe.tar.bz2 |
revert the changes approaching to compile libopie2 under X11
it broke signals and slots and has to be done like zecke did it with libqpe
-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 | |||
@@ -56,3 +56,3 @@ class OApplicationPrivate | |||
56 | OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) | 56 | OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) |
57 | :OpieApplication( argc, argv ), | 57 | :QPEApplication( argc, argv ), |
58 | _appname( rAppName ), | 58 | _appname( rAppName ), |
@@ -110,3 +110,3 @@ void 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 ); |
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 | |||
@@ -36,3 +36,3 @@ | |||
36 | 36 | ||
37 | #include "opieapplication.h" | 37 | #include <qpe/qpeapplication.h> |
38 | 38 | ||
@@ -43,3 +43,3 @@ class OConfig; | |||
43 | 43 | ||
44 | class OApplication : public OpieApplication | 44 | class OApplication : public QPEApplication |
45 | { | 45 | { |
@@ -94,7 +94,2 @@ class OApplication : public OpieApplication | |||
94 | 94 | ||
95 | /** | ||
96 | * see qpeDir() | ||
97 | */ | ||
98 | static QString opieDir() {return qpeDir();}; | ||
99 | |||
100 | protected: | 95 | protected: |
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 | |||
@@ -43,3 +43,3 @@ QPixmap loadPixmap( const QString& pix ) | |||
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 ); |