summaryrefslogtreecommitdiff
authorzecke <zecke>2003-08-28 14:35:37 (UTC)
committer zecke <zecke>2003-08-28 14:35:37 (UTC)
commitf837944e9a404c46efc00e4d5851ea13dbb88ef2 (patch) (side-by-side diff)
treeaa1276a41b80d3f42cab855fbcebf9ec48d1795a
parent3f829e499bac92d52a9bbb1ad6b31bb74734287f (diff)
downloadopie-f837944e9a404c46efc00e4d5851ea13dbb88ef2.zip
opie-f837944e9a404c46efc00e4d5851ea13dbb88ef2.tar.gz
opie-f837944e9a404c46efc00e4d5851ea13dbb88ef2.tar.bz2
Make it compile with opie ( use QLibrary )
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/irserver.cpp37
-rw-r--r--core/launcher/irserver.h27
2 files changed, 53 insertions, 11 deletions
diff --git a/core/launcher/irserver.cpp b/core/launcher/irserver.cpp
index 625cb60..579c78c 100644
--- a/core/launcher/irserver.cpp
+++ b/core/launcher/irserver.cpp
@@ -1,52 +1,73 @@
+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
+**
+** This file is part of the Qtopia Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+
#include "irserver.h"
-#include <qpe/qlibrary.h>
-#include <qpe/qpeapplication.h>
+#include <qtopia/qlibrary.h>
+#include <qtopia/qpeapplication.h>
#include <qtranslator.h>
-#include <stdlib.h>
#include "obexinterface.h"
#include <qdir.h>
IrServer::IrServer( QObject *parent, const char *name )
- : QObject( parent, name )
+ : QObject( parent, name ), obexIface(0)
{
lib = 0;
- iface = 0;
+ obexIface = 0;
QString path = QPEApplication::qpeDir() + "/plugins/obex/";
QDir dir( path, "lib*.so" );
QStringList list = dir.entryList();
QStringList::Iterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
QLibrary *trylib = new QLibrary( path + *it );
//qDebug("trying lib %s", (path + (*it)).latin1() );
- if ( trylib->queryInterface( IID_ObexInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
+ if ( trylib->queryInterface( IID_ObexInterface, (QUnknownInterface**)&obexIface ) == QS_OK ) {
lib = trylib;
//qDebug("found obex lib" );
QString lang = getenv( "LANG" );
QTranslator * trans = new QTranslator(qApp);
QString type = (*it).left( (*it).find(".") );
QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
//qDebug("tr fpr obex: %s", tfn.latin1() );
if ( trans->load( tfn ))
qApp->installTranslator( trans );
else
delete trans;
break;
} else {
delete lib;
}
}
if ( !lib )
qDebug("could not load IR plugin" );
}
IrServer::~IrServer()
{
- if ( iface )
- iface->release();
+ if ( obexIface )
+ obexIface->release();
delete lib;
}
+
diff --git a/core/launcher/irserver.h b/core/launcher/irserver.h
index b3434dd..a20f5e9 100644
--- a/core/launcher/irserver.h
+++ b/core/launcher/irserver.h
@@ -1,22 +1,43 @@
+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
+**
+** This file is part of the Qtopia Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
#ifndef IRSERVER_H
#define IRSERVER_H
+#include <qtopia/global.h>
#include <qobject.h>
class QCopChannel;
-class QLibrary;
struct ObexInterface;
+class QLibrary;
class IrServer : public QObject
{
Q_OBJECT
public:
IrServer( QObject *parent = 0, const char *name = 0 );
~IrServer();
private:
- QLibrary *lib;
- ObexInterface *iface;
+ QLibrary* lib;
+ ObexInterface *obexIface;
};
#endif