4 files changed, 6 insertions, 34 deletions

diff --git a/kabc/converter/qtopia/qtopiaE.pro b/kabc/converter/qtopia/qtopiaE.pro
deleted file mode 100644
index ab47091..0000000
--- a/kabc/converter/qtopia/qtopiaE.pro
+++ b/dev/null
@@ -1,29 +0,0 @@
-TEMPLATE = lib
-INCLUDEPATH += . ../.. ../../../microkde ../../../microkde/kdecore $(QPEDIR)/include
-#CONFIG += staticlib 
-OBJECTS_DIR = obj/$(PLATFORM)
-MOC_DIR = moc/$(PLATFORM)
-
-#for static linkage, put it here
-#DESTDIR=../../lib/$(PLATFORM)
-
-#for dynamic linkage, put it here
-DESTDIR=$(QPEDIR)/lib
-
-LIBS += -lmicrokde 
-LIBS += -lmicrokabc
-LIBS += -L$(QPEDIR)/lib
-LIBS += -lqpepim
-LIBS += -lqpe
-
-TARGET  = microkabc_qtopiaconverter
-
-# Input
-
-HEADERS += \
-  qtopiaconverter.h \
-  
-
-SOURCES += \
-  qtopiaconverter.cpp \
-  
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index d9fa87f..56eae87 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -5,3 +5,3 @@ TARGET = microkabc_qtopia
 
-INCLUDEPATH += ../.. ../../converter/qtopia ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
 
@@ -15,3 +15,2 @@ LIBS += -lqpepim
 LIBS += -lqpe
-LIBS += -lmicrokabc_qtopiaconverter
 
@@ -21,6 +20,8 @@ HEADERS = \
  resourceqtopia.h \
- resourceqtopiaconfig.h
- 
+ resourceqtopiaconfig.h \
+ qtopiaconverter.h
+
 SOURCES = \
  resourceqtopia.cpp \
- resourceqtopiaconfig.cpp
+ resourceqtopiaconfig.cpp \
+ qtopiaconverter.cpp 
diff --git a/kabc/converter/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index ac513b6..ac513b6 100644
--- a/kabc/converter/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
diff --git a/kabc/converter/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h
index 8f4c698..8f4c698 100644
--- a/kabc/converter/qtopia/qtopiaconverter.h
+++ b/kabc/plugins/qtopia/qtopiaconverter.h