diff options
50 files changed, 73 insertions, 73 deletions
diff --git a/dcoprss/CMakeLists.txt b/dcoprss/CMakeLists.txt index 44c47491..9a7b06c9 100644 --- a/dcoprss/CMakeLists.txt +++ b/dcoprss/CMakeLists.txt @@ -45,7 +45,7 @@ tde_add_executable( rssservice AUTOMOC tde_add_executable( rssclient SOURCES client.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -55,6 +55,6 @@ tde_add_executable( rssclient tde_add_executable( feedbrowser AUTOMOC SOURCES feedbrowser.skel feedbrowser.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/doc/kwifimanager/index.docbook b/doc/kwifimanager/index.docbook index 07cc908d..fbf46cc0 100644 --- a/doc/kwifimanager/index.docbook +++ b/doc/kwifimanager/index.docbook @@ -204,7 +204,7 @@ results will always be empty. If you are not the root user, the list may be incomplete or outdated. </para> <para> In order to receive a reliable, current list of access points you will need to - start the scan with root privileges, for example by using the &kdesu; utility to + start the scan with root privileges, for example by using the &tdesu; utility to start &kwifimanager;</para> <para> If at least one network was found, you are presented with a table showing details of the network. It has four columns that inform you about <itemizedlist> @@ -374,7 +374,7 @@ if you want to start an X application in the script and the X server belongs to someone else than root. You can make such scripts work correctly if you execute the X application via<userinput> - <command>kdesu</command> + <command>tdesu</command> <option>-u</option> <replaceable>USERNAME</replaceable> <option>-c</option> diff --git a/filesharing/advanced/kcm_sambaconf/CMakeLists.txt b/filesharing/advanced/kcm_sambaconf/CMakeLists.txt index 9ed92497..41723ee5 100644 --- a/filesharing/advanced/kcm_sambaconf/CMakeLists.txt +++ b/filesharing/advanced/kcm_sambaconf/CMakeLists.txt @@ -46,6 +46,6 @@ tde_add_kpart( kcm_kcmsambaconf AUTOMOC SOURCES kcminterface.ui kcmprinterdlg.ui printerdlgimpl.cpp kcmsambaconf.cpp joindomaindlg.ui - LINK filesharesamba-static kdeprint-shared + LINK filesharesamba-static tdeprint-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/filesharing/advanced/kcm_sambaconf/Makefile.am b/filesharing/advanced/kcm_sambaconf/Makefile.am index 55cd699d..a955dafc 100644 --- a/filesharing/advanced/kcm_sambaconf/Makefile.am +++ b/filesharing/advanced/kcm_sambaconf/Makefile.am @@ -15,7 +15,7 @@ kcm_kcmsambaconf_la_COMPILE_FIRST = usertab.h share.h kcm_kcmsambaconf_la_LIBADD = \ - -lkdeprint \ + -ltdeprint \ libfilesharesamba.la kcm_kcmsambaconf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp index da11d799..0ba2082b 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp @@ -46,8 +46,8 @@ #include <kurlrequester.h> #include <knuminput.h> #include <kdebug.h> -#include <kdeprint/kmmanager.h> -#include <kdeprint/kmprinter.h> +#include <tdeprint/kmmanager.h> +#include <tdeprint/kmprinter.h> #include <kcombobox.h> #include <kiconloader.h> #include <klocale.h> diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 2ba52a57..50df27c0 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -146,7 +146,7 @@ bool SambaFile::slotApply() // we simply save the values to it // if not we have to save the results in // a temporary file and copy it afterwards - // over the smb.conf file with kdesu. + // over the smb.conf file with tdesu. if (TQFileInfo(path).isWritable()) { saveTo(path); @@ -177,7 +177,7 @@ bool SambaFile::slotApply() .tqarg(_tempFile->name()) .tqarg(path) .tqarg(_tempFile->name()); - proc << "kdesu" << "-d" << suCommand; + proc << "tdesu" << "-d" << suCommand; if (! proc.start(KProcess::Block)) { kdDebug(5009) << "SambaFile::slotApply: saving to " << path << " failed!" << endl; diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp index ebc33a9c..9eb674c8 100644 --- a/filesharing/advanced/nfs/nfsfile.cpp +++ b/filesharing/advanced/nfs/nfsfile.cpp @@ -248,7 +248,7 @@ bool NFSFile::save() command +=";exportfs -ra"; if (!TQFileInfo(_url.path()).isWritable() ) - proc<<"kdesu" << "-d" << "-c"<<command; + proc<<"tdesu" << "-d" << "-c"<<command; if (!proc.start(KProcess::Block, true)) { return false; diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp index 24efa0e5..b52fd8fc 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp +++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp @@ -179,7 +179,7 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool nfsFile->saveTo(nfsFileName); } else { nfsNeedsKDEsu = true; - kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: nfs needs kdesu." << endl; + kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: nfs needs tdesu." << endl; } } else kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: nfs has not changed." << endl; @@ -192,7 +192,7 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool sambaFile->saveTo(sambaFileName); } else { sambaNeedsKDEsu = true; - kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba needs kdesu." << endl; + kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba needs tdesu." << endl; } } else kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: samba has not changed." << endl; @@ -222,10 +222,10 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool .tqarg(KProcess::quote( sambaFileName )); } - proc<<"kdesu" << "-d" << "-c"<<command; + proc<<"tdesu" << "-d" << "-c"<<command; if (!proc.start(KProcess::Block, true)) { - kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: kdesu command failed" << endl; + kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: tdesu command failed" << endl; return false; } } diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp index 93a9a6e8..2af403f5 100644 --- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp +++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp @@ -101,7 +101,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, void PropsDlgSharePlugin::slotConfigureFileSharing() { KProcess proc; - proc << KStandardDirs::findExe("kdesu") << locate("exe", "kcmshell") << "fileshare"; + proc << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare"; proc.start( KProcess::DontCare ); } diff --git a/kdict/CMakeLists.txt b/kdict/CMakeLists.txt index b56251aa..190f17c8 100644 --- a/kdict/CMakeLists.txt +++ b/kdict/CMakeLists.txt @@ -33,9 +33,9 @@ install( FILES kdict.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES kdictui.rc DESTINATION ${DATA_INSTALL_DIR}/kdict ) -##### kdict (kdeinit) ########################### +##### kdict (tdeinit) ########################### -tde_add_kdeinit_executable( kdict AUTOMOC +tde_add_tdeinit_executable( kdict AUTOMOC SOURCES dcopinterface.skel main.cpp actions.cpp dict.cpp options.cpp queryview.cpp toplevel.cpp sets.cpp matchview.cpp application.cpp diff --git a/kdict/Makefile.am b/kdict/Makefile.am index 5cb60755..d9e600f6 100644 --- a/kdict/Makefile.am +++ b/kdict/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = applet pics bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kdict.la +tdeinit_LTLIBRARIES = kdict.la # set the include path for X, qt and KDE AM_CPPFLAGS = $(all_includes) diff --git a/kdict/applet/CMakeLists.txt b/kdict/applet/CMakeLists.txt index 27d35f17..ad2d6b7d 100644 --- a/kdict/applet/CMakeLists.txt +++ b/kdict/applet/CMakeLists.txt @@ -31,6 +31,6 @@ install( FILES tde_add_kpart( kdict_panelapplet AUTOMOC SOURCES kdictapplet.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdnssd/kdedmodule/CMakeLists.txt b/kdnssd/kdedmodule/CMakeLists.txt index 5604c97a..c036055a 100644 --- a/kdnssd/kdedmodule/CMakeLists.txt +++ b/kdnssd/kdedmodule/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES dnssdwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) tde_add_kpart( kded_dnssdwatcher AUTOMOC SOURCES dnssdwatcher.cpp dnssdwatcher.skel watcher.cpp - LINK kdnssd-shared kdeinit_kded-shared + LINK kdnssd-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/kopete/Makefile.am b/kopete/kopete/Makefile.am index 3035e8a6..c5b22ac2 100644 --- a/kopete/kopete/Makefile.am +++ b/kopete/kopete/Makefile.am @@ -33,7 +33,7 @@ kopete_SOURCES = main.cpp kopeteapplication.cpp kopeteiface.cpp \ kimiface_DIR = $(kde_includes) -kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -lktexteditor $(LIB_QT) $(LIB_KDECORE) -lkdefx -lDCOP +kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -lktexteditor $(LIB_QT) $(LIB_KDECORE) -ltdefx -lDCOP kopete_LDADD = \ addcontactwizard/libkopeteaddcontactwizard.la \ addaccountwizard/libkopeteaddaccountwizard.la \ diff --git a/kopete/kopete/contactlist/Makefile.am b/kopete/kopete/contactlist/Makefile.am index 4a8c23e3..9061eb86 100644 --- a/kopete/kopete/contactlist/Makefile.am +++ b/kopete/kopete/contactlist/Makefile.am @@ -18,7 +18,7 @@ libkopetecontactlist_la_SOURCES = kopetemetacontactlvi.cpp \ customnotificationprops.cpp kopetegrouplistaction.cpp kabcexport.cpp \ kabcexport_base.ui -libkopetecontactlist_la_LDFLAGS = $(all_libraries) -lkdefx +libkopetecontactlist_la_LDFLAGS = $(all_libraries) -ltdefx libkopetecontactlist_la_LIBADD = -lkabc ../../libkopete/libkopete.la ../addcontactwizard/libkopeteaddcontactwizard.la $(LIB_KDEUI) $(LIB_XRENDER) noinst_HEADERS = kopeteaddrbookexport.h customnotificationprops.h kabcexport.h diff --git a/kopete/kopete/contactlist/configure.in.in b/kopete/kopete/contactlist/configure.in.in index 900224ea..eeaa09b0 100644 --- a/kopete/kopete/contactlist/configure.in.in +++ b/kopete/kopete/contactlist/configure.in.in @@ -1,6 +1,6 @@ dnl ----------------------------------------------------- -dnl XRender check - stolen from kdelibs/kdefx +dnl XRender check - stolen from kdelibs/tdefx dnl ----------------------------------------------------- LIB_XRENDER= if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then diff --git a/kopete/kopete/kconf_update/CMakeLists.txt b/kopete/kopete/kconf_update/CMakeLists.txt index 1317d824..b708b42c 100644 --- a/kopete/kopete/kconf_update/CMakeLists.txt +++ b/kopete/kopete/kconf_update/CMakeLists.txt @@ -59,6 +59,6 @@ tde_add_executable( kopete_pluginloader2_kconf_update tde_add_executable( kopete_nameTracking_kconf_update SOURCES kopete-nameTracking.cpp - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin ) diff --git a/kopete/kopete/kconf_update/Makefile.am b/kopete/kopete/kconf_update/Makefile.am index 3dd58c64..6b7db7d5 100644 --- a/kopete/kopete/kconf_update/Makefile.am +++ b/kopete/kopete/kconf_update/Makefile.am @@ -17,15 +17,15 @@ kconf_PROGRAMS = kopete-account-kconf_update kopete-pluginloader2-kconf_update \ kconfdir = $(libdir)/kconf_update_bin kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp -kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_account_kconf_update_LDADD = $(LIB_QT) kopete_pluginloader2_kconf_update_SOURCES = kopete-pluginloader2.cpp -kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_pluginloader2_kconf_update_LDADD = $(LIB_QT) kopete_nameTracking_kconf_update_SOURCES = kopete-nameTracking.cpp -kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_KDECORE) # vim: set noet: diff --git a/kopete/libkopete/Makefile.am b/kopete/libkopete/Makefile.am index 11355aa2..7e90bfc7 100644 --- a/kopete/libkopete/Makefile.am +++ b/kopete/libkopete/Makefile.am @@ -5,7 +5,7 @@ endif include ../../admin/Doxyfile.am -DOXYGEN_REFERENCES = kio kdecore kdeui +DOXYGEN_REFERENCES = kio tdecore tdeui DOXYGEN_EXCLUDE = compat DOXYGEN_SET_PROJECT_NAME = libkopete diff --git a/kopete/libkopete/avdevice/CMakeLists.txt b/kopete/libkopete/avdevice/CMakeLists.txt index 8e37773f..fb3f77c4 100644 --- a/kopete/libkopete/avdevice/CMakeLists.txt +++ b/kopete/libkopete/avdevice/CMakeLists.txt @@ -41,6 +41,6 @@ tde_add_library( kopete_videodevice SHARED AUTOMOC videodevicepool.cpp videoinput.cpp bayer.cpp sonix_compress.cpp VERSION 1.0.0 - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kopete/libkopete/avdevice/Makefile.am b/kopete/libkopete/avdevice/Makefile.am index 65c88c30..5000288c 100644 --- a/kopete/libkopete/avdevice/Makefile.am +++ b/kopete/libkopete/avdevice/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CA METASOURCES = AUTO lib_LTLIBRARIES = libkopete_videodevice.la noinst_LTLIBRARIES = libkvideoio.la -libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = kxv.h qvideo.h qvideostream.h videocontrol.h videodevice.h \ videodevicemodelpool.h videodevicepool.h videoinput.h \ diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp index 8c561b99..453ca98b 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp @@ -18,8 +18,8 @@ */ /* NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim - * This is because kdepim has to remain backwards compatible. Any changes + * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * This is because tdepim has to remain backwards compatible. Any changes * to either file should be made to the other. */ diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.h b/kopete/libkopete/compat/kpixmapregionselectorwidget.h index 7143576d..5cbb067c 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.h +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.h @@ -34,8 +34,8 @@ class KPopupMenu; * user with a friendly way to select a rectangular subregion of the pixmap. * * NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim - * This is because kdepim has to remain backwards compatible. Any changes + * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * This is because tdepim has to remain backwards compatible. Any changes * to either file should be made to the other. * * @author Antonio Larrosa <larrosa@kde.org> diff --git a/kopete/plugins/smpppdcs/unittest/Makefile.am b/kopete/plugins/smpppdcs/unittest/Makefile.am index 7080412c..89718cd6 100644 --- a/kopete/plugins/smpppdcs/unittest/Makefile.am +++ b/kopete/plugins/smpppdcs/unittest/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO check_PROGRAMS = smpppdcstests smpppdcstests_SOURCES = main.cpp clienttest.cpp -smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -lkunittestgui noinst_HEADERS = clienttest.h diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index f7e4ee24..5dca8771 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -56,7 +56,7 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) /* Create a list of supported encodings, and keep only one of each encoding * mime name. * - * This piece of code from kdepim/kmail/kmmsgbase.cpp + * This piece of code from tdepim/kmail/kmmsgbase.cpp */ TQStringList KCodecAction::supportedEncodings(bool usAscii) diff --git a/kopete/protocols/oscar/liboscar/tests/Makefile.am b/kopete/protocols/oscar/liboscar/tests/Makefile.am index 10c3e473..14b0e3af 100644 --- a/kopete/protocols/oscar/liboscar/tests/Makefile.am +++ b/kopete/protocols/oscar/liboscar/tests/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO check_PROGRAMS = kunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest kunittest_SOURCES = main.cpp kunittest.cpp chatnavtests.cpp -kunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kunittest_LDADD = $(LIB_KDECORE) ../liboscar.la clientstream_test_SOURCES = clientstream_test.cpp diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index a3ee592e..15440eda 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -110,8 +110,8 @@ bool WinPopupLib::checkMessageDir() "Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR), TQString::tqfromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create")); if (tmpYesNo == KMessageBox::Yes) { - TQStringList kdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR)); - if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true; + TQStringList tdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR)); + if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true; } } else { KFileItem tmpFileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(WP_POPUP_DIR)); @@ -129,8 +129,8 @@ bool WinPopupLib::checkMessageDir() "Fix? (May need root password)").tqarg(WP_POPUP_DIR), TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); if (tmpYesNo == KMessageBox::Yes) { - TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR)); - if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true; + TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR)); + if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true; } } else { return true; @@ -305,8 +305,8 @@ void WinPopupLib::readMessages(const KFileItemList &items) "Fix? (May need root password)"), TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); if (tmpYesNo == KMessageBox::Yes) { - TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path())); - if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) { + TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path())); + if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) { if (!messageFile.remove()) KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("Still cannot remove it; please fix manually.")); } diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index a6805a7e..d16c8e6a 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -140,7 +140,7 @@ void WPProtocol::installSamba() TQStringList args; args += KStandardDirs::findExe("winpopup-install.sh"); args += KStandardDirs::findExe("winpopup-send.sh"); - if (KApplication::kdeinitExecWait("kdesu", args) == 0) + if (KApplication::tdeinitExecWait("tdesu", args) == 0) KMessageBox::information(Kopete::UI::Global::mainWidget(), i18n("The Samba configuration file is modified."), i18n("Configuration Succeeded")); else KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("Updating the Samba configuration file failed."), i18n("Configuration Failed")); diff --git a/kppp/ChangeLog b/kppp/ChangeLog index 36984467..ed067258 100644 --- a/kppp/ChangeLog +++ b/kppp/ChangeLog @@ -316,7 +316,7 @@ * modem.cpp: dropped ISTRIP option and made everything else "8-bit clean" by using unsigned char and removing 0x7F AND'ing. Characters like [§´°öäü] will work now. - * modem.cpp: use usleep() replacement from kdecore/fakes.cpp + * modem.cpp: use usleep() replacement from tdecore/fakes.cpp 1999-03-10 Harri Porten <porten@kde.org> diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt index 5451be71..22869a0b 100644 --- a/krdc/CMakeLists.txt +++ b/krdc/CMakeLists.txt @@ -60,6 +60,6 @@ tde_add_executable( krdc AUTOMOC maindialogbase.ui keycapturewidget.ui kservicelocator.cpp keycapturedialog.cpp kremoteview.cpp smartptr.cpp hostpreferences.cpp preferencesdialog.cpp maindialogwidget.cpp maindialog.cpp - LINK vnc-static rdp-static kdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext + LINK vnc-static rdp-static tdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp index fdbae624..abdfed2e 100644 --- a/krdc/keycapturedialog.cpp +++ b/krdc/keycapturedialog.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ // -// based on key capture code from kdelibs/kdeui/kshortcutdialog.cpp +// based on key capture code from kdelibs/tdeui/kshortcutdialog.cpp // #include "keycapturedialog.h" diff --git a/krdc/rdp/Makefile.am b/krdc/rdp/Makefile.am index cf9c75db..5150b855 100644 --- a/krdc/rdp/Makefile.am +++ b/krdc/rdp/Makefile.am @@ -8,4 +8,4 @@ librdp_la_SOURCES = krdpview.cpp rdphostpref.cpp rdpprefs.ui noinst_HEADERS = krdpview.h rdphostpref.h librdp_la_LIBADD = $(LIB_KDEUI) $(LIBJPEG) -librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +librdp_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/krfb/kinetd/CMakeLists.txt b/krfb/kinetd/CMakeLists.txt index d74481af..bad2d690 100644 --- a/krfb/kinetd/CMakeLists.txt +++ b/krfb/kinetd/CMakeLists.txt @@ -33,6 +33,6 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kinetd ) tde_add_kpart( kded_kinetd AUTOMOC SOURCES kinetd.cpp kinetd.skel LINK - srvloc-static kdnssd-shared kdeinit_kded-shared + srvloc-static kdnssd-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/krfb/krfb/CMakeLists.txt b/krfb/krfb/CMakeLists.txt index 7b49b694..9f720945 100644 --- a/krfb/krfb/CMakeLists.txt +++ b/krfb/krfb/CMakeLists.txt @@ -39,7 +39,7 @@ tde_add_executable( krfb AUTOMOC rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc LINK - krfbconfig-static vncserver-static srvloc-static kdeui-shared kio-shared jpeg Xext pthread ${XTST_LIBRARIES} + krfbconfig-static vncserver-static srvloc-static tdeui-shared kio-shared jpeg Xext pthread ${XTST_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/krfb/krfb/Makefile.am b/krfb/krfb/Makefile.am index 7d09d45d..f35e935f 100644 --- a/krfb/krfb/Makefile.am +++ b/krfb/krfb/Makefile.am @@ -13,7 +13,7 @@ krfb_SOURCES = rfbcontroller.cc xupdatescanner.cc main.cpp \ connectionwidget.ui krfbifaceimpl.cc krfbiface.skel \ trayicon.cpp connectiondialog.cc krfb_LDADD = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_KDEUI) $(LIBJPEG) -lkio -lDCOP -krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) -lkdefx +krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) -ltdefx appdatadir = $(kde_datadir)/krfb/pics appdata_DATA = eyes-open24.png eyes-closed24.png connection-side-image.png diff --git a/ksirc/CMakeLists.txt b/ksirc/CMakeLists.txt index c3b9c488..6c6a1bf8 100644 --- a/ksirc/CMakeLists.txt +++ b/ksirc/CMakeLists.txt @@ -51,9 +51,9 @@ install( FILES DESTINATION ${XDG_APPS_INSTALL_DIR} ) -##### ksirc (kdeinit) ########################### +##### ksirc (tdeinit) ########################### -tde_add_kdeinit_executable( ksirc AUTOMOC +tde_add_tdeinit_executable( ksirc AUTOMOC SOURCES toplevel.cpp charSelector.cpp chanButtons.cpp ksirc.cpp alistbox.cpp ahistlineedit.cpp iocontroller.cpp NewWindowDialog.cpp diff --git a/ksirc/KSTicker/Makefile.am b/ksirc/KSTicker/Makefile.am index 419f2fad..e97faf34 100644 --- a/ksirc/KSTicker/Makefile.am +++ b/ksirc/KSTicker/Makefile.am @@ -15,6 +15,6 @@ check_PROGRAMS = ksttest ksttest_SOURCES = ksttest.cpp ksttest_LDADD = libksticker.la ../ksopts.lo ../nickColourMaker.lo $(LIB_KDEUI) -ksttest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +ksttest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/ksirc/Makefile.am b/ksirc/Makefile.am index d8f68edc..04c1067a 100644 --- a/ksirc/Makefile.am +++ b/ksirc/Makefile.am @@ -13,15 +13,15 @@ check_PROGRAMS = testview dccMgrTest testview_SOURCES = kstextviewtest.cpp testview_LDADD = kstextview.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI) -testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor dccMgrTest_SOURCES = dccMgrTest.cpp dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI) -dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = ksirc.la +tdeinit_LTLIBRARIES = ksirc.la noinst_PROGRAMS = getdate diff --git a/ktalkd/ChangeLog b/ktalkd/ChangeLog index c2e26b51..089230f3 100644 --- a/ktalkd/ChangeLog +++ b/ktalkd/ChangeLog @@ -26,7 +26,7 @@ 2000-01-26 David Faure <faure@kde.org> * readcfg++.cpp, announce.cpp : remove HAVE_FUNC_SETENV tests and - putenv(), since ktalkd can now use kdecore's fake for setenv if setenv + putenv(), since ktalkd can now use tdecore's fake for setenv if setenv is not available. Thanks to Stefan.Becker@nokia.com. 2000-01-18 David Faure <faure@kde.org> @@ -348,7 +348,7 @@ 1998-04-20 David Faure <faure@kde.org> (0.5.3) - * Makefile.am: Removed -lkdeui, not needed. + * Makefile.am: Removed -ltdeui, not needed. * io.c: Corrected an awful bug (NEUBanner displayed instead of OPTinvitelines) * readcfg++.cpp: Added missing "/" before 'ktalkdrc' diff --git a/ktalkd/SNPRINTF_MISSING b/ktalkd/SNPRINTF_MISSING index 95e85366..50a04a89 100644 --- a/ktalkd/SNPRINTF_MISSING +++ b/ktalkd/SNPRINTF_MISSING @@ -17,5 +17,5 @@ and to Bert Haverkamp <b.r.j.haverkamp@its.tudelft.nl> for reporting bugs in thi I know, the really good approach would be to include the missing automatically, which can be done. But for this I need to know if vsnprintf.c compiles on all architectures where snprintf is missing. -If yes, I'll make the code in vsnprintf included automatically (in kdecore/fakes.cpp) +If yes, I'll make the code in vsnprintf included automatically (in tdecore/fakes.cpp) diff --git a/ktalkd/ktalkd/CMakeLists.txt b/ktalkd/ktalkd/CMakeLists.txt index 32a9cb73..091b664e 100644 --- a/ktalkd/ktalkd/CMakeLists.txt +++ b/ktalkd/ktalkd/CMakeLists.txt @@ -36,6 +36,6 @@ tde_add_executable( ktalkd SOURCES print.c repairs.c announce.cpp process.cpp readcfg++.cpp table.cpp talkd.cpp find_user.cpp threads.cpp options.cpp unixsock.cpp - LINK mach-static kdecore-shared + LINK mach-static tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ktalkd/ktalkdlg/CMakeLists.txt b/ktalkd/ktalkdlg/CMakeLists.txt index 9183ba5c..960deaa6 100644 --- a/ktalkd/ktalkdlg/CMakeLists.txt +++ b/ktalkd/ktalkdlg/CMakeLists.txt @@ -25,6 +25,6 @@ link_directories( tde_add_executable( ktalkdlg AUTOMOC SOURCES ktalkdlg.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/lanbrowsing/kcmlisa/CMakeLists.txt b/lanbrowsing/kcmlisa/CMakeLists.txt index fe01dbc2..12072365 100644 --- a/lanbrowsing/kcmlisa/CMakeLists.txt +++ b/lanbrowsing/kcmlisa/CMakeLists.txt @@ -34,6 +34,6 @@ tde_add_kpart( kcm_lanbrowser AUTOMOC SOURCES main.cpp setupwizard.cpp kcmlisa.cpp kcmreslisa.cpp kcmkiolan.cpp portsettingsbar.cpp findnic.cpp - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/lanbrowsing/kcmlisa/Makefile.am b/lanbrowsing/kcmlisa/Makefile.am index cd9750e9..56478072 100644 --- a/lanbrowsing/kcmlisa/Makefile.am +++ b/lanbrowsing/kcmlisa/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_lanbrowser.la kcm_lanbrowser_la_SOURCES = main.cpp setupwizard.cpp kcmlisa.cpp kcmreslisa.cpp kcmkiolan.cpp portsettingsbar.cpp findnic.cpp kcm_lanbrowser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kcm_lanbrowser_la_LIBADD = -lkdeui +kcm_lanbrowser_la_LIBADD = -ltdeui INCLUDES= $(all_includes) diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index 01bf9bc2..ea0ee2d9 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -291,7 +291,7 @@ void LisaSettings::save() TQString suCommand=TQString("cp '%1' '%2'; chmod 644 '%3'; rm -f '%4'").tqarg(m_tmpFilename).tqarg(m_configFilename).tqarg(m_configFilename).tqarg(m_tmpFilename); KProcess *proc = new KProcess(); connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(saveDone(KProcess *))); - *proc<<"kdesu"<<"-c"<<suCommand; + *proc<<"tdesu"<<"-c"<<suCommand; KApplication::setOverrideCursor(TQt::waitCursor); setEnabled(false); if ( !proc->start() ) diff --git a/lanbrowsing/kcmlisa/kcmlisa.h b/lanbrowsing/kcmlisa/kcmlisa.h index e3fbf46c..f8d606b2 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.h +++ b/lanbrowsing/kcmlisa/kcmlisa.h @@ -48,7 +48,7 @@ class LisaSettings:public KCModule protected slots: void slotChanged(); void autoSetup(); - void saveDone(KProcess *); // called after the kdesud returns (on save) + void saveDone(KProcess *); // called after the tdesud returns (on save) void suggestSettings(); protected: KConfig m_config; diff --git a/wifi/CMakeLists.txt b/wifi/CMakeLists.txt index cddd1dea..1e1ae90b 100644 --- a/wifi/CMakeLists.txt +++ b/wifi/CMakeLists.txt @@ -48,6 +48,6 @@ tde_add_executable( kwifimanager AUTOMOC interface_dcop.skel networkscanning.cpp kwifimanager.cpp locator.cpp main.cpp picture.cpp speed.cpp statistics.cpp status.cpp strength.cpp asusled.cpp - LINK kdeui-shared ${ARTS_LIBRARIES} ${IW_LIBRARY} + LINK tdeui-shared ${ARTS_LIBRARIES} ${IW_LIBRARY} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index b7d49abb..7fe46f95 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -457,9 +457,9 @@ KWiFiManagerApp::slotDisableRadio () // FIXME my Cisco Aironet 350 has two interfaces eth1 and wifi1, // kwifimanager works on wifi 1 where txpower does not work -- jriddell - //*disablePower << "kdesu" << "iwconfig" << "eth1" << "txpower" << onOrOff; + //*disablePower << "tdesu" << "iwconfig" << "eth1" << "txpower" << onOrOff; - *disablePower << "kdesu" << "iwconfig" << interface << "txpower" << onOrOff; + *disablePower << "tdesu" << "iwconfig" << interface << "txpower" << onOrOff; connect( disablePower, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotDisablePowerProcessExited()) ); disablePower->start(KProcess::NotifyOnExit); } @@ -558,7 +558,7 @@ void KWiFiManagerApp::slotStartConfigEditor () { KProcess startConf; - startConf << "kdesu" << locate("exe", "kcmshell") << "kcmwifi"; + startConf << "tdesu" << locate("exe", "kcmshell") << "kcmwifi"; startConf.start (KProcess::DontCare); } diff --git a/wifi/kwireless/CMakeLists.txt b/wifi/kwireless/CMakeLists.txt index 5acfb5ae..e6a9bad3 100644 --- a/wifi/kwireless/CMakeLists.txt +++ b/wifi/kwireless/CMakeLists.txt @@ -32,6 +32,6 @@ tde_add_kpart( libkwireless AUTOMOC SOURCES kwireless.cpp kwirelesswidget.cpp linuxwirelesswidget.cpp propertytablebase.ui propertytable.cpp - LINK kdeui-shared ${IW_LIBRARY} + LINK tdeui-shared ${IW_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp index 429cb525..0e2a42a8 100644 --- a/wifi/networkscanning.cpp +++ b/wifi/networkscanning.cpp @@ -144,7 +144,7 @@ NetworkScanning::switchToNetwork() delete tempfile; // autoDeletion off, so the file remains on disk KProcess switchProc; - switchProc << "kdesu" << tempfilename; + switchProc << "tdesu" << tempfilename; switchProc.start( KProcess::Block ); remove(tempfilename.ascii()); |