3 files changed, 6 insertions, 13 deletions

diff --git a/noncore/settings/tabmanager/main.cpp b/noncore/settings/tabmanager/main.cpp
index f737de5..cf6f835 100644
--- a/noncore/settings/tabmanager/main.cpp
+++ b/noncore/settings/tabmanager/main.cpp
@@ -1,12 +1,5 @@
 #include "tabmainwindow.h"
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplicationfactory.h>
 
-int main( int argc, char **argv ){
-  QPEApplication application( argc, argv );
-  TabMainWindow mainWindow;
-  application.showMainWidget(&mainWindow);
-  return application.exec();
-}
-
-//main.cpp
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<TabMainWindow> )
 
diff --git a/noncore/settings/tabmanager/tabmainwindow.h b/noncore/settings/tabmanager/tabmainwindow.h
index 69fb15d..d154f1e 100644
--- a/noncore/settings/tabmanager/tabmainwindow.h
+++ b/noncore/settings/tabmanager/tabmainwindow.h
@@ -1,38 +1,40 @@
 #ifndef TABMAINWINDOW_H
 #define TABMAINWINDOW_H
 
 #include "tabmanager.h"
 #include <qmainwindow.h>
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qpe/resource.h>
 
 class TabMainWindow : public QMainWindow { 
 
 public:
-  TabMainWindow( QWidget* parent = 0, const char* name = 0) : QMainWindow(parent, name){
+  static QString appName() { return QString::fromLatin1( QUICKAPP_NAME ); }
+
+  TabMainWindow( QWidget* parent = 0, const char* name = 0, WFlags fl = 0) : QMainWindow(parent, name, fl){
     tabManager = new TabManager(this, "TabManger");
     setCaption("Tab Manager");
     setToolBarsMovable(false);
     this->setCentralWidget(tabManager);
     QToolBar *newToolBar = new QToolBar("toolbar", this);
     QToolBar *emptyToolBar = new QToolBar("empty", this);
     emptyToolBar->setHorizontalStretchable(true);
    
     // Insert all of the buttons. 
     QToolButton *newFolder = new QToolButton(Resource::loadPixmap("fileopen"), "New Folder", 0, tabManager, SLOT(newFolder()), newToolBar);
     QToolButton *newFile = new QToolButton(Resource::loadPixmap("new"), "New Application", 0, tabManager, SLOT(newApplication()), newToolBar);
     QToolButton *editItem = new QToolButton(Resource::loadPixmap("edit"), "Edit", 0, tabManager, SLOT(editCurrentItem()), newToolBar);
     QToolButton *deleteItem = new QToolButton(Resource::loadPixmap("trash"), "Delete", 0, tabManager, SLOT(removeItem()), newToolBar);
     
   };
 
 protected:
   TabManager *tabManager;
 
 };
 
 #endif
 
 // tabmainwindow.h 
 
diff --git a/noncore/settings/tabmanager/tabmanager.pro b/noncore/settings/tabmanager/tabmanager.pro
index d4aac43..f65a1d7 100644
--- a/noncore/settings/tabmanager/tabmanager.pro
+++ b/noncore/settings/tabmanager/tabmanager.pro
@@ -1,12 +1,10 @@
-        TEMPLATE= app
-        CONFIG  = qt warn_on 
+        CONFIG  = qt quick-app
         HEADERS         = tabmanager.h tabmainwindow.h tablistview.h tabmanagerbase.h tabapplnk.h
         SOURCES         = main.cpp tabmanager.cpp tabmanagerbase.cpp
         INCLUDEPATH+= $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
         LIBS    += -lqpe -lopiecore2
         INTERFACES= app.ui wait.ui
         TARGET  = tabmanager
-        DESTDIR = $(OPIEDIR)/bin
 
 include ( $(OPIEDIR)/include.pro )