summaryrefslogtreecommitdiffstats
path: root/tdeioslave/trash
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2019-04-15 00:06:17 +0900
committerMichele Calgaro <[email protected]>2019-04-15 00:06:17 +0900
commit563adb52cbe17faf30ddbb720cb5707eac66fd95 (patch)
tree697c1fe99d810d45a8ab25f1266eab7ead2acb80 /tdeioslave/trash
parent85e0371c0e2a969d01347ddb5ec8f0e273084994 (diff)
downloadtdebase-563adb52cbe17faf30ddbb720cb5707eac66fd95.tar.gz
tdebase-563adb52cbe17faf30ddbb720cb5707eac66fd95.zip
Renamed kcm_trash to kcmtrash and minor fixup to previous commits.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdeioslave/trash')
-rw-r--r--tdeioslave/trash/CMakeLists.txt4
-rw-r--r--tdeioslave/trash/Makefile.am6
-rw-r--r--tdeioslave/trash/kcmtrash.cpp (renamed from tdeioslave/trash/kcm_trash.cpp)10
-rw-r--r--tdeioslave/trash/kcmtrash.desktop (renamed from tdeioslave/trash/kcm_trash.desktop)2
-rw-r--r--tdeioslave/trash/kcmtrash.h (renamed from tdeioslave/trash/kcm_trash.h)0
5 files changed, 11 insertions, 11 deletions
diff --git a/tdeioslave/trash/CMakeLists.txt b/tdeioslave/trash/CMakeLists.txt
index 2f1b184a9..cb3c3c201 100644
--- a/tdeioslave/trash/CMakeLists.txt
+++ b/tdeioslave/trash/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
##### other data ################################
install( FILES ktrashpropsdlgplugin.desktop trash.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kcm_trash.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES kcmtrash.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
##### trashcommon (static) ######################
@@ -51,7 +51,7 @@ tde_add_kpart( ${target} AUTOMOC
set( target kcm_trash )
tde_add_kpart( ${target} AUTOMOC
- SOURCES kcm_trash.cpp
+ SOURCES kcmtrash.cpp
LINK trashcommon-static tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
index cee2825a1..5d0d9b3e6 100644
--- a/tdeioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -3,13 +3,13 @@ METASOURCES = AUTO
SUBDIRS = . tdefile-plugin
-kde_module_LTLIBRARIES = tdeio_trash.la kcm_trash ktrashpropsdlgplugin.la
+kde_module_LTLIBRARIES = tdeio_trash.la kcm_trash.la ktrashpropsdlgplugin.la
tdeio_trash_la_SOURCES = tdeio_trash.cpp
tdeio_trash_la_LIBADD = libtrashcommon.la $(LIB_TDEIO)
tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-kcm_trash_la_SOURCES = kcm_trash.cpp
+kcm_trash_la_SOURCES = kcmtrash.cpp
kcm_trash_la_LIBADD = libtrashcommon.la $(LIB_TDEIO)
kcm_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
@@ -43,4 +43,4 @@ ktrashpropsdlgplugin_la_LIBADD = $(LIB_TDEIO)
services_DATA = ktrashpropsdlgplugin.desktop
servicesdir = $(kde_servicesdir)
-xdg_apps_DATA = kcm_trash.desktop
+xdg_apps_DATA = kcmtrash.desktop
diff --git a/tdeioslave/trash/kcm_trash.cpp b/tdeioslave/trash/kcmtrash.cpp
index 3a915fac0..4747e092a 100644
--- a/tdeioslave/trash/kcm_trash.cpp
+++ b/tdeioslave/trash/kcmtrash.cpp
@@ -16,7 +16,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "kcm_trash.h"
+#include "kcmtrash.h"
#include "ktrashpropswidget.h"
#include <tqlayout.h>
@@ -31,7 +31,7 @@ extern "C"
{
KDE_EXPORT TDECModule *create_trash(TQWidget *parent, const char *)
{
- return new TrashModule(parent, "trash");
+ return new TrashModule(parent, "kcmtrash");
}
}
@@ -39,13 +39,13 @@ extern "C"
TrashModule::TrashModule(TQWidget *parent, const char *name)
: TDECModule(parent, name)
{
- TDEAboutData * about = new TDEAboutData("trash",
+ TDEAboutData * about = new TDEAboutData("kcmtrash",
I18N_NOOP("Trash"), "1",
I18N_NOOP("Trash Control Panel Module"),
TDEAboutData::License_GPL_V2,
I18N_NOOP("(c) 2019 Michele Calgaro"));
setAboutData( about );
- TDEGlobal::locale()->insertCatalogue("trash");
+ TDEGlobal::locale()->insertCatalogue("tdeio_trash");
tab = new TQTabWidget(this);
@@ -78,4 +78,4 @@ TQString TrashModule::quickHelp() const
"for your Trash Bin size and clean up policy. ");
}
-#include "kcm_trash.moc"
+#include "kcmtrash.moc"
diff --git a/tdeioslave/trash/kcm_trash.desktop b/tdeioslave/trash/kcmtrash.desktop
index 83b70c920..b9c2a6ea9 100644
--- a/tdeioslave/trash/kcm_trash.desktop
+++ b/tdeioslave/trash/kcmtrash.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=tdecmshell kcm_trash
+Exec=tdecmshell kcmtrash
Icon=trashcan_empty
Type=Application
#X-DocPath=kcontrol/kcmcgi/index.html
diff --git a/tdeioslave/trash/kcm_trash.h b/tdeioslave/trash/kcmtrash.h
index 4987ccfba..4987ccfba 100644
--- a/tdeioslave/trash/kcm_trash.h
+++ b/tdeioslave/trash/kcmtrash.h