summaryrefslogtreecommitdiff
authorzecke <zecke>2004-11-04 21:58:46 (UTC)
committer zecke <zecke>2004-11-04 21:58:46 (UTC)
commit2df2234beb066097c1c3bd899c21eff30abf4323 (patch) (side-by-side diff)
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) (show 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
@@ -10,51 +10,48 @@
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This program is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = 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.
*/
#include <opie2/oapplication.h>
#include <opie2/oconfig.h>
#include <opie2/odebug.h>
-#include <qcopchannel_qws.h>
-
-
#include <signal.h>
#include <stdio.h>
using namespace Opie::Core;
OApplication* OApplication::_instance = 0;
/**************************************************************************************************
* OApplicationPrivate
**************************************************************************************************/
namespace Opie {
namespace Core {
namespace Internal {
class OApplicationPrivate
{
public:
OApplicationPrivate() {};
~OApplicationPrivate() {};
};
}
/**************************************************************************************************
@@ -84,52 +81,48 @@ OApplication::~OApplication()
delete _config;
OApplication::_instance = 0;
// after deconstruction of the one-and-only application object,
// the construction of another object is allowed
}
OConfig* OApplication::config()
{
if ( !_config )
{
_config = new OConfig( _appname );
}
return _config;
}
void OApplication::init()
{
d = new Internal::OApplicationPrivate();
if ( !OApplication::_instance )
{
OApplication::_instance = this;
- QCopChannel *chan = new QCopChannel("QPE/System", this, "OApplication System Channel");
- connect(chan,SIGNAL(received(const QCString&,const QByteArray&)),
- this,SIGNAL(systemMessageSignal(const QCString&,const QByteArray&)));
-
/* register SIGSEGV handler to give programs an option
* to exit gracefully, e.g. save or close devices or files.
struct sigaction sa;
sa.sa_handler = ( void (*)(int) ) &segv_handler;
sa.sa_flags = SA_SIGINFO | SA_RESTART;
sigemptyset(&sa.sa_mask);
sigaction(SIGSEGV, &sa, NULL);
*/
}
else
{
ofatal << "OApplication: Can't create more than one OApplication object. Aborting." << oendl;
//FIXME exit gracefully ?
::exit( -1 );
}
}
void OApplication::showMainWidget( QWidget* widget, bool nomax )
{
QPEApplication::showMainWidget( widget, nomax );
widget->setCaption( _appname );
}
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
@@ -80,49 +80,38 @@ class OApplication : public QPEApplication
/**
* Returns the application name as given during creation.
*
* @returns a reference to the application name
*/
const QCString& appName() const { return _appname; };
/**
* @returns the application session config object.
*
* @see OConfig
*/
OConfig* config();
/**
* 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;
- signals:
-
- /**
- * Emit signals when messages are received on QPE/System
- * QCOP Channel.
- *
- * @param msg The QCOP Message
- * @param data The QCOP Data
- */
- void systemMessageSignal(const QCString& msg, const QByteArray& data);
-
protected:
void init();
private:
const QCString _appname;
static OApplication* _instance;
OConfig* _config;
Internal::OApplicationPrivate* d;
};
} // Core
} // Opie
#endif // OAPPLICATION_H