summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/pimconverter/converter.cpp29
-rwxr-xr-xnoncore/tools/pimconverter/converter.h3
-rw-r--r--noncore/tools/pimconverter/converter.pro5
-rw-r--r--noncore/tools/pimconverter/converter_base.ui2
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
@@ -1,8 +1,7 @@
1#include "converter.h" 1#include "converter.h"
2 2
3/* OPIE */ 3/* OPIE */
4#include <qpe/qpeapplication.h> 4#include <opie2/oapplicationfactory.h>
5
6#include <opie2/odebug.h> 5#include <opie2/odebug.h>
7#include <opie2/opimglobal.h> 6#include <opie2/opimglobal.h>
8// Include SQL related header files 7// Include SQL related header files
@@ -17,10 +16,13 @@
17#include <qmessagebox.h> 16#include <qmessagebox.h>
18 17
19 18
19OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<Converter> )
20
20using namespace Opie; 21using namespace Opie;
21using namespace Pim; 22using namespace Pim;
22 23
23Converter::Converter(): 24Converter::Converter(QWidget *p, const char* n, WFlags fl):
25 converter_base( p, n, fl ),
24 m_selectedDatabase( ADDRESSBOOK ), 26 m_selectedDatabase( ADDRESSBOOK ),
25 m_selectedSourceFormat( XML ), 27 m_selectedSourceFormat( XML ),
26 m_selectedDestFormat( SQL ), 28 m_selectedDestFormat( SQL ),
@@ -56,11 +58,11 @@ void Converter::start_conversion(){
56 odebug << "SourceFormat: " << m_selectedSourceFormat << oendl; 58 odebug << "SourceFormat: " << m_selectedSourceFormat << oendl;
57 odebug << "DestFormat: " << m_selectedDestFormat << oendl; 59 odebug << "DestFormat: " << m_selectedDestFormat << oendl;
58 if ( m_selectedSourceFormat == m_selectedDestFormat ){ 60 if ( m_selectedSourceFormat == m_selectedDestFormat ){
59 61
60 QMessageBox::warning( this, "PimConverter", 62 QMessageBox::warning( this, "PimConverter",
61 tr( "It is not a good idea to use\n" ) 63 tr( "It is not a good idea to use\n" )
62 +tr( "the same source and destformat !" ), 64 +tr( "the same source and destformat !" ),
63 tr( "Ok" ) ); 65 tr( "Ok" ) );
64 return; 66 return;
65 } 67 }
66 68
@@ -212,7 +214,7 @@ void Converter::start_conversion(){
212 214
213void Converter::closeEvent( QCloseEvent *e ) 215void Converter::closeEvent( QCloseEvent *e )
214{ 216{
215 217
216 /* Due to the fact that we don't have multitasking here, this 218 /* Due to the fact that we don't have multitasking here, this
217 * critical handling don't make sense, but the future.. 219 * critical handling don't make sense, but the future..
218 */ 220 */
@@ -222,18 +224,3 @@ void Converter::closeEvent( QCloseEvent *e )
222 } 224 }
223 e->accept(); 225 e->accept();
224} 226}
225
226
227
228int main( int argc, char** argv ) {
229
230 QPEApplication a( argc, argv );
231
232 Converter dlg;
233
234 a.showMainWidget( &dlg );
235 // dlg. showMaximized ( );
236
237 return a.exec();
238
239}
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
@@ -7,7 +7,8 @@
7 7
8class Converter: public converter_base { 8class Converter: public converter_base {
9public: 9public:
10 Converter(); 10 Converter(QWidget *parent, const char* name, WFlags fl);
11 static QString appName() { return QString::fromLatin1("opimconverter");}
11 12
12 // Slots defined in the ui-description file 13 // Slots defined in the ui-description file
13 void start_conversion(); 14 void start_conversion();
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 @@
1 CONFIG = qt warn_on debug 1 CONFIG = qt quick-app
2 # CONFIG = qt warn_on release quick-app
3HEADERS = converter.h 2HEADERS = converter.h
4 SOURCES = converter.cpp 3 SOURCES = converter.cpp
5INTERFACES = converter_base.ui 4INTERFACES = converter_base.ui
6 INCLUDEPATH+= $(OPIEDIR)/include 5 INCLUDEPATH+= $(OPIEDIR)/include
7 DEPENDPATH+= $(OPIEDIR)/include 6 DEPENDPATH+= $(OPIEDIR)/include
8LIBS += -lqpe -lopiecore2 -lopiepim2 -lopiedb2 7LIBS += -lqpe -lopiecore2 -lopiepim2 -lopiedb2
9 TARGET = $(OPIEDIR)/bin/opimconverter 8 TARGET = opimconverter
10 9
11include ( $(OPIEDIR)/include.pro ) 10include ( $(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,7 +1,7 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>converter_base</class> 2<class>converter_base</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QWidget</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>converter_base</cstring> 7 <cstring>converter_base</cstring>