From daee8329636cf2dad3eaebe90f155881551a365c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:20:06 -0600 Subject: [PATCH] Additional kde to tde renaming --- knetworkmanager-0.9/configure.in.in | 6 +++--- knetworkmanager-0.9/src/CMakeLists.txt | 6 +++--- knetworkmanager-0.9/src/Makefile.am | 2 +- knetworkmanager-0.9/src/knetworkmanager_dummy.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/knetworkmanager-0.9/configure.in.in b/knetworkmanager-0.9/configure.in.in index a6734ae..2c9ed09 100644 --- a/knetworkmanager-0.9/configure.in.in +++ b/knetworkmanager-0.9/configure.in.in @@ -89,17 +89,17 @@ if test "x$with_dialup" != "xno"; then case $with_distro in suse) AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, - "kdesu --nonewdcop /sbin/yast2 modem", + "tdesu --nonewdcop /sbin/yast2 modem", [Command to launch dial up configuration tool]) ;; gentoo) AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, - "kdesu --nonewdcop ${KDEDIR}/bin/kppp", + "tdesu --nonewdcop ${KDEDIR}/bin/kppp", [Command to launch dial up configuration tool]) ;; fedora) AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, - "kdesu --nonewdcop /usr/bin/kppp", + "tdesu --nonewdcop /usr/bin/kppp", [Command to launch dial up configuration tool]) ;; *) diff --git a/knetworkmanager-0.9/src/CMakeLists.txt b/knetworkmanager-0.9/src/CMakeLists.txt index ec1d648..ba1e362 100644 --- a/knetworkmanager-0.9/src/CMakeLists.txt +++ b/knetworkmanager-0.9/src/CMakeLists.txt @@ -41,9 +41,9 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/knetworkmanager ) install( FILES knetworkmanager_plugin.desktop knetworkmanager_vpnplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -##### knetworkmanager (kdeinit) ################# +##### knetworkmanager (tdeinit) ################# -tde_add_kdeinit_executable( knetworkmanager AUTOMOC +tde_add_tdeinit_executable( knetworkmanager AUTOMOC SOURCES connection_setting_info.ui connection_setting_wireless_security_wep.ui connection_setting_gsm.ui connection_setting_cdma.ui connection_setting_ipv4.ui connection_setting_ppp.ui @@ -89,5 +89,5 @@ tde_add_kdeinit_executable( knetworkmanager AUTOMOC knetworkmanager-pluginmanager.cpp knetworkmanager-vpnservice.cpp knetworkmanager-vpnmanager.cpp knetworkmanager-vpnauthenticationdialog.cpp devicetraycomponent.cpp traycomponent.cpp vpn_tray_component.cpp secret_storage_plugin.cpp - LINK knm_dbus-static kdeui-shared kutils-shared ${DBUS_TQT_LIBRARIES} + LINK knm_dbus-static tdeui-shared kutils-shared ${DBUS_TQT_LIBRARIES} ) diff --git a/knetworkmanager-0.9/src/Makefile.am b/knetworkmanager-0.9/src/Makefile.am index 3527112..a18146e 100644 --- a/knetworkmanager-0.9/src/Makefile.am +++ b/knetworkmanager-0.9/src/Makefile.am @@ -95,7 +95,7 @@ messages: rc.cpp # of the other Makefile.am variables bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = knetworkmanager.la +tdeinit_LTLIBRARIES = knetworkmanager.la KDE_CXXFLAGS = -UQT_NO_ASCII_CAST ${LIBNMUTIL_CFLAGS} diff --git a/knetworkmanager-0.9/src/knetworkmanager_dummy.cpp b/knetworkmanager-0.9/src/knetworkmanager_dummy.cpp index 68be1e7..efd89d8 100644 --- a/knetworkmanager-0.9/src/knetworkmanager_dummy.cpp +++ b/knetworkmanager-0.9/src/knetworkmanager_dummy.cpp @@ -1,3 +1,3 @@ #include extern "C" int kdemain(int argc, char* argv[]); -extern "C" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); } +extern "C" KDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }