summaryrefslogtreecommitdiff
authorerik <erik>2007-05-10 23:34:29 (UTC)
committer erik <erik>2007-05-10 23:34:29 (UTC)
commite87affd3d9a8a7d705d0dc3d1a4905e1e3f902d0 (patch) (side-by-side diff)
treea5b03a9e3dbff8f004f10d33c15fd86601f213f9
parent34975323367e4a903886cd317b34192f1271a1f2 (diff)
downloadopie-e87affd3d9a8a7d705d0dc3d1a4905e1e3f902d0.zip
opie-e87affd3d9a8a7d705d0dc3d1a4905e1e3f902d0.tar.gz
opie-e87affd3d9a8a7d705d0dc3d1a4905e1e3f902d0.tar.bz2
application of proper parens for the socket call check
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/irdaapplet/irda.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index d57104b..848ddb4 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -9,97 +9,97 @@
** 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.
**
**********************************************************************/
#include "irda.h"
/* OPIE */
#include <opie2/oresource.h>
#include <opie2/otaskbarapplet.h>
#include <qpe/applnk.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/ir.h>
/* QT */
#include <qpainter.h>
#include <qfile.h>
#include <qtimer.h>
#include <qtextstream.h>
/* STD */
#include <unistd.h>
#include <net/if.h>
#include <netinet/in.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
//===========================================================================
IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) :
QWidget ( parent, name ),
m_irda_active( false ),
m_irda_discovery_active( false ),
m_receive_active( false ),
m_receive_state_changed( false ),
m_popup( 0 ),
m_wasOn( false ),
m_wasDiscover( false )
{
setFixedHeight( AppLnk::smallIconSize() );
setFixedWidth( AppLnk::smallIconSize() );
- if (m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ) == -1)
+ if ( ( m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ) ) == -1)
perror ( "failed grabbing IrDA socket" );
m_irdaOnPixmap =
Opie::Core::OResource::loadPixmap( "irdaapplet/irdaon",
Opie::Core::OResource::SmallIcon );
m_irdaOffPixmap =
Opie::Core::OResource::loadPixmap( "irdaapplet/irdaoff",
Opie::Core::OResource::SmallIcon );
m_irdaDiscoveryOnPixmap =
Opie::Core::OResource::loadPixmap( "irdaapplet/magglass",
Opie::Core::OResource::SmallIcon );
m_receiveActivePixmap =
Opie::Core::OResource::loadPixmap( "irdaapplet/receive",
Opie::Core::OResource::SmallIcon );
QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this );
connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), this,
SLOT(slotMessage(const QCString&,const QByteArray&) ) );
}
int IrdaApplet::position()
{
return 6;
}
void IrdaApplet::show()
{
QWidget::show ( );
startTimer ( 2000 );
}
IrdaApplet::~IrdaApplet()
{
if ( m_sockfd >= 0 )
::close ( m_sockfd );
}
void IrdaApplet::popup ( QString message, QString icon )
{
if ( !m_popup )
m_popup = new QPopupMenu ( this );
m_popup-> clear ( );
if ( icon. isEmpty ( ))
m_popup-> insertItem ( message, 0 );
else
m_popup-> insertItem ( QIconSet (