summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2019-05-03 15:02:28 +0200
committergregory guy <g-gregory@gmx.fr>2019-05-03 15:02:28 +0200
commit4c357c392d3aa896844e120d4c0c40e188f557c5 (patch)
treed2e17b2289c94f4ce4e6b89be75f220026a09af8
parent2efc9f9cf4aca3f634053f2d6865b471a5ef1835 (diff)
downloadkshowmail-4c357c39.tar.gz
kshowmail-4c357c39.zip
conversion to the cmake building system
Signed-off-by: gregory guy <g-gregory@gmx.fr>
-rw-r--r--CMakeLists.txt80
-rw-r--r--ConfigureChecks.cmake35
-rw-r--r--config.h.cmake8
-rw-r--r--doc/CMakeLists.txt9
-rw-r--r--doc/de/CMakeLists.txt1
-rw-r--r--doc/en/CMakeLists.txt1
-rw-r--r--doc/es/CMakeLists.txt1
-rw-r--r--doc/fr/CMakeLists.txt1
-rw-r--r--doc/hu/CMakeLists.txt1
-rw-r--r--doc/it/CMakeLists.txt1
-rw-r--r--doc/man/CMakeLists.txt5
-rw-r--r--doc/man/kshowmail.162
-rw-r--r--doc/ru/CMakeLists.txt1
-rw-r--r--doc/sv/CMakeLists.txt1
-rw-r--r--kshowmail/CMakeLists.txt66
-rw-r--r--kshowmail/alertdialog.cpp1
-rw-r--r--kshowmail/alertdialog.h2
-rw-r--r--kshowmail/configelem.cpp2
-rw-r--r--kshowmail/configelem.h18
-rw-r--r--kshowmail/configlist.cpp4
-rw-r--r--kshowmail/configlist.h6
-rw-r--r--kshowmail/decodeRFC2047.h8
-rw-r--r--kshowmail/encryption.h2
-rw-r--r--kshowmail/filteritem.h4
-rw-r--r--kshowmail/filteritemcriteria.h4
-rw-r--r--kshowmail/filterlog.h10
-rw-r--r--kshowmail/filterlogentry.h6
-rw-r--r--kshowmail/filterlogview.h6
-rw-r--r--kshowmail/filterlogviewdeleteditem.h2
-rw-r--r--kshowmail/filterlogviewmoveditem.h2
-rw-r--r--kshowmail/headerfilter.h4
-rw-r--r--kshowmail/kcmconfigs/CMakeLists.txt137
-rw-r--r--kshowmail/kcmconfigs/accountsetupdialog.h16
-rw-r--r--kshowmail/kcmconfigs/configaccounts.h2
-rw-r--r--kshowmail/kcmconfigs/configactions.h8
-rw-r--r--kshowmail/kcmconfigs/configdisplay.h10
-rw-r--r--kshowmail/kcmconfigs/configfilter.h8
-rw-r--r--kshowmail/kcmconfigs/configgeneral.h12
-rw-r--r--kshowmail/kcmconfigs/configlog.h14
-rw-r--r--kshowmail/kcmconfigs/configspamcheck.h8
-rw-r--r--kshowmail/kcmconfigs/encryption.h2
-rw-r--r--kshowmail/kcmconfigs/filtercriteriawidget.h6
-rw-r--r--kshowmail/kcmconfigs/filtersetupdialog.h16
-rw-r--r--kshowmail/kcmconfigs/mailboxwizard.h14
-rw-r--r--kshowmail/kcmconfigs/mailboxwizardlistitem.h2
-rw-r--r--kshowmail/kcmconfigs/senderlistdialog.h10
-rw-r--r--kshowmail/kcmconfigs/tdewalletaccess.h2
-rw-r--r--kshowmail/kfeedback.cpp14
-rw-r--r--kshowmail/kfeedback.h4
-rw-r--r--kshowmail/kshowmail.cpp1
-rw-r--r--kshowmail/kshowmaildoc.cpp6
-rw-r--r--kshowmail/kshowmaildoc.h4
-rw-r--r--kshowmail/kshowmaildock.cpp7
-rw-r--r--kshowmail/kshowmaildock.h4
-rw-r--r--kshowmail/kshowmailview.cpp12
-rw-r--r--kshowmail/kshowmailview.h8
-rw-r--r--kshowmail/senderlistfilter.h4
-rw-r--r--kshowmail/serverdialog.h16
-rw-r--r--kshowmail/showheaderdialog.h4
-rw-r--r--kshowmail/showlistviewitem.h2
-rw-r--r--kshowmail/showmaildialog.h4
-rw-r--r--kshowmail/showrecord.h4
-rw-r--r--kshowmail/showrecordelem.h8
-rw-r--r--kshowmail/tdewalletaccess.h2
-rw-r--r--kshowmail/types.h8
-rw-r--r--pics/CMakeLists.txt17
-rw-r--r--po/CMakeLists.txt5
-rw-r--r--sounds/CMakeLists.txt4
68 files changed, 602 insertions, 157 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..f23dcac
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,80 @@
+############################################
+# #
+# Improvements and feedbacks are welcome #
+# #
+# This file is released under GPL >= 3 #
+# #
+############################################
+
+
+cmake_minimum_required( VERSION 2.8 )
+
+
+#### general package setup
+
+project( kshowmail )
+set( VERSION R14.1.0 )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig )
+include( CheckFunctionExists )
+include( CheckSymbolExists )
+include( CheckIncludeFile )
+include( CheckLibraryExists )
+include( CheckCSourceCompiles )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL "Build all" ON )
+option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### directories
+
+add_subdirectory( pics )
+add_subdirectory( sounds )
+add_subdirectory( ${PROJECT_NAME} )
+tde_conditional_add_subdirectory( BUILD_DOC doc )
+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
new file mode 100644
index 0000000..d67d3c9
--- /dev/null
+++ b/ConfigureChecks.cmake
@@ -0,0 +1,35 @@
+###########################################
+# #
+# Improvements and feedback are welcome #
+# #
+# This file is released under GPL >= 3 #
+# #
+###########################################
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
+##### check for gcc visibility support
+
+if( WITH_GCC_VISIBILITY )
+ tde_setup_gcc_visibility( )
+endif( WITH_GCC_VISIBILITY )
+
+
+##### check for mimelib1 support
+
+find_path( MIMELIB1_INCLUDE_DIR NAMES "mimelib/mimepp.h" )
+find_library( MIMELIB1_LIBRARIES NAMES mimelib )
+
+if( (NOT MIMELIB1_INCLUDE_DIR) OR (NOT MIMELIB1_LIBRARIES) )
+ tde_message_fatal( "mimelib1 is required but either the headers or the library have not been found on your system" )
+endif( (NOT MIMELIB1_INCLUDE_DIR) OR (NOT MIMELIB1_LIBRARIES) )
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 0000000..61ede3a
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,8 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 0000000..ca7faeb
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_subdirectory( en )
+add_subdirectory( de )
+add_subdirectory( es )
+add_subdirectory( sv )
+add_subdirectory( fr )
+add_subdirectory( hu )
+add_subdirectory( it )
+add_subdirectory( ru )
+add_subdirectory( man )
diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt
new file mode 100644
index 0000000..eca4bd4
--- /dev/null
+++ b/doc/de/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG de )
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
new file mode 100644
index 0000000..ba3ef3e
--- /dev/null
+++ b/doc/en/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} )
diff --git a/doc/es/CMakeLists.txt b/doc/es/CMakeLists.txt
new file mode 100644
index 0000000..7995d65
--- /dev/null
+++ b/doc/es/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG es )
diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt
new file mode 100644
index 0000000..495f168
--- /dev/null
+++ b/doc/fr/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG fr )
diff --git a/doc/hu/CMakeLists.txt b/doc/hu/CMakeLists.txt
new file mode 100644
index 0000000..9847ebe
--- /dev/null
+++ b/doc/hu/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG hu )
diff --git a/doc/it/CMakeLists.txt b/doc/it/CMakeLists.txt
new file mode 100644
index 0000000..e213f2f
--- /dev/null
+++ b/doc/it/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG it )
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
new file mode 100644
index 0000000..8512250
--- /dev/null
+++ b/doc/man/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+ FILES ${PROJECT_NAME}.1
+ DESTINATION ${MAN_INSTALL_DIR}/man1
+ COMPONENT doc
+)
diff --git a/doc/man/kshowmail.1 b/doc/man/kshowmail.1
new file mode 100644
index 0000000..6903cf4
--- /dev/null
+++ b/doc/man/kshowmail.1
@@ -0,0 +1,62 @@
+.TH QT: "1" "April 2007" "Qt: 3.3.7" "User Commands"
+.SH NAME
+kshowmail \- A powerful pop3 mail checker
+.SH SYNOPSIS
+.B kshowmail
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIaccount\fR]
+.SH DESCRIPTION
+KShowmail can be used to show mails on a POP3 server without actually
+downloading them. The headers or the complete mails can be viewed, and
+unwanted mails can be deleted. An initial and an interval timer can be set to
+check the mails periodical. KShowmail supports multiple accounts.
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-tde\fR
+Show TDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH OPTIONS
+.TP
+\fB\-r\fR, \fB\-\-refresh\fR
+Refresh messages now
+.TP
+\fB\-c\fR, \fB\-\-config\fR
+Launch configure dialog
+.SS "Arguments:"
+.TP
+account
+Select account
+.PP
+KDE: 3.5.6
+KShowmail: 3.1.2
+.SH "SEE ALSO"
+The full documentation for
+.B Qt:
+is maintained as a Texinfo manual. If the
+.B info
+and
+.B Qt:
+programs are properly installed at your site, the command
+.IP
+.B info Qt:
+.PP
+should give you access to the complete manual.
diff --git a/doc/ru/CMakeLists.txt b/doc/ru/CMakeLists.txt
new file mode 100644
index 0000000..33e9cb6
--- /dev/null
+++ b/doc/ru/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG ru )
diff --git a/doc/sv/CMakeLists.txt b/doc/sv/CMakeLists.txt
new file mode 100644
index 0000000..bc04ab0
--- /dev/null
+++ b/doc/sv/CMakeLists.txt
@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG sv )
diff --git a/kshowmail/CMakeLists.txt b/kshowmail/CMakeLists.txt
new file mode 100644
index 0000000..ef44f75
--- /dev/null
+++ b/kshowmail/CMakeLists.txt
@@ -0,0 +1,66 @@
+add_subdirectory( kcmconfigs )
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${MIMELIB1_INCLUDE_DIR}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kshowmail (executable)
+
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
+
+ SOURCES
+ AlertDlg.ui
+ alertdialog.cpp configelem.cpp
+ configlist.cpp decodeRFC2047.cpp
+ encryption.cpp filteritem.cpp
+ filteritemcriteria.cpp filterlog.cpp
+ filterlogentry.cpp headerfilter.cpp
+ kfeedback.cpp kshowmail.cpp
+ kshowmaildoc.cpp kshowmaildock.cpp
+ kshowmailfeedback.cpp kshowmailview.cpp
+ tdewalletaccess.cpp main.cpp
+ senderlistfilter.cpp serverdialog.cpp
+ showheaderdialog.cpp showlistviewitem.cpp
+ showmaildialog.cpp showrecord.cpp
+ showrecordelem.cpp uniqueapp.cpp
+ filterlogview.cpp filterlogviewdeleteditem.cpp
+ filterlogviewmoveditem.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ tdeutils-shared
+ tdewalletclient
+ ${MIMELIB1_LIBRARIES}
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( ${PROJECT_NAME} )
+
+
+##### other data
+
+install(
+ FILES kshowmailui.rc
+ DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
+)
+
+install(
+ FILES ${PROJECT_NAME}.desktop
+ DESTINATION ${APPS_INSTALL_DIR}/Internet
+)
diff --git a/kshowmail/alertdialog.cpp b/kshowmail/alertdialog.cpp
index 5805fba..b74eaba 100644
--- a/kshowmail/alertdialog.cpp
+++ b/kshowmail/alertdialog.cpp
@@ -37,3 +37,4 @@ void AlertDialog::slotOk ()
emit signalOk ();
}
+#include "alertdialog.moc"
diff --git a/kshowmail/alertdialog.h b/kshowmail/alertdialog.h
index 92fce8d..140833c 100644
--- a/kshowmail/alertdialog.h
+++ b/kshowmail/alertdialog.h
@@ -18,7 +18,7 @@
#ifndef ALERTDIALOG_H
#define ALERTDIALOG_H
-#include <ntqwidget.h>
+#include <tqwidget.h>
#include "AlertDlg.h"
/**
diff --git a/kshowmail/configelem.cpp b/kshowmail/configelem.cpp
index 4407256..48593cb 100644
--- a/kshowmail/configelem.cpp
+++ b/kshowmail/configelem.cpp
@@ -1757,3 +1757,5 @@ void ConfigElem::slotCommitBeforeRefreshDone(TDEIO::Job *)
//after a commit was send, we start a new refresh cyle
refreshMailList();
}
+
+#include "configelem.moc"
diff --git a/kshowmail/configelem.h b/kshowmail/configelem.h
index c81bca2..bd5252d 100644
--- a/kshowmail/configelem.h
+++ b/kshowmail/configelem.h
@@ -25,15 +25,15 @@
#include <stdio.h>
//QT headers
-#include <ntqstring.h>
-#include <ntqlistview.h>
-#include <ntqdom.h>
-#include <ntqobject.h>
-#include <ntqtimer.h>
-#include <ntqregexp.h>
-#include <ntqdir.h>
-#include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqstring.h>
+#include <tqlistview.h>
+#include <tqdom.h>
+#include <tqobject.h>
+#include <tqtimer.h>
+#include <tqregexp.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
//KDE headers
#include <kurl.h>
diff --git a/kshowmail/configlist.cpp b/kshowmail/configlist.cpp
index 40a75bd..4ba01c6 100644
--- a/kshowmail/configlist.cpp
+++ b/kshowmail/configlist.cpp
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <ntqfile.h>
+#include <tqfile.h>
#include <tdeconfig.h>
#include <ksavefile.h>
@@ -1200,4 +1200,4 @@ void ConfigList::refreshFilterSetup( )
}
-
+#include "configlist.moc"
diff --git a/kshowmail/configlist.h b/kshowmail/configlist.h
index 0b8215b..22dc4af 100644
--- a/kshowmail/configlist.h
+++ b/kshowmail/configlist.h
@@ -23,9 +23,9 @@
#define CONFIGLIST_H
//TQt header
-#include <ntqptrlist.h>
-#include <ntqlistview.h>
-#include <ntqobject.h>
+#include <tqptrlist.h>
+#include <tqlistview.h>
+#include <tqobject.h>
//KDE headers
#include <kcombobox.h>
diff --git a/kshowmail/decodeRFC2047.h b/kshowmail/decodeRFC2047.h
index fad7810..3190985 100644
--- a/kshowmail/decodeRFC2047.h
+++ b/kshowmail/decodeRFC2047.h
@@ -21,10 +21,10 @@
#include <stdlib.h>
//TQt header
-#include <ntqtextcodec.h>
-#include <ntqregexp.h>
-#include <ntqstring.h>
-#include <ntqcstring.h>
+#include <tqtextcodec.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqcstring.h>
//KDE header
#include <tdelocale.h>
diff --git a/kshowmail/encryption.h b/kshowmail/encryption.h
index 4c68b4f..8781139 100644
--- a/kshowmail/encryption.h
+++ b/kshowmail/encryption.h
@@ -11,7 +11,7 @@
//
//TQt headers
-#include <ntqstring.h>
+#include <tqstring.h>
//KDE headers
#include <kurl.h>
diff --git a/kshowmail/filteritem.h b/kshowmail/filteritem.h
index 28aac13..5a1a97c 100644
--- a/kshowmail/filteritem.h
+++ b/kshowmail/filteritem.h
@@ -13,8 +13,8 @@
#define FILTERITEM_H
//TQt headers
-#include <ntqstring.h>
-#include <ntqptrlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
//KDE headers
#include <tdeapplication.h>
diff --git a/kshowmail/filteritemcriteria.h b/kshowmail/filteritemcriteria.h
index 0546c2f..a0db19f 100644
--- a/kshowmail/filteritemcriteria.h
+++ b/kshowmail/filteritemcriteria.h
@@ -13,8 +13,8 @@
#define FILTERITEMCRITERIA_H
//TQt headers
-#include <ntqstring.h>
-#include <ntqregexp.h>
+#include <tqstring.h>
+#include <tqregexp.h>
//KDE headers
#include <tdeapplication.h>
diff --git a/kshowmail/filterlog.h b/kshowmail/filterlog.h
index e5d55c8..2baaa5e 100644
--- a/kshowmail/filterlog.h
+++ b/kshowmail/filterlog.h
@@ -13,11 +13,11 @@
#define FILTERLOG_H
//TQt headers
-#include <ntqvaluelist.h>
-#include <ntqdatetime.h>
-#include <ntqdom.h>
-#include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqvaluelist.h>
+#include <tqdatetime.h>
+#include <tqdom.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
//KDE headers
#include <kdebug.h>
diff --git a/kshowmail/filterlogentry.h b/kshowmail/filterlogentry.h
index 74eb509..4363de2 100644
--- a/kshowmail/filterlogentry.h
+++ b/kshowmail/filterlogentry.h
@@ -13,9 +13,9 @@
#define FILTERLOGENTRY_H
//TQt headers
-#include <ntqdatetime.h>
-#include <ntqstring.h>
-#include <ntqdom.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
+#include <tqdom.h>
//KDE headers
#include <kdebug.h>
diff --git a/kshowmail/filterlogview.h b/kshowmail/filterlogview.h
index b60d1b9..c6d3d02 100644
--- a/kshowmail/filterlogview.h
+++ b/kshowmail/filterlogview.h
@@ -13,9 +13,9 @@
#define FILTERLOGVIEW_H
//TQt headers
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqtooltip.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
//KDE headers
#include <kdialogbase.h>
diff --git a/kshowmail/filterlogviewdeleteditem.h b/kshowmail/filterlogviewdeleteditem.h
index f00f839..2aace09 100644
--- a/kshowmail/filterlogviewdeleteditem.h
+++ b/kshowmail/filterlogviewdeleteditem.h
@@ -13,7 +13,7 @@
#define FILTERLOGVIEWDELETEDITEM_H
//TQt Headers
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
//KDE headers
#include <tdelistview.h>
diff --git a/kshowmail/filterlogviewmoveditem.h b/kshowmail/filterlogviewmoveditem.h
index 3c2367d..4c1be06 100644
--- a/kshowmail/filterlogviewmoveditem.h
+++ b/kshowmail/filterlogviewmoveditem.h
@@ -13,7 +13,7 @@
#define FILTERLOGVIEWMOVEDITEM_H
//TQt Headers
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
//KDE headers
#include <tdelistview.h>
diff --git a/kshowmail/headerfilter.h b/kshowmail/headerfilter.h
index da04b2d..30f58ae 100644
--- a/kshowmail/headerfilter.h
+++ b/kshowmail/headerfilter.h
@@ -13,8 +13,8 @@
#define HEADERFILTER_H
//TQt headers
-#include <ntqstring.h>
-#include <ntqptrlist.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
//KDE headers
#include <tdeapplication.h>
diff --git a/kshowmail/kcmconfigs/CMakeLists.txt b/kshowmail/kcmconfigs/CMakeLists.txt
new file mode 100644
index 0000000..d2f590b
--- /dev/null
+++ b/kshowmail/kcmconfigs/CMakeLists.txt
@@ -0,0 +1,137 @@
+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}
+)
+
+
+##### kcm_kshowmailconfigaccounts (kpart)
+
+tde_add_kpart( kcm_kshowmailconfigaccounts AUTOMOC
+
+ SOURCES
+ configaccounts.cpp
+ accountsetupitem.cpp
+ accountsetupdialog.cpp
+ encryption.cpp
+ tdewalletaccess.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ tdewalletclient
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### kcm_kshowmailconfigactions (kpart)
+
+tde_add_kpart( kcm_kshowmailconfigactions AUTOMOC
+
+ SOURCES
+ configactions.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### kcm_kshowmailconfigdisplay (kpart)
+
+tde_add_kpart( kcm_kshowmailconfigdisplay AUTOMOC
+
+ SOURCES
+ configdisplay.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### kcm_kshowmailconfigfilter (kpart)
+
+tde_add_kpart( kcm_kshowmailconfigfilter AUTOMOC
+
+ SOURCES
+ configfilter.cpp
+ senderlistdialog.cpp
+ filtersetupitem.cpp
+ filtersetupdialog.cpp
+ filtercriteriawidget.cpp
+ mailboxwizard.cpp
+ mailboxwizardlistitem.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### kcm_kshowmailconfiggeneral (kpart)
+
+tde_add_kpart( kcm_kshowmailconfiggeneral AUTOMOC
+
+ SOURCES
+ configgeneral.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### kcm_kshowmailconfiglog (kpart)
+
+tde_add_kpart( kcm_kshowmailconfiglog AUTOMOC
+
+ SOURCES
+ configlog.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### kcm_kshowmailconfigspamcheck (kpart)
+
+tde_add_kpart( kcm_kshowmailconfigspamcheck AUTOMOC
+
+ SOURCES
+ configspamcheck.cpp
+ mailboxwizard.cpp
+ mailboxwizardlistitem.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+file( GLOB _desktops RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.desktop )
+
+install(
+ FILES ${_desktops}
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kshowmail/kcmconfigs/accountsetupdialog.h b/kshowmail/kcmconfigs/accountsetupdialog.h
index 61e92e1..24e343e 100644
--- a/kshowmail/kcmconfigs/accountsetupdialog.h
+++ b/kshowmail/kcmconfigs/accountsetupdialog.h
@@ -13,14 +13,14 @@
#define ACCOUNTSETUPDIALOG_H
//TQt headers
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqtooltip.h>
-#include <ntqspinbox.h>
-#include <ntqgroupbox.h>
-#include <ntqbuttongroup.h>
-#include <ntqradiobutton.h>
-#include <ntqcheckbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
+#include <tqspinbox.h>
+#include <tqgroupbox.h>
+#include <tqbuttongroup.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
//KDE headers
#include <kdialogbase.h>
diff --git a/kshowmail/kcmconfigs/configaccounts.h b/kshowmail/kcmconfigs/configaccounts.h
index 047c262..9016859 100644
--- a/kshowmail/kcmconfigs/configaccounts.h
+++ b/kshowmail/kcmconfigs/configaccounts.h
@@ -13,7 +13,7 @@
#define CONFIGACCOUNTS_H
//TQt headers
-#include <ntqlayout.h>
+#include <tqlayout.h>
//KDE headers
#include <tdecmodule.h>
diff --git a/kshowmail/kcmconfigs/configactions.h b/kshowmail/kcmconfigs/configactions.h
index 927f121..787a759 100644
--- a/kshowmail/kcmconfigs/configactions.h
+++ b/kshowmail/kcmconfigs/configactions.h
@@ -15,10 +15,10 @@
#include <string.h>
//QT headers
-#include <ntqlayout.h>
-#include <ntqgroupbox.h>
-#include <ntqcheckbox.h>
-#include <ntqtooltip.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqtooltip.h>
//KDE headers
#include <tdecmodule.h>
diff --git a/kshowmail/kcmconfigs/configdisplay.h b/kshowmail/kcmconfigs/configdisplay.h
index 1404681..bbebd03 100644
--- a/kshowmail/kcmconfigs/configdisplay.h
+++ b/kshowmail/kcmconfigs/configdisplay.h
@@ -13,11 +13,11 @@
#define CONFIGDISPLAY_H
//TQt headers
-#include <ntqlayout.h>
-#include <ntqgroupbox.h>
-#include <ntqcheckbox.h>
-#include <ntqlabel.h>
-#include <ntqtooltip.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
//KDE headers
#include <tdecmodule.h>
diff --git a/kshowmail/kcmconfigs/configfilter.h b/kshowmail/kcmconfigs/configfilter.h
index bcff4ef..297ba75 100644
--- a/kshowmail/kcmconfigs/configfilter.h
+++ b/kshowmail/kcmconfigs/configfilter.h
@@ -13,10 +13,10 @@
#define CONFIGFILTER_H
//QT headers
-#include <ntqlayout.h>
-#include <ntqgroupbox.h>
-#include <ntqtooltip.h>
-#include <ntqcheckbox.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqtooltip.h>
+#include <tqcheckbox.h>
//KDE headers
#include <tdecmodule.h>
diff --git a/kshowmail/kcmconfigs/configgeneral.h b/kshowmail/kcmconfigs/configgeneral.h
index 21c47bf..55cbb39 100644
--- a/kshowmail/kcmconfigs/configgeneral.h
+++ b/kshowmail/kcmconfigs/configgeneral.h
@@ -13,12 +13,12 @@
#define CONFIGGENERAL_H
//TQt headers
-#include <ntqlayout.h>
-#include <ntqgroupbox.h>
-#include <ntqcheckbox.h>
-#include <ntqspinbox.h>
-#include <ntqtooltip.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqspinbox.h>
+#include <tqtooltip.h>
+#include <tqlabel.h>
//KDE headers
#include <tdecmodule.h>
diff --git a/kshowmail/kcmconfigs/configlog.h b/kshowmail/kcmconfigs/configlog.h
index 7fbd9c3..a331d83 100644
--- a/kshowmail/kcmconfigs/configlog.h
+++ b/kshowmail/kcmconfigs/configlog.h
@@ -17,13 +17,13 @@
#define ID_BUTTON_REMOVE_AFTER_DAYS 2
//qt headers
-#include <ntqlayout.h>
-#include <ntqgroupbox.h>
-#include <ntqtooltip.h>
-#include <ntqcheckbox.h>
-#include <ntqradiobutton.h>
-#include <ntqbuttongroup.h>
-#include <ntqspinbox.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqtooltip.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqspinbox.h>
//KDE headers
#include <tdecmodule.h>
diff --git a/kshowmail/kcmconfigs/configspamcheck.h b/kshowmail/kcmconfigs/configspamcheck.h
index 61fe431..359fc98 100644
--- a/kshowmail/kcmconfigs/configspamcheck.h
+++ b/kshowmail/kcmconfigs/configspamcheck.h
@@ -19,10 +19,10 @@
#include <string.h>
//TQt headers
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqgroupbox.h>
-#include <ntqtooltip.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqgroupbox.h>
+#include <tqtooltip.h>
//KDE headers
#include <tdecmodule.h>
diff --git a/kshowmail/kcmconfigs/encryption.h b/kshowmail/kcmconfigs/encryption.h
index 4c68b4f..8781139 100644
--- a/kshowmail/kcmconfigs/encryption.h
+++ b/kshowmail/kcmconfigs/encryption.h
@@ -11,7 +11,7 @@
//
//TQt headers
-#include <ntqstring.h>
+#include <tqstring.h>
//KDE headers
#include <kurl.h>
diff --git a/kshowmail/kcmconfigs/filtercriteriawidget.h b/kshowmail/kcmconfigs/filtercriteriawidget.h
index ca5548f..ad02f89 100644
--- a/kshowmail/kcmconfigs/filtercriteriawidget.h
+++ b/kshowmail/kcmconfigs/filtercriteriawidget.h
@@ -13,9 +13,9 @@
#define FILTERCRITERIAWIDGET_H
//TQt headers
-#include <ntqwidget.h>
-#include <ntqlayout.h>
-#include <ntqcheckbox.h>
+#include <tqwidget.h>
+#include <tqlayout.h>
+#include <tqcheckbox.h>
//KDE headers
#include <klineedit.h>
diff --git a/kshowmail/kcmconfigs/filtersetupdialog.h b/kshowmail/kcmconfigs/filtersetupdialog.h
index b989238..0e15c96 100644
--- a/kshowmail/kcmconfigs/filtersetupdialog.h
+++ b/kshowmail/kcmconfigs/filtersetupdialog.h
@@ -17,14 +17,14 @@
#define ID_BUTTON_LINKAGE_MATCH_ANY 2
//TQt headers
-#include <ntqlayout.h>
-#include <ntqgroupbox.h>
-#include <ntqbuttongroup.h>
-#include <ntqradiobutton.h>
-#include <ntqvbox.h>
-#include <ntqobjectlist.h>
-#include <ntqtooltip.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqgroupbox.h>
+#include <tqbuttongroup.h>
+#include <tqradiobutton.h>
+#include <tqvbox.h>
+#include <tqobjectlist.h>
+#include <tqtooltip.h>
+#include <tqlabel.h>
//KDE headers
#include <kdialogbase.h>
diff --git a/kshowmail/kcmconfigs/mailboxwizard.h b/kshowmail/kcmconfigs/mailboxwizard.h
index 7332cf4..a75d8be 100644
--- a/kshowmail/kcmconfigs/mailboxwizard.h
+++ b/kshowmail/kcmconfigs/mailboxwizard.h
@@ -16,13 +16,13 @@
#include <stdlib.h>
//TQt headers
-#include <ntqwizard.h>
-#include <ntqwidget.h>
-#include <ntqlayout.h>
-#include <ntqdir.h>
-#include <ntqregexp.h>
-#include <ntqfileinfo.h>
-#include <ntqmap.h>
+#include <tqwizard.h>
+#include <tqwidget.h>
+#include <tqlayout.h>
+#include <tqdir.h>
+#include <tqregexp.h>
+#include <tqfileinfo.h>
+#include <tqmap.h>
//KDE headers
#include <tdelocale.h>
diff --git a/kshowmail/kcmconfigs/mailboxwizardlistitem.h b/kshowmail/kcmconfigs/mailboxwizardlistitem.h
index 13be613..f2819fe 100644
--- a/kshowmail/kcmconfigs/mailboxwizardlistitem.h
+++ b/kshowmail/kcmconfigs/mailboxwizardlistitem.h
@@ -13,7 +13,7 @@
#define MAILBOXWIZARDLISTITEM_H
//TQt-Headers
-#include <ntqlistview.h>
+#include <tqlistview.h>
//KDE-Headers
#include <tdelistview.h>
diff --git a/kshowmail/kcmconfigs/senderlistdialog.h b/kshowmail/kcmconfigs/senderlistdialog.h
index 9ba0e4c..87a0c37 100644
--- a/kshowmail/kcmconfigs/senderlistdialog.h
+++ b/kshowmail/kcmconfigs/senderlistdialog.h
@@ -13,11 +13,11 @@
#define SENDERLISTDIALOG_H
//TQt headers
-#include <ntqlayout.h>
-#include <ntqtooltip.h>
-#include <ntqradiobutton.h>
-#include <ntqbuttongroup.h>
-#include <ntqpushbutton.h>
+#include <tqlayout.h>
+#include <tqtooltip.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqpushbutton.h>
//KDE headers
#include <kdialogbase.h>
diff --git a/kshowmail/kcmconfigs/tdewalletaccess.h b/kshowmail/kcmconfigs/tdewalletaccess.h
index 6699408..26c72dc 100644
--- a/kshowmail/kcmconfigs/tdewalletaccess.h
+++ b/kshowmail/kcmconfigs/tdewalletaccess.h
@@ -10,7 +10,7 @@
#define TDEWALLETACCESS_H
//TQt headers
-#include <ntqstring.h>
+#include <tqstring.h>
//KDE headers
#include <tdewallet.h>
diff --git a/kshowmail/kfeedback.cpp b/kshowmail/kfeedback.cpp
index 431dfde..af1c0eb 100644
--- a/kshowmail/kfeedback.cpp
+++ b/kshowmail/kfeedback.cpp
@@ -13,11 +13,11 @@
*/
-#include <ntqheader.h>
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqmultilineedit.h>
-#include <ntqhbox.h>
+#include <tqheader.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqmultilineedit.h>
+#include <tqhbox.h>
#include <tdeglobal.h>
#include <tdeapplication.h>
@@ -278,7 +278,7 @@ TQString KFeedbackQuestionList::result()
question = question->nextQuestion();
}
- res += "Compiled on KDE version: ";
+ res += "Compiled on TDE version: ";
res += TDE_VERSION_STRING;
return res;
@@ -499,6 +499,6 @@ KFeedbackAnswer::stateChange( bool newState )
}
}
-
+#include "kfeedback.moc"
// EOF
diff --git a/kshowmail/kfeedback.h b/kshowmail/kfeedback.h
index 10c0633..426868e 100644
--- a/kshowmail/kfeedback.h
+++ b/kshowmail/kfeedback.h
@@ -18,8 +18,8 @@
#include <config.h>
#endif
-#include <ntqlistview.h>
-#include <ntqvbox.h>
+#include <tqlistview.h>
+#include <tqvbox.h>
#include <kdialogbase.h>
diff --git a/kshowmail/kshowmail.cpp b/kshowmail/kshowmail.cpp
index ff1a3d9..104f2c9 100644
--- a/kshowmail/kshowmail.cpp
+++ b/kshowmail/kshowmail.cpp
@@ -859,3 +859,4 @@ void KShowMailApp::slotAddToBlacklist( )
m_ConfigList.refreshFilterSetup();
}
+#include "kshowmail.moc"
diff --git a/kshowmail/kshowmaildoc.cpp b/kshowmail/kshowmaildoc.cpp
index 5dc412b..5ec5fa1 100644
--- a/kshowmail/kshowmaildoc.cpp
+++ b/kshowmail/kshowmaildoc.cpp
@@ -16,8 +16,8 @@
***************************************************************************/
// include files for TQt
-#include <ntqdir.h>
-#include <ntqwidget.h>
+#include <tqdir.h>
+#include <tqwidget.h>
// include files for KDE
#include <tdelocale.h>
@@ -79,3 +79,5 @@ bool KshowmailDoc::newDocument()
return true;
}
+
+#include "kshowmaildoc.moc"
diff --git a/kshowmail/kshowmaildoc.h b/kshowmail/kshowmaildoc.h
index e2bd9c5..3d31a29 100644
--- a/kshowmail/kshowmaildoc.h
+++ b/kshowmail/kshowmaildoc.h
@@ -23,8 +23,8 @@
#endif
// include files for QT
-#include <ntqobject.h>
-#include <ntqstring.h>
+#include <tqobject.h>
+#include <tqstring.h>
// include files for KDE
#include <kurl.h>
diff --git a/kshowmail/kshowmaildock.cpp b/kshowmail/kshowmaildock.cpp
index e278aaf..aa324f6 100644
--- a/kshowmail/kshowmaildock.cpp
+++ b/kshowmail/kshowmaildock.cpp
@@ -15,9 +15,9 @@
* *
***************************************************************************/
-#include <ntqpixmap.h>
-#include <ntqpainter.h>
-#include <ntqtooltip.h>
+#include <tqpixmap.h>
+#include <tqpainter.h>
+#include <tqtooltip.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
@@ -81,3 +81,4 @@ void KShowMailDock::clear ()
setPixmap (m_background);
}
+#include "kshowmaildock.moc"
diff --git a/kshowmail/kshowmaildock.h b/kshowmail/kshowmaildock.h
index 79722d3..c632447 100644
--- a/kshowmail/kshowmaildock.h
+++ b/kshowmail/kshowmaildock.h
@@ -18,8 +18,8 @@
#ifndef KSHOWMAILDOCK_H
#define KSHOWMAILDOCK_H
-#include <ntqwidget.h>
-#include <ntqpixmap.h>
+#include <tqwidget.h>
+#include <tqpixmap.h>
#include <ksystemtray.h>
#include <tdeaction.h>
diff --git a/kshowmail/kshowmailview.cpp b/kshowmail/kshowmailview.cpp
index 860bd79..49bfc1d 100644
--- a/kshowmail/kshowmailview.cpp
+++ b/kshowmail/kshowmailview.cpp
@@ -18,11 +18,11 @@
***************************************************************************/
// include files for TQt
-#include <ntqprinter.h>
-#include <ntqpainter.h>
-#include <ntqmessagebox.h>
-#include <ntqkeycode.h>
-#include <ntqvaluelist.h>
+#include <tqprinter.h>
+#include <tqpainter.h>
+#include <tqmessagebox.h>
+#include <tqkeycode.h>
+#include <tqvaluelist.h>
#include <kstandarddirs.h>
#include <tdelocale.h>
@@ -447,3 +447,5 @@ void KshowmailView::refreshSetup( )
m_pListMessages->saveLayout( config, CONFIG_GROUP_MESSAGE_LIST );
config->sync();
}
+
+#include "kshowmailview.moc"
diff --git a/kshowmail/kshowmailview.h b/kshowmail/kshowmailview.h
index 8e3607c..bf12c46 100644
--- a/kshowmail/kshowmailview.h
+++ b/kshowmail/kshowmailview.h
@@ -25,10 +25,10 @@
#endif
//TQt headers
-#include <ntqwidget.h>
-#include <ntqsplitter.h>
-#include <ntqcursor.h>
-#include <ntqpopupmenu.h>
+#include <tqwidget.h>
+#include <tqsplitter.h>
+#include <tqcursor.h>
+#include <tqpopupmenu.h>
//KDE headers
#include <tdelistview.h>
diff --git a/kshowmail/senderlistfilter.h b/kshowmail/senderlistfilter.h
index ec3fa72..829e53e 100644
--- a/kshowmail/senderlistfilter.h
+++ b/kshowmail/senderlistfilter.h
@@ -13,8 +13,8 @@
#define SENDERLISTFILTER_H
//TQt headers
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
//KDE headers
#include <tdeapplication.h>
diff --git a/kshowmail/serverdialog.h b/kshowmail/serverdialog.h
index 8db7fff..a848c3a 100644
--- a/kshowmail/serverdialog.h
+++ b/kshowmail/serverdialog.h
@@ -19,14 +19,14 @@
#define SERVERDIALOG_H
//TQt headers
-#include <ntqlayout.h>
-#include <ntqlabel.h>
-#include <ntqtooltip.h>
-#include <ntqspinbox.h>
-#include <ntqgroupbox.h>
-#include <ntqbuttongroup.h>
-#include <ntqradiobutton.h>
-#include <ntqcheckbox.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
+#include <tqtooltip.h>
+#include <tqspinbox.h>
+#include <tqgroupbox.h>
+#include <tqbuttongroup.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
//KDE headers
#include <kdialogbase.h>
diff --git a/kshowmail/showheaderdialog.h b/kshowmail/showheaderdialog.h
index 9fa2fab..a196d87 100644
--- a/kshowmail/showheaderdialog.h
+++ b/kshowmail/showheaderdialog.h
@@ -13,8 +13,8 @@
#define SHOWHEADERDIALOG_H
//QT headers
-#include <ntqlayout.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
//KDE headers
#include <kdialogbase.h>
diff --git a/kshowmail/showlistviewitem.h b/kshowmail/showlistviewitem.h
index 12d3ce9..15b856b 100644
--- a/kshowmail/showlistviewitem.h
+++ b/kshowmail/showlistviewitem.h
@@ -18,7 +18,7 @@
#ifndef SHOWLISTVIEWITEM_H
#define SHOWLISTVIEWITEM_H
-#include <ntqlistview.h>
+#include <tqlistview.h>
/**
*@author Eggert Ehmke
diff --git a/kshowmail/showmaildialog.h b/kshowmail/showmaildialog.h
index d2b3f3a..856c5db 100644
--- a/kshowmail/showmaildialog.h
+++ b/kshowmail/showmaildialog.h
@@ -13,8 +13,8 @@
#define SHOWMAILDIALOG_H
//QT headers
-#include <ntqlayout.h>
-#include <ntqlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
//KDE headers
#include <tdelocale.h>
diff --git a/kshowmail/showrecord.h b/kshowmail/showrecord.h
index 87fda3f..65cefa0 100644
--- a/kshowmail/showrecord.h
+++ b/kshowmail/showrecord.h
@@ -22,8 +22,8 @@
#include <iostream>
//TQt headers
-#include <ntqdom.h>
-#include <ntqptrlist.h>
+#include <tqdom.h>
+#include <tqptrlist.h>
//KDE headers
#include <kstandarddirs.h>
diff --git a/kshowmail/showrecordelem.h b/kshowmail/showrecordelem.h
index e14ef3f..57d46c7 100644
--- a/kshowmail/showrecordelem.h
+++ b/kshowmail/showrecordelem.h
@@ -19,10 +19,10 @@
#define SHOWRECORDELEM_H
//TQt headers
-#include <ntqdom.h>
-#include <ntqstring.h>
-#include <ntqlistview.h>
-#include <ntqdatetime.h>
+#include <tqdom.h>
+#include <tqstring.h>
+#include <tqlistview.h>
+#include <tqdatetime.h>
//KDE headers
#include <tdelocale.h>
diff --git a/kshowmail/tdewalletaccess.h b/kshowmail/tdewalletaccess.h
index 6699408..26c72dc 100644
--- a/kshowmail/tdewalletaccess.h
+++ b/kshowmail/tdewalletaccess.h
@@ -10,7 +10,7 @@
#define TDEWALLETACCESS_H
//TQt headers
-#include <ntqstring.h>
+#include <tqstring.h>
//KDE headers
#include <tdewallet.h>
diff --git a/kshowmail/types.h b/kshowmail/types.h
index a817ee8..35df1fb 100644
--- a/kshowmail/types.h
+++ b/kshowmail/types.h
@@ -15,10 +15,10 @@
#define TYPES_H
//TQt headers
-#include <ntqvaluelist.h>
-#include <ntqmap.h>
-#include <ntqstring.h>
-
+#include <tqvaluelist.h>
+#include <tqmap.h>
+#include <tqstring.h>
+#include <list>
using namespace std;
/**
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
new file mode 100644
index 0000000..20dd57b
--- /dev/null
+++ b/pics/CMakeLists.txt
@@ -0,0 +1,17 @@
+tde_install_icons( ${PROJECT_NAME} )
+
+
+##### other icon
+
+install(
+ FILES
+ eraser.png
+ kshowmail24.png
+ kshowmail.png
+ letter-closed.png
+ letter-open.png
+ ok.png
+ tool.png
+
+ DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
+)
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100644
index 0000000..597c341
--- /dev/null
+++ b/po/CMakeLists.txt
@@ -0,0 +1,5 @@
+file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
+
+if( _srcs )
+ tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} )
+endif( )
diff --git a/sounds/CMakeLists.txt b/sounds/CMakeLists.txt
new file mode 100644
index 0000000..0340592
--- /dev/null
+++ b/sounds/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+ FILES neuepost.wav newmail.wav
+ DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/sounds
+)