6 files changed, 18 insertions, 17 deletions

diff --git a/noncore/apps/tableviewer/db/common.cpp b/noncore/apps/tableviewer/db/common.cpp
index 4c70e54..71844a5 100644
--- a/noncore/apps/tableviewer/db/common.cpp
+++ b/noncore/apps/tableviewer/db/common.cpp
@@ -24,3 +24,3 @@
 #include <qdatetime.h>
-#include <timestring.h>
+#include <qpe/timestring.h>
 #include "common.h"
diff --git a/noncore/apps/tableviewer/main.cpp b/noncore/apps/tableviewer/main.cpp
index 736e1cf..56c567f 100644
--- a/noncore/apps/tableviewer/main.cpp
+++ b/noncore/apps/tableviewer/main.cpp
@@ -20,3 +20,3 @@
 #include "tableviewer.h"
-#include <qpeapplication.h>
+#include <qpe/qpeapplication.h>
 
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index 0d4a412..0456b41 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -30,4 +30,5 @@
 /* QPE includes */
-#include "fileselector.h"
-#include "resource.h"
+#include <qpe/fileselector.h>
+#include <qpe/resource.h>
+#include <qpe/qpetoolbar.h>
 
@@ -40,3 +41,2 @@
 #include <qbuffer.h>
-
 /*!
@@ -95,9 +95,9 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
     QToolButton *newItemButton = new QToolButton(
-            QIconSet(Resource::loadImage("new")), "New Item", QString::null,
+      QIconSet(Resource::loadPixmap("new")), "New Item", QString::null,
             this, SLOT(newItemSlot()), navigation, "New Item");
     QToolButton *editItemButton = new QToolButton(
-            QIconSet(Resource::loadImage("edit")), "Edit Item", QString::null,
+      QIconSet(Resource::loadPixmap("edit")), "Edit Item", QString::null,
             this, SLOT(editItemSlot()), navigation, "Edit Item");
     QToolButton *deleteItemButton = new QToolButton(
-            QIconSet(Resource::loadImage("trash")), "Delete Item", 
+      QIconSet(Resource::loadPixmap("trash")), "Delete Item", 
             QString::null, this, 
@@ -108,3 +108,3 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
     QToolButton *firstItemButton = new QToolButton(
-            QIconSet(Resource::loadImage("fastback")), "First Item", 
+      QIconSet(Resource::loadPixmap("fastback")), "First Item", 
             QString::null, this, 
@@ -112,3 +112,3 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
     QToolButton *previousItemButton = new QToolButton(
-            QIconSet(Resource::loadImage("back")), "Previous Item", 
+      QIconSet(Resource::loadPixmap("back")), "Previous Item", 
             QString::null, this, 
@@ -116,3 +116,3 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
     QToolButton *nextItemButton = new QToolButton(
-            QIconSet(Resource::loadImage("forward")), "Next Item", 
+      QIconSet(Resource::loadPixmap("forward")), "Next Item", 
             QString::null, this, 
@@ -120,3 +120,3 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
     QToolButton *lastItemButton = new QToolButton(
-            QIconSet(Resource::loadImage("fastforward")), "Last Item", 
+      QIconSet(Resource::loadPixmap("fastforward")), "Last Item", 
             QString::null, this, 
@@ -126,3 +126,3 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
     QToolButton *browseButton = new QToolButton(
-            QIconSet(Resource::loadImage("day")), "View Single Item", 
+      QIconSet(Resource::loadPixmap("day")), "View Single Item", 
             QString::null, this, 
@@ -130,3 +130,3 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
     QToolButton *listButton = new QToolButton(
-            QIconSet(Resource::loadImage("month")), "View Multiple Items", 
+      QIconSet(Resource::loadPixmap("month")), "View Multiple Items", 
             QString::null, this, 
diff --git a/noncore/apps/tableviewer/tableviewer.h b/noncore/apps/tableviewer/tableviewer.h
index 2d4686a..0d3c39d 100644
--- a/noncore/apps/tableviewer/tableviewer.h
+++ b/noncore/apps/tableviewer/tableviewer.h
@@ -24,3 +24,3 @@
 #include "db/common.h"
-#include "fileselector.h"
+#include <qpe/fileselector.h>
 
diff --git a/noncore/apps/tableviewer/ui/commonwidgets.cpp b/noncore/apps/tableviewer/ui/commonwidgets.cpp
index 0b4f3c2..bf4c36f 100644
--- a/noncore/apps/tableviewer/ui/commonwidgets.cpp
+++ b/noncore/apps/tableviewer/ui/commonwidgets.cpp
@@ -24,3 +24,4 @@
 #include <qcombobox.h>
-#include <datebookmonth.h>
+
+#include <qpe/datebookmonth.h>
 #include <qpopupmenu.h>
diff --git a/noncore/apps/tableviewer/ui/tvbrowseview.cpp b/noncore/apps/tableviewer/ui/tvbrowseview.cpp
index f6da7b1..9bfc791 100644
--- a/noncore/apps/tableviewer/ui/tvbrowseview.cpp
+++ b/noncore/apps/tableviewer/ui/tvbrowseview.cpp
@@ -45,3 +45,3 @@ TVBrowseView::TVBrowseView(TableState *t, QWidget* parent = 0, const char *name
 
-    setSizePolicy(QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding, 0, 0, sizePolicy().hasHeightForWidth() ) );
+//      setSizePolicy(QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding, 0, 0, sizePolicy().hasHeightForWidth() ) );
     QVBoxLayout *vlayout = new QVBoxLayout(this);