summaryrefslogtreecommitdiff
authortille <tille>2003-08-25 14:06:41 (UTC)
committer tille <tille>2003-08-25 14:06:41 (UTC)
commit5f292b6e4fc0f4ee8e4bced9a916f6bdce864b6b (patch) (side-by-side diff)
tree6a0d25ed238d8175694cee322b6871120931e9e8
parentc817abf3b81ca47927433ede1efd9afddfc15a72 (diff)
downloadopie-5f292b6e4fc0f4ee8e4bced9a916f6bdce864b6b.zip
opie-5f292b6e4fc0f4ee8e4bced9a916f6bdce864b6b.tar.gz
opie-5f292b6e4fc0f4ee8e4bced9a916f6bdce864b6b.tar.bz2
remoce this stupid bug once again...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oapplication.cpp11
-rw-r--r--libopie2/opiecore/oapplication.h11
-rw-r--r--libopie2/opiecore/opiecore.pro9
3 files changed, 8 insertions, 23 deletions
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index 84cab48..c3cacce 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -45,29 +45,25 @@ class OApplicationPrivate
{
public:
OApplicationPrivate() {};
~OApplicationPrivate() {};
};
/**************************************************************************************************/
/* OApplication
/**************************************************************************************************/
OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
-#ifdef QWS
:QPEApplication( argc, argv ),
-#else
- :QApplication( argc, argv ),
-#endif
_appname( rAppName ),
_config( 0 )
{
init();
}
OApplication::~OApplication()
{
delete d;
if ( _config )
delete _config;
@@ -103,32 +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 )
{
-#ifdef QWS
QPEApplication::showMainWidget( widget, nomax );
-#else
-// tille: I am quit sure if this is the right way to do..
- odDebug(nomax,7) << "ignoring nomax";
- setMainWidget( widget );
- widget->show();
-#endif
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 3043910..72a659e 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -24,38 +24,33 @@
  -_. . .   )=.  = Library General Public License along with
    --        :-=` 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()
-#ifdef QWS
+
#include <qpe/qpeapplication.h>
-#else
-#include <qapplication.h>
-#endif
+
class OApplicationPrivate;
class OConfig;
-#ifdef QWS
+
class OApplication : public QPEApplication
-#else
-class OApplication : public QApplication
-#endif
{
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 );
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index c8a291a..18c6986 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -1,38 +1,39 @@
TEMPLATE = lib
CONFIG += qt warn_on debug
DESTDIR = $(OPIEDIR)/lib
-HEADERS = oapplication.h \
- oconfig.h \
+HEADERS = oconfig.h \
ocompletionbase.h \
ocompletion.h \
odebug.h \
oglobal.h \
oglobalsettings.h \
osortablevaluelist.h
-SOURCES = oapplication.cpp \
- oconfig.cpp \
+SOURCES = oconfig.cpp \
ocompletionbase.cpp \
ocompletion.cpp \
odebug.cpp \
oglobal.cpp \
oglobalsettings.cpp
INTERFACES =
TARGET = opiecore2
VERSION = 1.8.1
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
MOC_DIR = moc
OBJECTS_DIR = obj
!contains( platform, x11 ) {
+ HEADERS += oapplication.h
+ SOURCES += oapplication.cpp
LIBS = -lqpe
include ( $(OPIEDIR)/include.pro )
}
contains( platform, x11 ) {
+ message( NOT building oapplication for X11 )
LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
}