Namespace changes for Apps

QAshMoney and Reader need to be valgrinded

4 files changed, 5 insertions, 3 deletions

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
@@ -37,48 +37,49 @@
 
 #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 );
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
@@ -14,87 +14,86 @@
      +  .  -:.       =       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;
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
@@ -7,27 +7,29 @@
 .> <`_,   >  .   <=          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
@@ -14,49 +14,49 @@
      +  .  -:.       =       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 );