summaryrefslogtreecommitdiff
path: root/libopie2
Unidiff
Diffstat (limited to 'libopie2') (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
@@ -51,17 +51,13 @@ class OApplicationPrivate
51/**************************************************************************************************/ 51/**************************************************************************************************/
52/* OApplication 52/* OApplication
53/**************************************************************************************************/ 53/**************************************************************************************************/
54 54
55 55
56OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) 56OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
57#ifdef QWS
58 :QPEApplication( argc, argv ), 57 :QPEApplication( argc, argv ),
59#else
60 :QApplication( argc, argv ),
61#endif
62 _appname( rAppName ), 58 _appname( rAppName ),
63 _config( 0 ) 59 _config( 0 )
64{ 60{
65 init(); 61 init();
66} 62}
67 63
@@ -109,20 +105,13 @@ void OApplication::init()
109 } 105 }
110} 106}
111 107
112 108
113void OApplication::showMainWidget( QWidget* widget, bool nomax ) 109void OApplication::showMainWidget( QWidget* widget, bool nomax )
114{ 110{
115#ifdef QWS
116 QPEApplication::showMainWidget( widget, nomax ); 111 QPEApplication::showMainWidget( widget, nomax );
117#else
118// tille: I am quit sure if this is the right way to do..
119 odDebug(nomax,7) << "ignoring nomax";
120 setMainWidget( widget );
121 widget->show();
122#endif
123 widget->setCaption( _appname ); 112 widget->setCaption( _appname );
124} 113}
125 114
126 115
127void OApplication::setTitle( const QString& title ) const 116void OApplication::setTitle( const QString& title ) const
128{ 117{
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
@@ -30,26 +30,21 @@
30 30
31#ifndef OAPPLICATION_H 31#ifndef OAPPLICATION_H
32#define OAPPLICATION_H 32#define OAPPLICATION_H
33 33
34#define oApp OApplication::oApplication() 34#define oApp OApplication::oApplication()
35 35
36#ifdef QWS 36
37#include <qpe/qpeapplication.h> 37#include <qpe/qpeapplication.h>
38#else 38
39#include <qapplication.h>
40#endif
41 39
42class OApplicationPrivate; 40class OApplicationPrivate;
43class OConfig; 41class OConfig;
44 42
45#ifdef QWS 43
46class OApplication : public QPEApplication 44class OApplication : public QPEApplication
47#else
48class OApplication : public QApplication
49#endif
50{ 45{
51 Q_OBJECT 46 Q_OBJECT
52 47
53 public: 48 public:
54 /** 49 /**
55 * Constructor. Parses command-line arguments and sets the window caption. 50 * Constructor. Parses command-line arguments and sets the window caption.
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,20 +1,18 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on debug 2CONFIG += qt warn_on debug
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = oapplication.h \ 4HEADERS = oconfig.h \
5 oconfig.h \
6 ocompletionbase.h \ 5 ocompletionbase.h \
7 ocompletion.h \ 6 ocompletion.h \
8 odebug.h \ 7 odebug.h \
9 oglobal.h \ 8 oglobal.h \
10 oglobalsettings.h \ 9 oglobalsettings.h \
11 osortablevaluelist.h 10 osortablevaluelist.h
12 11
13SOURCES = oapplication.cpp \ 12SOURCES = oconfig.cpp \
14 oconfig.cpp \
15 ocompletionbase.cpp \ 13 ocompletionbase.cpp \
16 ocompletion.cpp \ 14 ocompletion.cpp \
17 odebug.cpp \ 15 odebug.cpp \
18 oglobal.cpp \ 16 oglobal.cpp \
19 oglobalsettings.cpp 17 oglobalsettings.cpp
20 18
@@ -25,14 +23,17 @@ INCLUDEPATH += $(OPIEDIR)/include
25DEPENDPATH += $(OPIEDIR)/include 23DEPENDPATH += $(OPIEDIR)/include
26MOC_DIR = moc 24MOC_DIR = moc
27OBJECTS_DIR = obj 25OBJECTS_DIR = obj
28 26
29 27
30!contains( platform, x11 ) { 28!contains( platform, x11 ) {
29 HEADERS += oapplication.h
30 SOURCES += oapplication.cpp
31 LIBS = -lqpe 31 LIBS = -lqpe
32 include ( $(OPIEDIR)/include.pro ) 32 include ( $(OPIEDIR)/include.pro )
33} 33}
34 34
35contains( platform, x11 ) { 35contains( platform, x11 ) {
36 message( NOT building oapplication for X11 )
36 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 37 LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
37} 38}
38 39