6 files changed, 50 insertions, 35 deletions
diff --git a/lib/tdeio-msits/CMakeL10n.txt b/lib/tdeio-msits/CMakeL10n.txt
new file mode 100644
index 0000000..81e35fd
--- /dev/null
+++ b/lib/tdeio-msits/CMakeL10n.txt
@@ -0,0 +1,6 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/kchmviewer-desktops"
+    SOURCES *.desktop *.protocol
+)
diff --git a/lib/tdeio-msits/CMakeLists.txt b/lib/tdeio-msits/CMakeLists.txt
new file mode 100644
index 0000000..d0ab1ae
--- /dev/null
+++ b/lib/tdeio-msits/CMakeLists.txt
@@ -0,0 +1,39 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CHMLIB_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/lib/libchmfile
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### tdeio_msits (kpart)
+
+tde_add_kpart( tdeio_msits
+
+  SOURCES
+        msits.cpp
+  LINK
+     tdeio-shared
+     tdecore-shared
+     ${CHMLIB_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE msits.protocol
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+tde_create_translated_desktop( ${PROJECT_NAME}.desktop )
diff --git a/lib/tdeio-msits/Makefile.am b/lib/tdeio-msits/Makefile.am
deleted file mode 100644
index 93a8f89..0000000
--- a/lib/tdeio-msits/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-METASOURCES = AUTO
-INCLUDES = $(TQT_INCLUDES) $(CHM_INCLUDES) $(KDE_INCLUDES) $(LIBCHMFILE_INCLUDES)
-
-kde_module_LTLIBRARIES = tdeio_msits.la
-
-tdeio_msits_la_SOURCES = msits.cpp
-tdeio_msits_la_LIBADD = -ltdeio $(CHM_LIBS)
-tdeio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_TQT) $(LIB_TDEIO) $(LIB_TDECORE) $(KDE_PLUGIN) $(QT_LDFLAGS)
-
-protocol_DATA = msits.protocol
-protocoldir = $(kde_servicesdir)
-
-# Put it here to avoid creating another directory
-kde_apps_DATA = kchmviewer.desktop
diff --git a/lib/tdeio-msits/msits.cpp b/lib/tdeio-msits/msits.cpp
index 28d2821..31cfb01 100644
--- a/lib/tdeio-msits/msits.cpp
+++ b/lib/tdeio-msits/msits.cpp
@@ -40,7 +40,7 @@ using namespace TDEIO;
 
 extern "C"
 {
-    int kdemain( int argc, char **argv )
+TDE_EXPORT int kdemain( int argc, char **argv )
     {
 		kdDebug() << "*** tdeio_msits Init" << endl;
 
diff --git a/lib/tdeio-msits/msits.h b/lib/tdeio-msits/msits.h
index 4248908..7678ba3 100644
--- a/lib/tdeio-msits/msits.h
+++ b/lib/tdeio-msits/msits.h
@@ -30,8 +30,11 @@
 #include <tqcstring.h>
 
 #include "config.h"
+#if USE_BUILTIN_CHMLIB
 #include "chm_lib.h"
-
+#else
+#include <chm_lib.h>
+#endif
 
 class ProtocolMSITS : public TDEIO::SlaveBase
 {
@@ -59,13 +62,8 @@ private:
 	// Retrieve an object from the CHM file
 	inline size_t RetrieveObject (const chmUnitInfo *ui, unsigned char *buffer, LONGUINT64 fileOffset, LONGINT64 bufferSize)
 	{
-#if USE_BUILTIN_CHMLIB
-		return ::chm_retrieve_object(m_chmFile, ui, buffer, 
-			fileOffset, bufferSize);
-#else
 		return ::chm_retrieve_object(m_chmFile, const_cast<chmUnitInfo*>(ui),
 			buffer, fileOffset, bufferSize);
-#endif
 	}
 
 	// An opened file name, if presend
diff --git a/lib/tdeio-msits/msits.protocol b/lib/tdeio-msits/msits.protocol
index 835e935..e58ed02 100644
--- a/lib/tdeio-msits/msits.protocol
+++ b/lib/tdeio-msits/msits.protocol
@@ -7,19 +7,5 @@ reading=true
 listing=Name,Type,Size
 defaultMimetype=text/html
 Description=A tdeioslave for displaying WinHelp files
-Description[da]=En tdeioslave til visning af Windows hjælpefiler
-Description[de]=Ein Ein-/Ausgabemodul zur Anzeige von WinHelp-Dateien
-Description[es]=Un tdeioslave para mostrar archivos WinHelp
-Description[et]=WinHelp-failide kuvamise IO-moodul
-Description[fr]=Un module d'entrée / sortie pour l'affichage des fichiers WinHelp
-Description[hu]=TDE-protokoll WinHelp-fájlok megjelenítéséhez
-Description[it]=Un tdeioslave per mostrare i file WinHelp
-Description[nl]=Een tdeioslave voor het weergeven van WinHelp-bestanden
-Description[pl]=tdeioslave do pokazywania plików WinHelp
-Description[pt]=A 'tdeioslave' para mostrar ficheiros WinHelp
-Description[pt_BR]=Um tdeioslave para exibir arquivos WinHelp
-Description[ru]=Обработчик ввода-вывода для файлов WinHelp
-Description[sv]=En I/O-slav för att visa WinHelp-filer
-Description[xx]=xxA tdeioslave for displaying WinHelp filesxx
 Icon=help
 X-DocPath=tdeioslave/msits/index.html