diff options
Diffstat (limited to 'kioslave/media')
| -rw-r--r-- | kioslave/media/mediamanager/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kioslave/media/mediamanager/halbackend.cpp | 32 | ||||
| -rw-r--r-- | kioslave/media/medianotifier/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kioslave/media/mounthelper/Makefile.am | 2 |
4 files changed, 20 insertions, 20 deletions
diff --git a/kioslave/media/mediamanager/CMakeLists.txt b/kioslave/media/mediamanager/CMakeLists.txt index 58854b630..411091365 100644 --- a/kioslave/media/mediamanager/CMakeLists.txt +++ b/kioslave/media/mediamanager/CMakeLists.txt @@ -47,7 +47,7 @@ if( WITH_HAL ) tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK mediacommon-static kdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} + LINK mediacommon-static tdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) else( ) @@ -59,7 +59,7 @@ else( ) tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK mediacommon-static kdeinit_kded-shared + LINK mediacommon-static tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) endif( ) diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp index f4250f1ba..58e2992e0 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -1079,37 +1079,37 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio return true; } -TQString startKdeSudoProcess(const TQString& kdesudoPath, const TQString& command, +TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& command, const TQString& dialogCaption, const TQString& dialogComment) { - KProcess kdesudoProcess; + KProcess tdesudoProcess; - kdesudoProcess << kdesudoPath + tdesudoProcess << tdesudoPath << "-d" << "--noignorebutton" << "--caption" << dialogCaption << "--comment" << dialogComment << "-c" << command; - // @todo handle kdesudo output - kdesudoProcess.start(KProcess::Block); + // @todo handle tdesudo output + tdesudoProcess.start(KProcess::Block); return TQString(); } -TQString startKdeSuProcess(const TQString& kdesuPath, const TQString& command, +TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command, const TQString& dialogCaption) { - KProcess kdesuProcess; + KProcess tdesuProcess; - kdesuProcess << kdesuPath + tdesuProcess << tdesuPath << "-d" << "--noignorebutton" << "--caption" << dialogCaption << "-c" << command; - // @todo handle kdesu output - kdesuProcess.start(KProcess::Block); + // @todo handle tdesu output + tdesuProcess.start(KProcess::Block); return TQString(); } @@ -1118,15 +1118,15 @@ TQString startPrivilegedProcess(const TQString& command, const TQString& dialogC { TQString error; - TQString kdesudoPath = KStandardDirs::findExe("kdesudo"); + TQString tdesudoPath = KStandardDirs::findExe("tdesudo"); - if (!kdesudoPath.isEmpty()) - error = startKdeSudoProcess(kdesudoPath, command, dialogCaption, dialogComment); + if (!tdesudoPath.isEmpty()) + error = startKdeSudoProcess(tdesudoPath, command, dialogCaption, dialogComment); else { - TQString kdesuPath = KStandardDirs::findExe("kdesu"); + TQString tdesuPath = KStandardDirs::findExe("tdesu"); - if (!kdesuPath.isEmpty()) - error = startKdeSuProcess(kdesuPath, command, dialogCaption); + if (!tdesuPath.isEmpty()) + error = startKdeSuProcess(tdesuPath, command, dialogCaption); } return error; diff --git a/kioslave/media/medianotifier/CMakeLists.txt b/kioslave/media/medianotifier/CMakeLists.txt index 7d67c736a..44d6cb308 100644 --- a/kioslave/media/medianotifier/CMakeLists.txt +++ b/kioslave/media/medianotifier/CMakeLists.txt @@ -38,6 +38,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK mediacommon-static kdeinit_kded-shared + LINK mediacommon-static tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslave/media/mounthelper/Makefile.am b/kioslave/media/mounthelper/Makefile.am index 4030305c9..99bba4df9 100644 --- a/kioslave/media/mounthelper/Makefile.am +++ b/kioslave/media/mounthelper/Makefile.am @@ -5,7 +5,7 @@ AM_LDFLAGS = $(all_libraries) kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp decryptdialog.ui dialog.cpp -kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_KDEUI) METASOURCES = AUTO |