Namespace changes for Apps

QAshMoney and Reader need to be valgrinded
author: zecke <zecke> 2004-03-13 22:41:59 (UTC)
committer: zecke <zecke> 2004-03-13 22:41:59 (UTC)
commit: 3d27828732fe7e499219ad6e208dc13dead86431 (patch) (unidiff)
tree: faa42dec364ad1e0470a370c81d0a7dc0cd2f9bc /noncore
parent: ee753c0009da5bec4a71d3263e9623d04dddc5c4 (diff)
download: opie-3d27828732fe7e499219ad6e208dc13dead86431.zip
opie-3d27828732fe7e499219ad6e208dc13dead86431.tar.gz
opie-3d27828732fe7e499219ad6e208dc13dead86431.tar.bz2
43 files changed, 90 insertions, 63 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 2ba3dca..a60d6ce 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1,83 +1,85 @@
 /***************************************************************************
   AdvancedFm.cpp
  -------------------
  ** Created: Sat Mar 9 23:33:09 2002
    copyright            : (C) 2002 by ljp
    email                : ljp@llornkcor.com
    *   This program is free software; you can redistribute it and/or modify  *
    *   it under the terms of the GNU General Public License as published by  *
    *   the Free Software Foundation; either version 2 of the License, or     *
    *   (at your option) any later version.                                   *
    ***************************************************************************/
 #define DEVELOPERS_VERSION
 #include "advancedfm.h"
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <mntent.h>
+using namespace Opie::Ui;
 #ifdef NOQUICKLAUNCH
 AdvancedFm::AdvancedFm( )
 #else
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
 #endif
   : QMainWindow( ) {
   init();
   renameBox = 0;
   unknownXpm = Resource::loadImage(  "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(),  AppLnk::smallIconSize() );
   initConnections();
   whichTab=1;
   rePopulate();
   currentPathCombo->setFocus();
   channel = new QCopChannel( "QPE/Application/advancedfm", this );
   connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
            this, SLOT( qcopReceive(const QCString&,const QByteArray&)) );
 }
 AdvancedFm::~AdvancedFm() {
 }
 void AdvancedFm::cleanUp() {
   QString sfile=QDir::homeDirPath();
   if(sfile.right(1) != "/")
      sfile+="/._temp";
   else
      sfile+="._temp";
   QFile file( sfile);
   if(file.exists())
      file.remove();
 }
 void AdvancedFm::tabChanged(QWidget *) {
 //   qWarning("tab changed");
   QString path = CurrentDir()->canonicalPath();
   currentPathCombo->lineEdit()->setText( path );
   if(whichTab == 1) {
      viewMenu->setItemChecked(viewMenu->idAt(0), true);
      viewMenu->setItemChecked(viewMenu->idAt(1), false);
   } else {
      viewMenu->setItemChecked(viewMenu->idAt(0), false);
      viewMenu->setItemChecked(viewMenu->idAt(1), true);
   }
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 547fa7c..4eaa6d6 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -1,192 +1,191 @@
 /***************************************************************************
   advancedfm.h
                             -------------------
                             ** Created: Sat Mar 9 23:33:09 2002
    copyright            : (C) 2002 by ljp
    email                : ljp@llornkcor.com
    *   This program is free software; you can redistribute it and/or modify  *
    *   it under the terms of the GNU General Public License as published by  *
    *   the Free Software Foundation; either version 2 of the License, or     *
    *   (at your option) any later version.                                   *
    ***************************************************************************/
 #ifndef ADVANCEDFM_H
 #define ADVANCEDFM_H
 #define QTOPIA_INTERNAL_FSLP // to get access to fileproperties
 #define QT_QWS_OPIE
 #include <opie2/oprocess.h>
 #include <opie2/osplitter.h>
 #include <qpe/ir.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qmainwindow.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qstring.h>
 #include <qpoint.h>
 #include <qtimer.h>
 #include <qpixmap.h>
-using Opie::OSplitter;
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QComboBox;
 class QListView;
 class QListviewItem;
 class QLabel;
 class QProgressBar;
 class QSpinBox;
 class QWidget;
 class QPopupMenu;
 class QFile;
 class QListViewItem;
 class QLineEdit;
 class MenuButton;
 class QToolButton;
 class Ir;
 class AdvancedFm : public QMainWindow
 {
    Q_OBJECT
 public:
    static QString appName() { return QString::fromLatin1("advancedfm"); }
 #ifdef NOQUICKLAUNCH
   AdvancedFm();
 #else
   AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0);
 #endif
   ~AdvancedFm();
 protected slots:
   void slotSwitchMenu(int);
   void selectAll();
   void addToDocs();
   void doDirChange();
   void mkDir();
   void del();
   void rn();
   void populateView();
   void rePopulate();
   void showHidden();
   void showMenuHidden();
   void writeConfig();
   void readConfig();
   void ListClicked(QListViewItem *);
   void ListPressed( int, QListViewItem *, const QPoint&, int);
   void makeDir();
   void doDelete();
   void tabChanged(QWidget*);
   void cleanUp();
   void renameIt();
   void runThis();
   void runText();
   void filePerms();
   void doProperties();
   void runCommand();
   void runCommandStd();
   QStringList getPath();
   void mkSym();
   void switchToLocalTab();
   void switchToRemoteTab();
 protected:
-   OSplitter *TabWidget;
+   Opie::Ui::OSplitter *TabWidget;
   QCopChannel * channel;
   QPixmap unknownXpm;
   int whichTab;
 //    QTabWidget *TabWidget;
   QWidget *tab, *tab_2, *tab_3;
   QListView *Local_View, *Remote_View;
   QLineEdit *currentPathEdit;
   QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/;
   QToolButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
 //    QPushButton  *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
   QDir currentDir, currentRemoteDir;
   QComboBox *currentPathCombo;
   QString filterStr, s_addBookmark, s_removeBookmark;
   QListViewItem * item;
   bool b;
   QStringList fileSystemTypeList, fsList;
   int currentServerConfig;
   bool zaurusDevice;
   QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
   QStringList remoteDirPathStringList, localDirPathStringList;
   QLineEdit *renameBox;
   void init();
   void initConnections();
   void keyReleaseEvent( QKeyEvent *);
   void keyPressEvent( QKeyEvent *);
   QString getFileSystemType(const QString &);
   QString getDiskSpace(const QString &);
   void parsetab(const QString &fileName);
   QString checkDiskSpace(const QString &);
   QString dealWithSymName(const QString &);
   QDir *CurrentDir();
   QDir *OtherDir();
   QListView *CurrentView();
   QListView *OtherView();
   void setOtherTabCurrent();
   void dealWithSchmooSchmaa(QWidget *);
 protected slots:
   void openSearch();
   void dirMenuSelected(int);
   void showFileMenu();
   void cancelMenuTimer();
   void homeButtonPushed();
   void docButtonPushed();
   void SDButtonPushed();
   void CFButtonPushed();
   void QPEButtonPushed();
   void upDir();
   void currentPathComboChanged();
   void copy();
   void copyAs();
   void copySameDir();
   void currentPathComboActivated(const QString &);
   void fillCombo(const QString &);
   bool copyFile( const QString & , const QString & );
   void move();
   void fileStatus();
   void doAbout();
   void doBeam();
   void fileBeamFinished( Ir *);
   bool copyDirectory( const QString & , const QString & );
 //   void navigateToSelected();
   bool moveDirectory( const QString & , const QString & );
 //   void slotSwitchtoLocal(int);
 private:
   MenuButton *menuButton;
   QString oldName;
   QTimer menuTimer;
   void startProcess(const QString &);
   bool eventFilter( QObject * , QEvent * );
   void cancelRename();
   void doRename(QListView *);
   void okRename();
   void customDirsToMenu();
   void addCustomDir();
   void removeCustomDir();
   void gotoDirectory(const QString &);
   void navigateToSelected();
   void findFile(const QString &);
 private slots:
-   void processEnded(OProcess *);
+   void processEnded(Opie::Core::OProcess *);
-   void oprocessStderr(OProcess *, char *, int);
+   void oprocessStderr(Opie::Core::OProcess *, char *, int);
   void gotoCustomDir(const QString &);
   void qcopReceive(const QCString&, const QByteArray&);
   void setDocument(const QString &);
 };
 #endif // ADVANCEDFM_H
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index f791c77..73ef8f9 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -1,77 +1,78 @@
 /***************************************************************************
   advancedfmData.cpp
                             -------------------
 ** Created: Mon 09-23-2002 13:24:11
    copyright            : (C) 2002 by ljp
    email                : ljp@llornkcor.com
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 #include "advancedfm.h"
 #include <qpe/storage.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qmenubar.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <sys/utsname.h>
+using namespace Opie::Ui;
 void AdvancedFm::init() {
 #if defined(QT_QWS_OPIE)
    qDebug("<<<<<<<<<<<<<<<<<<<<<<<< OPIE!!!");
 #endif
    setCaption( tr( "AdvancedFm" ) );
    QVBoxLayout *layout = new QVBoxLayout( this );
    layout->setSpacing( 2);
    layout->setMargin( 2);
 QMenuBar *menuBar = new QMenuBar(this);
  fileMenu = new QPopupMenu( this );
  viewMenu  = new QPopupMenu( this );
 //  customDirMenu  = new QPopupMenu( this );
  layout->addWidget( menuBar );
  menuBar->insertItem( tr( "File" ), fileMenu);
  menuBar->insertItem( tr( "View" ), viewMenu);
  cdUpButton = new QToolButton( 0,"cdUpButton");
  cdUpButton->setPixmap(Resource::loadPixmap("up"));
  cdUpButton->setAutoRaise( true );
  menuBar->insertItem( cdUpButton );
  QHBox *lineBox = new QHBox( this );
  qpeDirButton= new QToolButton( 0,"QPEButton");
  qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
  qpeDirButton->setAutoRaise( true );
  menuBar->insertItem( qpeDirButton );
  cfButton = new QToolButton( 0, "CFButton");
  cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
  cfButton->setAutoRaise( true );
  menuBar->insertItem( cfButton );
  sdButton = new QToolButton( 0, "SDButton");
  sdButton->setPixmap(Resource::loadPixmap("advancedfm/sdcard"));
  sdButton->setAutoRaise( true );
  menuBar->insertItem( sdButton );
  docButton = new QToolButton( 0,"docsButton");
  docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
  docButton->setAutoRaise( true );
  menuBar->insertItem( docButton );
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 9e740d0..a694b70 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -1,82 +1,84 @@
 /***************************************************************************
   AdvancedFm.cpp
  -------------------
  ** Created: Sat Mar 9 23:33:09 2002
    copyright            : (C) 2002 by ljp
    email               : ljp@llornkcor.com
    *   This program is free software; you can redistribute it and/or modify  *
    *   it under the terms of the GNU General Public License as published by  *
    *   the Free Software Foundation; either version 2 of the License, or     *
    *   (at your option) any later version.                                   *
    ***************************************************************************/
 #include "advancedfm.h"
 #include "output.h"
 #include "filePermissions.h"
 #include <qpe/lnkproperties.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <sys/sendfile.h>
 #include <fcntl.h>
+using namespace Opie::Core;
+using namespace Opie::Core;
 void AdvancedFm::doDirChange() {
   QString pathItem = CurrentView()->currentItem()->text(0);
   if( pathItem == "../") {
      ListClicked( CurrentView()->currentItem());
   } else {
      if( pathItem.find(" -> ",0,TRUE) != -1)
         pathItem = dealWithSymName((const QString&)pathItem)+"/";
 //      qWarning(pathItem);
      gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
   }
 }
 void AdvancedFm::showMenuHidden() {
  if (b) {
      CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
      OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
      fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
    } else {
      CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
      OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
      fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
    }
     b = !b;
         populateView();
 }
 void AdvancedFm::showHidden() {
  if (b) {
      CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
      OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
    }  else {
      CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
      OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
    }
         populateView();
 }
 QString AdvancedFm::dealWithSymName(const QString &fileName) {
   QString strItem = fileName;
   return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
 }
 void AdvancedFm::runThis() {
   if( !CurrentView()->currentItem()) return;
  QString fs;
  QDir *thisDir = CurrentDir();
  QString curFile = CurrentView()->currentItem()->text(0);
@@ -657,100 +659,100 @@ void AdvancedFm::mkSym() {
          if( curFile.right(1) == "/") {
              curFile = curFile.left( curFile.length() -1);
            }
          cmd = "ln -s "+curFile+" "+destName;
 //          qDebug(cmd);
          startProcess( (const QString)cmd );
        }
            rePopulate();
            setOtherTabCurrent();
    }
 }
 void AdvancedFm::doBeam() {
   Ir ir;
   if(!ir.supported())  {
   } else {
      QStringList curFileList = getPath();
      if( curFileList.count() > 0)  {
         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
            QString curFile = (*it);
            QString curFilePath =  CurrentDir()->canonicalPath()+"/"+curFile;
            if( curFilePath.right(1) == "/") {
               curFilePath = curFilePath.left( curFilePath.length() -1);
            }
            Ir *file = new Ir(this, "IR");
            connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished(Ir*)));
            file->send( curFilePath, curFile );
         }
      }
   }
 }
 void AdvancedFm::fileBeamFinished( Ir *) {
  QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
 }
 void AdvancedFm::selectAll() {
  QListView *thisView = CurrentView();
  thisView->selectAll(true);
  thisView->setSelected( thisView->firstChild(),false);
 }
 void AdvancedFm::startProcess(const QString & cmd) {
  QStringList command;
  OProcess *process;
  process = new OProcess();
-  connect(process, SIGNAL(processExited(OProcess*)),
+  connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),
          this, SLOT( processEnded(OProcess*)));
-  connect(process, SIGNAL( receivedStderr(OProcess*,char*,int)),
+  connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),
            this, SLOT( oprocessStderr(OProcess*,char*,int)));
  command << "/bin/sh";
  command << "-c";
  command << cmd.latin1();
  *process << command;
  if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
    qDebug("could not start process");
 }
 void AdvancedFm::processEnded(OProcess *) {
            rePopulate();
 }
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
 //    qWarning("received stderrt %d bytes", buflen);
    QString lineStr = buffer;
    QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
 }
 bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
  if ( o->inherits( "QLineEdit" ) )  {
      if ( e->type() == QEvent::KeyPress ) {
          QKeyEvent *ke = (QKeyEvent*)e;
          if ( ke->key() == Key_Return ||
               ke->key() == Key_Enter )  {
              okRename();
              return true;
            }
          else if ( ke->key() == Key_Escape ) {
                cancelRename();
                return true;
              }
        }
      else if ( e->type() == QEvent::FocusOut ) {
            cancelRename();
            return true;
          }
    }
   if ( o->inherits( "QListView" ) ) {
       if ( e->type() == QEvent::FocusIn ) {
          if( o == Local_View) { //keep track of which view
             whichTab=1;
          }
          else {
             whichTab=2;
          }
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp
index 3c1a164..df0d4af 100644
--- a/noncore/apps/advancedfm/main.cpp
+++ b/noncore/apps/advancedfm/main.cpp
@@ -1,33 +1,22 @@
 /***************************************************************************
+using namespace Opie::Core;
+using namespace Opie::Core;
                          main.cpp  -  description
                             -------------------
    begin                : March 10, 2002
    copyright            : (C) 2002 by llornkcor
    email                : ljp@llornkcor.com
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 #include "advancedfm.h"
-#ifdef NOQUICKLAUNCH
-#include <qpe/qpeapplication.h>
-int main(int argc, char *argv[])
-{
-    QPEApplication a(argc, argv);
-    AdvancedFm advencedFm;
-    a.showMainWidget( &advencedFm);
-    return a.exec();
-}
-#else
 #include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> )
-#endif
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp
index 0bba1d8..16a0992 100644
--- a/noncore/apps/advancedfm/output.cpp
+++ b/noncore/apps/advancedfm/output.cpp
@@ -1,66 +1,68 @@
 /****************************************************************************
 ** outputEdit.cpp
 **
 ** Copyright: Fri Apr 12 15:12:58 2002 L.J. Potter <ljp@llornkcor.com>
 ****************************************************************************/
 #include "output.h"
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 #include <qfile.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <errno.h>
 /* XPM */
+using namespace Opie::Core;
+using namespace Opie::Core;
 static char * filesave_xpm[] = {
 "16 16 78 1",
 "   c None",
 ".  c #343434",
 "+  c #A0A0A0",
 "@  c #565656",
 "#  c #9E9E9E",
 "$  c #525252",
 "%  c #929292",
 "&  c #676767",
 "*  c #848484",
 "=  c #666666",
 "-  c #D8D8D8",
 ";  c #FFFFFF",
 ">  c #DBDBDB",
 ",  c #636363",
 "'  c #989898",
 ")  c #2D2D2D",
 "!  c #909090",
 "~  c #AEAEAE",
 "{  c #EAEAEA",
 "]  c #575757",
 "^  c #585858",
 "/  c #8A8A8A",
 "(  c #828282",
 "_  c #6F6F6F",
 ":  c #C9C9C9",
 "<  c #050505",
 "[  c #292929",
 "}  c #777777",
 "|  c #616161",
 "1  c #3A3A3A",
 "2  c #BEBEBE",
 "3  c #2C2C2C",
 "4  c #7C7C7C",
 "5  c #F6F6F6",
 "6  c #FCFCFC",
 "7  c #6B6B6B",
 "8  c #959595",
 "9  c #4F4F4F",
 "0  c #808080",
 "a  c #767676",
 "b  c #818181",
 "c  c #B8B8B8",
 "d  c #FBFBFB",
 "e  c #F9F9F9",
 "f  c #CCCCCC",
 "g  c #030303",
@@ -96,103 +98,103 @@ static char * filesave_xpm[] = {
 "K  c #323232",
 "L  c #D0D0D0",
 "M  c #1C1C1C",
 "    ...+        ",
 "   @#$%&..+     ",
 "   .*=-;;>,..+  ",
 "  ')!~;;;;;;{]..",
 "  ^/(-;;;;;;;_:<",
 "  [}|;;;;;;;{12$",
 " #34-55;;;;678$+",
 " 90ab=c;dd;e1fg ",
 " [ahij((kbl0mn$ ",
 " op^q^^7r&]s/$+ ",
 "@btu;vbwxy]zAB  ",
 "CzDEvEv;;DssF$  ",
 "G.H{E{E{IxsJ$+  ",
 "  +...vEKxzLM   ",
 "     +...z]n$   ",
 "        +...    "};
 Output::Output( const QStringList commands, QWidget* parent,  const char* name, bool modal, WFlags fl)
    : QDialog( parent, name, modal, fl )
 {
   QStringList cmmds;
 //   cmmds=QStringList::split( " ", commands, false);
   cmmds=commands;
 //   qDebug("count %d", cmmds.count());
   if ( !name )
       setName( tr("Output"));
    resize( 196, 269 );
    setCaption( name );
    OutputLayout = new QGridLayout( this );
    OutputLayout->setSpacing( 2);
    OutputLayout->setMargin( 2);
    QPushButton *docButton;
     docButton = new QPushButton(  QPixmap(( const char** ) filesave_xpm  ) ,"",this,"saveButton");
     docButton->setFixedSize( QSize( 20, 20 ) );
     connect( docButton,SIGNAL(released()),this,SLOT( saveOutput() ));
 //    docButton->setFlat(TRUE);
     OutputLayout->addMultiCellWidget( docButton, 0,0,3,3 );
    OutputEdit = new QMultiLineEdit( this, "OutputEdit" );
    OutputLayout->addMultiCellWidget( OutputEdit, 1,1,0,3 );
    proc = new OProcess();
-    connect(proc, SIGNAL(processExited(OProcess*)),
+    connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
            this, SLOT( processFinished()));
-    connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)),
+    connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
            this, SLOT(commandStdout(OProcess*,char*,int)));
-    connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)),
+    connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
            this, SLOT(commandStderr(OProcess*,char*,int)));
 //     connect( , SIGNAL(received(const QByteArray&)),
 //             this, SLOT(commandStdin(const QByteArray&)));
 //    * proc << commands.latin1();
      for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) {
         qDebug( "%s", (*it).latin1() );
         * proc << (*it).latin1();
      }
     if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) {
         OutputEdit->append(tr("Process could not start") );
         OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
         perror("Error: ");
         QString errorMsg=tr("Error\n")+(QString)strerror(errno);
         OutputEdit->append( errorMsg);
         OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
     }
 }
 Output::~Output() {
 }
 void Output::saveOutput() {
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Save output to file (name only)"),TRUE, 0);
    fileDlg->exec();
    if( fileDlg->result() == 1 ) {
      QString  filename = QPEApplication::documentDir();
      if(filename.right(1).find('/') == -1)
          filename+="/";
      QString name = fileDlg->LineEdit1->text();
      filename+="text/plain/"+name;
      qDebug(filename);
      QFile f(filename);
      f.open( IO_WriteOnly);
      if( f.writeBlock( OutputEdit->text(), qstrlen( OutputEdit->text()) ) != -1) {
          DocLnk lnk;
          lnk.setName(name); //sets file name
          lnk.setFile(filename); //sets File property
          lnk.setType("text/plain");
          if(!lnk.writeLink()) {
              qDebug("Writing doclink did not work");
          }
diff --git a/noncore/apps/advancedfm/output.h b/noncore/apps/advancedfm/output.h
index 26c0fa0..37ba57d 100644
--- a/noncore/apps/advancedfm/output.h
+++ b/noncore/apps/advancedfm/output.h
@@ -1,65 +1,65 @@
 /****************************************************************************
 ** Form interface generated from reading ui file 'outputEdit.ui'
 **
 ** Created: Fri Apr 12 15:12:44 2002
 **      by:  The User Interface Compiler (uic)
 **
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 #ifndef OUTPUT_H
 #define OUTPUT_H
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qcstring.h>
 #include <qstringlist.h>
 #include <qlineedit.h>
 #include <qwhatsthis.h>
 #include <opie2/oprocess.h>
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QMultiLineEdit;
 class Output : public QDialog
 {
    Q_OBJECT
 public:
    Output(const QStringList commands=0, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
    ~Output();
    QMultiLineEdit* OutputEdit;
 protected:
    QGridLayout* OutputLayout;
-    OProcess *proc;
+    Opie::Core::OProcess *proc;
 protected slots:
    void saveOutput();
-    void commandStdout(OProcess*, char *, int);
+    void commandStdout(Opie::Core::OProcess*, char *, int);
    void commandStdin(const QByteArray &);
-    void commandStderr(OProcess*, char *, int);
+    void commandStderr(Opie::Core::OProcess*, char *, int);
    void processFinished();
  private:
    QString cmmd;
 };
 class InputDialog : public QDialog
 {
    Q_OBJECT
 public:
    InputDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
    ~InputDialog();
    QString inputText;
    QLineEdit* LineEdit1;
  void setInputText(const QString &);
 private slots:
    void returned();
 };
 #endif // OUTPUT_H
diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp
index 1b933f2..706d970 100644
--- a/noncore/apps/checkbook/checkbook.cpp
+++ b/noncore/apps/checkbook/checkbook.cpp
@@ -13,96 +13,97 @@
 � � .i_,=:_. � � �-<s.       This file is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful, but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.= � � � = � � � ;      Public License for more details.
 ++= � -. � � .` � � .:
 �: � � = �...= . :.=-        You should have received a copy of the GNU
 �-. � .:....=;==+<;          General Public License along with this file;
 � -_. . . � )=. �=           see the file COPYING. If not, write to the
 � � -- � � � �:-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "checkbook.h"
 #include "cbinfo.h"
 #include "transaction.h"
 #include "traninfo.h"
 #include "graph.h"
 #include "graphinfo.h"
 #include "password.h"
 #include "cfg.h"
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
 #include <qpopupmenu.h>
 #define COL_ID          0
 #define COL_SORTDATE    1
 #define COL_NUM         2
 #define COL_DATE        3
 #define COL_DESC        4
 #define COL_AMOUNT      5
 #define COL_BAL         6
 // --- Checkbook --------------------------------------------------------------
+using namespace Opie::Ui;
 Checkbook::Checkbook( QWidget *parent, CBInfo *i, Cfg *cfg )
    : QDialog( parent, 0, TRUE, WStyle_ContextHelp )
 {
    info = i;
    _pCfg=cfg;
    // Title bar
    if ( info->name() != "" )
    {
        QString tempstr = info->name();
        tempstr.append( " - " );
        tempstr.append( tr( "Checkbook" ) );
        setCaption( tempstr );
    }
    else
    {
        setCaption( tr( "New checkbook" ) );
    }
    // Setup layout to make everything pretty
    QVBoxLayout *layout = new QVBoxLayout( this );
    layout->setMargin( 2 );
    layout->setSpacing( 4 );
    // Setup tabs for all info
    mainWidget = new OTabWidget( this );
    layout->addWidget( mainWidget );
    mainWidget->addTab( initInfo(), "checkbook/infotab", tr( "Info" ) );
    mainWidget->addTab( initTransactions(), "checkbook/trantab", tr( "Transactions" ) );
    mainWidget->addTab( initCharts(), "checkbook/charttab", tr( "Charts" ) );
    if( _pCfg->isShowLastTab() )
        mainWidget->setCurrentTab( info->getLastTab() );
    else
        mainWidget->setCurrentTab( tr( "Info" ) );
    connect( mainWidget, SIGNAL( currentChanged(QWidget*) ), this, SLOT( slotTab(QWidget*) ) );
    // Load checkbook information
    loadCheckbook();
 }
 Checkbook::~Checkbook()
 {
 }
 // --- initInfo ---------------------------------------------------------------
 QWidget *Checkbook::initInfo()
 {
diff --git a/noncore/apps/checkbook/checkbook.h b/noncore/apps/checkbook/checkbook.h
index e2f0e56..80bc106 100644
--- a/noncore/apps/checkbook/checkbook.h
+++ b/noncore/apps/checkbook/checkbook.h
@@ -1,124 +1,123 @@
 /*
 � � � � � � � �              This file is part of the OPIE Project
               =.
 � � � � � � �.=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This file is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This file is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful, but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.= � � � = � � � ;      Public License for more details.
 ++= � -. � � .` � � .:
 �: � � = �...= . :.=-        You should have received a copy of the GNU
 �-. � .:....=;==+<;          General Public License along with this file;
 � -_. . . � )=. �=           see the file COPYING. If not, write to the
 � � -- � � � �:-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef CHECKBOOK_H
 #define CHECKBOOK_H
 #include <opie2/otabwidget.h>
 #include <qdatetime.h>
 #include <qdialog.h>
 #include <qlistview.h>
-using Opie::OTabWidget;
 class CBInfo;
 class Graph;
 class GraphInfo;
 class QCheckBox;
 class QComboBox;
 class QLabel;
 class QLineEdit;
 class QListView;
 class QMultiLineEdit;
 class QString;
 class TranInfo;
 class TranInfoList;
 class Cfg;
 class QMouseEvent;
 // --- Checkbook --------------------------------------------------------------
 class Checkbook : public QDialog
 {
    Q_OBJECT
    public:
        Checkbook( QWidget *, CBInfo *, Cfg *cfg );
        ~Checkbook();
        // resort
        void resort();
        // members
        TranInfoList *getTranList() { return(tranList); }
    private:
        CBInfo *info;
        TranInfoList *tranList;
        Cfg *_pCfg;
-        OTabWidget *mainWidget;
+        Opie::Ui::OTabWidget *mainWidget;
        void        loadCheckbook();
        void        adjustBalance();
        // Info tab
        QWidget        *initInfo();
        QCheckBox      *passwordCB;
        QLineEdit      *nameEdit;
        QComboBox      *typeList;
        QLineEdit      *bankEdit;
        QLineEdit      *acctNumEdit;
        QLineEdit      *pinNumEdit;
        QLineEdit      *balanceEdit;
        QMultiLineEdit *notesEdit;
        int _sortCol;
        // Transactions tab
        QWidget *initTransactions();
        QListView *tranTable;
        QComboBox *_cbSortType;
        QDate _dLastNew;
        // Charts tab
        QWidget   *initCharts();
        GraphInfo *graphInfo;
        QComboBox *graphList;
        Graph     *graphWidget;
        void drawBalanceChart();
        void drawCategoryChart( bool = TRUE );
    protected slots:
        void accept();
        void slotTab(QWidget *tab);
    private slots:
        void slotPasswordClicked();
        void slotNameChanged( const QString & );
        void slotStartingBalanceChanged( const QString & );
        void slotNewTran();
        void slotEditTran();
        void slotMenuTran(QListViewItem *, const QPoint &);
        void slotDeleteTran();
        void slotDrawGraph();
        void slotSortChanged( const QString & );
 };
diff --git a/noncore/apps/checkbook/main.cpp b/noncore/apps/checkbook/main.cpp
index 0384620..1135bee 100644
--- a/noncore/apps/checkbook/main.cpp
+++ b/noncore/apps/checkbook/main.cpp
@@ -1,33 +1,35 @@
 /*
 � � � � � � � �              This file is part of the OPIE Project
               =.
 � � � � � � �.=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This file is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This file is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful, but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.= � � � = � � � ;      Public License for more details.
 ++= � -. � � .` � � .:
 �: � � = �...= . :.=-        You should have received a copy of the GNU
 �-. � .:....=;==+<;          General Public License along with this file;
 � -_. . . � )=. �=           see the file COPYING. If not, write to the
 � � -- � � � �:-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
+using namespace Opie::Core;
 #include "mainwindow.h"
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index 254ce6a..ce15e3e 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -1,86 +1,86 @@
 /*
 � � � � � � � �              This file is part of the OPIE Project
               =.
 � � � � � � �.=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This file is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This file is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful, but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.= � � � = � � � ;      Public License for more details.
 ++= � -. � � .` � � .:
 �: � � = �...= . :.=-        You should have received a copy of the GNU
 �-. � .:....=;==+<;          General Public License along with this file;
 � -_. . . � )=. �=           see the file COPYING. If not, write to the
 � � -- � � � �:-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "mainwindow.h"
 #include "cbinfo.h"
 #include "configuration.h"
 #include "password.h"
 #include "checkbook.h"
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/resource.h>
 #include <qmenubar.h>
 #include <qaction.h>
 #include <qdir.h>
 #include <qwhatsthis.h>
 MainWindow::MainWindow( QWidget* parent, const char* name, WFlags /*fl*/ )
    : QMainWindow( parent, name, WStyle_ContextHelp )
 {
    setCaption( tr( "Checkbook" ) );
    cbDir = Global::applicationFileName( "checkbook", "" );
    lockIcon = Resource::loadPixmap( "locked" );
    // Load configuration options
    Config config( "checkbook" );
    _cfg.readConfig( config );
    // Build menu and tool bars
    setToolBarsMovable( FALSE );
    QToolBar *bar = new QToolBar( this );
    bar->setHorizontalStretchable( TRUE );
    QMenuBar *mb = new QMenuBar( bar );
    mb->setMargin( 0 );
    QPopupMenu *popup = new QPopupMenu( this );
    bar = new QToolBar( this );
    QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
    a->setWhatsThis( tr( "Click here to create a new checkbook.\n\nYou also can select New from the Checkbook menu." ) );
    connect( a, SIGNAL( activated() ), this, SLOT( slotNew() ) );
    a->addTo( popup );
    a->addTo( bar );
    actionOpen = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
                              0, this, 0 );
    actionOpen->setWhatsThis( tr( "Select a checkbook and then click here to edit it.\n\nYou also can select Edit from the Checkbook menu, or click and hold on a checkbook name." ) );
    connect( actionOpen, SIGNAL( activated() ), this, SLOT( slotEdit() ) );
    actionOpen->addTo( popup );
    actionOpen->addTo( bar );
    actionDelete = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
                                0, this, 0 );
    actionDelete->setWhatsThis( tr( "Select a checkbook and then click here delete it.\n\nYou also can select Delete from the Checkbook menu." ) );
    connect( actionDelete, SIGNAL( activated() ), this, SLOT( slotDelete() ) );
diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp
index 584e6b2..3a010dd 100644
--- a/noncore/apps/confedit/main.cpp
+++ b/noncore/apps/confedit/main.cpp
@@ -1,5 +1,6 @@
 #include "mainwindow.h"
 #include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/apps/odict/main.cpp b/noncore/apps/odict/main.cpp
index d5b08d3..7729d5f 100644
--- a/noncore/apps/odict/main.cpp
+++ b/noncore/apps/odict/main.cpp
@@ -1,24 +1,26 @@
 /***************************************************************************
   application:             : ODict
   begin                    : December 2002
   copyright                : ( C ) 2002, 2003 by Carsten Niehaus
   email                    : cniehaus@handhelds.org
 **************************************************************************/
 /***************************************************************************
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *
 * it under the terms of the GNU General Public License as published by    *
 * the Free Software Foundation; either version 2 of the License, or       *
 * ( at your option ) any later version.                                   *
 *                                                                         *
 **************************************************************************/
 #include <opie2/oapplicationfactory.h>
 #include "odict.h"
+using namespace Opie::Core;
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<ODict> )
diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp
index f71cfd8..34e8b16 100644
--- a/noncore/apps/odict/searchmethoddlg.cpp
+++ b/noncore/apps/odict/searchmethoddlg.cpp
@@ -1,81 +1,80 @@
 /***************************************************************************
   application:             : ODict
   begin                    : December 2002
   copyright                : ( C ) 2002, 2003 by Carsten Niehaus
   email                    : cniehaus@handhelds.org
 **************************************************************************/
 /***************************************************************************
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *
 * it under the terms of the GNU General Public License as published by    *
 * the Free Software Foundation; either version 2 of the License, or       *
 * ( at your option ) any later version.                                   *
 *                                                                         *
 **************************************************************************/
 #include "searchmethoddlg.h"
 #include <opie2/ofileselector.h>
 #include <opie2/ofiledialog.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qdir.h>
-using Opie::OFileDialog;
+using namespace Opie::Ui;
-using Opie::OFileSelector;
 SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, QString itemname) : QDialog(parent, name, modal)
 {
        QVBoxLayout *vbox_layout = new QVBoxLayout( this, 4,4,"vbox_layout" );
        QVBox *vbox = new QVBox( this );
        QHBox *hbox1 = new QHBox( vbox );
        QLabel *nameLabel = new QLabel( tr( "Name:" ) , hbox1 );
        nameLE = new QLineEdit( hbox1 );
        QLabel *dictLabel = new QLabel( tr( "Dictionary file" ), vbox );
        QHBox *hbox2 = new QHBox( vbox );
        dictFileLE = new QLineEdit( hbox2 );
        QPushButton *browseButton = new QPushButton( tr( "Browse" ) , hbox2 );
        connect( browseButton, SIGNAL( clicked() ), this, SLOT( slotBrowse() ) );
        QWidget *dummywidget = new QWidget( vbox );
        QLabel *lag1 = new QLabel( tr( "Language 1" ),dummywidget);
        QLabel *devider = new QLabel( tr( "Decollator" ),dummywidget);
        QLabel *lag2 = new QLabel( tr( "Language 2" ),dummywidget);
        lang1 = new QLineEdit( dummywidget );
        lang2 = new QLineEdit( dummywidget );
        trenner = new QLineEdit( dummywidget );
                trenner->setText( "::" );
        QGridLayout *grid = new QGridLayout( dummywidget, 2,3 );
        grid->addWidget( lag1, 0,0 );
        grid->addWidget( devider, 0,1 );
        grid->addWidget( lag2, 0,2 );
        grid->addWidget( lang1, 1,0 );
        grid->addWidget( trenner, 1,1 );
        grid->addWidget( lang2, 1,2 );
        vbox_layout->addWidget( vbox );
        QPEApplication::execDialog ( this );
        if( !itemname )
                setCaption( tr( "New Searchmethod" ) );
        else
        {
                setCaption( tr( "Change Searchmethod" ) );
                itemName = itemname;
                setupEntries(itemname);
        }
 }
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index b6401ed..e6cb515 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -1,67 +1,67 @@
 /****************************************************************************
 **
 ** Created: Sat Jul 20 08:10:53 2002
 **      by:  L.J. Potter <ljp@llornkcor.com>
 **     copyright            : (C) 2002 by ljp
    email                : ljp@llornkcor.com
    *   This program is free software; you can redistribute it and/or modify  *
    *   it under the terms of the GNU General Public License as published by  *
    *   the Free Software Foundation; either version 2 of the License, or     *
    *   (at your option) any later version.                                   *
    ***************************************************************************/
 #include "bartender.h"
 #include "showdrinks.h"
 #include "inputDialog.h"
 #include "searchresults.h"
 #include "bac.h"
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 //#include <opie2/colorpopupmenu.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qmultilineedit.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qlistview.h>
 #include <qlayout.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
    : QMainWindow( parent, name, fl ) {
    if ( !name )
  setName( "Bartender" );
    QGridLayout *layout = new QGridLayout( this );
    layout->setSpacing( 2);
    layout->setMargin( 2);
    connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
    setCaption( tr( "Bartender" ) );
    ToolBar1 = new QToolBar( this, "ToolBar1" );
    ToolBar1->setFixedHeight(22);
    layout->addMultiCellWidget( ToolBar1, 0, 0, 0, 4 );
    QMenuBar *menuBar = new QMenuBar( ToolBar1 );
    QPopupMenu *fileMenu;
    fileMenu = new QPopupMenu( this);
    menuBar->insertItem( tr("File"), fileMenu );
    fileMenu->insertItem(tr("New Drink"));
    fileMenu->insertItem(tr("Open Drink"));
    fileMenu->insertItem(tr("Find by Drink Name"));
    fileMenu->insertItem(tr("Find by Alcohol"));
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 1a8c979..35a328f 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -1,87 +1,89 @@
 #include "io_bt.h"
+using namespace Opie::Core;
+using namespace Opie::Core;
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
    m_attach = 0;
 }
 IOBt::~IOBt() {
    if ( m_attach ) {
        delete m_attach;
    }
 }
 void IOBt::close() {
    IOSerial::close();
    // still need error handling
    if ( m_attach ) {
        delete m_attach;
        m_attach = 0;
    }
 }
 bool IOBt::open() {
    bool ret = false;
    // only set up bt stuff if mac address was set, otherwise use the device set
    if ( !m_mac.isEmpty() ) {
        // now it should also be checked, if there is a connection to the device with that mac allready
        // hciattach here
        m_attach = new OProcess();
        *m_attach << "hciattach /dev/ttyS2 any 57600";
        // then start hcid, then rcfomm handling (m_mac)
-        connect( m_attach, SIGNAL( processExited(OProcess*) ),
+        connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
                 this, SLOT( slotExited(OProcess*) ) );
        if ( m_attach->start() ) {
            ret = IOSerial::open();
        } else {
            qWarning("could not attach to device");
            delete m_attach;
            m_attach = 0;
        }
    } else {
        // directly to the normal serial
        // TODO: look first if the connection really exists. ( is set up )
        ret =IOSerial::open();
    }
    return ret;
 }
 void IOBt::reload( const Profile &config ) {
    m_device = config.readEntry("Device", BT_DEFAULT_DEVICE);
    m_mac = config.readEntry("Mac", BT_DEFAULT_MAC);
    m_baud = config.readNumEntry("Baud", BT_DEFAULT_BAUD);
    m_parity = config.readNumEntry("Parity", BT_DEFAULT_PARITY);
    m_dbits = config.readNumEntry("DataBits", BT_DEFAULT_DBITS);
    m_sbits = config.readNumEntry("StopBits", BT_DEFAULT_SBITS);
    m_flow = config.readNumEntry("Flow", BT_DEFAULT_FLOW);
 }
 QString IOBt::identifier() const {
    return "bluetooth";
 }
 QString IOBt::name() const {
    return "BLuetooth IO Layer";
 }
 void IOBt::slotExited( OProcess* proc ){
    close();
    delete proc;
 }
 QBitArray IOBt::supports() const {
    return QBitArray( 3 );
 }
 bool IOBt::isConnected() {
    return false;
diff --git a/noncore/apps/opie-console/io_bt.h b/noncore/apps/opie-console/io_bt.h
index df6dd38..00ca7e5 100644
--- a/noncore/apps/opie-console/io_bt.h
+++ b/noncore/apps/opie-console/io_bt.h
@@ -1,51 +1,51 @@
 #ifndef OPIE_IO_BT
 #define OPIE_IO_BT
 #include <opie2/oprocess.h>
 #include "io_serial.h"
 /* Default values to be used if the profile information is incomplete */
 #define BT_DEFAULT_DEVICE       "/dev/ttyU0"
 #define BT_DEFAULT_BAUD         9600
 #define BT_DEFAULT_PARITY       0
 #define BT_DEFAULT_DBITS        8
 #define BT_DEFAULT_SBITS        1
 #define BT_DEFAULT_FLOW         0
 #define BT_DEFAULT_MAC          0
 /* IOSerial implements a RS232 IO Layer */
 class IOBt : public IOSerial {
    Q_OBJECT
 public:
    IOBt(const Profile &);
    ~IOBt();
    virtual QString identifier() const;
    virtual QString name() const;
    virtual QBitArray supports() const;
    virtual bool isConnected();
 signals:
    void received(const QByteArray &);
    void error(int, const QString &);
 public slots:
    virtual void send( const QByteArray& );
    virtual bool open();
    virtual void close();
    virtual void reload(const Profile &);
 private:
-    OProcess *m_attach;
+    Opie::Core::OProcess *m_attach;
    QString m_mac;
 private slots:
-    void slotExited(OProcess* proc);
+    void slotExited(Opie::Core::OProcess* proc);
 };
 #endif /* OPIE_IO_IRDA */
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index b281b7d..ba0b0e5 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -1,77 +1,79 @@
 #include "io_irda.h"
+using namespace Opie::Core;
+using namespace Opie::Core;
 IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
    m_attach = 0;
 }
 IOIrda::~IOIrda() {
    if ( m_attach ) {
        delete m_attach;
    }
 }
 void IOIrda::close() {
    IOSerial::close();
    // still need error handling
    delete m_attach;
 }
 bool IOIrda::open() {
    bool ret;
    // irdaattach here
    m_attach = new OProcess();
    *m_attach << "irattach /dev/ttyS2 -s";
-    connect( m_attach, SIGNAL( processExited(OProcess*) ),
+    connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
            this, SLOT( slotExited(OProcess*) ) );
    if ( m_attach->start() ) {
        ret= IOSerial::open();
    } else {
    // emit error!!!
        qWarning("could not attach to device");
        delete m_attach;
        m_attach = 0l;
    }
    return ret;
 }
 void IOIrda::reload( const Profile &config ) {
    m_device = config.readEntry("Device", IRDA_DEFAULT_DEVICE);
    m_baud = config.readNumEntry("Baud", IRDA_DEFAULT_BAUD);
    m_parity = config.readNumEntry("Parity", IRDA_DEFAULT_PARITY);
    m_dbits = config.readNumEntry("DataBits", IRDA_DEFAULT_DBITS);
    m_sbits = config.readNumEntry("StopBits", IRDA_DEFAULT_SBITS);
    m_flow = config.readNumEntry("Flow", IRDA_DEFAULT_FLOW);
 }
 QString IOIrda::identifier() const {
    return "irda";
 }
 QString IOIrda::name() const {
    return "Irda IO Layer";
 }
 void IOIrda::slotExited(OProcess* proc ){
    close();
    delete proc;
 }
 QBitArray IOIrda::supports()const {
    return QBitArray( 3 );
 }
 bool IOIrda::isConnected() {
    return false;
 }
 void IOIrda::send(const QByteArray &data) {
    qDebug( "Please overload me..." );
 }
diff --git a/noncore/apps/opie-console/io_irda.h b/noncore/apps/opie-console/io_irda.h
index 69bed7d..fb29686 100644
--- a/noncore/apps/opie-console/io_irda.h
+++ b/noncore/apps/opie-console/io_irda.h
@@ -1,49 +1,49 @@
 #ifndef OPIE_IO_IRDA
 #define OPIE_IO_IRDA
 #include <opie2/oprocess.h>
 #include "io_serial.h"
 /* Default values to be used if the profile information is incomplete */
 #define IRDA_DEFAULT_DEVICE       "/dev/ircomm0"
 #define IRDA_DEFAULT_BAUD         9600
 #define IRDA_DEFAULT_PARITY       0
 #define IRDA_DEFAULT_DBITS        8
 #define IRDA_DEFAULT_SBITS        1
 #define IRDA_DEFAULT_FLOW         0
 /* IOSerial implements a RS232 IO Layer */
 class IOIrda : public IOSerial {
    Q_OBJECT
 public:
    IOIrda(const Profile &);
    ~IOIrda();
    virtual QString identifier() const;
    virtual QString name() const;
    virtual QBitArray supports() const;
    virtual bool isConnected();
 signals:
    void received(const QByteArray &);
    void error(int, const QString &);
 public slots:
    virtual void send( const QByteArray& );
    virtual bool open();
    virtual void close();
    virtual void reload(const Profile &);
 private:
-    OProcess *m_attach;
+    Opie::Core::OProcess *m_attach;
 private slots:
-    void slotExited(OProcess* proc);
+    void slotExited(Opie::Core::OProcess* proc);
 };
 #endif /* OPIE_IO_IRDA */
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index 1ce680a..b74d076 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -1,53 +1,55 @@
 #include "io_modem.h"
 #include "dialer.h"
+using namespace Opie::Core;
+using namespace Opie::Core;
 IOModem::IOModem( const Profile &profile )
        : IOSerial( profile ) {
        m_profile = profile;
 }
 IOModem::~IOModem() {
 }
 void IOModem::close() {
        // Hangup, discarding result
        //int fd = rawIO();
        internDetach();
        Dialer d(m_profile, m_fd);
        d.setHangupOnly();
        //d.exec();
        internAttach();
        //closeRawIO(fd);
    IOSerial::close();
 }
 bool IOModem::open() {
    bool ret = IOSerial::open();
        if(!ret) return false;
        //int fd = rawIO();
        internDetach();
        Dialer d(m_profile, m_fd);
        int result = d.exec();
        internAttach();
        //closeRawIO(fd);
        if(result == QDialog::Accepted)
        {
                return true;
        }
        else
        {
                close();
                return false;
        }
 }
 void IOModem::reload( const Profile &config ) {
diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h
index 96ec3ef..5b99e00 100644
--- a/noncore/apps/opie-console/io_modem.h
+++ b/noncore/apps/opie-console/io_modem.h
@@ -22,53 +22,53 @@
 #define MODEM_DEFAULT_DIAL_PREFIX3 ""
 #define MODEM_DEFAULT_DIAL_SUFFIX3 ""
 #define MODEM_DEFAULT_CONNECT_STRING "CONNECT"
 #define MODEM_DEFAULT_HANGUP_STRING "+++ATH"
 #define MODEM_DEFAULT_CANCEL_STRING ""
 #define MODEM_DEFAULT_DIAL_TIME     45
 #define MODEM_DEFAULT_DELAY_REDIAL  2
 #define MODEM_DEFAULT_NUMBER_TRIES  10
 #define MODEM_DEFAULT_DTR_DROP_TIME 1
 #define MODEM_DEFAULT_BPS_DETECT    0   // bool
 #define MODEM_DEFAULT_DCD_LINES     1   //bool
 #define MODEM_DEFAULT_MULTI_LINE_UNTAG 0 // bool
 /* IOSerial implements a RS232 IO Layer */
 class IOModem : public IOSerial {
    Q_OBJECT
 public:
    IOModem(const Profile &);
    ~IOModem();
    virtual QString identifier() const;
    virtual QString name() const;
    virtual QBitArray supports() const;
    virtual bool isConnected();
 signals:
    void received(const QByteArray &);
    void error(int, const QString &);
 public slots:
    virtual void send( const QByteArray& );
    virtual bool open();
    virtual void close();
    virtual void reload(const Profile &);
 private:
    QString m_initString, m_resetString, m_dialPref1, m_dialSuf1, m_dialPref2,
        m_dialSuf2, m_dialPref3, m_dialSuf3, m_connect, m_hangup, m_cancel;
    int  m_dialTime, m_delayRedial, m_numberTries, m_dtrDropTime,
        m_bpsDetect, m_dcdLines, m_multiLineUntag;
    Profile m_profile;
 private slots:
-    void slotExited(OProcess* proc);
+    void slotExited(Opie::Core::OProcess* proc);
 };
 #endif
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 197f799..06a8f7d 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -1,74 +1,75 @@
 #include <assert.h>
 #include <qaction.h>
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qmessagebox.h>
 #include <qwhatsthis.h>
 #include <qfileinfo.h>
 #include <qpe/filemanager.h>
 #include <opie2/ofiledialog.h>
 #include "TEmulation.h"
 #include "profileeditordialog.h"
 #include "configdialog.h"
 #include "default.h"
 #include "profilemanager.h"
 #include "mainwindow.h"
 #include "tabwidget.h"
 #include "transferdialog.h"
 #include "function_keyboard.h"
 #include "emulation_handler.h"
 #include "script.h"
+using namespace Opie::Ui;
 MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp)  {
    KeyTrans::loadAll();
    for (int i = 0; i < KeyTrans::count(); i++ ) {
        KeyTrans* s = KeyTrans::find(i );
        assert( s );
    }
    m_factory = new MetaFactory();
    Default def(m_factory);
    m_sessions.setAutoDelete( TRUE );
    m_curSession = 0;
    m_manager = new ProfileManager( m_factory );
    m_manager->load();
    m_scriptsData.setAutoDelete(TRUE);
    initUI();
    populateProfiles();
    populateScripts();
 }
 void MainWindow::initUI() {
    setToolBarsMovable( FALSE  );
    /* tool bar for the menu */
    m_tool = new QToolBar( this );
    m_tool->setHorizontalStretchable( TRUE );
    m_bar = new QMenuBar( m_tool );
    m_console = new QPopupMenu( this );
    m_scripts = new QPopupMenu( this );
    m_sessionsPop= new QPopupMenu( this );
    m_scriptsPop = new QPopupMenu( this );
    /* add a toolbar for icons */
    m_icons = new QToolBar(this);
    /*
     * the settings action
     */
    m_setProfiles = new QAction(tr("Configure Profiles"),
                             Resource::loadPixmap( "SettingsIcon" ),
                             QString::null, 0, this, 0);
    m_setProfiles->addTo( m_console );
    connect( m_setProfiles, SIGNAL(activated() ),
             this, SLOT(slotConfigure() ) );
    m_console->insertSeparator();
    /*
@@ -287,97 +288,97 @@ void MainWindow::populateScripts() {
                m_scriptsPop->insertItem((*dit)->name());
            }
        }
    }
 }
 MainWindow::~MainWindow() {
    delete m_factory;
    manager()->save();
 }
 MetaFactory* MainWindow::factory() {
    return m_factory;
 }
 Session* MainWindow::currentSession() {
    return m_curSession;
 }
 QList<Session> MainWindow::sessions() {
    return m_sessions;
 }
 void MainWindow::slotNew() {
    ProfileEditorDialog dlg(factory() );
    dlg.setCaption( tr("New Connection") );
    int ret = QPEApplication::execDialog( &dlg );
    if ( ret == QDialog::Accepted ) {
        create( dlg.profile() );
    }
 }
 void MainWindow::slotRecordScript() {
    if (currentSession()) {
        currentSession()->emulationHandler()->startRecording();
        m_saveScript->setEnabled(true);
        m_recordScript->setEnabled(false);
    }
 }
 void MainWindow::slotSaveScript() {
    if (currentSession() && currentSession()->emulationHandler()->isRecording()) {
        QMap<QString, QStringList> map;
        QStringList text;
        text << "text/plain";
        map.insert(tr("Script"), text );
-        QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
+        QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
        if (!filename.isEmpty()) {
            QFileInfo info(filename);
            if (info.extension(FALSE) != "script")
                filename += ".script";
            DocLnk nf;
            nf.setType("text/plain");
            nf.setFile(filename);
            nf.setName(info.fileName());
            FileManager fm;
            fm.saveFile(nf, currentSession()->emulationHandler()->script()->script());
            currentSession()->emulationHandler()->clearScript();
            m_saveScript->setEnabled(false);
            m_recordScript->setEnabled(true);
            populateScripts();
        }
    }
 }
 void MainWindow::slotRunScript(int id) {
    if (currentSession()) {
        int index = m_scriptsPop->indexOf(id);
        DocLnk *lnk = m_scriptsData.at(index);
        QString filePath = lnk->file();
        Script script(filePath);
        currentSession()->emulationHandler()->runScript(&script);
    }
 }
 void MainWindow::slotConnect() {
    if ( currentSession() ) {
        bool ret = currentSession()->layer()->open();
        if(!ret) QMessageBox::warning(currentSession()->widgetStack(),
                                      QObject::tr("Failed"),
                                      QObject::tr("Connecting failed for this session."));
        else {
            m_connect->setEnabled( false );
            m_disconnect->setEnabled( true );
            // if it does not support file transfer, disable the menu entry
            if ( ( m_curSession->layer() )->supports()[1] == 0 ) {
                m_transfer->setEnabled( false );
            } else {
                m_transfer->setEnabled( true );
            }
            m_recordScript->setEnabled( true );
            m_scripts->setItemEnabled(m_runScript_id, true);
        }
@@ -660,68 +661,68 @@ void MainWindow::slotFullscreen() {
    m_isFullscreen = !m_isFullscreen;
 }
 void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) {
    if ( m_curSession ) {
        QEvent::Type state;
        if (pressed) state = QEvent::KeyPress;
        else state = QEvent::KeyRelease;
        QKeyEvent ke(state, k.qcode, k.unicode, 0, QString(QChar(k.unicode)));
        // is this the best way to do this? cant figure out any other way to work
        QApplication::sendEvent((QObject *)m_curSession->widget(), &ke);
        ke.ignore();
    }
 }
 void MainWindow::slotCopy() {
    if (!currentSession() ) return;
    currentSession()->emulationHandler()->copy();
 }
 void MainWindow::slotPaste() {
    if (!currentSession() ) return;
    currentSession()->emulationHandler()->paste();
 }
 /*
 * Save the session
 */
 void MainWindow::slotSaveSession() {
    if (!currentSession() ) {
      QMessageBox::information(this, tr("Save Connection"),
                                          tr("<qt>There is no Connection.</qt>"), 1 );
      return;
    }
    manager()->add( currentSession()->profile() );
    manager()->save();
    populateProfiles();
 }
 void MainWindow::slotSaveHistory() {
    QMap<QString, QStringList> map;
    QStringList text;
    text << "text/plain";
    map.insert(tr("History"), text );
-    QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
+    QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
    if (filename.isEmpty() ) return;
    QFileInfo info(filename);
    DocLnk nf;
    nf.setType("text/plain");
    nf.setFile(filename);
    nf.setName(info.fileName());
    QFile file(filename);
    file.open(IO_WriteOnly );
    QTextStream str(&file );
    if ( currentSession() )
        currentSession()->emulationHandler()->emulation()->streamHistory(&str);
    file.close();
    nf.writeLink();
 }
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 6e1e23e..dc42d8b 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -1,59 +1,60 @@
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qscrollview.h>
 #include "metafactory.h"
 #include "profileeditordialog.h"
+using namespace Opie::Ui;
 namespace {
    void setCurrent( const QString& str, QComboBox* bo ) {
        for (int i = 0; i < bo->count(); i++ ) {
            if ( bo->text(i) == str ) {
                bo->setCurrentItem( i );
            }
        }
    };
 }
 ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact,
                                          const Profile& prof )
    : QDialog(0, 0, TRUE), m_fact( fact ), m_prof( prof )
 {
    initUI();
        // Apply current profile
        // plugin_plugin->load(profile);
        // ... (reset profile name line edit etc.)
 }
 ProfileEditorDialog::ProfileEditorDialog( MetaFactory* fact )
    : QDialog(0, 0, TRUE), m_fact( fact )
 {
    // Default profile
    m_prof = Profile(tr("New Profile"), "serial", "default", Profile::Black, Profile::White, Profile::VT102);
    initUI();
    // Apply current profile
    // plugin_plugin->load(profile);
 }
 Profile ProfileEditorDialog::profile() const
 {
          return m_prof;
 }
 void ProfileEditorDialog::initUI()
 {
    m_con = m_term = m_key = 0l;
    QVBoxLayout *mainLayout = new QVBoxLayout( this );
    tabWidget = new OTabWidget( this );
    tabWidget->setTabStyle(OTabWidget::TextTab);
    mainLayout->add(tabWidget);
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index 97bd650..e7a88e9 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -8,54 +8,54 @@
 class MetaFactory;
 class EditBase;
 class QTabWidget;
 class QHBoxLayout;
 class QLineEdit;
 class QComboBox;
 class QCheckBox;
 class QLabel;
 class QScrollView;
 class ProfileDialogWidget;
 class ProfileEditorDialog : public QDialog {
    Q_OBJECT
 public:
    ProfileEditorDialog(MetaFactory* fact,
                        const Profile& prof );
    ProfileEditorDialog(MetaFactory* fact );
    ~ProfileEditorDialog();
    Profile profile()const;
 public slots:
    void accept();
 private slots:
    void slotConActivated(const QString& );
    void slotTermActivated( const QString& );
    void slotKeyActivated(const QString&);
 private:
    void initUI();
    QString profName()const;
    QCString profType()const;
    MetaFactory* m_fact;
    QHBoxLayout* m_lay;
    Profile m_prof;
    QLineEdit *m_name;
    QComboBox *m_conCmb, *m_termCmb;
    QCheckBox *m_autoConnect;
    QScrollView *m_svCon, *m_svTerm;
    QWidget *m_tabCon, *m_tabTerm, *m_tabKey;
    ProfileDialogWidget* m_con, *m_term, *m_key;
    QHBoxLayout *m_layCon, *m_layTerm, *m_layKey;
-    OTabWidget *tabWidget;
+    Opie::Ui::OTabWidget *tabWidget;
    QWidget *tabprof;
    int m_showconntab;
 };
 #endif
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp
index 2f82417..5958e93 100644
--- a/noncore/apps/opie-console/sz_transfer.cpp
+++ b/noncore/apps/opie-console/sz_transfer.cpp
@@ -1,80 +1,82 @@
 #include "sz_transfer.h"
 #include <qfile.h>
 #include <stdio.h>
 #include <sys/termios.h>
+using namespace Opie::Core;
+using namespace Opie::Core;
 SzTransfer::SzTransfer(Type t, IOLayer *layer) : FileTransferLayer(layer), m_t(t)
 {
 }
 SzTransfer::~SzTransfer() {
 }
 void SzTransfer::sendFile(const QFile& file) {
    sendFile(file.name());
 }
 void SzTransfer::sendFile(const QString& file) {
    //setcbreak(2); /* raw no echo */
    proc = new OProcess;
    *proc << "sz";
    *proc << "-v" << "-v" << "-b" << file;
-    connect(proc, SIGNAL(processExited(OProcess*)),
+    connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
            this, SLOT(sent()));
-    connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)),
+    connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
            this, SLOT(SzReceivedStdout(OProcess*,char*,int)));
-    connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)),
+    connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
            this, SLOT(SzReceivedStderr(OProcess*,char*,int)));
    connect(layer(), SIGNAL(received(const QByteArray&)),
            this, SLOT(receivedStdin(const QByteArray&)));
    proc->start(OProcess::NotifyOnExit, OProcess::All);
 }
 void SzTransfer::SzReceivedStdout(OProcess *, char *buffer, int buflen) {
    qWarning("recieved from sz on stdout %d bytes", buflen);
    QByteArray data(buflen);
    data.fill(*buffer, buflen);
    for (uint i = 0; i < data.count(); i++ ) {
        printf("%c", buffer[i] );
    }
    printf("\n");
    // send out through the io layer
    layer()->send(data);
 }
 void SzTransfer::SzReceivedStderr(OProcess *, char *buffer, int length) {
    // parse and show data in a progress dialog/widget
    printf("stderr:\n");
    //for (int i = 0; i < length; i++)
    //    printf("%c", buffer[i]);
    //printf("\n");
 }
 void SzTransfer::receivedStdin(const QByteArray &data) {
    qWarning("recieved from io_serial %d bytes", data.size());
    // recieved data from the io layer goes to sz
    proc->writeStdin(data.data(), data.size());
 }
 void SzTransfer::sent() {
    qWarning("sent file");
    //setcbreak(0); /* default */
    delete proc;
diff --git a/noncore/apps/opie-console/sz_transfer.h b/noncore/apps/opie-console/sz_transfer.h
index aa97c32..0505215 100644
--- a/noncore/apps/opie-console/sz_transfer.h
+++ b/noncore/apps/opie-console/sz_transfer.h
@@ -1,40 +1,40 @@
 #ifndef OPIE_FL_SZ_H
 #define OPIE_FL_SZ_H
 #include "file_layer.h"
 #include <opie2/oprocess.h>
 class SzTransfer : public FileTransferLayer {
    Q_OBJECT
 public:
    enum Type {
      SZ=0,
      SX,
      SY
    };
    SzTransfer( Type t, IOLayer * );
    ~SzTransfer();
 public slots:
    /**
     * send a file over the layer
     */
    void sendFile( const QString& file ) ;
    void sendFile( const QFile& );
    void sent();
 private slots:
-    void SzReceivedStdout(OProcess *, char *, int);
+    void SzReceivedStdout(Opie::Core::OProcess *, char *, int);
-    void SzReceivedStderr(OProcess *, char *, int);
+    void SzReceivedStderr(Opie::Core::OProcess *, char *, int);
    void receivedStdin(const QByteArray &);
 private:
-    OProcess *proc;
+    Opie::Core::OProcess *proc;
    Type m_t;
 };
 #endif
diff --git a/noncore/apps/opie-console/tabwidget.cpp b/noncore/apps/opie-console/tabwidget.cpp
index 419f8ac..6429e3c 100644
--- a/noncore/apps/opie-console/tabwidget.cpp
+++ b/noncore/apps/opie-console/tabwidget.cpp
@@ -1,44 +1,45 @@
 #include "tabwidget.h"
+using namespace Opie::Ui;
 TabWidget::TabWidget( QWidget* parent, const char* name )
    : OTabWidget( parent, name ) {
    connect(this, SIGNAL( currentChanged(QWidget*) ),
            this, SLOT( slotCurChanged(QWidget*) ) );
 }
 TabWidget::~TabWidget() {
 }
 void TabWidget::add( Session* ses ) {
    qWarning("session ses " + ses->name() );
    if ( !ses->widgetStack() ) return;
    //reparent( ses->widgetStack(), QPoint() );
    addTab( ses->widgetStack(), "console/konsole", ses->name() );
    //addTab( ses->widgetStack(), ses->name() );
    m_map.insert( ses->widgetStack(), ses );
 }
 void TabWidget::remove( Session* ses ) {
    m_map.remove( ses->widgetStack() );
    removePage( ses->widgetStack() );
 }
 void TabWidget::slotCurChanged( QWidget* wid ) {
    QMap<QWidget*, Session*>::Iterator it;
    it = m_map.find( wid );
    if ( it == m_map.end() ) {
        return;
    }
    emit activated( it.data() );
 }
 void TabWidget::setCurrent( Session* ses ) {
    if (!ses )
        return;
    //showPage( ses->widgetStack() );
    setCurrentTab( ses->widgetStack() );
 }
diff --git a/noncore/apps/opie-console/tabwidget.h b/noncore/apps/opie-console/tabwidget.h
index 98450a3..0138645 100644
--- a/noncore/apps/opie-console/tabwidget.h
+++ b/noncore/apps/opie-console/tabwidget.h
@@ -1,29 +1,29 @@
 #ifndef OPIE_TAB_WIDGET_H
 #define OPIE_TAB_WIDGET_H
 #include <qmap.h>
 #include <opie2/otabwidget.h>
 #include "session.h"
 /**
 * This is our central tab widget
 * we can add sessions here
 */
-class TabWidget : public OTabWidget{
+class TabWidget : public Opie::Ui::OTabWidget{
    Q_OBJECT
 public:
    TabWidget(QWidget *parent, const char* name );
    ~TabWidget();
    void add( Session* );
    void remove( Session* );
    void setCurrent( Session* );
 signals:
    void activated(Session* ses );
 private slots:
    void slotCurChanged( QWidget* wid );
 private:
    QMap<QWidget*, Session*> m_map;
 };
 #endif
diff --git a/noncore/apps/opie-console/test/senderui.cpp b/noncore/apps/opie-console/test/senderui.cpp
index b1725db..df27055 100644
--- a/noncore/apps/opie-console/test/senderui.cpp
+++ b/noncore/apps/opie-console/test/senderui.cpp
@@ -1,65 +1,67 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/termios.h>
 #include <qmultilineedit.h>
 #include <qsocketnotifier.h>
 #include "../profile.h"
 #include "../io_serial.h"
 #include "../filetransfer.h"
 #include "../filereceive.h"
 #include <opie2/oprocess.h>
 #include "senderui.h"
+using namespace Opie::Core;
+using namespace Opie::Core;
 SenderUI::SenderUI()
    : Sender() {
    /* we do that manually */
    Profile prof;
    QString str = "/dev/bty0";
    prof.writeEntry("Device",str );
    prof.writeEntry("Baud", 19200 );
    qWarning("prof " + prof.readEntry("Device")  + " " + str);
    ser = new IOSerial(prof);
    connect(ser, SIGNAL(received(const QByteArray&) ),
            this, SLOT(got(const QByteArray&) ) );
    if ( ser->open() )
        qWarning("opened!!!");
    else
        qWarning("could not open");
 }
 SenderUI::~SenderUI() {
 }
 void SenderUI::slotSendFile() {
    sz = new FileTransfer(FileTransfer::SY, ser);
    sz->sendFile("/home/ich/bootopie-v06-13.jffs2");
    connect (sz, SIGNAL(sent()),
             this, SLOT(fileTransComplete()));
 }
 void SenderUI::slotSend() {
    QCString str = MultiLineEdit1->text().utf8();
    qWarning("sending: %s", str.data() );
    str = str.replace( QRegExp("\n"), "\r");
    ser->send( str );
 }
 void SenderUI::got(const QByteArray& ar) {
    qWarning("got:");
    for ( uint i = 0; i < ar.count(); i++ ) {
        printf("%c", ar[i] );
    }
    printf("\n");
 }
 void SenderUI::fileTransComplete() {
diff --git a/noncore/apps/opie-console/test/senderui.h b/noncore/apps/opie-console/test/senderui.h
index c130dcf..15f0743 100644
--- a/noncore/apps/opie-console/test/senderui.h
+++ b/noncore/apps/opie-console/test/senderui.h
@@ -1,34 +1,34 @@
 #ifndef SENDER_UI_H
 #define SENDER_UI_H
 #include <qcstring.h>
 #include "sender.h"
 class IOSerial;
 class FileTransfer;
 class QSocketNotifier;
-class OProcess;
+namespace Opie {namespace Core {class Opie::Core::OProcess;}}
 class SenderUI : public Sender {
    Q_OBJECT
 public:
    SenderUI();
    ~SenderUI();
 public slots:
    void send();
    void slotSendFile();
    void slotSend();
    void slotRev();
    void got(const QByteArray& );
    void fileTransComplete();
 private:
    IOSerial* ser;
    FileTransfer* sz;
    int m_fd;
    QSocketNotifier* m_sock;
-    OProcess* m_proc;
+    Opie::Core::OProcess* m_proc;
 };
 #endif
diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp
index d494a6c..75eb443 100644
--- a/noncore/apps/opie-console/transferdialog.cpp
+++ b/noncore/apps/opie-console/transferdialog.cpp
@@ -1,149 +1,150 @@
 #include <qlayout.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qprogressbar.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <opie2/ofiledialog.h>
 #include "metafactory.h"
 #include "mainwindow.h"
 #include "transferdialog.h"
+using namespace Opie::Ui;
 TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *)
 : QDialog(parent, 0l, false), m_win(mainwindow)
 {
    m_lay = 0l;
    m_recvlay = 0l;
    QVBoxLayout *vbox, *vbox2;
    QHBoxLayout *hbox, *hbox2, *hbox3;
    QLabel *file, *mode, *progress, *status;
    QButtonGroup *group;
    QRadioButton *mode_send, *mode_receive;
    m_autocleanup = 0;
    m_running = true;
    group = new QButtonGroup(QObject::tr("Transfer mode"), this);
    mode_send = new QRadioButton(QObject::tr("Send"), group);
    mode_receive = new QRadioButton(QObject::tr("Receive"), group);
    group->insert(mode_send, id_send);
    group->insert(mode_receive, id_receive);
    vbox2 = new QVBoxLayout(group, 2);
    vbox2->addSpacing(10);
    hbox3 = new QHBoxLayout(vbox2, 2);
    hbox3->add(mode_send);
    hbox3->add(mode_receive);
    mode_send->setChecked(true);
    m_transfermode = id_send;
    file = new QLabel(QObject::tr("Send file"), this);
    mode = new QLabel(QObject::tr("Transfer protocol"), this);
    progress = new QLabel(QObject::tr("Progress"), this);
    status = new QLabel(QObject::tr("Status"), this);
    statusbar = new QLabel(QObject::tr("Ready"), this);
    statusbar->setFrameStyle(QFrame::Panel | QFrame::Sunken);
    protocol = new QComboBox(this);
    QStringList list = m_win->factory()->fileTransferLayers();
    for (QStringList::Iterator it = list.begin(); it != list.end(); ++it)
        protocol->insertItem((*it));
    filename = new QLineEdit(this);
    progressbar = new QProgressBar(this);
    progressbar->setProgress(0);
    selector = new QPushButton("...", this);
    ok = new QPushButton(QObject::tr("Start transfer"), this);
    cancel = new QPushButton(QObject::tr("Cancel"), this);
    vbox = new QVBoxLayout(this, 2);
    vbox->add(group);
    vbox->add(file);
    hbox = new QHBoxLayout(vbox, 0);
    hbox->add(filename);
    hbox->add(selector);
    vbox->add(mode);
    vbox->add(protocol);
    vbox->add(progress);
    vbox->add(progressbar);
    vbox->add(status);
    vbox->add(statusbar);
    vbox->addStretch(1);
    hbox2 = new QHBoxLayout(vbox, 2);
    hbox2->add(ok);
    hbox2->add(cancel);
    setCaption(QObject::tr("File transfer"));
    show();
    connect(selector, SIGNAL(clicked()), SLOT(slotFilename()));
    connect(ok, SIGNAL(clicked()), SLOT(slotTransfer()));
    connect(cancel, SIGNAL(clicked()), SLOT(slotCancel()));
    connect(group, SIGNAL(clicked(int)), SLOT(slotMode(int)));
 }
 TransferDialog::~TransferDialog()
 {
 }
 void TransferDialog::slotFilename()
 {
    QString f;
-    f = Opie::OFileDialog::getOpenFileName(0);
+    f = OFileDialog::getOpenFileName(0);
    if(!f.isNull()) filename->setText(f);
 }
 void TransferDialog::slotTransfer()
 {
    if((m_transfermode == id_send) && (filename->text().isEmpty()))
    {
        QMessageBox::information(this,
            QObject::tr("Attention"),
            QObject::tr("No file has been specified."));
        return;
    }
    ok->setEnabled(false);
    cleanup();
    m_autocleanup = 0;
    if(m_transfermode == id_send) statusbar->setText(QObject::tr("Sending..."));
    else statusbar->setText(QObject::tr("Receiving..."));
    if(m_transfermode == id_send)
    {
        m_lay = m_win->factory()->newFileTransfer(protocol->currentText(), m_win->currentSession()->layer());
        m_lay->sendFile(filename->text());
        connect(m_lay, SIGNAL(progress(const QString&,int,int,int,int,int)),
            SLOT(slotProgress(const QString&,int,int,int,int,int)));
        connect(m_lay, SIGNAL(error(int,const QString&)), SLOT(slotError(int,const QString&)));
        connect(m_lay, SIGNAL(sent()), SLOT(slotSent()));
    }
    else
    {
        m_recvlay = m_win->factory()->newReceive(protocol->currentText(), m_win->currentSession()->layer());
        m_recvlay->receive();
        connect(m_recvlay, SIGNAL(progress(const QString&,int,int,int,int,int)),
            SLOT(slotProgress(const QString&,int,int,int,int,int)));
        connect(m_recvlay, SIGNAL(error(int,const QString&)), SLOT(slotError(int,const QString&)));
        connect(m_recvlay, SIGNAL(received(const QString&)), SLOT(slotReceived(const QString&)));
    }
 }
 void TransferDialog::cleanup()
 {
    if(m_lay)
    {
        m_lay->cancel();
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index b0d589e..b072854 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -1,74 +1,74 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  Allrights reserved.
 **
 ** This file is part of Qt Palmtop 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 "useqpe.h"
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qwidgetstack.h>
 #ifdef USEQPE
 #include <qmenubar.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #endif
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #ifdef USEQPE
 #include <qpe/menubutton.h>
 #include <qpe/fontdatabase.h>
 #endif
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qaction.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qtoolbutton.h>
 #include <qspinbox.h>
 #include <qobjectlist.h>
 #ifdef USEQPE
 #include <qpe/global.h>
 #include <qpe/applnk.h>
 #endif
 #include <qfileinfo.h>
 #include <stdlib.h> //getenv
 #include <qprogressbar.h>
 #ifdef USEQPE
 #include <qpe/config.h>
 #endif
 #include <qbuttongroup.h>
 #include <qradiobutton.h>
 #ifdef USEQPE
 #include <qpe/qcopenvelope_qws.h>
 #endif
 #include "QTReader.h"
 #include "GraphicWin.h"
 #include "Bkmks.h"
 #include "cbkmkselector.h"
 #include "infowin.h"
 #include "ToolbarPrefs.h"
 #include "Prefs.h"
 #include "CAnnoEdit.h"
 #include "QFloatBar.h"
 #include "FixedFont.h"
 #include "URLDialog.h"
 //#include <qpe/fontdatabase.h>
 #ifdef USEQPE
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include "fileBrowser.h"
 #else
diff --git a/noncore/apps/opie-sheet/main.cpp b/noncore/apps/opie-sheet/main.cpp
index c7a7d88..861473e 100644
--- a/noncore/apps/opie-sheet/main.cpp
+++ b/noncore/apps/opie-sheet/main.cpp
@@ -1,20 +1,23 @@
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 /*
 * Opie Sheet (formerly Sheet/Qt)
 * by Serdar Ozler <sozler@sitebest.com>
 */
 #include "mainwindow.h"
 #include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/apps/opie-write/main.cpp b/noncore/apps/opie-write/main.cpp
index 6a8aaaa..036fe48 100644
--- a/noncore/apps/opie-write/main.cpp
+++ b/noncore/apps/opie-write/main.cpp
@@ -1,28 +1,30 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** Licensees holding valid Qtopia Developer license may use this
 ** file in accordance with the Qtopia Developer License Agreement
 ** provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
 ** THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 ** PURPOSE.
 **
 ** email sales@trolltech.com for information about Qtopia License
 ** Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "mainwindow.h"
 #include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/apps/oxygen/main.cpp b/noncore/apps/oxygen/main.cpp
index 276b90d..e2a602b 100644
--- a/noncore/apps/oxygen/main.cpp
+++ b/noncore/apps/oxygen/main.cpp
@@ -1,23 +1,25 @@
 /***************************************************************************
   application:             : Oxygen
   begin                    : September 2002
   copyright                : ( C ) 2002 by Carsten Niehaus
   email                    : cniehaus@handhelds.org
 **************************************************************************/
 /***************************************************************************
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *
 * it under the terms of the GNU General Public License as published by    *
 * the Free Software Foundation; either version 2 of the License, or       *
 * ( at your option ) any later version.                                   *
 *                                                                         *
 **************************************************************************/
 #include <opie2/oapplicationfactory.h>
 #include "oxygen.h"
+using namespace Opie::Core;
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Oxygen> )
diff --git a/noncore/apps/tableviewer/main.cpp b/noncore/apps/tableviewer/main.cpp
index 80a76e0..7ef281c 100644
--- a/noncore/apps/tableviewer/main.cpp
+++ b/noncore/apps/tableviewer/main.cpp
@@ -1,25 +1,27 @@
 /**********************************************************************
 ** 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 "tableviewer.h"
 #include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<TableViewerWindow> )
+using namespace Opie::Core;
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index 4c6d809..102b94c 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -1,81 +1,81 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/ 
 /* local includes */
 #include "tableviewer.h"
 #include "ui/tvbrowseview.h"
 #include "ui/tvfilterview.h"
 #include "ui/tvlistview.h"
 #include "ui/tveditview.h"
 #include "ui/tvkeyedit.h"
 #include "db/datacache.h"
 /* QPE includes */
 #include <qpe/fileselector.h>
 #include <qpe/resource.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 /* QTE includes */
 #include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qbuffer.h>
 /*!
    \class TableViewerWindow
    \brief The main window widget of the application
    This is the main widget of the table viewer application.  
    It is the co-ordination point.
 */
 /*!
    Constructs a new TableViewerWindow
 */
 TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f)
    : QMainWindow(parent, name, f)
 {
    setCaption(tr("Table Viewer"));
 /* Build data */
    ds = new DBStore();
    doc.setType("text/x-xml-tableviewer");
    doc.setName("table");
    dirty = FALSE;
    ts.current_column = 0;
    ts.kRep = ds->getKeys();
 /* build menus */
    menu = new QMenuBar(this, 0);
    QPopupMenu *file_menu = new QPopupMenu;
    file_menu->insertItem("New", this, SLOT(newDocument()));
    file_menu->insertItem("Open", this, SLOT(selectDocument()));
    file_menu->insertSeparator();
    file_menu->insertItem("Properties");
    /* later will want to set this up to clean up first via this, SLOT(quit) */
    menu->insertItem("Document", file_menu); 
    QPopupMenu *edit_menu = new QPopupMenu;
    edit_menu->insertItem("Edit Item", this, SLOT(editItemSlot()));
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
index 8e68262..c3a0a2e 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
@@ -2,96 +2,98 @@
                          kateviewdialog.cpp  -  description
                             -------------------
    copyright            : (C) 2001 by The Kate Team
                           (C) 2002 by Joseph Wenninger
    email                : kwrite-devel@kde.org
                           jowenn@kde.org
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 // Dialogs
 #include <stdio.h>
 #include <stdlib.h>
 #include <qgrid.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qgroupbox.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qcollection.h>
 #include <qpushbutton.h>
 #include <qobjectlist.h>
 #include <qradiobutton.h>
 #include <qwhatsthis.h>
 #include <qstringlist.h>
 #include <klocale.h>
 #include <kcolorbtn.h>
 #include <kglobal.h>
 #include <qvbox.h>
 #include <qspinbox.h>
 #include <qcombobox.h>
 #include <kfontdialog.h>
 #include "../document/katedocument.h"
 #include "kateviewdialog.h"
 #include <opie2/ofontselector.h>
+using namespace Opie::Ui;
+using namespace Opie::Ui;
 SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags )
  : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok )
  , m_replace( 0L )
 {
  QWidget *page = new QWidget( this );
  setMainWidget( page );
  QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() );
  m_search = new QComboBox( true, page );
  m_search->insertStringList( searchFor );
  m_search->setMinimumWidth( m_search->sizeHint().width() );
  m_search->lineEdit()->selectAll();
  QLabel *label = new QLabel( m_search, i18n( "&Text To Find:" ), page );
  m_optRegExp = new QCheckBox( i18n( "Regular Expression" ), page );
  topLayout->addWidget( label );
  topLayout->addWidget( m_search );
  topLayout->addWidget( m_optRegExp );
  if( flags & KateView::sfReplace )
  {
    // make it a replace dialog
    setCaption( i18n( "Replace Text" ) );
    m_replace = new QComboBox( true, page );
    m_replace->insertStringList( replaceWith );
    m_replace->setMinimumWidth( m_search->sizeHint().width() );
    label = new QLabel( m_replace, i18n( "&Replace With:" ), page );
    //m_optPlaceholders = new QCheckBox( i18n( "&Use Placeholders" ), page );
    topLayout->addWidget( label );
    topLayout->addWidget( m_replace );
    //topLayout->addWidget( m_optPlaceholders );
  }
  QGroupBox *group = new QGroupBox( i18n( "Options" ), page );
  topLayout->addWidget( group, 10 );
  QGridLayout *gbox = new QGridLayout( group, 5, 2, spacingHint() );
  gbox->addRowSpacing( 0, fontMetrics().lineSpacing() );
  gbox->setRowStretch( 4, 10 );
  m_opt1 = new QCheckBox( i18n( "C&ase Sensitive" ), group );
  gbox->addWidget( m_opt1, 1, 0 );
  m_opt2 = new QCheckBox(i18n("&Whole Words Only" ), group );
  gbox->addWidget( m_opt2, 2, 0 );
  m_opt3 = new QCheckBox(i18n("&From Beginning" ), group );
  gbox->addWidget( m_opt3, 3, 0 );
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.h b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
index 98d8799..d081152 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.h
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
@@ -139,58 +139,58 @@ class EditConfigTab : public QWidget
    EditConfigTab(QWidget *parent, KateView *);
    void getData(KateView *);
  protected:
    static const int numFlags = 9;
    static const int flags[numFlags];
    QCheckBox *opt[numFlags];
    QComboBox *encoding;
    QSpinBox *e1;
    QSpinBox *e2;
    QSpinBox *e3;
 };
 class ColorConfig : public QWidget
 {
  Q_OBJECT
 public:
  ColorConfig( QWidget *parent = 0, char *name = 0 );
  ~ColorConfig();
  void setColors( QColor * );
  void getColors( QColor * );
 private:
  KColorButton *m_back;
  KColorButton *m_selected;
 };
 class FontConfig : public QWidget
 {
  Q_OBJECT
 public:
  FontConfig( QWidget *parent = 0, char *name = 0 );
  ~FontConfig();
  void setFont ( const QFont &font );
  QFont getFont ( ) { return myFont; };
  private:
-  Opie::OFontSelector *m_fontselect;
+  Opie::Opie::Ui::OFontSelector *m_fontselect;
 //    class KFontChooser *m_fontchooser;
    QFont myFont;
  private slots:
    void slotFontSelected( const QFont &font );
 };
 #endif //_KWDIALOG_H_
diff --git a/noncore/apps/tinykate/main.cpp b/noncore/apps/tinykate/main.cpp
index e62930c..c14d10a 100644
--- a/noncore/apps/tinykate/main.cpp
+++ b/noncore/apps/tinykate/main.cpp
@@ -1,22 +1,25 @@
 /***************************************************************************
                             main.cpp
                             -------------------
    begin                : November 2002
    copyright            : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation.                                         *
 *   ONLY VERSION 2 OF THE LICENSE IS APPLICABLE                           *
 *                                                                         *
 ***************************************************************************/
 #include <opie2/oapplicationfactory.h>
 #include "tinykate.h"
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<TinyKate> )
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index 32c1eab..3c9a637 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -1,77 +1,78 @@
 /***************************************************************************
                             tinykate.cpp
                        Tiny KATE mainwindow
                             -------------------
    begin                : November 2002
    copyright            : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   This program is free softwaSre; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation.                                         *
 *   ONLY VERSION 2 OF THE LICENSE IS APPLICABLE                           *
 *                                                                         *
 ***************************************************************************/
 #include <qaction.h>
 #include <qtoolbutton.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <opie2/ofiledialog.h>
 #include "tinykate.h"
 #include <katedocument.h>
 #include <kglobal.h>
+using namespace Opie::Ui;
 TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
    QMainWindow( parent, name, f )
 {
  shutDown=false;
  nextUnnamed=0;
  currentView=0;
  viewCount=0;
  setCaption(tr("TinyKATE"));
  KGlobal::setAppName("TinyKATE");
  QMenuBar *mb = new QMenuBar( this );
  mb->setMargin( 0 );
  tabwidget=new OTabWidget(this);
  setCentralWidget(tabwidget);
  connect(tabwidget,SIGNAL(currentChanged(QWidget*)),this,SLOT(slotCurrentChanged(QWidget*)));
 //FILE ACTIONS
        QPopupMenu *popup = new QPopupMenu( this );
  // Action for creating a new document
        QAction *a = new QAction( tr( "New" ),  Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
        a->addTo( popup );
        connect(a, SIGNAL(activated()), this, SLOT(slotNew()));
  // Action for opening an exisiting document
        a = new QAction( tr( "Open" ),Resource::loadPixmap( "fileopen" ) , QString::null, 0, this, 0 );
  a->addTo(popup);
        connect(a, SIGNAL(activated()), this, SLOT(slotOpen()));
  // Action for saving  document
        a = new QAction( tr( "Save" ), Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
  a->addTo(popup);
        connect(a, SIGNAL(activated()), this, SLOT(slotSave()));
  // Action for saving document to a new name
        a = new QAction( tr( "Save As" ),Resource::loadPixmap( "save" ) , QString::null, 0, this, 0 );
  a->addTo(popup);
        connect(a, SIGNAL(activated()), this, SLOT(slotSaveAs()));
  // Action for closing the currently active document
        a = new QAction( tr( "Close" ), Resource::loadPixmap( "quit_icon" ) , QString::null, 0, this, 0 );
  a->addTo(popup);
        connect(a, SIGNAL(activated()), this, SLOT(slotClose()));
  mb->insertItem(tr("File"),popup);
@@ -121,158 +122,158 @@ TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
        popup = new QPopupMenu( this );
        mb->insertItem(tr("Utils"),popup);
        mb->insertItem( editCut );
        mb->insertItem( editCopy );
        mb->insertItem( editPaste );
        mb->insertItem( editFindReplace );
        mb->insertItem( editUndo );
        mb->insertItem(  editRedo );
 //Highlight management
  hlmenu=new QPopupMenu(this);
  HlManager *hlm=HlManager::self();
  for (int i=0;i<hlm->highlights();i++)
  {
    hlmenu->insertItem(hlm->hlName(i),i);
  }
  popup->insertItem(tr("Highlighting"),hlmenu);
        utilSettings = new QAction( tr( "Settings" ), QString::null, 0, this, 0 );
        utilSettings->addTo( popup);
  if( qApp->argc() > 1) open(qApp->argv()[1]);
  else slotNew();
 }
 TinyKate::~TinyKate( )
 {
  qWarning("TinyKate destructor\n");
  shutDown=true;
  while (currentView!=0) {
    slotClose();
  }
  if( KGlobal::config() != 0 ) {
    qWarning("deleting KateConfig object..\n");
    delete KGlobal::config();
  }
 }
 void TinyKate::slotOpen( )
 {
-    QString filename = Opie::OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
+    QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
                                                QString::null);
  if (!filename.isEmpty()) {
    open(filename);
  }
 }
 void TinyKate::open(const QString & filename)
 {
    KateDocument *kd= new KateDocument(false, false, this,0,this);
    KTextEditor::View *kv;
    QFileInfo fi(filename);
    QString filenamed = fi.fileName();
    tabwidget->addTab(kv=kd->createView(tabwidget,"bLAH"),"tinykate/tinykate", filenamed );
    qDebug(filename);
    kd->setDocName( filenamed);
    kd->open( filename );
    viewCount++;
 }
 void TinyKate::setDocument(const QString& fileref)
 {
    open( fileref );
 }
 void TinyKate::slotCurrentChanged( QWidget * view)
 {
  if (currentView) {
    disconnect(editCopy,SIGNAL(activated()),currentView,SLOT(copy()));
    disconnect(editCut,SIGNAL(activated()),currentView,SLOT(cut()));
    disconnect(editPaste,SIGNAL(activated()),currentView,SLOT(paste()));
    disconnect(editUndo,SIGNAL(activated()),currentView,SLOT(undo()));
    disconnect(editRedo,SIGNAL(activated()),currentView,SLOT(redo()));
    disconnect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes()));
    disconnect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes()));
    disconnect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int)));
    disconnect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog()));
  }
  currentView=(KTextEditor::View*)view;
  connect(editCopy,SIGNAL(clicked()),currentView,SLOT(copy()));
  connect(editCut,SIGNAL(clicked()),currentView,SLOT(cut()));
  connect(editPaste,SIGNAL(clicked()),currentView,SLOT(paste()));
  connect(editUndo,SIGNAL(clicked()),currentView,SLOT(undo()));
  connect(editRedo,SIGNAL(clicked()),currentView,SLOT(redo()));
  connect(viewIncFontSizes,SIGNAL(activated()), currentView,SLOT(slotIncFontSizes()));
  connect(viewDecFontSizes,SIGNAL(activated()), currentView,SLOT(slotDecFontSizes()));
  connect(hlmenu,SIGNAL(activated(int)), currentView,SLOT(setHl(int)));
  connect(utilSettings,SIGNAL(activated()), currentView,SLOT(configDialog()));
 }
 void TinyKate::slotNew( )
 {
  KateDocument *kd= new KateDocument(false, false, this,0,this);
  KTextEditor::View *kv;
  tabwidget->addTab(kv=kd->createView(tabwidget,"BLAH"),
                    "tinykate/tinykate",
                    tr("Unnamed %1").arg(nextUnnamed++));
  viewCount++;
 }
 void TinyKate::slotClose( )
 {
  if (currentView==0) return;
  KTextEditor::View *dv=currentView;
  currentView=0;
  tabwidget->removePage(dv);
  delete dv->document();
  viewCount--;
  if ((!viewCount) && (!shutDown))  slotNew();
 }
 void TinyKate::slotSave() {
  // feel free to make this how you want
  if (currentView==0) return;
  //  KateView *kv = (KateView*) currentView;
  KateDocument *kd = (KateDocument*) currentView->document();
  //  qDebug("saving file "+kd->docName());
  if( kd->docName().isEmpty())
    slotSaveAs();
  else
     kd->saveFile();
  //    kv->save();
  //    kd->saveFile();
 }
 void TinyKate::slotSaveAs() {
  if (currentView==0) return;
  KateDocument *kd = (KateDocument*) currentView->document();
-  QString filename= Opie::OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL,
+  QString filename= OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL,
-                                                QString::null);
+                                                 QString::null);
  if (!filename.isEmpty()) {
    qDebug("saving file "+filename);
    QFileInfo fi(filename);
    QString filenamed = fi.fileName();
    kd->setDocFile( filename);
    kd->setDocName( filenamed);
    kd->saveFile();
 //   KTextEditor::View *dv = currentView;
 //     tabwidget->changeTab( dv, filenamed);
    // need to change tab label here
  }
 }
diff --git a/noncore/apps/tinykate/tinykate.h b/noncore/apps/tinykate/tinykate.h
index f844c55..f435c03 100644
--- a/noncore/apps/tinykate/tinykate.h
+++ b/noncore/apps/tinykate/tinykate.h
@@ -5,62 +5,62 @@
    begin                : November 2002
    copyright            : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
 ***************************************************************************/
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation.                                         *
 *   ONLY VERSION 2 OF THE LICENSE IS APPLICABLE                           *
 *                                                                         *
 ***************************************************************************/
 #ifndef __TINYKATE_H__
 #define __TINYKATE_H__
 #include <qmainwindow.h>
 #include <opie2/otabwidget.h>
 #include <ktexteditor.h>
 class QToolButton;
 class QAction;
 class QPopupMenu;
 class TinyKate : public QMainWindow
 {
 Q_OBJECT
 public:
    TinyKate( QWidget *parent=0, const char *name=0, WFlags f = 0);
    ~TinyKate( );
    static QString appName() { return QString::fromLatin1( "kate" ); };
 public slots:
    void slotNew();
 void setDocument(const QString& fileref);
 protected slots:
    void slotOpen();
    void slotClose();
    void slotCurrentChanged(QWidget *);
    void slotSave();
    void slotSaveAs();
 protected:
    void open(const QString&);
 private:
    QString currentFileName;
-    OTabWidget *tabwidget;
+    Opie::Ui::OTabWidget *tabwidget;
    KTextEditor::View *currentView;
    bool shutDown;
    QToolButton *editCopy, *editCut, *editPaste, *editUndo, *editRedo,  *editFindReplace;
    QAction *viewIncFontSizes, *viewDecFontSizes, *utilSettings;
    QPopupMenu *hlmenu;
    uint nextUnnamed;
    uint viewCount;
 };
 #endif // __TINYKATE_H__
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index a3467e5..3df55eb 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -1,82 +1,81 @@
 /****************************************************************************
 **
 ** Created: Sat Apr 6 17:57:45 2002
 **
 ** Author: Carsten Schneider <CarstenSchneider@t-online.de>
 **
 ** $Id$
 **
 ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html
 **
 ** Compile Flags:
 **    Zaurus arm     : -DNO_OPIE
 **    Zaurus Opie arm: none
 **    Linux Desktop  : -DDESKTOP
 **    Windows Desktop: -DDESKTOP -DWIN32
 **
 **    for japanese version additional use: -DJPATCH_HDE
 **
 ****************************************************************************/
 #include "zsafe.h"
 #include "newdialog.h"
 #include "searchdialog.h"
 #include "categorydialog.h"
 #include "passworddialog.h"
 #include "infoform.h"
 #include "zlistview.h"
 #include "shadedlistitem.h"
 #ifndef DESKTOP
 #ifndef NO_OPIE
 #include <opie2/ofiledialog.h>
-using Opie::OFileDialog;
+using namespace Opie::Ui;
-using Opie::OFileSelector;
 #else
 #include "scqtfileedit.h"
 #endif
 #endif
 #include <qclipboard.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
 #include <string.h>
 #include <errno.h>
 #include <qmenubar.h>
 #include <qpopupmenu.h>
 #ifdef DESKTOP
 #include <qfiledialog.h>
 #ifndef WIN32
 #include <qsettings.h>
 #else
 #include "qsettings.h"
 #endif
 #include <qapplication.h>
 #else
 #include <qfile.h>
 #include <qpe/fileselector.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #endif
 #include <qtimer.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qheader.h>
 #include <qlistview.h>
 #include <qtoolbutton.h>
 #include <qvariant.h>
author	zecke <zecke>	2004-03-13 22:41:59 (UTC)
committer	zecke <zecke>	2004-03-13 22:41:59 (UTC)
commit	3d27828732fe7e499219ad6e208dc13dead86431 (patch) (unidiff)
tree	faa42dec364ad1e0470a370c81d0a7dc0cd2f9bc /noncore
parent	ee753c0009da5bec4a71d3263e9623d04dddc5c4 (diff)
download	opie-3d27828732fe7e499219ad6e208dc13dead86431.zip opie-3d27828732fe7e499219ad6e208dc13dead86431.tar.gz opie-3d27828732fe7e499219ad6e208dc13dead86431.tar.bz2