4 files changed, 12 insertions, 12 deletions

diff --git a/noncore/applets/memoryapplet/swapfile.cpp b/noncore/applets/memoryapplet/swapfile.cpp
index 04da8bb..9416db3 100644
--- a/noncore/applets/memoryapplet/swapfile.cpp
+++ b/noncore/applets/memoryapplet/swapfile.cpp
@@ -1,307 +1,307 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of 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 "swapfile.h"
 
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qhbuttongroup.h>
 #include <qradiobutton.h>
 #include <qlineedit.h>
 #include <qprogressbar.h>
 #include <qcombobox.h>
 #include <qvgroupbox.h>
 #include <qhbox.h>
 #include <qmessagebox.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <qcopchannel_qws.h>
 #include <qpe/resource.h>
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #include <unistd.h>
 #include <sys/types.h>
 
 Swapfile::Swapfile( QWidget *parent, const char *name, WFlags f )
     : QWidget( parent, name, f )
 {
         // are we running as root?
         isRoot = geteuid() == 0;
 
     QVBoxLayout* vb = new QVBoxLayout(this, 5);
 
         QHButtonGroup* cfsdRBG = new QHButtonGroup(tr("Swapfile location"), this);
         cfsdRBG->setRadioButtonExclusive(true);
     vb->addWidget(cfsdRBG);
 
         ramRB = new QRadioButton(tr("RAM"), cfsdRBG);
         cfRB = new QRadioButton(tr("CF Card"), cfsdRBG);
         sdRB = new QRadioButton(tr("SD Card"), cfsdRBG);
 
         QHBox *hb1 = new QHBox(this);
         hb1->setSpacing(5);
 
         swapPath1 = new QLineEdit(hb1);
         swapPath1->setEnabled(false);
 
         QPushButton* swapOn = new QPushButton(tr(" On "), hb1);
         QPushButton* swapOff = new QPushButton(tr(" Off "), hb1);
         vb->addWidget(hb1);
 
         QVGroupBox* box1 = new QVGroupBox(tr("Manage Swapfile"), this);
     vb->addWidget(box1);
 
         QHBox *hb2 = new QHBox(box1);
         hb2->setSpacing(5);
         QPushButton* mkSwap = new QPushButton(tr("Generate"), hb2);
         QPushButton* rmSwap = new QPushButton(tr("Remove"), hb2);
 
         QHBox *hb3 = new QHBox(box1);
         hb3->setSpacing(5);
         swapSize = new QComboBox(hb3);
         swapSize->insertStringList(QStringList::split(",", tr("2 Mb,4 Mb,6 Mb,8 Mb")));
 
         mkswapProgress = new QProgressBar(3, hb3);
         mkswapProgress->setCenterIndicator(true);
 
         QHBox *hb4 = new QHBox(this);
         hb4->setSpacing(5);
 
         swapStatusIcon = new QLabel(hb4);
         swapStatus = new QLabel(tr(""), hb4);
         hb4->setStretchFactor(swapStatus, 99);
     vb->addWidget(hb4);
 
     connect(swapOn, SIGNAL(clicked()), this, SLOT(swapon()));
     connect(swapOff, SIGNAL(clicked()), this, SLOT(swapoff()));
     connect(cfRB, SIGNAL(clicked()), this, SLOT(cfsdchecked()));
     connect(sdRB, SIGNAL(clicked()), this, SLOT(cfsdchecked()));
     connect(ramRB, SIGNAL(clicked()), this, SLOT(cfsdchecked()));
     connect(mkSwap, SIGNAL(clicked()), this, SLOT(makeswapfile()));
     connect(rmSwap, SIGNAL(clicked()), this, SLOT(removeswapfile()));
 
         cfRB->setEnabled(FALSE);
     sdRB->setEnabled(FALSE);
 
     QCopChannel *pcmciaChannel = new QCopChannel("QPE/Card", this);
-    connect(pcmciaChannel, SIGNAL(received(const QCString &, const QByteArray &)), this, SLOT(cardnotify(const QCString &, const QByteArray &)));
+    connect(pcmciaChannel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(cardnotify(const QCString&,const QByteArray&)));
     QCopChannel *sdChannel = new QCopChannel("QPE/Card", this);
-    connect(sdChannel, SIGNAL(received(const QCString &, const QByteArray &)), this, SLOT(cardnotify(const QCString &, const QByteArray &)));
+    connect(sdChannel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(cardnotify(const QCString&,const QByteArray&)));
 
     cardInPcmcia0 = FALSE;
     cardInPcmcia1 = FALSE;
     cardInSd = FALSE;
 
     Swapfile::status();
     Swapfile::getStatusPcmcia();
     Swapfile::getStatusSd();
 }
 
 int Swapfile::exec(const QString& arg)
 {
         return system((!isRoot ? "sudo " : "") + arg);
 }
 
 
 Swapfile::~Swapfile()
 {
 }
 
 void Swapfile::cardnotify(const QCString & msg, const QByteArray &)
 {
     if (msg == "stabChanged()")
         {
         getStatusPcmcia();
     }
         else if (msg == "mtabChanged()")
         {
         getStatusSd();
         }
 }
 
 void Swapfile::getStatusPcmcia()
 {
 
             bool cardWas0 = cardInPcmcia0;// remember last state
     bool cardWas1 = cardInPcmcia1;
 
     QString fileName;
 
     // one of these 3 files should exist
     if (QFile::exists("/var/run/stab")) {
         fileName = "/var/run/stab";
     } else if (QFile::exists("/var/state/pcmcia/stab")) {
         fileName = "/var/state/pcmcia/stab";
     } else {
         fileName = "/var/lib/pcmcia/stab";
     }
 
     QFile f(fileName);
 
     if (f.open(IO_ReadOnly)) {
         QStringList list;
         QTextStream stream(&f);
         QString streamIn;
         streamIn = stream.read();
         list = QStringList::split("\n", streamIn);
         for (QStringList::Iterator line = list.begin(); line != list.end();
              line++) {
             if ((*line).startsWith("Socket 0:")) {
                 if ((*line).startsWith("Socket 0: empty") && cardInPcmcia0) {
                     cardInPcmcia0 = FALSE;
                 } else if (!(*line).startsWith("Socket 0: empty")
                            && !cardInPcmcia0) {
                     cardInPcmcia0 = TRUE;
                 }
             } else if ((*line).startsWith("Socket 1:")) {
                 if ((*line).startsWith("Socket 1: empty") && cardInPcmcia1) {
                     cardInPcmcia1 = FALSE;
                 } else if (!(*line).startsWith("Socket 1: empty")
                            && !cardInPcmcia1) {
                     cardInPcmcia1 = TRUE;
                 }
             }
         }
         f.close();
 
         if (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1) {
             QString text = QString::null;
             QString what = QString::null;
             if (cardWas0 != cardInPcmcia0) {
                 if (cardInPcmcia0) {
                    cfRB->setEnabled(TRUE);
                 } else {
                    cfRB->setChecked(FALSE);
                    cfRB->setEnabled(FALSE);
                 }
             }
 
             if (cardWas1 != cardInPcmcia1) {
                 if (cardInPcmcia1) {
                    cfRB->setEnabled(TRUE);
                 } else {
                    cfRB->setChecked(FALSE);
                    cfRB->setEnabled(FALSE);
                 }
             }
         }
     } else {
         // no file found
         qDebug("no file found");
         cardInPcmcia0 = FALSE;
         cardInPcmcia1 = FALSE;
     }
     Swapfile::cfsdchecked();
 }
 
 
 void Swapfile::getStatusSd()
 {
 
             bool cardWas = cardInSd;// remember last state
     cardInSd = FALSE;
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     struct mntent *me;
     FILE *mntfp = setmntent("/etc/mtab", "r");
 
     if (mntfp) {
         while ((me = getmntent(mntfp)) != 0) {
             QString fs = me->mnt_fsname;
             if (fs.left(14) == "/dev/mmc/part1" || fs.left(7) == "/dev/sd"
                 || fs.left(9) == "/dev/mmcd") {
                 cardInSd = TRUE;
                 show();
             }
         }
         endmntent(mntfp);
     }
 
     if (cardWas != cardInSd) {
         QString text = QString::null;
         QString what = QString::null;
         if (cardInSd) {
            sdRB->setEnabled(TRUE);
         } else {
                sdRB->setChecked(FALSE);
            sdRB->setEnabled(FALSE);
         }
     }
 #else
 #error "Not on Linux"
 #endif
         Swapfile::cfsdchecked();
 }
 
 int rc=0;
 
 void Swapfile::swapon()
 {
         char swapcmd[128] ="swapon ";
         Swapfile::cfsdchecked();
         strcat(swapcmd,swapPath1->text());
         char *runcmd = swapcmd;
         rc = exec(QString("%1").arg(runcmd));
         if (rc != 0) {
                setStatusMessage("Failed to attach swapfile.", true);
         }
         else {
         /*       QMessageBox::information(this, "Information", "Swapfile is active!"); */
                setStatusMessage("Swapfile activated.");
         }
        Swapfile::status();
 }
 
 
 void Swapfile::setStatusMessage(const QString& text, bool error /* = false */)
 {
         swapStatus->setText("<b>" + text + "</b>");
         swapStatusIcon->setPixmap(Resource::loadPixmap(error ? "close" : "done"));
 }
 
 
 void Swapfile::swapoff()
 {
         char swapcmd[128] ="swapoff ";
         if (Swapfile::cfRB->isChecked() == TRUE)
         Swapfile::cfsdchecked();
         strcat(swapcmd,swapPath1->text());
         char *runcmd = swapcmd;
         rc = exec(QString("%1").arg(runcmd));
         if (rc != 0) {
                setStatusMessage(tr("Failed to detach swapfile."), true);
         }
         else {
         /*       QMessageBox::information(this, "Information", "Swapfile is inactive!"); */
                setStatusMessage(tr("Swapfile deactivated."));
         /*              Swapfile::swapPath->clear();*/
         }
        Swapfile::status();
 }
 
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp
index 1142028..9b5e475 100644
--- a/noncore/applets/notesapplet/notes.cpp
+++ b/noncore/applets/notesapplet/notes.cpp
@@ -1,417 +1,417 @@
 /**********************************************************************
 ** Copyright (C) 2002 L.J. Potter <llornkcor@handhelds.org>
 
 **  All rights reserved.
 **
 ** 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 "notes.h"
 
 #include <qapplication.h>
 #include <stdlib.h>
 #include <qstringlist.h>
 
 #include <opie2/otaskbarapplet.h>
 #include <qpe/filemanager.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/timestring.h>
 #include <qpe/applnk.h>
 #include <qpe/ir.h>
 #include <qpe/config.h>
 
 // #include <qsocket.h>
 // #include <qclipboard.h>
 #include <qmultilineedit.h>
 #include <qlistbox.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qpoint.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qtimer.h>
 
 /* XPM */
 static char * notes_xpm[] = {
 "16 16 11 1",
 "   c None",
 ".  c #000000",
 "+  c #7F7F7F",
 "@  c #BFBFBF",
 "#  c #BFC1FF",
 "$  c #FF0000",
 "%  c #FFFFFF",
 "&  c #00037F",
 "*  c #0006FF",
 "=  c #0005BF",
 "-  c #7F0000",
 "            ..  ",
 "            ..  ",
 "           ...  ",
 "           .+   ",
 "          .@.   ",
 "        . .+    ",
 "      ..#.@.    ",
 "    ..###.+..   ",
 "  ..###$...##.. ",
 "..###$$$%+$$##&.",
 ".*=####$-###&=&.",
 ".=**=###==&=&=..",
 " ..=**=#&=&=..  ",
 "   ..=*=&=..    ",
 "     ..=..      ",
 "       .        "};
 
 
 NotesControl::NotesControl( QWidget *, const char * )
         : QVBox( 0, "NotesControl",/* WDestructiveClose | */WStyle_StaysOnTop )
 //        : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup )
 {
     QDir d( QDir::homeDirPath()+"/notes");
     if( !d.exists()) {
         qDebug("make dir");
         if(!d.mkdir( QDir::homeDirPath()+"/notes", true))
             qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed");
     }
     Config cfg("Notes");
      cfg.setGroup("Options");
      showMax = cfg.readBoolEntry("ShowMax", false);
 
      setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
     loaded=false;
     edited=false;
     doPopulate=true;
     isNew=false;
     QVBox *vbox = new QVBox( this, "Vlayout" );
     QHBox  *hbox = new QHBox( this, "HLayout" );
 
     view = new QMultiLineEdit(vbox, "OpieNotesView");
 
     box = new QListBox(vbox, "OpieNotesBox");
 
     QPEApplication::setStylusOperation( box->viewport(),QPEApplication::RightOnHold);
 
     box->setFixedHeight(50);
 
     vbox->setMargin( 6 );
     vbox->setSpacing( 3 );
 
 
 
     setFocusPolicy(QWidget::StrongFocus);
 
     newButton= new QPushButton( hbox, "newButton" );
     newButton->setText(tr("New"));
 
 
     saveButton= new QPushButton( hbox, "saveButton" );
     saveButton->setText(tr("Save"));
 
 
     deleteButton= new QPushButton( hbox, "deleteButton" );
     deleteButton->setText(tr("Delete"));
 
 
 
-    connect( box, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint&)),
-             this,SLOT( boxPressed(int, QListBoxItem *, const QPoint&)) );
+    connect( box, SIGNAL( mouseButtonPressed(int,QListBoxItem*,const QPoint&)),
+             this,SLOT( boxPressed(int,QListBoxItem*,const QPoint&)) );
 
-    connect(box, SIGNAL(highlighted(const QString&)), this, SLOT(slotBoxSelected(const QString &)));
+    connect(box, SIGNAL(highlighted(const QString&)), this, SLOT(slotBoxSelected(const QString&)));
 
     connect( &menuTimer, SIGNAL( timeout() ), SLOT( showMenu() ) );
 
     connect(view,SIGNAL( textChanged() ), this, SLOT(slotViewEdited() ) );
 
     connect(newButton, SIGNAL(clicked()), this, SLOT(slotNewButton()));
     connect(saveButton, SIGNAL(clicked()), this, SLOT(slotSaveButton()));
     connect(deleteButton, SIGNAL(clicked()), this, SLOT(slotDeleteButtonClicked()));
 
     populateBox();
     load();
     setCaption("Notes");
       //  parent->setFocus();
 }
 
 void NotesControl::slotSaveButton() {
     slotNewButton();
     populateBox();
 }
 
 void NotesControl::slotDeleteButtonClicked() {
     switch ( QMessageBox::warning(this,tr("Delete?")
                                   ,tr("Do you really want to<BR><B> delete</B> this note ?")
                                   ,tr("Yes"),tr("No"),0,1,1) ) {
       case 0:
           slotDeleteButton();
           break;
     };
 }
 
 void NotesControl::slotDeleteButton() {
 
     QString selectedText = box->currentText();
     qDebug("deleting "+selectedText);
 
     if( !selectedText.isEmpty()) {
 
         Config cfg("Notes");
         cfg.setGroup("Docs");
         int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
         QString entryName, entryName2;;
         for ( int i = 0; i < noOfFiles; i++ ) {
             entryName.sprintf( "File%i", i + 1 );
             if(selectedText == cfg.readEntry( entryName )) {
                 qDebug("removing %s, %d", selectedText.latin1(), i);
                 for ( int j = i; j < noOfFiles; j++ ) {
                     entryName.sprintf( "File%i", i + 1  );
                     entryName2.sprintf( "File%i", i + 2 );
                     QString temp = cfg.readEntry(entryName2);
                     qDebug("move "+temp);
                     cfg.writeEntry(entryName, temp);
                     i++;
                 }
                 cfg.writeEntry("NumberOfFiles", noOfFiles-1 );
                 entryName.sprintf( "File%i", noOfFiles );
                 cfg.removeEntry(entryName);
                 cfg.write();
                 DocLnk nf(selectedText);
                 nf.removeFiles();
                 QString fi=QPEApplication::documentDir()+"/text/plain/"+selectedText+".desktop";
                 qDebug(fi);
 
                 QFile f( fi);
                 if( !f.remove()) qDebug(".desktop file not removed");
 
             }
         }
         view->clear();
 
         populateBox();
     }
 }
 
 void NotesControl::slotNewButton() {
     if(edited) save();
     view->clear();
     view->setFocus();
     edited=false;
     isNew=false;
 }
 
 void NotesControl::slotBeamButton() {
   Ir ir;
   if(!ir.supported()){
   } else {
       this->hide();
     QString selectedText = box->currentText();
     if( !selectedText.isEmpty()) {
         QString file = QDir::homeDirPath()+"/"+selectedText;
         QFile f(file);
            Ir *irFile = new Ir(this, "IR");
-          connect( irFile, SIGNAL(done(Ir*)), this, SLOT( slotBeamFinished( Ir * )));
+          connect( irFile, SIGNAL(done(Ir*)), this, SLOT( slotBeamFinished(Ir*)));
           irFile->send( file, "Note", "text/plain" );
     }
   }
 }
 
 void NotesControl::slotBeamFinished(Ir *) {
     this->show();
 }
 
 void NotesControl::boxPressed(int mouse, QListBoxItem *, const QPoint&) {
   switch (mouse) {
     case 1:{
     }
     break;
   case 2:
     menuTimer.start( 500, TRUE );
     break;
   };
 }
 
 void NotesControl::slotBoxSelected(const QString &itemString) {
     if(edited) {
         save();
     }
     loaded=false;
     edited=false;
     load(itemString);
 }
 
 
 void NotesControl::showMenu() {
   QPopupMenu *m = new QPopupMenu(0);
   m->insertItem(  tr( "Beam Out" ), this,  SLOT( slotBeamButton() ));
   m->insertItem(  tr( "Search For..." ), this,  SLOT( slotSearch() ));
   m->insertItem(  tr( "Toggle Maximized" ), this,  SLOT( slotShowMax() ));
   m->insertSeparator();
   m->insertItem(  tr( "Delete" ), this,  SLOT( slotDeleteButton() ));
   m->setFocus();
   m->exec( QCursor::pos() );
 
   if(m) delete m;
 }
 
 void NotesControl::focusOutEvent ( QFocusEvent * e) {
     if( e->reason() == QFocusEvent::Popup)
         save();
     else {
         if(!loaded) {
         populateBox();
         load();
         }
     }
     QWidget::focusOutEvent(e);
 }
 
 void NotesControl::save() {
     Config cfg("Notes");
     cfg.setGroup("Docs");
     if( edited) {
 //        qDebug("is edited");
         QString rt = view->text();
         if( rt.length()>1) {
             QString pt = rt.simplifyWhiteSpace();
             int i = pt.find( ' ', pt.find( ' ' )+2 );
             QString docname = pt;
             if ( i > 0 )
                 docname = pt.left(i);
               // remove "." at the beginning
             while( docname.startsWith( "." ) )
                 docname = docname.mid( 1 );
             docname.replace( QRegExp("/"), "_" );
               // cut the length. filenames longer than that don't make sense
               // and something goes wrong when they get too long.
             if ( docname.length() > 40 )
                 docname = docname.left(40);
             if ( docname.isEmpty() )
                 docname = "Empty Text";
 //            qDebug(docname);
 
             if( oldDocName != docname) {
                 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
                 QString entryName;
                 entryName.sprintf( "File%i", noOfFiles + 1 );
                 cfg.writeEntry( entryName,docname );
                 cfg.writeEntry("NumberOfFiles", noOfFiles+1 );
                 cfg.write();
             }
 //             else
 //                 qDebug("oldname equals docname");
 
             doc = new DocLnk(docname);
             if(QFile(doc->linkFile()).exists())
                qDebug("puppie");
             doc->setType("text/plain");
             doc->setName(docname);
             QString temp = docname.replace( QRegExp(" "), "_" );
             doc->setFile( QDir::homeDirPath()+"/notes/"+temp);
             FileManager fm;
             if ( !fm.saveFile( *doc, rt ) ) {
             }
 
             oldDocName=docname;
             edited=false;
 //            qDebug("save");
             if (doPopulate)
                 populateBox();
         }
     cfg.writeEntry( "LastDoc",oldDocName );
     cfg.write();
 
     }
 }
 
 void NotesControl::populateBox() {
     box->clear();
 //    qDebug("populate");
     Config cfg("Notes");
     cfg.setGroup("Docs");
     int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
     QStringList list;
     QString entryName;
     for ( int i = 0; i < noOfFiles; i++ ) {
         entryName.sprintf( "File%i", i + 1 );
         list.append(cfg.readEntry( entryName ));
     }
     list.sort();
     box->insertStringList(list,-1);
     doPopulate=false;
     update();
 }
 
 void NotesControl::load() {
 
     if(!loaded) {
         Config cfg("Notes");
         cfg.setGroup("Docs");
         QString lastDoc=cfg.readEntry( "LastDoc","notes");
         DocLnk nf;
         nf.setType("text/plain");
         nf.setFile(lastDoc);
 
         loadDoc(nf);
         loaded=true;
         oldDocName=lastDoc;
         cfg.writeEntry( "LastDoc",oldDocName );
         cfg.write();
     }
 }
 
 void NotesControl::load(const QString & file) {
     qDebug("loading "+file);
     QString name = file;
     QString temp;
     if( !QFile( QDir::homeDirPath()+"/"+file).exists() )
         temp =  QDir::homeDirPath()+"/notes/"+ name.replace( QRegExp(" "), "_" );
     else
         temp = name;
             if(!loaded) {
         DocLnk nf;
         nf.setType("text/plain");
         nf.setFile( temp);
         if(!temp.isEmpty())
         loadDoc(nf);
         loaded=true;
     }
 //    view->setFocus();
     oldDocName=file;
     Config cfg("Notes");
     cfg.setGroup("Docs");
     cfg.writeEntry( "LastDoc",oldDocName );
     cfg.write();
 }
 
 void NotesControl::loadDoc( const DocLnk &f) {
     FileManager fm;
     QString txt;
     if ( !fm.loadFile( f, txt ) ) {
         qDebug("could not load file "+f.file());
         return;
     }
     view->setText(txt);
 }
 
 void NotesControl::slotViewEdited() {
      if(loaded) {
          edited=true;
      }
 }
 
 
 void NotesControl::slotShowMax() {
      Config cfg("Notes");
diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index 9ce6618..6ef2e44 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -1,326 +1,326 @@
 /**********************************************************************
 ** Copyright (C) 2002-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 "wireless.h"
 #include "mgraph.h"
 #include "advancedconfig.h"
 #include "connect0.xpm"
 #include "connect1.xpm"
 #include "connect2.xpm"
 #include "connect3.xpm"
 #include "connect4.xpm"
 #include "connect5.xpm"
 #include "nowireless.xpm"
 
 /* OPIE */
 #include <opie2/onetwork.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/config.h>
 
 /* QT */
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qlabel.h>
 #include <qslider.h>
 #include <qbuttongroup.h>
 #include <qlayout.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
 /* STD */
 #include <sys/types.h>
 #include <signal.h>
 
 #define STYLE_BARS 0
 #define STYLE_ANTENNA 1
 
 //#define MDEBUG
 #undef MDEBUG
 
 WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name )
         : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet )
 {
 
     readConfig();
     writeConfigEntry( "UpdateFrequency", updateFrequency );
     writeConfigEntry( "DisplayStyle", displayStyle );
 
     setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
     QGridLayout *grid = new QGridLayout( this, 3, 2, 6, 2, "top layout" );
 
     /* status label */
 
     statusLabel = new QLabel( this, "statuslabel" );
     QString text( "Wireless Status:<br>"
                   "*** Unknown ***<br>"
                   "Card not inserted ?<br>"
                   "Or Sharp ROM ?<br>"
                   "CELL: 00:00:00:00:00:00" );
     /*    QString text( "Station: Unknown<br>"
                             "ESSID: Unknown<br>"
                         "MODE: Unknown<br>"
                         "FREQ: Unknown<br>"
                         "CELL: AA:BB:CC:DD:EE:FF" ); */
     statusLabel->setText( text );
     statusLabel->setFixedSize( statusLabel->sizeHint() );
     grid->addWidget( statusLabel, 0, 0 );
 
     /* visualization group box */
 
     QButtonGroup* group = new QButtonGroup( 1, Qt::Horizontal, "Visualization", this );
     QRadioButton* r1 = new QRadioButton( "Color Bars", group );
     QRadioButton* r2 = new QRadioButton( "Antenna", group );
     r1->setFocusPolicy( QWidget::NoFocus );
     r2->setFocusPolicy( QWidget::NoFocus );
     group->setFocusPolicy( QWidget::NoFocus );
     group->setButton( displayStyle );
     grid->addWidget( group, 0, 1 );
 
     /* quality graph */
 
     mgraph = new MGraph( this );
     mgraph->setFrameStyle( QFrame::Panel | QFrame::Sunken );
     mgraph->setMin( 0 );
     mgraph->setMax( 92 );
     grid->addWidget( mgraph, 1, 0 );
     mgraph->setFocusPolicy( QWidget::NoFocus );
 
     /* advanced configuration Button */
 
     QPushButton* advanced = new QPushButton( "Advanced...", this );
     advanced->setFocusPolicy( QWidget::NoFocus );
     grid->addWidget( advanced, 2, 0, Qt::AlignCenter );
     connect( advanced, SIGNAL( clicked() ),
              this, SLOT( advancedConfigClicked() ) );
 
     /* update Frequency Label */
 
     updateLabel = new QLabel( this );
     text.sprintf( "Update every %d s", updateFrequency );
     updateLabel->setText( text );
     grid->addWidget( updateLabel, 2, 1 );
 
     /* update Frequency Slider */
 
     QSlider* updateSlider = new QSlider( QSlider::Horizontal, this );
     updateSlider->setRange( 0, 9 );
     updateSlider->setValue( updateFrequency );
     updateSlider->setTickmarks( QSlider::Both );
     updateSlider->setTickInterval( 1 );
     updateSlider->setSteps( 1, 1 );
     updateSlider->setFocusPolicy( QWidget::NoFocus );
     grid->addWidget( updateSlider, 1, 1 );
-    connect( updateSlider, SIGNAL( valueChanged( int ) ),
-             this, SLOT( updateDelayChange( int ) ) );
+    connect( updateSlider, SIGNAL( valueChanged(int) ),
+             this, SLOT( updateDelayChange(int) ) );
 
     setFixedSize( sizeHint() );
     setFocusPolicy( QWidget::NoFocus );
 
     applet->displayStyleChange( displayStyle );
     applet->updateDelayChange( updateFrequency );
 
-    connect( group, SIGNAL( clicked( int ) ),
-             this, SLOT( displayStyleChange( int ) ) );
+    connect( group, SIGNAL( clicked(int) ),
+             this, SLOT( displayStyleChange(int) ) );
 
     applet->updateDHCPConfig( rocESSID, rocFREQ, rocAP, rocMODE );
 }
 
 void WirelessControl::advancedConfigClicked()
 {
     AdvancedConfig * a = new AdvancedConfig( this, "dialog", TRUE );
     int result = a->exec();
     a->hide();
     delete a;
     if ( result == QDialog::Accepted )
     {
         readConfig();
         applet->updateDHCPConfig( rocESSID, rocFREQ, rocAP, rocMODE );
     }
 }
 
 void WirelessControl::updateDelayChange( int delay )
 {
     QString text;
     text.sprintf( "Update every %d s", delay );
     updateLabel->setText( text );
     applet->updateDelayChange( delay );
     writeConfigEntry( "UpdateFrequency", delay );
 }
 
 void WirelessControl::displayStyleChange( int style )
 {
     applet->displayStyleChange( style );
     writeConfigEntry( "DisplayStyle", style );
 }
 
 void WirelessControl::show ( bool )
 {
     QPoint curPos = applet->mapToGlobal( QPoint ( 0, 0 ) );
 
     int w = sizeHint().width();
     int x = curPos.x() - ( w / 2 );
 
     if ( ( x + w ) > QPEApplication::desktop() ->width() )
         x = QPEApplication::desktop ( ) -> width ( ) - w;
 
     move( x, curPos.y () - sizeHint().height () );
     QFrame::show();
 }
 
 void WirelessControl::readConfig()
 {
     Config cfg( "qpe" );
     cfg.setGroup( "Wireless" );
 
     updateFrequency = cfg.readNumEntry( "UpdateFrequency", 2 );
     displayStyle = cfg.readNumEntry( "DisplayStyle", STYLE_ANTENNA );
     rocESSID = cfg.readBoolEntry( "renew_dhcp_on_essid_change", false );
     rocFREQ = cfg.readBoolEntry( "renew_dhcp_on_freq_change", false );
     rocAP = cfg.readBoolEntry( "renew_dhcp_on_ap_change", false );
     rocMODE = cfg.readBoolEntry( "renew_dhcp_on_mode_change", false );
 }
 
 void WirelessControl::writeConfigEntry( const char *entry, int val )
 {
     Config cfg( "qpe" );
     cfg.setGroup( "Wireless" );
     cfg.writeEntry( entry, val );
 }
 
 //===========================================================================
 
 WirelessApplet::WirelessApplet( QWidget *parent, const char *name )
         : QWidget( parent, name ), visualStyle( STYLE_ANTENNA ),
         timer( 0 ), interface( 0 ), oldiface( 0 ),
         rocESSID( false ), rocFREQ( false ), rocAP( false ), rocMODE( false )
 {
     setFixedHeight( 18 );
     setFixedWidth( 14 );
     status = new WirelessControl( this, this, "wireless status" );
 }
 
 void WirelessApplet::checkInterface()
 {
     interface = 0L;
     ONetwork* net = ONetwork::instance();
     net->synchronize();
     ONetwork::InterfaceIterator it = net->iterator();
 
     while ( it.current() && !it.current()->isWireless() ) ++it;
 
     if ( it.current() && it.current()->isWireless() )
         interface = static_cast<OWirelessNetworkInterface*>( it.current() );
 
     if ( interface )
     {
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: using interface '%s'", ( const char* ) interface->name() );
 #endif
 
     }
     else
     {
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" );
 #endif
         hide();
     }
 }
 
 void WirelessApplet::renewDHCP()
 {
 #ifdef MDEBUG
     qDebug( "WIFIAPPLET: Going to request a DHCP configuration renew." );
 #endif
 
     QString pidfile;
     if ( !interface )
         return ;
     QString ifacename( interface->name() );
 
     // At first we are trying dhcpcd
 
     pidfile.sprintf( "/var/run/dhcpcd-%s.pid", ( const char* ) ifacename );
 #ifdef MDEBUG
     qDebug( "WIFIAPPLET: dhcpcd pidfile is '%s'", ( const char* ) pidfile );
 #endif
     int pid;
     QFile pfile( pidfile );
     bool hasFile = pfile.open( IO_ReadOnly );
     QTextStream s( &pfile );
     if ( hasFile )
     {
         s >> pid;
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: sent SIGALARM to pid %d", pid );
 #endif
         kill( pid, SIGALRM );
         return ;
     }
 
     // No dhcpcd, so we are trying udhcpc
 #ifdef MDEBUG
     qDebug( "WIFIAPPLET: dhcpcd not available." );
 #endif
     pidfile.sprintf( "/var/run/udhcpc.%s.pid", ( const char* ) ifacename );
 #ifdef MDEBUG
     qDebug( "WIFIAPPLET: udhcpc pidfile is '%s'", ( const char* ) pidfile );
 #endif
     QFile pfile2( pidfile );
     hasFile = pfile2.open( IO_ReadOnly );
     QTextStream s2( &pfile2 );
     if ( hasFile )
     {
         s2 >> pid;
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: sent SIGUSR1 to pid %d", pid );
 #endif
         kill( pid, SIGUSR1 );
         return ;
     }
 }
 
 void WirelessApplet::updateDHCPConfig( bool ESSID, bool FREQ, bool AP, bool MODE )
 {
     rocESSID = ESSID;
     rocFREQ = FREQ;
     rocAP = AP;
     rocMODE = MODE;
 }
 
 void WirelessApplet::updateDelayChange( int delay )
 {
     if ( timer )
         killTimer( timer );
     delay *= 1000;
     if ( delay == 0 )
         delay = 50;
     timer = startTimer( delay );
 }
 
 void WirelessApplet::displayStyleChange( int style )
 {
     visualStyle = style;
     repaint();
 }
 
 WirelessApplet::~WirelessApplet()
 {}
 
 void WirelessApplet::timerEvent( QTimerEvent* )
 {
 #ifdef MDEBUG
     qDebug( "WirelessApplet::timerEvent" );
 #endif
     if ( interface )
diff --git a/noncore/applets/zkbapplet/zkbwidget.cpp b/noncore/applets/zkbapplet/zkbwidget.cpp
index 0b5ab78..0083e9b 100644
--- a/noncore/applets/zkbapplet/zkbwidget.cpp
+++ b/noncore/applets/zkbapplet/zkbwidget.cpp
@@ -1,162 +1,162 @@
 #include <opie2/otaskbarapplet.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <stdio.h>
 #include <unistd.h>
 #include "zkbwidget.h"
 #include "zkbcfg.h"
 
 ZkbWidget::ZkbWidget(QWidget* parent):QLabel(parent),keymap(0),
         disabled(Resource::loadPixmap("zkb-disabled")) {
 
         labels = new QPopupMenu();
         connect(labels, SIGNAL(activated(int)), this, 
                 SLOT(labelChanged(int)));
 
         loadKeymap();
 
         channel = new QCopChannel("QPE/zkb", this);
-        connect(channel, SIGNAL(received(const QCString&, const QByteArray&)),
-                this, SLOT(signalReceived(const QCString&, const QByteArray&)));
+        connect(channel, SIGNAL(received(const QCString&,const QByteArray&)),
+                this, SLOT(signalReceived(const QCString&,const QByteArray&)));
     setFixedWidth ( AppLnk::smallIconSize()  );
     setFixedHeight ( AppLnk::smallIconSize()  );
 }
 
 ZkbWidget::~ZkbWidget() {
 }
 
 int ZkbWidget::position()
 {
         return 8;
 }
 
 bool ZkbWidget::loadKeymap() {
         ZkbConfig c(QPEApplication::qpeDir()+"/share/zkb");
         QFontMetrics fm(font());
 
         if (keymap != 0) {
                 delete keymap;
                 keymap = 0;
         }
 
         Keymap* km = new Keymap();
 
         if (!c.load("zkb.xml", *km, "")) {
                 delete km;
                 setPixmap(disabled);
                 return false;
         }
 
         connect(km, SIGNAL(stateChanged(const QString&)),
                 this, SLOT(stateChanged(const QString&)));
 
         qwsServer->setKeyboardFilter(km);
 
         Keymap* oldkm = keymap;
         keymap = km;
 
         if (oldkm != 0) {
                 delete oldkm;
         }
 
         setText(keymap->getCurrentLabel());
 
         labels->clear();
         QStringList l = keymap->listLabels();
         labels->insertItem(disabled, 0, 0);
         int n = 1;
         w = 0;
         for(QStringList::Iterator it = l.begin(); it != l.end(); 
                 ++it, n++) {
 
         //      printf("label: %s\n", (const char*) (*it).utf8());
 
                 labels->insertItem(*it, n, n);
                 int lw = fm.width(*it);
                 if (lw > w) {
                         w = lw;
                 }
         }
 
         if (w == 0) {
                 hide();
         } else {
                 show();
         }
         return true;
 }
 
 QSize ZkbWidget::sizeHint() const {
     return QSize(AppLnk::smallIconSize(),AppLnk::smallIconSize());
 }
 
 void ZkbWidget::stateChanged(const QString& s) {
         //qDebug("stateChanged: %s\n", (const char*) s.utf8());
         setText(s);
 }
 
 void ZkbWidget::labelChanged(int id) {
         if (id == 0) {
                 keymap->disable();
                 setPixmap(disabled);
                 return;
         }
 
         keymap->enable();
 
         QStringList l = keymap->listLabels();
         QString lbl = l[id-1];
 
         //printf("labelChanged: %s\n", (const char*) lbl.utf8());
         State* state = keymap->getStateByLabel(lbl);
         if (state != 0) {
                 keymap->setCurrentState(state);
                 setText(lbl);
         }
 }
 
 void ZkbWidget::mouseReleaseEvent(QMouseEvent*) {
         QSize sh = labels->sizeHint();
         QPoint p = mapToGlobal(QPoint((width()-sh.width())/2,-sh.height()));
         labels->exec(p);
 }
 
 void ZkbWidget::signalReceived(const QCString& msg, const QByteArray& data) {
         QDataStream stream(data, IO_ReadOnly);
 
         if (msg == "enable()") {
                 keymap->enable();
         } else if (msg == "disable()") {
                 keymap->disable();
         } else if (msg == "reload()") {
                 QCopEnvelope("QPE/System", "busy()");
                 QTimer::singleShot(0, this, SLOT(reload()));
         } else if (msg == "switch(QString)") {
                 QString lbl;
                 stream >> lbl;
 
                 if (keymap != 0) {
                         State* state = keymap->getStateByLabel(lbl);
                         if (state != 0) {
                                 keymap->setCurrentState(state);
                                 setText(lbl);
                         }
                 }
         } else if (msg == "debug(QString)") {
                 QString flag;
                 stream >> flag;
         }
 }
 
 void ZkbWidget::reload() {
         loadKeymap();
         QCopEnvelope("QPE/System", "notBusy()");
 }
 
 Q_EXPORT_INTERFACE()
 {
     Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ZkbWidget> );
 }