4 files changed, 10 insertions, 23 deletions

diff --git a/noncore/tools/pimconverter/converter.cpp b/noncore/tools/pimconverter/converter.cpp
index ded59b6..e9de3c3 100644
--- a/noncore/tools/pimconverter/converter.cpp
+++ b/noncore/tools/pimconverter/converter.cpp
@@ -1,31 +1,33 @@
 #include "converter.h"
 
 /* OPIE */
-#include <qpe/qpeapplication.h>
-
+#include <opie2/oapplicationfactory.h>
 #include <opie2/odebug.h>
 #include <opie2/opimglobal.h>
 // Include SQL related header files
 #define __USE_SQL
 #include <opie2/opimaccessfactory.h>
 
 /* QT */
 #include <qdatetime.h>
 #include <qprogressbar.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qmessagebox.h>
 
 
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<Converter> )
+
 using namespace Opie;
 using namespace Pim;
 
-Converter::Converter():
+Converter::Converter(QWidget *p, const char* n,  WFlags fl):
+    converter_base( p, n, fl ),
     m_selectedDatabase( ADDRESSBOOK ),
     m_selectedSourceFormat( XML ),
     m_selectedDestFormat( SQL ),
     m_criticalState( false )
 {
     m_dataBaseSelector -> setCurrentItem( m_selectedDatabase );
     m_sourceFormatSelector -> setCurrentItem( m_selectedSourceFormat );
     m_destFormatSelector -> setCurrentItem( m_selectedDestFormat );
@@ -217,23 +219,8 @@ void Converter::closeEvent( QCloseEvent *e )
 	 * critical handling don't make sense, but the future..
 	 */
 	if ( m_criticalState ){
 		e->ignore();
 		return;
 	}
 	e->accept();
 }
-
-
-
-int main( int argc, char** argv ) {
-
-    QPEApplication a( argc, argv );
-
-    Converter dlg;
-
-    a.showMainWidget( &dlg );
-    // dlg. showMaximized ( );
-
-    return a.exec();
-
-}
diff --git a/noncore/tools/pimconverter/converter.h b/noncore/tools/pimconverter/converter.h
index a78c6bc..344562a 100755
--- a/noncore/tools/pimconverter/converter.h
+++ b/noncore/tools/pimconverter/converter.h
@@ -2,17 +2,18 @@
 #define _CONVERTER_H_
 
 
 #include "converter_base.h"
 
 
 class Converter: public converter_base {
 public:
-	Converter();
+        Converter(QWidget *parent, const char* name, WFlags fl);
+	static QString appName() { return QString::fromLatin1("opimconverter");}
 
 	// Slots defined in the ui-description file
 	void start_conversion();
 	void selectedDatabase( int num );
 	void selectedDestFormat( int num );
 	void selectedSourceFormat( int num );
 
 	void closeEvent( QCloseEvent *e );
diff --git a/noncore/tools/pimconverter/converter.pro b/noncore/tools/pimconverter/converter.pro
index 0504a55..4677ee6 100644
--- a/noncore/tools/pimconverter/converter.pro
+++ b/noncore/tools/pimconverter/converter.pro
@@ -1,11 +1,10 @@
-CONFIG		= qt warn_on debug
-# CONFIG		= qt warn_on release quick-app
+CONFIG		= qt quick-app
 HEADERS         =  converter.h
 SOURCES		=  converter.cpp
 INTERFACES      =  converter_base.ui
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopiepim2 -lopiedb2 
-TARGET		= $(OPIEDIR)/bin/opimconverter
+TARGET		= opimconverter
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/tools/pimconverter/converter_base.ui b/noncore/tools/pimconverter/converter_base.ui
index c7a2fb5..a5b22c9 100644
--- a/noncore/tools/pimconverter/converter_base.ui
+++ b/noncore/tools/pimconverter/converter_base.ui
@@ -1,12 +1,12 @@
 <!DOCTYPE UI><UI>
 <class>converter_base</class>
 <widget>
-    <class>QDialog</class>
+    <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>converter_base</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>