summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-02 15:29:06 (UTC)
committer mickeyl <mickeyl>2003-12-02 15:29:06 (UTC)
commite215d4b2bc542b557913ba3dcd57fd20a5a2a0fe (patch) (side-by-side diff)
tree8bb36647649cebf7c204ce58adcb820f4f0c19d6
parent7a7683d435cfbb4fa2d6ed99fd4a94d388402aec (diff)
downloadopie-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
Diffstat (more/less context) (show 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
@@ -56,3 +56,3 @@ class OApplicationPrivate
OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
- :OpieApplication( argc, argv ),
+ :QPEApplication( argc, argv ),
_appname( rAppName ),
@@ -110,3 +110,3 @@ 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
@@ -36,3 +36,3 @@
-#include "opieapplication.h"
+#include <qpe/qpeapplication.h>
@@ -43,3 +43,3 @@ class OConfig;
-class OApplication : public OpieApplication
+class OApplication : public QPEApplication
{
@@ -94,7 +94,2 @@ class OApplication : public OpieApplication
- /**
- * see qpeDir()
- */
- static QString opieDir() {return qpeDir();};
-
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 )
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 );