author | mickeyl <mickeyl> | 2003-05-01 18:55:39 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-05-01 18:55:39 (UTC) |
commit | 8266da96576ad43a768da37000cef4e8eba000ac (patch) (unidiff) | |
tree | 904f07a06eb9e18e650c123bad8e901a5da56bf1 /libopie2 | |
parent | 95e533a6ac257d3b95cd8905660008fb7dcd33f1 (diff) | |
download | opie-8266da96576ad43a768da37000cef4e8eba000ac.zip opie-8266da96576ad43a768da37000cef4e8eba000ac.tar.gz opie-8266da96576ad43a768da37000cef4e8eba000ac.tar.bz2 |
remove stupid approach to encapsulate X11/Embedded differences into OApplication
thanks to zecke reminding me (once again) that moc does not preprocess...
if I ever forget it again, I owe you a beer :-)
-rw-r--r-- | libopie2/opiecore/oapplication.cpp | 13 | ||||
-rw-r--r-- | libopie2/opiecore/oapplication.h | 116 |
2 files changed, 43 insertions, 86 deletions
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp index ce26420..7a6c174 100644 --- a/libopie2/opiecore/oapplication.cpp +++ b/libopie2/opiecore/oapplication.cpp | |||
@@ -51,5 +51,5 @@ class OApplicationPrivate | |||
51 | 51 | ||
52 | OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) | 52 | OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) |
53 | :OApplicationBaseClass( argc, argv ), | 53 | :QPEApplication( argc, argv ), |
54 | _appname( rAppName ), | 54 | _appname( rAppName ), |
55 | _config( 0 ) | 55 | _config( 0 ) |
@@ -94,18 +94,7 @@ void OApplication::init() | |||
94 | 94 | ||
95 | 95 | ||
96 | void OApplication::setMainWidget( QWidget* widget ) | ||
97 | { | ||
98 | showMainWidget( widget ); | ||
99 | } | ||
100 | |||
101 | |||
102 | void OApplication::showMainWidget( QWidget* widget, bool nomax ) | 96 | void OApplication::showMainWidget( QWidget* widget, bool nomax ) |
103 | { | 97 | { |
104 | #ifdef Q_WS_QWS | ||
105 | QPEApplication::showMainWidget( widget, nomax ); | 98 | QPEApplication::showMainWidget( widget, nomax ); |
106 | #else | ||
107 | QApplication::setMainWidget( widget ); | ||
108 | widget->show(); | ||
109 | #endif | ||
110 | widget->setCaption( _appname ); | 99 | widget->setCaption( _appname ); |
111 | } | 100 | } |
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index 8326847..94ac488 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h | |||
@@ -34,91 +34,59 @@ | |||
34 | #define oApp OApplication::oApplication() | 34 | #define oApp OApplication::oApplication() |
35 | 35 | ||
36 | // the below stuff will fail with moc because moc does not pre process headers | 36 | #include <qpe/qpeapplication.h> |
37 | // This will make usage of signal and slots hard inside QPEApplication -zecke | ||
38 | |||
39 | #ifdef QWS | ||
40 | #include <qpe/qpeapplication.h> | ||
41 | #define OApplicationBaseClass QPEApplication | ||
42 | #else | ||
43 | #include <qapplication.h> | ||
44 | #define OApplicationBaseClass QApplication | ||
45 | #endif | ||
46 | 37 | ||
47 | class OApplicationPrivate; | 38 | class OApplicationPrivate; |
48 | class OConfig; | 39 | class OConfig; |
49 | 40 | ||
50 | class OApplication: public OApplicationBaseClass | 41 | class OApplication: public QPEApplication |
51 | { | 42 | { |
52 | // Q_OBJECT would fail -zecke | 43 | Q_OBJECT |
44 | |||
53 | public: | 45 | public: |
54 | 46 | /** | |
55 | /** | 47 | * Constructor. Parses command-line arguments and sets the window caption. |
56 | * Constructor. Parses command-line arguments and sets the window caption. | 48 | * |
57 | * | 49 | * @param rAppName application name. Will be used for finding the |
58 | * @param rAppName application name. Will be used for finding the | 50 | * associated message, icon and configuration files |
59 | * associated message, icon and configuration files | 51 | * |
60 | * | 52 | */ |
61 | */ | ||
62 | OApplication( int& argc, char** argv, const QCString& rAppName ); | 53 | OApplication( int& argc, char** argv, const QCString& rAppName ); |
63 | /** | 54 | /** |
64 | * Destructor. Destroys the application object and its children. | 55 | * Destructor. Destroys the application object and its children. |
65 | */ | 56 | */ |
66 | virtual ~OApplication(); | 57 | virtual ~OApplication(); |
67 | 58 | /** | |
68 | /** | 59 | * @returns the process-wide application object |
69 | * Returns the current application object. | 60 | * |
70 | * | 61 | * This is similar to the global @ref QApplication pointer qApp. It |
71 | * This is similar to the global @ref QApplication pointer qApp. It | 62 | * allows access to the single global OApplication object, since |
72 | * allows access to the single global OApplication object, since | 63 | * more than one cannot be created in the same application. It |
73 | * more than one cannot be created in the same application. It | 64 | * saves you the trouble of having to pass the pointer explicitly |
74 | * saves you the trouble of having to pass the pointer explicitly | 65 | * to every function that may require it. |
75 | * to every function that may require it. | 66 | */ |
76 | * | ||
77 | * @return the current application object | ||
78 | */ | ||
79 | static const OApplication* oApplication() { return _instance; }; | 67 | static const OApplication* oApplication() { return _instance; }; |
80 | 68 | /** | |
81 | /** | 69 | * Returns the application name as given during creation. |
82 | * Returns the application name as given during creation. | 70 | * |
83 | * | 71 | * @returns a reference to the application name |
84 | * @return A reference to the application name | 72 | */ |
85 | */ | ||
86 | const QCString& appName() const { return _appname; }; | 73 | const QCString& appName() const { return _appname; }; |
87 | 74 | /** | |
88 | /** | 75 | * @returns the application session config object. |
89 | * Returns the application session config object. | 76 | * |
90 | * | 77 | * @see OConfig |
91 | * @return A pointer to the application's instance specific | 78 | */ |
92 | * @ref OConfig object. | ||
93 | * @see OConfig | ||
94 | */ | ||
95 | OConfig* config(); | 79 | OConfig* config(); |
96 | 80 | /** | |
97 | /** | 81 | * Shows the main @a widget and sets the name of the application as window caption. |
98 | * Sets the main widget - reimplemented to call showMainWidget() | 82 | */ |
99 | * on Qt/Embedded. | ||
100 | * | ||
101 | * @param mainWidget the widget to become the main widget | ||
102 | * @see QWidget object | ||
103 | */ | ||
104 | virtual void setMainWidget( QWidget *mainWidget ); | ||
105 | |||
106 | /** | ||
107 | * Shows the main widget - reimplemented to call setMainWidget() | ||
108 | * on platforms other than Qt/Embedded. | ||
109 | * | ||
110 | * @param mainWidget the widget to become the main widget | ||
111 | * @see QWidget object | ||
112 | */ | ||
113 | virtual void showMainWidget( QWidget* widget, bool nomax = false ); | 83 | virtual void showMainWidget( QWidget* widget, bool nomax = false ); |
114 | 84 | /** | |
115 | /** | 85 | * Set the application title. The application title will be concatenated |
116 | * Set the application title. The application title will be concatenated | 86 | * to the application name given in the constructor. |
117 | * to the application name given in the constructor. | 87 | * |
118 | * | 88 | * @param title the title. If not given, resets caption to appname |
119 | * @param title the title. If not given, resets caption to appname | 89 | */ |
120 | */ | ||
121 | virtual void setTitle( const QString& title = QString::null ) const; | 90 | virtual void setTitle( const QString& title = QString::null ) const; |
122 | //virtual void setTitle() const; | ||
123 | 91 | ||
124 | protected: | 92 | protected: |