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) (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
@@ -45,25 +45,25 @@ class OApplicationPrivate
{
public:
OApplicationPrivate() {};
~OApplicationPrivate() {};
};
/**************************************************************************************************/
/* OApplication
/**************************************************************************************************/
OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
- :OpieApplication( argc, argv ),
+ :QPEApplication( argc, argv ),
_appname( rAppName ),
_config( 0 )
{
init();
}
OApplication::~OApplication()
{
delete d;
if ( _config )
delete _config;
@@ -99,25 +99,25 @@ void OApplication::init()
sigaction(SIGSEGV, &sa, NULL);
*/
}
else
{
qFatal( "OApplication: Can't create more than one OApplication object. Aborting." );
}
}
void OApplication::showMainWidget( QWidget* widget, bool nomax )
{
- OpieApplication::showMainWidget( widget, nomax );
+ QPEApplication::showMainWidget( widget, nomax );
widget->setCaption( _appname );
}
void OApplication::setTitle( const QString& title ) const
{
if ( mainWidget() )
{
if ( !title.isNull() )
mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title );
else
mainWidget()->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
@@ -25,32 +25,32 @@
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef OAPPLICATION_H
#define OAPPLICATION_H
#define oApp OApplication::oApplication()
-#include "opieapplication.h"
+#include <qpe/qpeapplication.h>
class OApplicationPrivate;
class OConfig;
-class OApplication : public OpieApplication
+class OApplication : public QPEApplication
{
Q_OBJECT
public:
/**
* Constructor. Parses command-line arguments and sets the window caption.
*
* @param rAppName application name. Will be used for finding the
* associated message, icon and configuration files
*
*/
OApplication( int& argc, char** argv, const QCString& rAppName );
@@ -83,28 +83,23 @@ class OApplication : public OpieApplication
/**
* Shows the main @a widget and sets the name of the application as window caption.
*/
virtual void showMainWidget( QWidget* widget, bool nomax = false );
/**
* Set the application title. The application title will be concatenated
* to the application name given in the constructor.
*
* @param title the title. If not given, resets caption to appname
*/
virtual void setTitle( const QString& title = QString::null ) const;
- /**
- * see qpeDir()
- */
- static QString opieDir() {return qpeDir();};
-
protected:
void init();
private:
const QCString _appname;
static OApplication* _instance;
OConfig* _config;
OApplicationPrivate* d;
};
#endif // OAPPLICATION_H
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
@@ -32,25 +32,25 @@
#include <opie2/odebug.h>
#include "oresource.h"
#ifdef QWS
namespace Resource
{
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() )
{
odebug << "libopie2 resource: can't find pixmap " << filename << oendl;;
}
return pixmap;
};
};
#endif