11 files changed, 103 insertions, 62 deletions
diff --git a/src/arkollon/CMakeLists.txt b/src/arkollon/CMakeLists.txt
new file mode 100644
index 0000000..0e93613
--- /dev/null
+++ b/src/arkollon/CMakeLists.txt
@@ -0,0 +1,41 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### torkarkollon (executable)
+
+tde_add_executable( torkarkollon AUTOMOC
+
+  SOURCES
+        logdialog.ui
+        wizardbase.ui
+        torkarkollon.cpp
+        wizard.cpp
+        rcparser.cpp
+        uninstallwizard.cpp
+        headerlistitem.cpp
+        data.cpp
+  LINK
+     tdecore-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+INSTALL(
+    FILES torkarkollon.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
diff --git a/src/arkollon/data.h b/src/arkollon/data.h
index 1526c1b..abd4c3a 100644
--- a/src/arkollon/data.h
+++ b/src/arkollon/data.h
@@ -169,8 +169,8 @@ static const unsigned char uninstaller_sh_data[] = {
     0x74,0x0a,0x64,0x6f,0x6e,0x65,0x0a,0x09,0x09,0x0a
 };
 
-#include <ntqimage.h>
-#include <ntqdict.h>
+#include <tqimage.h>
+#include <tqdict.h>
 static const TQRgb misc_data[] = {
     0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,
     0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffcfcfc,0xfffbfbfb,0xfff9f9f9,
@@ -3058,7 +3058,7 @@ static const TQRgb packageIcon_data[] = {
     0x44000000,0x44000000,0x44000000,0x44000000,0x44000000,0x44030303,0x1d000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0xffffff
 };
-#include <ntqcstring.h>
+#include <tqcstring.h>
 
 
 const TQImage& qembed_findImage( const TQString& name );
diff --git a/src/arkollon/headerlistitem.cpp b/src/arkollon/headerlistitem.cpp
index 0c29e6f..ab066d0 100644
--- a/src/arkollon/headerlistitem.cpp
+++ b/src/arkollon/headerlistitem.cpp
@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
-#include "headerlistitem.h"
-
-#include <ntqfontmetrics.h>
-#include <ntqpainter.h>
-#include <ntqapplication.h>
+ 
+#include <tqfontmetrics.h>
+#include <tqpainter.h>
+#include <tqapplication.h>
 
+#include "headerlistitem.h"
 #include "uninstallwizard.h"
 #include "wizard.h"
 
diff --git a/src/arkollon/headerlistitem.h b/src/arkollon/headerlistitem.h
index 3be07e5..4097b22 100644
--- a/src/arkollon/headerlistitem.h
+++ b/src/arkollon/headerlistitem.h
@@ -20,7 +20,7 @@
 #ifndef HEADERLISTITEM_H
 #define HEADERLISTITEM_H
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
 
 class HeaderListItem : public TQListViewItem
 {
diff --git a/src/arkollon/rcparser.cpp b/src/arkollon/rcparser.cpp
index 82123dc..6a7850b 100644
--- a/src/arkollon/rcparser.cpp
+++ b/src/arkollon/rcparser.cpp
@@ -17,11 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
-#include "rcparser.h"
 
-#include <ntqregexp.h>
-#include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqregexp.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+
+#include "rcparser.h"
 
 RcParser::RcParser()
 {
@@ -140,7 +141,3 @@ TQStringList RcParser::readList(TQString key)
 {
 	return TQStringList::split(",", sections[currentSection][key]);
 }
-
-
-
-
diff --git a/src/arkollon/rcparser.h b/src/arkollon/rcparser.h
index 71842fa..47db4d6 100644
--- a/src/arkollon/rcparser.h
+++ b/src/arkollon/rcparser.h
@@ -20,8 +20,8 @@
 #ifndef RCPARSER_H
 #define RCPARSER_H
 
-#include <ntqstringlist.h>
-#include <ntqmap.h>
+#include <tqstringlist.h>
+#include <tqmap.h>
 
 class RcParser
 {
diff --git a/src/arkollon/torkarkollon.cpp b/src/arkollon/torkarkollon.cpp
index c4e6c30..f57046d 100644
--- a/src/arkollon/torkarkollon.cpp
+++ b/src/arkollon/torkarkollon.cpp
@@ -19,15 +19,16 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
+#include <tqapplication.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h> 
 #include <sys/types.h> 
 
-#include <ntqapplication.h>
 #include "wizard.h"
 #include "uninstallwizard.h"
 
diff --git a/src/arkollon/uninstallwizard.cpp b/src/arkollon/uninstallwizard.cpp
index 58bd6b4..346d038 100644
--- a/src/arkollon/uninstallwizard.cpp
+++ b/src/arkollon/uninstallwizard.cpp
@@ -18,23 +18,22 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
+#include <tqregexp.h>
+#include <tqwidgetstack.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqheader.h>
+#include <tqlistbox.h>
+#include <tqmessagebox.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqtextedit.h>
+#include <tqlabel.h>
 
 #include "uninstallwizard.h"
 #include "headerlistitem.h"
 #include "data.h"
 
-#include <ntqregexp.h>
-#include <ntqwidgetstack.h>
-#include <ntqfile.h>
-#include <ntqtextstream.h>
-#include <ntqheader.h>
-#include <ntqlistbox.h>
-#include <ntqmessagebox.h>
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
-#include <ntqtextedit.h>
-#include <ntqlabel.h>
-
 AppListItem::AppListItem(TQString nN, TQString n, TQListView* parent)
  : TQCheckListItem(parent, "", TQCheckListItem::CheckBox)
 {
diff --git a/src/arkollon/uninstallwizard.h b/src/arkollon/uninstallwizard.h
index 712dc37..0d10cbd 100644
--- a/src/arkollon/uninstallwizard.h
+++ b/src/arkollon/uninstallwizard.h
@@ -21,14 +21,14 @@
 #ifndef UNINSTALLWIZARD_H
 #define UNINSTALLWIZARD_H
 
+#include <tqlistview.h>
+#include <tqprocess.h>
+#include <tqpixmap.h>
+
 #include "wizardbase.h"
 #include "logdialog.h"
 #include "headerlistitem.h"
 
-#include <ntqlistview.h>
-#include <ntqprocess.h>
-#include <ntqpixmap.h>
-
 class AppListItem : public TQCheckListItem
 {
 public:
diff --git a/src/arkollon/wizard.cpp b/src/arkollon/wizard.cpp
index fd2cfac..f9f5d9c 100644
--- a/src/arkollon/wizard.cpp
+++ b/src/arkollon/wizard.cpp
@@ -17,26 +17,26 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
-#include "wizard.h"
 
-#include <ntqfiledialog.h>
-#include <ntqwidgetstack.h>
-#include <ntqpushbutton.h>
-#include <ntqpainter.h>
-#include <ntqheader.h>
-#include <ntqapplication.h>
-#include <ntqmessagebox.h>
-#include <ntqprogressbar.h>
-#include <ntqradiobutton.h>
-#include <ntqtextedit.h>
-#include <ntqlineedit.h>
-#include <ntqpopupmenu.h>
-#include <ntqhbox.h>
-#include <ntqfileinfo.h>
-#include <ntqlabel.h>
-#include <ntqfontmetrics.h>
-#include <ntqcheckbox.h>
+#include <tqfiledialog.h>
+#include <tqwidgetstack.h>
+#include <tqpushbutton.h>
+#include <tqpainter.h>
+#include <tqheader.h>
+#include <tqapplication.h>
+#include <tqmessagebox.h>
+#include <tqprogressbar.h>
+#include <tqradiobutton.h>
+#include <tqtextedit.h>
+#include <tqlineedit.h>
+#include <tqpopupmenu.h>
+#include <tqhbox.h>
+#include <tqfileinfo.h>
+#include <tqlabel.h>
+#include <tqfontmetrics.h>
+#include <tqcheckbox.h>
 
+#include "wizard.h"
 #include "data.h"
 
 #include "rcparser.h"
diff --git a/src/arkollon/wizard.h b/src/arkollon/wizard.h
index 09e0ef9..d7e0866 100644
--- a/src/arkollon/wizard.h
+++ b/src/arkollon/wizard.h
@@ -20,17 +20,20 @@
 #ifndef WIZARD_H
 #define WIZARD_H
 
+#include <tqlistview.h>
+#include <tqprocess.h>
+#include <tqsettings.h>
+#include <tqiconview.h>
+#include <tqregexp.h>
+#include <tqvaluevector.h>
+#include <tqstring.h>
+
 #include <wizardbase.h>
-#include <ntqlistview.h>
-#include <ntqprocess.h>
-#include <ntqsettings.h>
-#include <ntqiconview.h>
-#include <ntqregexp.h>
-#include <ntqvaluevector.h>
-#include <ntqstring.h>
+
 #include <stdio.h>
 
 #include "logdialog.h"
+
 class HeaderListItem;
 
 struct Component