summaryrefslogtreecommitdiff
authorzecke <zecke>2004-11-04 21:58:46 (UTC)
committer zecke <zecke>2004-11-04 21:58:46 (UTC)
commit2df2234beb066097c1c3bd899c21eff30abf4323 (patch) (unidiff)
tree71334e406f8c66e8b9320e7af09f12975d523dcb
parent37ff6dd391e4b6e0c537cd1d74e226dfdf1b86ba (diff)
downloadopie-2df2234beb066097c1c3bd899c21eff30abf4323.zip
opie-2df2234beb066097c1c3bd899c21eff30abf4323.tar.gz
opie-2df2234beb066097c1c3bd899c21eff30abf4323.tar.bz2
-Revert Exposing QPE/System qcop signals via OApplication
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/oapplication.cpp7
-rw-r--r--libopie2/opiecore/oapplication.h11
2 files changed, 0 insertions, 18 deletions
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index 0164957..0ce61d8 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -1,149 +1,142 @@
1/* 1/*
2                 This file is part of the Opie Project 2                 This file is part of the Opie Project
3              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> 3              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
4 =. 4 =.
5 .=l. 5 .=l.
6           .>+-= 6           .>+-=
7 _;:,     .>    :=|. This program is free software; you can 7 _;:,     .>    :=|. This program is free software; you can
8.> <`_,   >  .   <= redistribute it and/or modify it under 8.> <`_,   >  .   <= redistribute it and/or modify it under
9:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 9:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i,     .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11 - .   .-<_>     .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12     ._= =}       : or (at your option) any later version.
13    .%`+i>       _;_. 13    .%`+i>       _;_.
14    .i_,=:_.      -<s. This program is distributed in the hope that 14    .i_,=:_.      -<s. This program is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.=       =       ; Library General Public License for more
20++=   -.     .`     .: details. 20++=   -.     .`     .: details.
21 :     =  ...= . :.=- 21 :     =  ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22 -.   .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23  -_. . .   )=.  = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24    --        :-=` this library; see the file COPYING.LIB.
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28*/ 28*/
29 29
30#include <opie2/oapplication.h> 30#include <opie2/oapplication.h>
31#include <opie2/oconfig.h> 31#include <opie2/oconfig.h>
32#include <opie2/odebug.h> 32#include <opie2/odebug.h>
33 33
34#include <qcopchannel_qws.h>
35
36
37#include <signal.h> 34#include <signal.h>
38#include <stdio.h> 35#include <stdio.h>
39 36
40using namespace Opie::Core; 37using namespace Opie::Core;
41 38
42 39
43OApplication* OApplication::_instance = 0; 40OApplication* OApplication::_instance = 0;
44 41
45/************************************************************************************************** 42/**************************************************************************************************
46 * OApplicationPrivate 43 * OApplicationPrivate
47 **************************************************************************************************/ 44 **************************************************************************************************/
48 45
49namespace Opie { 46namespace Opie {
50namespace Core { 47namespace Core {
51namespace Internal { 48namespace Internal {
52class OApplicationPrivate 49class OApplicationPrivate
53{ 50{
54 public: 51 public:
55 OApplicationPrivate() {}; 52 OApplicationPrivate() {};
56 ~OApplicationPrivate() {}; 53 ~OApplicationPrivate() {};
57}; 54};
58} 55}
59 56
60/************************************************************************************************** 57/**************************************************************************************************
61 * OApplication 58 * OApplication
62 **************************************************************************************************/ 59 **************************************************************************************************/
63OApplication::OApplication( int& argc, char** argv, Type type ) 60OApplication::OApplication( int& argc, char** argv, Type type )
64 :QPEApplication( argc, argv, type ), 61 :QPEApplication( argc, argv, type ),
65 _appname( QString::null ), 62 _appname( QString::null ),
66 _config( 0 ) 63 _config( 0 )
67{ 64{
68 init(); 65 init();
69 } 66 }
70 67
71OApplication::OApplication( int& argc, char** argv, const QCString& rAppName ) 68OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
72 :QPEApplication( argc, argv ), 69 :QPEApplication( argc, argv ),
73 _appname( rAppName ), 70 _appname( rAppName ),
74 _config( 0 ) 71 _config( 0 )
75{ 72{
76 init(); 73 init();
77} 74}
78 75
79 76
80OApplication::~OApplication() 77OApplication::~OApplication()
81{ 78{
82 delete d; 79 delete d;
83 if ( _config ) 80 if ( _config )
84 delete _config; 81 delete _config;
85 OApplication::_instance = 0; 82 OApplication::_instance = 0;
86 // after deconstruction of the one-and-only application object, 83 // after deconstruction of the one-and-only application object,
87 // the construction of another object is allowed 84 // the construction of another object is allowed
88} 85}
89 86
90 87
91OConfig* OApplication::config() 88OConfig* OApplication::config()
92{ 89{
93 if ( !_config ) 90 if ( !_config )
94 { 91 {
95 _config = new OConfig( _appname ); 92 _config = new OConfig( _appname );
96 } 93 }
97 return _config; 94 return _config;
98} 95}
99 96
100 97
101void OApplication::init() 98void OApplication::init()
102{ 99{
103 d = new Internal::OApplicationPrivate(); 100 d = new Internal::OApplicationPrivate();
104 if ( !OApplication::_instance ) 101 if ( !OApplication::_instance )
105 { 102 {
106 OApplication::_instance = this; 103 OApplication::_instance = this;
107
108 QCopChannel *chan = new QCopChannel("QPE/System", this, "OApplication System Channel");
109 connect(chan,SIGNAL(received(const QCString&,const QByteArray&)),
110 this,SIGNAL(systemMessageSignal(const QCString&,const QByteArray&)));
111 104
112 /* register SIGSEGV handler to give programs an option 105 /* register SIGSEGV handler to give programs an option
113 * to exit gracefully, e.g. save or close devices or files. 106 * to exit gracefully, e.g. save or close devices or files.
114 struct sigaction sa; 107 struct sigaction sa;
115 sa.sa_handler = ( void (*)(int) ) &segv_handler; 108 sa.sa_handler = ( void (*)(int) ) &segv_handler;
116 sa.sa_flags = SA_SIGINFO | SA_RESTART; 109 sa.sa_flags = SA_SIGINFO | SA_RESTART;
117 sigemptyset(&sa.sa_mask); 110 sigemptyset(&sa.sa_mask);
118 sigaction(SIGSEGV, &sa, NULL); 111 sigaction(SIGSEGV, &sa, NULL);
119 */ 112 */
120 } 113 }
121 else 114 else
122 { 115 {
123 ofatal << "OApplication: Can't create more than one OApplication object. Aborting." << oendl; 116 ofatal << "OApplication: Can't create more than one OApplication object. Aborting." << oendl;
124 //FIXME exit gracefully ? 117 //FIXME exit gracefully ?
125 ::exit( -1 ); 118 ::exit( -1 );
126 } 119 }
127} 120}
128 121
129 122
130void OApplication::showMainWidget( QWidget* widget, bool nomax ) 123void OApplication::showMainWidget( QWidget* widget, bool nomax )
131{ 124{
132 QPEApplication::showMainWidget( widget, nomax ); 125 QPEApplication::showMainWidget( widget, nomax );
133 widget->setCaption( _appname ); 126 widget->setCaption( _appname );
134} 127}
135 128
136 129
137void OApplication::setTitle( const QString& title ) const 130void OApplication::setTitle( const QString& title ) const
138{ 131{
139 if ( mainWidget() ) 132 if ( mainWidget() )
140 { 133 {
141 if ( !title.isNull() ) 134 if ( !title.isNull() )
142 mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title ); 135 mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title );
143 else 136 else
144 mainWidget()->setCaption( _appname ); 137 mainWidget()->setCaption( _appname );
145 } 138 }
146} 139}
147 140
148} 141}
149} 142}
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h
index 709d73a..d34e6b1 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -1,128 +1,117 @@
1/* 1/*
2                 This file is part of the Opie Project 2                 This file is part of the Opie Project
3              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> 3              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
4 =. 4 =.
5 .=l. 5 .=l.
6           .>+-= 6           .>+-=
7 _;:,     .>    :=|. This program is free software; you can 7 _;:,     .>    :=|. This program is free software; you can
8.> <`_,   >  .   <= redistribute it and/or modify it under 8.> <`_,   >  .   <= redistribute it and/or modify it under
9:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 9:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i,     .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11 - .   .-<_>     .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12     ._= =}       : or (at your option) any later version.
13    .%`+i>       _;_. 13    .%`+i>       _;_.
14    .i_,=:_.      -<s. This program is distributed in the hope that 14    .i_,=:_.      -<s. This program is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.=       =       ; Library General Public License for more
20++=   -.     .`     .: details. 20++=   -.     .`     .: details.
21 :     =  ...= . :.=- 21 :     =  ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22 -.   .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23  -_. . .   )=.  = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24    --        :-=` this library; see the file COPYING.LIB.
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28*/ 28*/
29 29
30#ifndef OAPPLICATION_H 30#ifndef OAPPLICATION_H
31#define OAPPLICATION_H 31#define OAPPLICATION_H
32 32
33#define oApp Opie::Core::OApplication::oApplication() 33#define oApp Opie::Core::OApplication::oApplication()
34 34
35 35
36#include <qpe/qpeapplication.h> 36#include <qpe/qpeapplication.h>
37 37
38namespace Opie { 38namespace Opie {
39namespace Core { 39namespace Core {
40namespace Internal { 40namespace Internal {
41class OApplicationPrivate; 41class OApplicationPrivate;
42} // private class 42} // private class
43 43
44class OConfig; 44class OConfig;
45 45
46 46
47class OApplication : public QPEApplication 47class OApplication : public QPEApplication
48{ 48{
49 Q_OBJECT 49 Q_OBJECT
50 50
51 public: 51 public:
52 52
53 /** 53 /**
54 * Constructor. Compatible to QPEApplication 54 * Constructor. Compatible to QPEApplication
55 */ 55 */
56 OApplication( int& argc, char** argv, Type type=GuiClient); 56 OApplication( int& argc, char** argv, Type type=GuiClient);
57 57
58 /** 58 /**
59 * Constructor. Parses command-line arguments and sets the window caption. 59 * Constructor. Parses command-line arguments and sets the window caption.
60 * 60 *
61 * @param rAppName application name. Will be used for finding the 61 * @param rAppName application name. Will be used for finding the
62 * associated message, icon and configuration files 62 * associated message, icon and configuration files
63 * 63 *
64 */ 64 */
65 OApplication( int& argc, char** argv, const QCString& rAppName ); 65 OApplication( int& argc, char** argv, const QCString& rAppName );
66 /** 66 /**
67 * Destructor. Destroys the application object and its children. 67 * Destructor. Destroys the application object and its children.
68 */ 68 */
69 virtual ~OApplication(); 69 virtual ~OApplication();
70 /** 70 /**
71 * @returns the process-wide application object 71 * @returns the process-wide application object
72 * 72 *
73 * This is similar to the global @ref QApplication pointer qApp. It 73 * This is similar to the global @ref QApplication pointer qApp. It
74 * allows access to the single global OApplication object, since 74 * allows access to the single global OApplication object, since
75 * more than one cannot be created in the same application. It 75 * more than one cannot be created in the same application. It
76 * saves you the trouble of having to pass the pointer explicitly 76 * saves you the trouble of having to pass the pointer explicitly
77 * to every function that may require it. 77 * to every function that may require it.
78 */ 78 */
79 static OApplication* oApplication() { return _instance; }; 79 static OApplication* oApplication() { return _instance; };
80 /** 80 /**
81 * Returns the application name as given during creation. 81 * Returns the application name as given during creation.
82 * 82 *
83 * @returns a reference to the application name 83 * @returns a reference to the application name
84 */ 84 */
85 const QCString& appName() const { return _appname; }; 85 const QCString& appName() const { return _appname; };
86 /** 86 /**
87 * @returns the application session config object. 87 * @returns the application session config object.
88 * 88 *
89 * @see OConfig 89 * @see OConfig
90 */ 90 */
91 OConfig* config(); 91 OConfig* config();
92 /** 92 /**
93 * Shows the main @a widget and sets the name of the application as window caption. 93 * Shows the main @a widget and sets the name of the application as window caption.
94 */ 94 */
95 virtual void showMainWidget( QWidget* widget, bool nomax = false ); 95 virtual void showMainWidget( QWidget* widget, bool nomax = false );
96 /** 96 /**
97 * Set the application title. The application title will be concatenated 97 * Set the application title. The application title will be concatenated
98 * to the application name given in the constructor. 98 * to the application name given in the constructor.
99 * 99 *
100 * @param title the title. If not given, resets caption to appname 100 * @param title the title. If not given, resets caption to appname
101 */ 101 */
102 virtual void setTitle( const QString& title = QString::null ) const; 102 virtual void setTitle( const QString& title = QString::null ) const;
103 103
104 signals:
105
106 /**
107 * Emit signals when messages are received on QPE/System
108 * QCOP Channel.
109 *
110 * @param msg The QCOP Message
111 * @param data The QCOP Data
112 */
113 void systemMessageSignal(const QCString& msg, const QByteArray& data);
114
115 protected: 104 protected:
116 void init(); 105 void init();
117 106
118 private: 107 private:
119 const QCString _appname; 108 const QCString _appname;
120 static OApplication* _instance; 109 static OApplication* _instance;
121 OConfig* _config; 110 OConfig* _config;
122 Internal::OApplicationPrivate* d; 111 Internal::OApplicationPrivate* d;
123}; 112};
124 113
125} // Core 114} // Core
126} // Opie 115} // Opie
127 116
128#endif // OAPPLICATION_H 117#endif // OAPPLICATION_H