summaryrefslogtreecommitdiffstats
path: root/src/torkapplet
diff options
context:
space:
mode:
authorgregory guy <gregory-tde@laposte.net>2020-10-20 14:40:51 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-01-15 15:15:39 +0100
commit7fefe15989a08e255ade5e577c781701b157d430 (patch)
tree094796ae879ca732f013f7ff6baf059da9d3b862 /src/torkapplet
parentade9896cdea394b76db639c1f22a43821a9d1ecd (diff)
downloadtork-7fefe159.tar.gz
tork-7fefe159.zip
Conversion to the cmake building system.
Signed-off-by: gregory guy <gregory-tde@laposte.net> (cherry picked from commit 81b64bcfc0a32fdeb0e4f367adbf273d924e55f4)
Diffstat (limited to 'src/torkapplet')
-rw-r--r--src/torkapplet/CMakeLists.txt35
-rw-r--r--src/torkapplet/tork_mnu.cpp18
-rw-r--r--src/torkapplet/tork_mnu.h2
3 files changed, 45 insertions, 10 deletions
diff --git a/src/torkapplet/CMakeLists.txt b/src/torkapplet/CMakeLists.txt
new file mode 100644
index 0000000..b29088b
--- /dev/null
+++ b/src/torkapplet/CMakeLists.txt
@@ -0,0 +1,35 @@
+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}
+)
+
+
+##### kickermenu_tork (kpart)
+
+tde_add_kpart( kickermenu_tork AUTOMOC
+
+ SOURCES
+ tork_mnu.cpp
+ ../functions.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop( torkmenu.desktop
+ DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext
+)
diff --git a/src/torkapplet/tork_mnu.cpp b/src/torkapplet/tork_mnu.cpp
index fc5a45d..1c72496 100644
--- a/src/torkapplet/tork_mnu.cpp
+++ b/src/torkapplet/tork_mnu.cpp
@@ -19,15 +19,9 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <stdlib.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-#include <ntqdir.h>
-#include <ntqfileinfo.h>
-#include <ntqstringlist.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
+#include <tqstringlist.h>
#include <tdeapplication.h>
#include <tdeglobal.h>
@@ -44,6 +38,12 @@
#include <tdelocale.h>
#include <krun.h>
+#include <stdlib.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
#include "tork_mnu.h"
#include "../functions.h"
diff --git a/src/torkapplet/tork_mnu.h b/src/torkapplet/tork_mnu.h
index f92c534..2474ea5 100644
--- a/src/torkapplet/tork_mnu.h
+++ b/src/torkapplet/tork_mnu.h
@@ -23,7 +23,7 @@
#ifndef _tork_mnu_h_
#define _tork_mnu_h_
-#include <ntqvaluevector.h>
+#include <tqvaluevector.h>
#include <kpanelmenu.h>
#include <klibloader.h>