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
@@ -55,12 +55,13 @@
 #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;
 
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
@@ -32,13 +32,12 @@
 #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;
@@ -70,13 +69,13 @@ class Checkbook : public QDialog
 
     private:
         CBInfo *info;
         TranInfoList *tranList;
         Cfg *_pCfg;
 
-        OTabWidget *mainWidget;
+        Opie::Ui::OTabWidget *mainWidget;
         void        loadCheckbook();
         void        adjustBalance();
 
         // Info tab
         QWidget        *initInfo();
         QCheckBox      *passwordCB;
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
@@ -25,9 +25,11 @@
                              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
@@ -32,13 +32,13 @@
 #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>