summaryrefslogtreecommitdiff
authoralwin <alwin>2004-03-14 12:14:02 (UTC)
committer alwin <alwin>2004-03-14 12:14:02 (UTC)
commitb329ada89fda307618f2d6161c249f46cae3e029 (patch) (side-by-side diff)
treed3e1c2f6ded77f327a47c4fe4ac23ecce2ecdc34
parent3e260630413b00d145f48b5ede85530743fd095e (diff)
downloadopie-b329ada89fda307618f2d6161c249f46cae3e029.zip
opie-b329ada89fda307618f2d6161c249f46cae3e029.tar.gz
opie-b329ada89fda307618f2d6161c249f46cae3e029.tar.bz2
namespace fix
Must reviewed 'cause it uses stuff from Private namespace!
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index e8072c6..6090b68 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -25,48 +25,51 @@
#include <qpe/resource.h>
/* QT */
#include <qcopchannel_qws.h>
#include <qpainter.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qsound.h>
#include <qtimer.h>
/* STD */
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
#include <sys/vfs.h>
#include <mntent.h>
#endif
using namespace Opie;
+using namespace Opie::Ui;
+using namespace Opie::Core;
+
CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
pm( Resource::loadPixmap( "cardmon/pcmcia" ) )
{
QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
connect( pcmciaChannel,
SIGNAL( received(const QCString&,const QByteArray&) ), this,
SLOT( cardMessage(const QCString&,const QByteArray&) ) );
QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this );
connect( sdChannel,
SIGNAL( received(const QCString&,const QByteArray&) ), this,
SLOT( cardMessage(const QCString&,const QByteArray&) ) );
cardInPcmcia0 = FALSE;
cardInPcmcia1 = FALSE;
cardInSd = FALSE;
setFocusPolicy( NoFocus );
setFixedWidth ( AppLnk::smallIconSize() );
setFixedHeight ( AppLnk::smallIconSize() );
getStatusPcmcia( TRUE );
@@ -397,27 +400,27 @@ bool CardMonitor::getStatusSd( int showPopUp )
void CardMonitor::paintEvent( QPaintEvent * )
{
QPainter p( this );
if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd )
{
p.drawPixmap( 0, 0, pm );
show();
}
else
{
//p.eraseRect(rect());
hide();
}
}
int CardMonitor::position()
{
return 7;
}
Q_EXPORT_INTERFACE()
{
- Q_CREATE_INSTANCE( OTaskbarAppletWrapper<CardMonitor> );
+ Q_CREATE_INSTANCE( Opie::Ui::Private::OTaskbarAppletWrapper<CardMonitor> );
}