4 files changed, 5 insertions, 33 deletions

diff --git a/kabc/converter/sharpdtm/sharpdtmE.pro b/kabc/converter/sharpdtm/sharpdtmE.pro
deleted file mode 100644
index 89b4e64..0000000
--- a/kabc/converter/sharpdtm/sharpdtmE.pro
+++ b/dev/null
@@ -1,30 +0,0 @@
-TEMPLATE = lib
-INCLUDEPATH += . ../.. $(SHARPDTMSDK)/include ../../../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
-LIBS += -lzdtm
-
-TARGET  = microkabc_sharpdtmconverter
-
-# Input
-
-HEADERS += \
-  sharpdtmconverter.h \
-  
-
-SOURCES += \
-  sharpdtmconverter.cpp \
-  
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index a03454f..54ef083 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,29 +1,31 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
 TARGET = microkabc_sharpdtm
 
-INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include 
+INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include 
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 LIBS += -lqte
 LIBS += -lzdtm
-LIBS += -lmicrokabc_sharpdtmconverter
+
 
 
 INTERFACES = \
 
 HEADERS = \
  resourcesharpdtm.h \
  resourcesharpdtmconfig.h \
+ sharpdtmconverter.h 
  
 SOURCES = \
  resourcesharpdtm.cpp \
  resourcesharpdtmconfig.cpp \
- 
+ sharpdtmconverter.cpp
+
diff --git a/kabc/converter/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index 8f8334e..8f8334e 100644
--- a/kabc/converter/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
diff --git a/kabc/converter/sharpdtm/sharpdtmconverter.h b/kabc/plugins/sharpdtm/sharpdtmconverter.h
index 99e0413..99e0413 100644
--- a/kabc/converter/sharpdtm/sharpdtmconverter.h
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.h