diff options
Diffstat (limited to 'tdeioslave/media')
19 files changed, 37 insertions, 37 deletions
diff --git a/tdeioslave/media/CMakeLists.txt b/tdeioslave/media/CMakeLists.txt index 68d4bf9d6..0746d259c 100644 --- a/tdeioslave/media/CMakeLists.txt +++ b/tdeioslave/media/CMakeLists.txt @@ -38,22 +38,22 @@ link_directories( install( FILES media.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -##### kiomedia (static) ######################### +##### tdeiomedia (static) ######################### -set( target kiomedia ) +set( target tdeiomedia ) tde_add_library( ${target} STATIC_PIC AUTOMOC - SOURCES kio_media.cpp mediaimpl.cpp mediaimpl.skel + SOURCES tdeio_media.cpp mediaimpl.cpp mediaimpl.skel ) -##### kio_media (module) ######################## +##### tdeio_media (module) ######################## -set( target kio_media ) +set( target tdeio_media ) tde_add_kpart( ${target} AUTOMOC SOURCES dummy.cpp - EMBED kiomedia-static + EMBED tdeiomedia-static LINK mediacommon-static tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeioslave/media/Makefile.am b/tdeioslave/media/Makefile.am index b82e48557..c827568a4 100644 --- a/tdeioslave/media/Makefile.am +++ b/tdeioslave/media/Makefile.am @@ -8,11 +8,11 @@ SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = kio_media.la +kde_module_LTLIBRARIES = tdeio_media.la -kio_media_la_SOURCES = dummy.cpp -kio_media_la_LIBADD = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO) -kio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined +tdeio_media_la_SOURCES = dummy.cpp +tdeio_media_la_LIBADD = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO) +tdeio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined dummy.cpp: echo > dummy.cpp @@ -20,7 +20,7 @@ dummy.cpp: kde_services_DATA = media.protocol noinst_LTLIBRARIES = libtdeiomedia.la -libtdeiomedia_la_SOURCES = kio_media.cpp mediaimpl.cpp mediaimpl.skel +libtdeiomedia_la_SOURCES = tdeio_media.cpp mediaimpl.cpp mediaimpl.skel check_PROGRAMS = testmedia testmedia_SOURCES = testmedia.cpp diff --git a/tdeioslave/media/media.protocol b/tdeioslave/media/media.protocol index f535e1a41..c390d6fca 100644 --- a/tdeioslave/media/media.protocol +++ b/tdeioslave/media/media.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_media +exec=tdeio_media protocol=media input=none output=filesystem diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp index aba2b0175..1022b36be 100644 --- a/tdeioslave/media/mediamanager/halbackend.cpp +++ b/tdeioslave/media/mediamanager/halbackend.cpp @@ -377,7 +377,7 @@ void HALBackend::DeviceCondition(const char* udi, const char* condition) } if (medium) { TDEProcess p; - p << "kio_media_mounthelper" << "-e" << medium->name(); + p << "tdeio_media_mounthelper" << "-e" << medium->name(); p.start(TDEProcess::DontCare); } } diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp index db2c12a71..511eb6c64 100644 --- a/tdeioslave/media/mediamanager/mediamanager.cpp +++ b/tdeioslave/media/mediamanager/mediamanager.cpp @@ -415,7 +415,7 @@ void MediaManager::slotMediumChanged(const TQString &/*id*/, const TQString &nam extern "C" { KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj) { - TDEGlobal::locale()->insertCatalogue("kio_media"); + TDEGlobal::locale()->insertCatalogue("tdeio_media"); return new MediaManager(obj); } } diff --git a/tdeioslave/media/mounthelper/CMakeLists.txt b/tdeioslave/media/mounthelper/CMakeLists.txt index ea06278a8..766fe3def 100644 --- a/tdeioslave/media/mounthelper/CMakeLists.txt +++ b/tdeioslave/media/mounthelper/CMakeLists.txt @@ -21,12 +21,12 @@ link_directories( ) -##### kio_media_mounthelper (executable) ######## +##### tdeio_media_mounthelper (executable) ######## -set( target kio_media_mounthelper ) +set( target tdeio_media_mounthelper ) set( ${target}_SRCS - kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp + tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp ) tde_add_executable( ${target} AUTOMOC diff --git a/tdeioslave/media/mounthelper/Makefile.am b/tdeioslave/media/mounthelper/Makefile.am index 934559d40..c1e056c18 100644 --- a/tdeioslave/media/mounthelper/Makefile.am +++ b/tdeioslave/media/mounthelper/Makefile.am @@ -1,12 +1,12 @@ -bin_PROGRAMS = kio_media_mounthelper +bin_PROGRAMS = tdeio_media_mounthelper INCLUDES = -I$(srcdir)/../libmediacommon $(all_includes) AM_LDFLAGS = $(all_libraries) -kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp +tdeio_media_mounthelper_SOURCES = tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp -kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI) +tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI) METASOURCES = AUTO diff --git a/tdeioslave/media/mounthelper/kio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index f321293d6..038a4de57 100644 --- a/tdeioslave/media/mounthelper/kio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -35,7 +35,7 @@ #include <kmimetype.h> #include "dialog.h" -#include "kio_media_mounthelper.h" +#include "tdeio_media_mounthelper.h" const Medium MountHelper::findMedium(const KURL &url) { @@ -263,12 +263,12 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - TDECmdLineArgs::init(argc, argv, "kio_media_mounthelper", - "kio_media_mounthelper", "kio_media_mounthelper", + TDECmdLineArgs::init(argc, argv, "tdeio_media_mounthelper", + "tdeio_media_mounthelper", "tdeio_media_mounthelper", "0.1"); TDECmdLineArgs::addCmdLineOptions( options ); - TDEGlobal::locale()->setMainCatalogue("kio_media"); + TDEGlobal::locale()->setMainCatalogue("tdeio_media"); TDEApplication::addCmdLineOptions(); if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage(); @@ -279,4 +279,4 @@ int main(int argc, char **argv) return app->exec(); } -#include "kio_media_mounthelper.moc" +#include "tdeio_media_mounthelper.moc" diff --git a/tdeioslave/media/mounthelper/kio_media_mounthelper.h b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h index 50ea88b3b..50ea88b3b 100644 --- a/tdeioslave/media/mounthelper/kio_media_mounthelper.h +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h diff --git a/tdeioslave/media/services/media_decrypt.desktop b/tdeioslave/media/services/media_decrypt.desktop index dd8dadc39..4adef7d90 100644 --- a/tdeioslave/media/services/media_decrypt.desktop +++ b/tdeioslave/media/services/media_decrypt.desktop @@ -1,5 +1,5 @@ [Desktop Action Decrypt] -Exec=kio_media_mounthelper -d %u +Exec=tdeio_media_mounthelper -d %u Icon=decrypted Name=Decrypt Name[de]=Entschlüsseln diff --git a/tdeioslave/media/services/media_eject.desktop b/tdeioslave/media/services/media_eject.desktop index af30d1088..121f83340 100644 --- a/tdeioslave/media/services/media_eject.desktop +++ b/tdeioslave/media/services/media_eject.desktop @@ -86,5 +86,5 @@ Name[xh]=Khuphela ngaphandle Name[zh_CN]=弹出 Name[zh_TW]=退出 Name[zu]=Khipha -Exec=kio_media_mounthelper -e %u +Exec=tdeio_media_mounthelper -e %u diff --git a/tdeioslave/media/services/media_mount.desktop b/tdeioslave/media/services/media_mount.desktop index 8011fe577..a8a943bb8 100644 --- a/tdeioslave/media/services/media_mount.desktop +++ b/tdeioslave/media/services/media_mount.desktop @@ -83,5 +83,5 @@ Name[xh]=Layisha Name[zh_CN]=挂载 Name[zh_TW]=掛載 Name[zu]=Yenyusa -Exec=kio_media_mounthelper -m %u +Exec=tdeio_media_mounthelper -m %u diff --git a/tdeioslave/media/services/media_safelyremove.desktop b/tdeioslave/media/services/media_safelyremove.desktop index 3dac85f15..37f3d3b7b 100644 --- a/tdeioslave/media/services/media_safelyremove.desktop +++ b/tdeioslave/media/services/media_safelyremove.desktop @@ -71,5 +71,5 @@ Name[vi]=Gỡ ra An toàn Name[wa]=Ositer e såvrité Name[zh_CN]=安全删除 Name[zh_TW]=安全的移除 -Exec=kio_media_mounthelper -s %u +Exec=tdeio_media_mounthelper -s %u diff --git a/tdeioslave/media/services/media_unmount.desktop b/tdeioslave/media/services/media_unmount.desktop index 04ced9d0d..c76adf1f5 100644 --- a/tdeioslave/media/services/media_unmount.desktop +++ b/tdeioslave/media/services/media_unmount.desktop @@ -83,5 +83,5 @@ Name[xh]=Sukuyilayisha Name[zh_CN]=卸载 Name[zh_TW]=卸載 Name[zu]=Yehlisa -Exec=kio_media_mounthelper -u %u +Exec=tdeio_media_mounthelper -u %u diff --git a/tdeioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp index 9036583df..9d8c4cb8f 100644 --- a/tdeioslave/media/tdecmodule/main.cpp +++ b/tdeioslave/media/tdecmodule/main.cpp @@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) ) MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& ) : TDECModule(MediaFactory::instance(), parent, name ) { - TDEGlobal::locale()->insertCatalogue("kio_media"); + TDEGlobal::locale()->insertCatalogue("tdeio_media"); TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQTabWidget *tab = new TQTabWidget( this ); diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp index 20e68e459..dc46e8287 100644 --- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp +++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp @@ -39,7 +39,7 @@ #endif typedef KGenericFactory<KFileMediaPlugin> KFileMediaPluginFactory; -K_EXPORT_COMPONENT_FACTORY(tdefile_media, KFileMediaPluginFactory("kio_media")) +K_EXPORT_COMPONENT_FACTORY(tdefile_media, KFileMediaPluginFactory("tdeio_media")) KFileMediaPlugin::KFileMediaPlugin(TQObject *parent, const char *name, const TQStringList& args) diff --git a/tdeioslave/media/kio_media.cpp b/tdeioslave/media/tdeio_media.cpp index d1647c6fc..c8af18133 100644 --- a/tdeioslave/media/kio_media.cpp +++ b/tdeioslave/media/tdeio_media.cpp @@ -28,7 +28,7 @@ #include <tqeventloop.h> #include "mediaimpl.h" -#include "kio_media.h" +#include "tdeio_media.h" static const KCmdLineOptions options[] = @@ -44,7 +44,7 @@ extern "C" { { // TDEApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); - TDECmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0); + TDECmdLineArgs::init(argc, argv, "tdeio_media", 0, 0, 0, 0); TDECmdLineArgs::addCmdLineOptions( options ); TDEApplication app( false, false ); // We want to be anonymous even if we use DCOP @@ -273,4 +273,4 @@ void MediaProtocol::slotWarning( const TQString &msg ) warning( msg ); } -#include "kio_media.moc" +#include "tdeio_media.moc" diff --git a/tdeioslave/media/kio_media.h b/tdeioslave/media/tdeio_media.h index bf1325475..bf1325475 100644 --- a/tdeioslave/media/kio_media.h +++ b/tdeioslave/media/tdeio_media.h diff --git a/tdeioslave/media/testmedia.cpp b/tdeioslave/media/testmedia.cpp index eb0871f6f..ebd4f6b53 100644 --- a/tdeioslave/media/testmedia.cpp +++ b/tdeioslave/media/testmedia.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include "kio_media.h" +#include "tdeio_media.h" #include "testmedia.h" #include <config.h> |