Browse Source

Renamed kcm_trash to kcmtrash and minor fixup to previous commits.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 1 month ago
parent
commit
563adb52cb
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF

+ 2
- 2
tdeioslave/trash/CMakeLists.txt View File

@@ -26,7 +26,7 @@ link_directories(
26 26
 ##### other data ################################
27 27
 
28 28
 install( FILES ktrashpropsdlgplugin.desktop trash.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
29
-install( FILES kcm_trash.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
29
+install( FILES kcmtrash.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
30 30
 
31 31
 
32 32
 ##### trashcommon (static) ######################
@@ -51,7 +51,7 @@ tde_add_kpart( ${target} AUTOMOC
51 51
 set( target kcm_trash )
52 52
 
53 53
 tde_add_kpart( ${target} AUTOMOC
54
-  SOURCES kcm_trash.cpp
54
+  SOURCES kcmtrash.cpp
55 55
   LINK trashcommon-static tdeio-shared
56 56
   DESTINATION ${PLUGIN_INSTALL_DIR}
57 57
 )

+ 3
- 3
tdeioslave/trash/Makefile.am View File

@@ -3,13 +3,13 @@ METASOURCES = AUTO
3 3
 
4 4
 SUBDIRS = . tdefile-plugin
5 5
 
6
-kde_module_LTLIBRARIES = tdeio_trash.la kcm_trash ktrashpropsdlgplugin.la
6
+kde_module_LTLIBRARIES = tdeio_trash.la kcm_trash.la ktrashpropsdlgplugin.la
7 7
 
8 8
 tdeio_trash_la_SOURCES = tdeio_trash.cpp
9 9
 tdeio_trash_la_LIBADD  = libtrashcommon.la $(LIB_TDEIO)
10 10
 tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
11 11
 
12
-kcm_trash_la_SOURCES = kcm_trash.cpp
12
+kcm_trash_la_SOURCES = kcmtrash.cpp
13 13
 kcm_trash_la_LIBADD  = libtrashcommon.la $(LIB_TDEIO)
14 14
 kcm_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
15 15
 
@@ -43,4 +43,4 @@ ktrashpropsdlgplugin_la_LIBADD = $(LIB_TDEIO)
43 43
 services_DATA = ktrashpropsdlgplugin.desktop
44 44
 servicesdir = $(kde_servicesdir)
45 45
 
46
-xdg_apps_DATA = kcm_trash.desktop
46
+xdg_apps_DATA = kcmtrash.desktop

tdeioslave/trash/kcm_trash.cpp → tdeioslave/trash/kcmtrash.cpp View File

@@ -16,7 +16,7 @@
16 16
    Boston, MA 02110-1301, USA.
17 17
 */
18 18
 
19
-#include "kcm_trash.h"
19
+#include "kcmtrash.h"
20 20
 #include "ktrashpropswidget.h"
21 21
 
22 22
 #include <tqlayout.h>
@@ -31,7 +31,7 @@ extern "C"
31 31
 {
32 32
   KDE_EXPORT TDECModule *create_trash(TQWidget *parent, const char *)
33 33
   {
34
-    return new TrashModule(parent, "trash");
34
+    return new TrashModule(parent, "kcmtrash");
35 35
   }
36 36
 }
37 37
 
@@ -39,13 +39,13 @@ extern "C"
39 39
 TrashModule::TrashModule(TQWidget *parent, const char *name)
40 40
 	: TDECModule(parent, name)
41 41
 {
42
-	TDEAboutData * about = new TDEAboutData("trash",
42
+	TDEAboutData * about = new TDEAboutData("kcmtrash",
43 43
 	                                    I18N_NOOP("Trash"), "1",
44 44
 	                                    I18N_NOOP("Trash Control Panel Module"),
45 45
 	                                    TDEAboutData::License_GPL_V2,
46 46
 	                                    I18N_NOOP("(c) 2019 Michele Calgaro"));
47 47
 	setAboutData( about );
48
-  TDEGlobal::locale()->insertCatalogue("trash");
48
+  TDEGlobal::locale()->insertCatalogue("tdeio_trash");
49 49
 
50 50
   tab = new TQTabWidget(this);
51 51
 
@@ -78,4 +78,4 @@ TQString TrashModule::quickHelp() const
78 78
               "for your Trash Bin size and clean up policy. ");
79 79
 }
80 80
 
81
-#include "kcm_trash.moc"
81
+#include "kcmtrash.moc"

tdeioslave/trash/kcm_trash.desktop → tdeioslave/trash/kcmtrash.desktop View File

@@ -1,5 +1,5 @@
1 1
 [Desktop Entry]
2
-Exec=tdecmshell kcm_trash
2
+Exec=tdecmshell kcmtrash
3 3
 Icon=trashcan_empty
4 4
 Type=Application
5 5
 #X-DocPath=kcontrol/kcmcgi/index.html

tdeioslave/trash/kcm_trash.h → tdeioslave/trash/kcmtrash.h View File


Loading…
Cancel
Save