1 files changed, 12 insertions, 12 deletions

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,