got tableviewer compiling to find out what the heck it is- and I still can't tell

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
@@ -19,13 +19,13 @@
 **********************************************************************/ 
 #include <stdlib.h>
 #include <qstring.h>
 #include <qheader.h>
 #include <qvector.h>
 #include <qdatetime.h>
-#include <timestring.h>
+#include <qpe/timestring.h>
 #include "common.h"
 #include "datacache.h"
 #include <assert.h>
 
 static const int del_flag = 0x1;
 static const int new_flag = 0x2;
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
@@ -15,13 +15,13 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "tableviewer.h"
-#include <qpeapplication.h>
+#include <qpe/qpeapplication.h>
 
 int main( int argc, char ** argv )
 {
     QPEApplication a( argc, argv );
 
     TableViewerWindow * mw = new TableViewerWindow;
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
@@ -25,23 +25,23 @@
 #include "ui/tvlistview.h"
 #include "ui/tveditview.h"
 #include "ui/tvkeyedit.h"
 #include "db/datacache.h"
 
 /* QPE includes */
-#include "fileselector.h"
-#include "resource.h"
+#include <qpe/fileselector.h>
+#include <qpe/resource.h>
+#include <qpe/qpetoolbar.h>
 
 /* QTE includes */
 #include <qpe/qpemenubar.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.
@@ -90,48 +90,48 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
 
     QVBoxLayout *main_layout = new QVBoxLayout;
 
     /* Build tool bar */
     navigation = new QPEToolBar(this, "navigation");
     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, 
 	    SLOT(deleteItemSlot()), navigation, "Delete Item");
 
     navigation->addSeparator();
 
     QToolButton *firstItemButton = new QToolButton(
-	    QIconSet(Resource::loadImage("fastback")), "First Item", 
+      QIconSet(Resource::loadPixmap("fastback")), "First Item", 
 	    QString::null, this, 
 	    SLOT(firstItem()), navigation, "First Item");
     QToolButton *previousItemButton = new QToolButton(
-	    QIconSet(Resource::loadImage("back")), "Previous Item", 
+      QIconSet(Resource::loadPixmap("back")), "Previous Item", 
 	    QString::null, this, 
 	    SLOT(previousItem()), navigation, "Previous Item");
     QToolButton *nextItemButton = new QToolButton(
-	    QIconSet(Resource::loadImage("forward")), "Next Item", 
+      QIconSet(Resource::loadPixmap("forward")), "Next Item", 
 	    QString::null, this, 
 	    SLOT(nextItem()), navigation, "Next Item");
     QToolButton *lastItemButton = new QToolButton(
-	    QIconSet(Resource::loadImage("fastforward")), "Last Item", 
+      QIconSet(Resource::loadPixmap("fastforward")), "Last Item", 
 	    QString::null, this, 
 	    SLOT(lastItem()), navigation, "Last Item");
 
     navigation->addSeparator();
     QToolButton *browseButton = new QToolButton(
-	    QIconSet(Resource::loadImage("day")), "View Single Item", 
+      QIconSet(Resource::loadPixmap("day")), "View Single Item", 
 	    QString::null, this, 
 	    SLOT(browseViewSlot()), navigation, "View Single Item");
     QToolButton *listButton = new QToolButton(
-	    QIconSet(Resource::loadImage("month")), "View Multiple Items", 
+      QIconSet(Resource::loadPixmap("month")), "View Multiple Items", 
 	    QString::null, this, 
 	    SLOT(listViewSlot()), navigation, "View Multiple Items");
 
     setToolBarsMovable(FALSE);
     setToolBarsMovable(FALSE);
     setToolBarsMovable(FALSE);
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
@@ -19,13 +19,13 @@
 **********************************************************************/
 #ifndef Tableviewer_H
 #define Tableviewer_H
 
 #include <qmainwindow.h>
 #include "db/common.h"
-#include "fileselector.h"
+#include <qpe/fileselector.h>
 
 /* Forward class declarations */
 class QWidgetStack;
 class QDialog;
 class QMenuBar;
 
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
@@ -19,13 +19,14 @@
 **********************************************************************/
 
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qcombobox.h>
-#include <datebookmonth.h>
+
+#include <qpe/datebookmonth.h>
 #include <qpopupmenu.h>
 #include <qspinbox.h>
 #include "commonwidgets.h"
 
 DateEdit::DateEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 )
     : QToolButton(parent, name)
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
@@ -40,13 +40,13 @@
 TVBrowseView::TVBrowseView(TableState *t, QWidget* parent = 0, const char *name = 0, 
 	WFlags fl =0)
 {
     if (!name) 
 	setName("BrowseView");
 
-    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);
     textViewDisplay = new QTextBrowser(this, "textViewDisplay");
     vlayout->addWidget( textViewDisplay );
 
     keyEntry = new TVBrowseKeyEntry(this, "keyEntry");
     vlayout->addWidget( keyEntry );