-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 20 | ||||
-rw-r--r-- | core/applets/clockapplet/clock.cpp | 4 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 4 | ||||
-rw-r--r-- | core/applets/multikeyapplet/multikey.cpp | 2 | ||||
-rw-r--r-- | core/applets/restartapplet/restart.cpp | 2 | ||||
-rw-r--r-- | core/applets/restartapplet/restartappletimpl.cpp | 1 | ||||
-rw-r--r-- | core/applets/rotateapplet/rotate.cpp | 7 | ||||
-rw-r--r-- | core/applets/screenshotapplet/screenshot.cpp | 20 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 34 | ||||
-rw-r--r-- | core/applets/vtapplet/vt.cpp | 25 |
10 files changed, 63 insertions, 56 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 1ad8b55..3a6ad27 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -16,16 +16,19 @@ * * ***************************************************************************/ #include "cardmon.h" /* OPIE */ +#include <opie2/odebug.h> #include <opie2/odevice.h> #include <opie2/otaskbarapplet.h> #include <qpe/applnk.h> #include <qpe/resource.h> +using namespace Opie::Core; +using namespace Opie::Ui; /* QT */ #include <qcopchannel_qws.h> #include <qpainter.h> #include <qfile.h> #include <qtextstream.h> @@ -35,24 +38,17 @@ /* 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::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, @@ -194,18 +190,18 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) { if ( msg == "stabChanged()" ) { - // qDebug("Pcmcia: stabchanged"); + // odebug << "Pcmcia: stabchanged" << oendl; getStatusPcmcia(); } else if ( msg == "mtabChanged()" ) { - // qDebug("CARDMONAPPLET: mtabchanged"); + // odebug << "CARDMONAPPLET: mtabchanged" << oendl; getStatusSd(); } } bool CardMonitor::getStatusPcmcia( int showPopUp ) { @@ -328,13 +324,13 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) } } else { // no file found - qDebug( "no file found" ); + odebug << "no file found" << oendl; cardInPcmcia0 = FALSE; cardInPcmcia1 = FALSE; } repaint( FALSE ); return ( ( cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE ); @@ -354,13 +350,13 @@ bool CardMonitor::getStatusSd( int showPopUp ) if ( mntfp ) { while ( ( me = getmntent( mntfp ) ) != 0 ) { QString fs = me->mnt_fsname; - //qDebug( fs ); + //odebug << fs << oendl; if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" || fs.left( 9 ) == "/dev/mmcd" ) { cardInSd = TRUE; show(); } @@ -382,13 +378,13 @@ bool CardMonitor::getStatusSd( int showPopUp ) } else { text += "Ejected: SD/MMC"; what = "off"; } - //qDebug("TEXT: " + text ); + //odebug << "TEXT: " + text << oendl; #ifndef QT_NO_SOUND QSound::play( Resource::findSound( "cardmon/card" + what ) ); #endif popUp( text, "cardmon/ide" ); // XX add SD pic } #else diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp index 3b13d74..7d396e7 100644 --- a/core/applets/clockapplet/clock.cpp +++ b/core/applets/clockapplet/clock.cpp @@ -17,18 +17,22 @@ ** not clear to you. ** **********************************************************************/ #include "clock.h" +/* OPIE */ +#include <opie2/odebug.h> #include <opie2/otaskbarapplet.h> #include <qpe/qpeapplication.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/config.h> +using namespace Opie::Core; using namespace Opie::Ui; + LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) { // If you want a sunken border around the clock do this: // setFrameStyle( QFrame::Panel | QFrame::Sunken ); //setFont( QFont( "Helvetica", , QFont::Normal ) ); connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime() ) ); diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index 2196d18..7122b40 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp @@ -204,25 +204,25 @@ void IrdaApplet::showDiscovered ( ) const QString &line = *lit; if ( line. startsWith ( "nickname:" )) { discoveredDevice = line. mid ( line. find ( ':' ) + 2, line. find ( ',' ) - line. find ( ':' ) - 2 ); deviceAddr = line. mid ( line. find ( "daddr:" ) + 9, 8 ); - // qDebug(discoveredDevice + "(" + deviceAddr + ")"); + // odebug << discoveredDevice + "(" + deviceAddr + ")" << oendl; if ( !m_devices. contains ( deviceAddr )) { popup ( tr( "Found:" ) + " " + discoveredDevice ); //snd_found. play ( ); qcopsend = true; } m_devices. replace ( deviceAddr, discoveredDevice ); } } for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) { - // qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?"); + // odebug << "IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?" << oendl; if ( it. data ( ). left ( 3 ) == "+++" ) { popup ( tr( "Lost:" ) + " " + it. data ( ). mid ( 3 )); //snd_lost. play ( ); QMap <QString, QString>::Iterator tmp = it; diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp index 195ada5..195d8a4 100644 --- a/core/applets/multikeyapplet/multikey.cpp +++ b/core/applets/multikeyapplet/multikey.cpp @@ -65,13 +65,13 @@ void Multikey::mouseReleaseEvent(QMouseEvent *ev) { if (!sw_maps.count()) return; lang = lang < sw_maps.count()-1 ? lang+1 : 0; QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); - //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii()); + //odebug << "Lang=" << lang << ", count=" << sw_maps.count() << ", lab=" << labels[lang].ascii() << "" << oendl; e << sw_maps[lang]; setText(labels[lang]); } void Multikey::message(const QCString &message, const QByteArray &data) { diff --git a/core/applets/restartapplet/restart.cpp b/core/applets/restartapplet/restart.cpp index 226c2a8..2e17608 100644 --- a/core/applets/restartapplet/restart.cpp +++ b/core/applets/restartapplet/restart.cpp @@ -50,23 +50,21 @@ static char *restart_xpm[] = { " .. ", " "}; RestartApplet::RestartApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { setFixedHeight( 18 ); setFixedWidth( 16 ); - qDebug("new restartapplet"); show(); } RestartApplet::~RestartApplet() { } void RestartApplet::mousePressEvent( QMouseEvent *) { QCopEnvelope e("QPE/System", "restart()"); } void RestartApplet::paintEvent( QPaintEvent* ) { QPainter p(this); - qDebug("paint RESTART pixmap"); p.drawPixmap( 0, 1, ( const char** ) restart_xpm ); } diff --git a/core/applets/restartapplet/restartappletimpl.cpp b/core/applets/restartapplet/restartappletimpl.cpp index d8e10d3..3adc80c 100644 --- a/core/applets/restartapplet/restartappletimpl.cpp +++ b/core/applets/restartapplet/restartappletimpl.cpp @@ -30,13 +30,12 @@ RestartAppletImpl::~RestartAppletImpl() { delete restart; } QWidget *RestartAppletImpl::applet( QWidget *parent ) { - qDebug("restart applet"); if ( !restart ) restart = new RestartApplet( parent ); return restart; } int RestartAppletImpl::position() const diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp index f621aa9..f23423d 100644 --- a/core/applets/rotateapplet/rotate.cpp +++ b/core/applets/rotateapplet/rotate.cpp @@ -28,12 +28,13 @@ Boston, MA 02111-1307, USA. */ #include "rotate.h" /* OPIE */ +#include <opie2/odebug.h> #include <opie2/odevice.h> #include <qpe/config.h> #include <qpe/power.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/resource.h> using namespace Opie::Core; @@ -59,23 +60,23 @@ RotateApplet::~RotateApplet ( ) /** * Qcop receive method. */ void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data ) { - qDebug( "RotateApplet::channelReceived( '%s' )", (const char*) msg ); + odebug << "RotateApplet::channelReceived( '" << msg << "' )" << oendl; if ( ODevice::inst()->hasHingeSensor() ) { struct timespec interval; struct timespec remain; interval.tv_sec = 0; interval.tv_nsec = 600000; ::nanosleep( &interval, &remain ); OHingeStatus status = ODevice::inst()->readHingeSensor(); - qDebug( "RotateApplet::readHingeSensor = %d", (int) status ); + odebug << "RotateApplet::readHingeSensor = " << (int) status << "" << oendl; Config cfg( "apm" ); cfg.setGroup( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ? "AC" : "Battery" ); int action = cfg.readNumEntry( "CloseHingeAction", 0 ); if ( status == CASE_CLOSED ) @@ -93,13 +94,13 @@ void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data { case 1: /* DISPLAY OFF */ ODevice::inst()->setDisplayBrightness( 127 ); break; case 2: /* SUSPEND */ /* How to wake up the device from kernel? */; break; default: /* IGNORE */ break; } } - qDebug( "RotateApplet::switchAction %d performed.", cfg.readNumEntry( "CloseHingeAction", 0 ) ); + odebug << "RotateApplet::switchAction " << cfg.readNumEntry( "CloseHingeAction" ) << " performed." << oendl; } QDataStream stream( data, IO_ReadOnly ); if ( msg == "flip()" ) { activated ( ); diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp index 9aa012a..938ea0c 100644 --- a/core/applets/screenshotapplet/screenshot.cpp +++ b/core/applets/screenshotapplet/screenshot.cpp @@ -13,15 +13,18 @@ **********************************************************************/ #include "screenshot.h" #include "inputDialog.h" /* OPIE */ +#include <opie2/odebug.h> #include <opie2/otaskbarapplet.h> #include <qpe/qpeapplication.h> #include <qpe/applnk.h> +using namespace Opie::Core; +using namespace Opie::Ui; /* QT */ #include <qlineedit.h> #include <qdir.h> #include <qlabel.h> #include <qpushbutton.h> @@ -36,13 +39,12 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> #include <unistd.h> /* XPM */ -using namespace Opie::Ui; static char * snapshot_xpm[] = { "32 32 177 2", " c None", ". c #042045", "+ c #0D2B47", "@ c #0E325E", @@ -359,57 +361,57 @@ void ScreenshotControl::savePixmap() //not sure why this is needed here, but it forgets fileName // if this is below the braces if (fileName.right(3) != "png") fileName = fileName + ".png"; lnk.setFile(fileName); //sets File property - qDebug("saving file " + fileName); + odebug << "saving file " + fileName << oendl; snapshot.save( fileName, "PNG"); QFileInfo fi( fileName); lnk.setName( fi.fileName()); //sets file name if (!lnk.writeLink()) - qDebug("Writing doclink did not work"); + odebug << "Writing doclink did not work" << oendl; } else { fileName = "sc_" + QDateTime::currentDateTime().toString(); fileName.replace(QRegExp("'"), ""); fileName.replace(QRegExp(" "), "_"); fileName.replace(QRegExp(":"), "."); fileName.replace(QRegExp(","), ""); QString dirName = QDir::homeDirPath() + "/Documents/image/png/"; if ( !QDir( dirName).exists() ) { - qDebug("making dir " + dirName); + odebug << "making dir " + dirName << oendl; QString msg = "mkdir -p " + dirName; system(msg.latin1()); } fileName = dirName + fileName; if (fileName.right(3) != "png") fileName = fileName + ".png"; lnk.setFile(fileName); //sets File property - qDebug("saving file " + fileName); + odebug << "saving file " + fileName << oendl; snapshot.save( fileName, "PNG"); QFileInfo fi( fileName); lnk.setName( fi.fileName()); //sets file name if (!lnk.writeLink()) - qDebug("Writing doclink did not work"); + odebug << "Writing doclink did not work" << oendl; } QPEApplication::beep(); } void ScreenshotControl::performGrab() { snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height() ); if (buttonPushed == 1) { - qDebug("grabbing screen"); + odebug << "grabbing screen" << oendl; grabTimer->stop(); show(); qApp->processEvents(); savePixmap(); } else { grabTimer->stop(); @@ -417,13 +419,13 @@ void ScreenshotControl::performGrab() struct sockaddr_in raddr; struct hostent *rhost_info; int sock = -1; bool ok = false; QString displayEnv = getenv("QWS_DISPLAY"); - qDebug(displayEnv); + odebug << displayEnv << oendl; if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) { if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) { ::memset ( &raddr, 0, sizeof (struct sockaddr_in)); ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length ); @@ -454,13 +456,13 @@ void ScreenshotControl::performGrab() "Content-Type: image/png\n" "Host: %4\n" // 4: scap host "\n"; header = header.arg( SCAP_model).arg( ::getenv( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname ); - qDebug(header); + odebug << header << oendl; if ( !pix.isNull() ) { const char *ascii = header.latin1( ); uint ascii_len = ::strlen( ascii ); ::write ( sock, ascii, ascii_len ); ::write ( sock, img.bits(), img.numBytes() ); diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 7dd5b4b..622b1df 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -9,12 +9,16 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ************************************************************************************/ // copyright 2002 Jeremy Cowgar <jc@cowgar.com> // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> +/* OPIE */ +#include <opie2/odebug.h> +using namespace Opie::Core; + extern "C" { #include "adpcm.h" } #include <unistd.h> #include <stdio.h> @@ -204,13 +208,13 @@ VMemo::VMemo( QWidget *parent, const char *_name ) Config vmCfg("Vmemo"); vmCfg.setGroup("Defaults"); int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1)); useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); - qDebug("toggleKey %d", toggleKey); + odebug << "toggleKey " << toggleKey << "" << oendl; if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" )) systemZaurus=TRUE; else systemZaurus=FALSE; myChannel = new QCopChannel( "QPE/VMemo", this ); @@ -242,13 +246,13 @@ VMemo::~VMemo() { int VMemo::position() { return 6; } void VMemo::receive( const QCString &msg, const QByteArray &data ) { - qDebug("receive"); + odebug << "receive" << oendl; QDataStream stream( data, IO_ReadOnly ); if (msg == "toggleRecord()") { if (recording) { fromToggle = TRUE; stopRecording(); @@ -290,13 +294,13 @@ bool VMemo::startRecording() { msgLabel = new QLabel( 0, "alertLabel" ); msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>"); msgLabel->show(); } - qDebug("Start recording engines"); + odebug << "Start recording engines" << oendl; recording = TRUE; if (openDSP() == -1) { recording = FALSE; return FALSE; } @@ -315,26 +319,26 @@ bool VMemo::startRecording() { fileName = config.readEntry("RecLocation", fName); int s; s=fileName.find(':'); if(s) fileName=fileName.right(fileName.length()-s-2); - qDebug("pathname will be "+fileName); + odebug << "pathname will be "+fileName << oendl; if( fileName.left(1).find('/') == -1) fileName="/"+fileName; if( fileName.right(1).find('/') == -1) fileName+="/"; fName = "vm_"+ date+ ".wav"; fileName+=fName; - qDebug("filename is "+fileName); + odebug << "filename is "+fileName << oendl; // open tmp file here char *pointer; pointer=tmpnam(NULL); - qDebug("Opening tmp file %s",pointer); + odebug << "Opening tmp file " << pointer << "" << oendl; if(openWAV(pointer ) == -1) { QString err("Could not open the temp file\n"); err += fileName; QMessageBox::critical(0, "vmemo", err, "Abort"); @@ -368,13 +372,13 @@ bool VMemo::startRecording() { return FALSE; } void VMemo::stopRecording() { show(); - qDebug("Stopped recording"); + odebug << "Stopped recording" << oendl; recording = FALSE; if(useAlerts) { msgLabel->close(); msgLabel=0; delete msgLabel; } @@ -396,13 +400,13 @@ int VMemo::openDSP() { resolution = 16; } else { format = AFMT_U8; resolution = 8; } - qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); + odebug << "samplerate: " << speed << ", channels " << channels << ", resolution " << resolution << "" << oendl; if(systemZaurus) { dsp = open("/dev/dsp1", O_RDONLY); //Zaurus needs /dev/dsp1 channels=1; //zaurus has one input channel } else { dsp = open("/dev/dsp", O_RDONLY); @@ -480,24 +484,24 @@ int VMemo::openWAV(const char *filename) { bool VMemo::record() { length=0; int result, value; QString msg; msg.sprintf("Recording format %d", format); - qDebug(msg); + odebug << msg << oendl; Config config("Vmemo"); config.setGroup("Record"); int sRate=config.readNumEntry("SizeLimit", 30); if(sRate > 0) t_timer->start( sRate * 1000+1000, TRUE); // if(systemZaurus) { // } else { // 16 bit only capabilities msg.sprintf("Recording format other"); - qDebug(msg); + odebug << msg << oendl; int bufsize=1024; int bytesWritten=0; signed short sound[1024], monoBuffer[1024]; char abuf[bufsize/2]; short sbuf[bufsize]; @@ -510,13 +514,13 @@ bool VMemo::record() { if(useADPCM) result = read( dsp, sbuf, bufsize); // 8192 else result = read(dsp, sound, 1024); // 8192 if( result <= 0) { perror("recording error "); -// qDebug(currentFileName); +// odebug << currentFileName << oendl; QMessageBox::message(tr("Note"),tr("error recording")); recording=FALSE; break; return FALSE; } @@ -537,13 +541,13 @@ bool VMemo::record() { recording=false; perror("dev/dsp's is a lookin' messy"); QMessageBox::message("Vmemo","Error writing to file\n"+ fileName); break; return FALSE; } - // printf("%d\r",length); + // odebug << "" << length << "\r" << oendl; // fflush(stdout); qApp->processEvents(); } // qDebug("file has length of %d lasting %d seconds", // length, (( length / speed) / channels) / 2 ); // } @@ -556,13 +560,13 @@ bool VMemo::record() { write(wav, &value, 4); lseek(wav, 40, SEEK_SET); write(wav, &length, 4); track.close(); - qDebug("Track closed"); + odebug << "Track closed" << oendl; if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1) perror("ioctl(\"SNDCTL_DSP_RESET\")"); ::close(dsp); @@ -580,17 +584,17 @@ bool VMemo::record() { cfgO.writeEntry( QString::number( nFiles + 1), currentFile); cfgO.writeEntry( currentFile, currentFileName); QString time; time.sprintf("%.2f", numberOfRecordedSeconds); cfgO.writeEntry( currentFileName, time ); - // qDebug("writing config numberOfRecordedSeconds "+time); + // odebug << "writing config numberOfRecordedSeconds "+time << oendl; cfgO.write(); - qDebug("done recording "+fileName); + odebug << "done recording "+fileName << oendl; Config cfg("qpe"); cfg.setGroup("Volume"); QString foo = cfg.readEntry("Mute","TRUE"); if(foo.find("TRUE",0,TRUE) != -1) QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp index bd39093..aec63c3 100644 --- a/core/applets/vtapplet/vt.cpp +++ b/core/applets/vtapplet/vt.cpp @@ -1,34 +1,37 @@ /********************************************************************** -** Copyright (C) 2003 Michael 'Mickey' Lauer. All rights reserved. -** -** Contact me @ mickeyl@handhelds.org +** Copyright (C) 2003-2004 Michael 'Mickey' Lauer <mickey@Vanille.de> ** ** 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. ** **********************************************************************/ +#include "vt.h" + +/* OPIE */ +#include <opie2/odebug.h> #include <qpe/resource.h> +using namespace Opie::Core; +/* QT */ #include <qpopupmenu.h> +/* STD */ #include <fcntl.h> #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/ioctl.h> #include <linux/vt.h> -#include "vt.h" - VTApplet::VTApplet ( ) : QObject ( 0, "VTApplet" ) { } VTApplet::~VTApplet ( ) @@ -71,13 +74,13 @@ QIconSet VTApplet::icon ( ) const pix. convertFromImage ( img. smoothScale ( 14, 14 )); return pix; } QPopupMenu *VTApplet::popup ( QWidget* parent ) const { - qDebug( "VTApplet::popup" ); + odebug << "VTApplet::popup" << oendl; struct vt_stat vtstat; int fd = ::open( "/dev/tty0", O_RDWR ); if ( fd == -1 ) return 0; if ( ioctl( fd, VT_GETSTATE, &vtstat ) == -1 ) return 0; @@ -96,48 +99,48 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const return m_subMenu; } void VTApplet::changeVT( int index ) { - //qDebug( "VTApplet::changeVT( %d )", index-500 ); + //odebug << "VTApplet::changeVT( " << index-500 << " )" << oendl; int fd = ::open("/dev/tty0", O_RDWR); if ( fd == -1 ) return; ioctl( fd, VT_ACTIVATE, index-500 ); } void VTApplet::updateMenu() { - //qDebug( "VTApplet::updateMenu()" ); + //odebug << "VTApplet::updateMenu()" << oendl; int fd = ::open( "/dev/console", O_RDONLY ); if ( fd == -1 ) return; for ( int i = 1; i < 10; ++i ) { int result = ioctl( fd, VT_DISALLOCATE, i ); /* if ( result == -1 ) - qDebug( "VT %d disallocated == free", i ); + odebug << "VT " << i << " disallocated == free" << oendl; else - qDebug( "VT %d _not_ disallocated == busy", i ); + odebug << "VT " << i << " _not_ disallocated == busy" << oendl; */ m_subMenu->setItemEnabled( 500+i, result == -1 ); } ::close( fd ); } void VTApplet::activated() { - qDebug( "VTApplet::activated()" ); + odebug << "VTApplet::activated()" << oendl; } QRESULT VTApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) { *iface = 0; |