-rw-r--r-- | noncore/tools/pimconverter/converter.cpp | 29 | ||||
-rwxr-xr-x | noncore/tools/pimconverter/converter.h | 3 | ||||
-rw-r--r-- | noncore/tools/pimconverter/converter.pro | 5 | ||||
-rw-r--r-- | noncore/tools/pimconverter/converter_base.ui | 2 |
4 files changed, 13 insertions, 26 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 @@ -3,4 +3,3 @@ /* OPIE */ -#include <qpe/qpeapplication.h> - +#include <opie2/oapplicationfactory.h> #include <opie2/odebug.h> @@ -19,2 +18,4 @@ +OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<Converter> ) + using namespace Opie; @@ -22,3 +23,4 @@ using namespace Pim; -Converter::Converter(): +Converter::Converter(QWidget *p, const char* n, WFlags fl): + converter_base( p, n, fl ), m_selectedDatabase( ADDRESSBOOK ), @@ -58,3 +60,3 @@ void Converter::start_conversion(){ if ( m_selectedSourceFormat == m_selectedDestFormat ){ - + QMessageBox::warning( this, "PimConverter", @@ -62,3 +64,3 @@ void Converter::start_conversion(){ +tr( "the same source and destformat !" ), - tr( "Ok" ) ); + tr( "Ok" ) ); return; @@ -214,3 +216,3 @@ void Converter::closeEvent( QCloseEvent *e ) { - + /* Due to the fact that we don't have multitasking here, this @@ -224,16 +226 @@ void Converter::closeEvent( QCloseEvent *e ) } - - - -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 @@ -9,3 +9,4 @@ class Converter: public converter_base { public: - Converter(); + Converter(QWidget *parent, const char* name, WFlags fl); + static QString appName() { return QString::fromLatin1("opimconverter");} 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,3 +1,2 @@ -CONFIG = qt warn_on debug -# CONFIG = qt warn_on release quick-app +CONFIG = qt quick-app HEADERS = converter.h @@ -8,3 +7,3 @@ DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopiecore2 -lopiepim2 -lopiedb2 -TARGET = $(OPIEDIR)/bin/opimconverter +TARGET = opimconverter 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 @@ -3,3 +3,3 @@ <widget> - <class>QDialog</class> + <class>QWidget</class> <property stdset="1"> |