Rename a number of libraries and executables to avoid conflicts with KDE4

README

@@ -25,7 +25,7 @@ administrator might need:
 * kdat
     Tape backup tool.
 
-* kfile-plugins
+* tdefile-plugins
     Make Konquerer display additional info on about *.dep and *.rpm files.
 
 * kpackage

doc/knetworkconf/Makefile.am

@@ -1,4 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = knetworkconf
-
-

doc/knetwortdeconf/Makefile.am

@@ -0,0 +1,4 @@
+KDE_LANG = en
+KDE_DOCS = knetwortdeconf
+
+

doc/knetwortdeconf/index.docbook

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY knetworkconf "<application>KNetworkConf</application>">
-  <!ENTITY kappname "&knetworkconf;">
+  <!ENTITY knetwortdeconf "<application>KNetworkConf</application>">
+  <!ENTITY kappname "&knetwortdeconf;">
   <!ENTITY package "tdeadmin">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -65,7 +65,7 @@ document.</revremark>
 <releaseinfo>1.0</releaseinfo>
 
 <abstract>
-<para>This manual explains how to install and use &knetworkconf;, a module for
+<para>This manual explains how to install and use &knetwortdeconf;, a module for
 &kcontrolcenter; that enables management of Network Interfaces, Routing and DNS
 properties.</para>
 </abstract>
@@ -86,9 +86,9 @@ integrated interface from which to manage a wide variety of system and
 desktop settings and preferences. &kcontrolcenter; can be started by selecting
 <menuchoice><guimenu>TDE Menu</guimenu><guimenuitem>&kcontrolcenter;</guimenuitem></menuchoice>.</para>
 
-<para>The &knetworkconf; package was developed to enable users to manage TCP/IP
+<para>The &knetwortdeconf; package was developed to enable users to manage TCP/IP
 networking settings in the same way they manage other system settings from
-&kcontrolcenter;. Tasks enabled by &knetworkconf; provide users with a simple
+&kcontrolcenter;. Tasks enabled by &knetwortdeconf; provide users with a simple
 interface from which to perform the following tasks:</para>
 
 <itemizedlist>
@@ -117,7 +117,7 @@ interface from which to perform the following tasks:</para>
 
 <para>Once installed a new module called <guimenuitem>Network
 Settings</guimenuitem> is displayed in the &kcontrolcenter;.
-To start the <application>Network Settings</application> (&knetworkconf;) module select <menuchoice>
+To start the <application>Network Settings</application> (&knetwortdeconf;) module select <menuchoice>
 <guimenuitem>&kcontrolcenter;</guimenuitem> <guimenuitem>Internet &amp; Network</guimenuitem>
 <guimenuitem>Network Settings</guimenuitem> </menuchoice> in the &kmenu;.</para>
 
@@ -126,13 +126,13 @@ To start the <application>Network Settings</application> (&knetworkconf;) module
 <imagedata fileref="11.png" format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>&knetworkconf; in user mode</phrase>
+<phrase>&knetwortdeconf; in user mode</phrase>
 </textobject>
 </mediaobject>
 
-<para>It is important to understand that &knetworkconf; cannot install
+<para>It is important to understand that &knetwortdeconf; cannot install
 networking hardware. As such physical devices and their drivers must be
-properly installed and configured in order for &knetworkconf; to display the
+properly installed and configured in order for &knetwortdeconf; to display the
 device and enable management of networking properties.</para>
 
 <para>In most cases drivers for networking hardware and other devices are
@@ -211,14 +211,14 @@ click the <guibutton>Administrator Mode</guibutton> button located bottom
 left of the module. Enter your password when prompted.</para>
 
 <screenshot>
-<screeninfo>&knetworkconf; in administrator mode</screeninfo>
+<screeninfo>&knetwortdeconf; in administrator mode</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="01.png"
 format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>&knetworkconf; in administrator mode</phrase>
+<phrase>&knetwortdeconf; in administrator mode</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
@@ -277,7 +277,7 @@ fileref="03.png"
 format="PNG"/>
 </imageobject>
 <textobject>
-<phrase>The &knetworkconf; interface</phrase>
+<phrase>The &knetwortdeconf; interface</phrase>
 </textobject>
 </mediaobject>
 
@@ -748,8 +748,8 @@ following command.</para>
 <title>How to obtain knetwork-conf</title>
 
 <para>knetwork-conf's home page is at <ulink
-url="http://knetworkconf.sourceforge.net"
->http://knetworkconf.sourceforge.net</ulink> where you at least can download
+url="http://knetwortdeconf.sourceforge.net"
+>http://knetwortdeconf.sourceforge.net</ulink> where you at least can download
 source packages. </para>
 </sect1>
 
@@ -778,7 +778,7 @@ packages. Install them from &konsole; using
 installed; you also need the development packages which include libraries
 and other stuff. </para>
 
-<para>Recommended for advanced users only. Otherwise, compiling &knetworkconf;
+<para>Recommended for advanced users only. Otherwise, compiling &knetwortdeconf;
 is not difficult.  The following commands should do it.</para>
 
 <screen>
@@ -801,7 +801,7 @@ let us know.</para>
 
 <para>In the first section of this chapter, you'll find some valuable
 information about networking basics. In the second, all configuration files
-on your disk which can be changed by &knetworkconf; will be discussed. </para>
+on your disk which can be changed by &knetwortdeconf; will be discussed. </para>
 
 <sect1 id="networking-overview">
 <title>IPv4 Networking</title>
@@ -894,7 +894,7 @@ gateway-computer. </para>
 <title>Configuration files</title>
 
 <para>In this section you'll find the configuration files which are touched
-by &knetworkconf; and where they reside in the file system of the different
+by &knetwortdeconf; and where they reside in the file system of the different
 distributions. </para>
 
 <sect2 id="resolv.conf">

kcron/ktapp.cpp

@@ -13,7 +13,7 @@
 #include <kmenubar.h>
 #include <kstdaccel.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <klocale.h>       // i18n()
 #include <kstdaction.h>

kcron/kttask.cpp

@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kaccel.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>

kdat/KDatMainWindow.cpp

@@ -35,7 +35,7 @@
 #include <kpopupmenu.h>
 #include <ktoolbar.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstringhandler.h>
 #include <kpushbutton.h>

kdat/LoggerWidget.cpp

@@ -21,7 +21,7 @@
 #include <tqmultilineedit.h>
 
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "LoggerWidget.h"
 #include <klocale.h>

kdat/Options.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "Options.h"
 

kdat/OptionsDlgWidget.ui

@@ -364,7 +364,7 @@ You must still specify the block size.</string>
 </connections>
 <includes>
     <include location="global" impldecl="in implementation">kapplication.h</include>
-    <include location="global" impldecl="in implementation">kfiledialog.h</include>
+    <include location="global" impldecl="in implementation">tdefiledialog.h</include>
     <include location="global" impldecl="in implementation">kmessagebox.h</include>
     <include location="global" impldecl="in implementation">kglobal.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>

kdat/VerifyOptDlg.cpp

@@ -24,7 +24,7 @@
 #include <tqlistbox.h>
 
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 

kfile-plugins/deb/Makefile.am

@@ -1,22 +0,0 @@
-## Makefile.am for deb file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_deb.h
-
-kde_module_LTLIBRARIES = kfile_deb.la
-
-kfile_deb_la_SOURCES = kfile_deb.cpp
-kfile_deb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_deb_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kfile_deb.pot
-
-services_DATA = kfile_deb.desktop
-servicesdir = $(kde_servicesdir)

kfile-plugins/rpm/Makefile.am

@@ -1,22 +0,0 @@
-## Makefile.am for rpm file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_rpm.h
-
-kde_module_LTLIBRARIES = kfile_rpm.la
-
-kfile_rpm_la_SOURCES = kfile_rpm.cpp
-kfile_rpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_rpm_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kfile_rpm.pot
-
-services_DATA = kfile_rpm.desktop
-servicesdir = $(kde_servicesdir)

knetworkconf/Makefile.am

@@ -1 +0,0 @@
-SUBDIRS = knetworkconf backends pixmaps 

knetworkconf/backends/configure.in.in

@@ -1,15 +0,0 @@
-dnl ==============================================================
-dnl Set SCRIPTS_DIR, FILES_DIR & LOCALE_DIR
-dnl ==============================================================
-KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
-scriptsdir="$KDE_DATADIR/knetworkconf/backends"
-
-AC_SUBST(scriptsdir)
-
-dnl ==============================================================
-dnl END: Set SCRIPTS_DIR, FILES_DIR & LOCALE_DIR
-dnl ==============================================================
-
-dnl Keep the comment on the line below, it works that way.
-dnl AC_OUTPUT(knetworkconf/backends/system-tools-backends.pc knetworkconf/backends/network-conf knetworkconf/backends/debug.pl knetworkconf/backends/file.pl knetworkconf/backends/general.pl knetworkconf/backends/network.pl knetworkconf/backends/parse.pl knetworkconf/backends/platform.pl knetworkconf/backends/process.pl knetworkconf/backends/replace.pl knetworkconf/backends/report.pl knetworkconf/backends/service-list.pl knetworkconf/backends/service.pl knetworkconf/backends/util.pl knetworkconf/backends/xml.pl)
-echo "Backend configured."

knetworkconf/knetworkconf/Makefile.am

@@ -1,41 +0,0 @@
-# set the include path for X, qt and KDE
-#INCLUDES= $(all_includes)
-AM_CPPFLAGS = $(all_includes)
-
-# We use deprecated routines in QButton, undefine QT_NO_COMPAT.
-KDE_CXXFLAGS = -UQT_NO_COMPAT
-
-METASOURCES = AUTO
-#bin_PROGRAMS = knetworkconf
-
-kde_module_LTLIBRARIES = kcm_knetworkconfmodule.la
-
-kcm_knetworkconfmodule_la_LIBADD   =  $(LIB_TDEUI)
-
-# the library search path. 
-kcm_knetworkconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-
-## INCLUDES were found outside tdevelop specific part
-
-kcm_knetworkconfmodule_la_SOURCES = kselectdistrodlg.ui kknownhostinfo.cpp \
-		kinterfaceupdowndlg.ui kaddknownhostdlg.ui kdetectdistrodlg.ui knetworkconfmodule.cpp \
-		kroutinginfo.cpp kreloadnetworkdlg.ui kaddressvalidator.cpp kdnsinfo.cpp \
-		knetworkinfo.cpp kadddevicedlg.ui kadddnsserverdlg.ui knetworkconfigparser.cpp \
-		knetworkinterface.cpp knetworkconfdlg.ui knetworkconf.cpp main.cpp kadddevicedlgextension.ui \
-		knetworkconfiface.skel kwirelessinterface.cpp kadddevicewifiext.ui 	kadddevicecontainer.cpp \
-	kprofileslistviewtooltip.cpp
-
-
-EXTRA_DIST = main.cpp knetworkconf.cpp knetworkconf.h knetworkconf.desktop cr16-app-knetworkconf.png cr22-app-knetworkconf.png cr32-app-knetworkconf.png knetworkconfdlg.ui knetworkinterface.cpp knetworkinterface.h knetworkconfigparser.cpp knetworkconfigparser.h kadddnsserverdlg.ui kadddevicedlg.ui knetworkinfo.cpp knetworkinfo.h kdnsinfo.cpp kdnsinfo.h kaddressvalidator.cpp kaddressvalidator.h kreloadnetworkdlg.ui network_card.png kroutinginfo.cpp kroutinginfo.h knetworkconfmodule.cpp knetworkconfmodule.h kdetectdistrodlg.ui kaddknownhostdlg.ui kinterfaceupdowndlg.ui kadddnsserverdlg.ui.h kadddevicedlg.ui.h kaddknownhostdlg.ui.h kknownhostinfo.cpp kknownhostinfo.h kselectdistrodlg.ui kcm_knetworkconfmodule version.h
-
-xdg_apps_DATA = kcm_knetworkconfmodule.desktop 
-
-KDE_ICON = AUTO
-
-messages: rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
-	if test -n "$$LIST"; then \
-	 $(XGETTEXT) $$LIST -o $(podir)/knetworkconf.pot; \
-	fi
-
-noinst_HEADERS = kprofileslistviewtooltip.h

knetworkconf/knetworkconf/kcm_knetworkconfmodule

@@ -1 +0,0 @@
-?package(local.kcm_knetworkconfmodule.desktop):needs="x11" kde_filename="kcm_knetworkconfmodule" section="System/Configuration/KDE/Network" command="kcmshell kcm_knetworkconfmodule" icon="locolor/32x32/apps/knetworkconf.png" longtitle="Configure your Network settings" title="Network Settings" kde_opt="Encoding=UTF-8\\nX-TDE-RootOnly=true\\nX-TDE-ModuleType=Library\\nX-TDE-Library=knetworkconfmodule\\nX-TDE-FactoryName=knetworkconfmodule\\nX-TDE-ParentApp=kcontrol\\nType=Application\\nDocPath=knetworkconf/index.docbook\\nComment[es]=Configurar las propiedades de Red\\nComment[de]=Netzwerkschnittstellen konfigurieren\\nTerminal=0\\nName[es]=Propiedades de Red\\nName[de]=Netzwerkschnittstellen konfigurieren\\nGenericName=Configure TCP/IP settings\\nGenericName[es]=Configurar las propiedades de red\\nKeywords=Network,DNS,routes,interfaces\\n"

knetwortdeconf/Doxyfile

@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = knetworkconf
+PROJECT_NAME           = knetwortdeconf
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = 
 OUTPUT_LANGUAGE        = English
@@ -57,7 +57,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = /home/juancho/cvs_proyectos/knetworkconf_0.4.9
+INPUT                  = /home/juancho/cvs_proyectos/knetwortdeconf_0.4.9
 FILE_PATTERNS          = *.c \
                          *.cc \
                          *.cxx \

knetwortdeconf/LEAME

@@ -2,7 +2,7 @@ KNetworkConf 0.6.1 - Un m
 para configurar las propiedades de red.
 Juan Luis Baptiste M. <juan.baptiste@kdemail.net>
 Colombia 2003 - 2005
-http://www.merlinux.org/knetworkconf/
+http://www.merlinux.org/knetwortdeconf/
 
 ------------------------------------------------------------
 
@@ -79,5 +79,5 @@ y correr el comando update-menus despu
 4. Contacto
 Para reportar errores, o si tiene comentarios o sugerencias acerca
 de KNetworkConf, por favor escriba a las listas de correo del proyecto:
-knetworkconf-devel@lists.sourceforge.net o knetworkconf-users@lists.sourceforge.net.
+knetwortdeconf-devel@lists.sourceforge.net o knetwortdeconf-users@lists.sourceforge.net.
 

knetwortdeconf/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = knetwortdeconf backends pixmaps 

knetwortdeconf/README

@@ -1,7 +1,7 @@
 KNetworkConf 0.6.1 - A KDE control Center Module to confiure Network settings.
 Juan Luis Baptiste M. <juan.baptiste@kdemail.net>
 Colombia, 2003 - 2005
-http://www.merlinux.org/knetworkconf/
+http://www.merlinux.org/knetwortdeconf/
 
 ------------------------------------------------------------
 
@@ -69,6 +69,6 @@ install the files in the correct path and run update-menus after make install.
 
 4. Contact
 To report bugs or if you have any comments or sugestions about KNetworkConf,
-please write to the mailing lists knetworkconf-devel@lists.sourceforge.net or
-knetworkconf-users@lists.sourceforge.net.
+please write to the mailing lists knetwortdeconf-devel@lists.sourceforge.net or
+knetwortdeconf-users@lists.sourceforge.net.
 

knetwortdeconf/backends/configure.in.in

@@ -0,0 +1,15 @@
+dnl ==============================================================
+dnl Set SCRIPTS_DIR, FILES_DIR & LOCALE_DIR
+dnl ==============================================================
+KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
+scriptsdir="$KDE_DATADIR/knetwortdeconf/backends"
+
+AC_SUBST(scriptsdir)
+
+dnl ==============================================================
+dnl END: Set SCRIPTS_DIR, FILES_DIR & LOCALE_DIR
+dnl ==============================================================
+
+dnl Keep the comment on the line below, it works that way.
+dnl AC_OUTPUT(knetwortdeconf/backends/system-tools-backends.pc knetwortdeconf/backends/network-conf knetwortdeconf/backends/debug.pl knetwortdeconf/backends/file.pl knetwortdeconf/backends/general.pl knetwortdeconf/backends/network.pl knetwortdeconf/backends/parse.pl knetwortdeconf/backends/platform.pl knetwortdeconf/backends/process.pl knetwortdeconf/backends/replace.pl knetwortdeconf/backends/report.pl knetwortdeconf/backends/service-list.pl knetwortdeconf/backends/service.pl knetwortdeconf/backends/util.pl knetwortdeconf/backends/xml.pl)
+echo "Backend configured."

knetwortdeconf/knetwortdeconf-mdk.spec

@@ -1,4 +1,4 @@
-%define name knetworkconf
+%define name knetwortdeconf
 %define version 0.6.1
 %define release 1mdk
 #%define _unpackaged_files_terminate_build 0
@@ -8,12 +8,12 @@ Name:      	%{name}
 Version:   	%{version}
 Release:   	%{release}
 License: 	GPL
-Url:       	http://www.merlinux.org/knetworkconf/
+Url:       	http://www.merlinux.org/knetwortdeconf/
 Group:     	Networking/Other
 Source:    	%{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-buildroot
 Requires: 	%_bindir/tdesu
-Patch1:		knetworkconf-0.6-fix-menu.patch.bz2
+Patch1:		knetwortdeconf-0.6-fix-menu.patch.bz2
 
 %description
 KNetworkConf is a TDE Control Center module to configure  the Network 
@@ -64,7 +64,7 @@ install -m 644 %{name}/lo32-app-%{name}.png %buildroot/%{_iconsdir}/%{name}.png
 install -m 644 %{name}/network_card.png %buildroot/%{_prefix}/share/pixmaps/network_card.png
 
 mkdir -p %{buildroot}/%{_menudir}
-kdedesktop2mdkmenu.pl %{name} System/Configuration/KDE/Network  $RPM_BUILD_ROOT%{_datadir}/applications/tde/kcm_knetworkconfmodule.desktop $RPM_BUILD_ROOT%{_menudir}/%{name}
+kdedesktop2mdkmenu.pl %{name} System/Configuration/KDE/Network  $RPM_BUILD_ROOT%{_datadir}/applications/tde/kcm_knetwortdeconfmodule.desktop $RPM_BUILD_ROOT%{_menudir}/%{name}
 
 
 %post
@@ -81,16 +81,16 @@ rm -rf $RPM_BUILD_ROOT/*
 %files -f %name.lang
 
 #Quick Hack: for some reason the %find_lang command doesn't find 
-#the translations files, it outputs a knetworkconf.lang file full
+#the translations files, it outputs a knetwortdeconf.lang file full
 #of empty lines instead of the following ones:
-%lang(de) /usr/share/locale/de/LC_MESSAGES/knetworkconfmodule.mo
-%lang(es) /usr/share/locale/es/LC_MESSAGES/knetworkconfmodule.mo
-%lang(eu) /usr/share/locale/eu/LC_MESSAGES/knetworkconfmodule.mo
-%lang(fr) /usr/share/locale/fr/LC_MESSAGES/knetworkconfmodule.mo
-%lang(hu) /usr/share/locale/hu/LC_MESSAGES/knetworkconfmodule.mo
-%lang(no) /usr/share/locale/no/LC_MESSAGES/knetworkconfmodule.mo
-%lang(pl) /usr/share/locale/pl/LC_MESSAGES/knetworkconfmodule.mo
-%lang(pt_BR) /usr/share/locale/pt_BR/LC_MESSAGES/knetworkconfmodule.mo
+%lang(de) /usr/share/locale/de/LC_MESSAGES/knetwortdeconfmodule.mo
+%lang(es) /usr/share/locale/es/LC_MESSAGES/knetwortdeconfmodule.mo
+%lang(eu) /usr/share/locale/eu/LC_MESSAGES/knetwortdeconfmodule.mo
+%lang(fr) /usr/share/locale/fr/LC_MESSAGES/knetwortdeconfmodule.mo
+%lang(hu) /usr/share/locale/hu/LC_MESSAGES/knetwortdeconfmodule.mo
+%lang(no) /usr/share/locale/no/LC_MESSAGES/knetwortdeconfmodule.mo
+%lang(pl) /usr/share/locale/pl/LC_MESSAGES/knetwortdeconfmodule.mo
+%lang(pt_BR) /usr/share/locale/pt_BR/LC_MESSAGES/knetwortdeconfmodule.mo
 
 %defattr(-,root,root,0755)
 %doc README COPYING AUTHORS LEAME

knetwortdeconf/knetwortdeconf.spec

@@ -1,7 +1,7 @@
 # This spec file was generated using Kpp
 # If you find any problems with this spec file please report
 # the error to ian geiser <geiseri@msoe.edu>
-%define name knetworkconf
+%define name knetwortdeconf
 %define version 0.5
 %define release 1mdk
 
@@ -10,7 +10,7 @@ Name:      %{name}
 Version:   %{version}
 Release:   %{release}
 License: GPL
-Url:       http://www.merlinux.org/knetworkconf/
+Url:       http://www.merlinux.org/knetwortdeconf/
 Group:     Networking/Other
 Source:    %{name}-%{version}.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-buildroot
@@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT/*
 %defattr(-,root,root,0755)
 %doc README COPYING AUTHORS LEAME
 %{_libdir}/menu/*
-%{_bindir}/knetworkconf
+%{_bindir}/knetwortdeconf
 %{_iconsdir}/*.png
 %{_miconsdir}/%{name}.png
 %_datadir/pixmaps/network_card.png
@@ -83,11 +83,11 @@ rm -rf $RPM_BUILD_ROOT/*
 #%_datadir/applnk/Internet/*
 %_datadir/icons/locolor/16x16/apps/*
 %_datadir/icons/locolor/32x32/apps/*
-%_docdir/HTML/en/knetworkconf
-%_docdir/HTML/de/knetworkconf
-%_docdir/HTML/es/knetworkconf
-%_datadir/apps/knetworkconf/backends/*
-%_datadir/apps/knetworkconf/pixmaps/*
+%_docdir/HTML/en/knetwortdeconf
+%_docdir/HTML/de/knetwortdeconf
+%_docdir/HTML/es/knetwortdeconf
+%_datadir/apps/knetwortdeconf/backends/*
+%_datadir/apps/knetwortdeconf/pixmaps/*
 %{_libdir}/pkgconfig/system-tools-backends.pc
 
 

knetwortdeconf/knetwortdeconf/Makefile.am

@@ -0,0 +1,41 @@
+# set the include path for X, qt and KDE
+#INCLUDES= $(all_includes)
+AM_CPPFLAGS = $(all_includes)
+
+# We use deprecated routines in QButton, undefine QT_NO_COMPAT.
+KDE_CXXFLAGS = -UQT_NO_COMPAT
+
+METASOURCES = AUTO
+#bin_PROGRAMS = knetwortdeconf
+
+kde_module_LTLIBRARIES = kcm_knetwortdeconfmodule.la
+
+kcm_knetwortdeconfmodule_la_LIBADD   =  $(LIB_TDEUI)
+
+# the library search path. 
+kcm_knetwortdeconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+
+## INCLUDES were found outside tdevelop specific part
+
+kcm_knetwortdeconfmodule_la_SOURCES = kselectdistrodlg.ui kknownhostinfo.cpp \
+		kinterfaceupdowndlg.ui kaddknownhostdlg.ui kdetectdistrodlg.ui knetwortdeconfmodule.cpp \
+		kroutinginfo.cpp kreloadnetworkdlg.ui kaddressvalidator.cpp kdnsinfo.cpp \
+		knetworkinfo.cpp kadddevicedlg.ui kadddnsserverdlg.ui knetwortdeconfigparser.cpp \
+		knetworkinterface.cpp knetwortdeconfdlg.ui knetwortdeconf.cpp main.cpp kadddevicedlgextension.ui \
+		knetwortdeconfiface.skel kwirelessinterface.cpp kadddevicewifiext.ui 	kadddevicecontainer.cpp \
+	kprofileslistviewtooltip.cpp
+
+
+EXTRA_DIST = main.cpp knetwortdeconf.cpp knetwortdeconf.h knetwortdeconf.desktop cr16-app-knetwortdeconf.png cr22-app-knetwortdeconf.png cr32-app-knetwortdeconf.png knetwortdeconfdlg.ui knetworkinterface.cpp knetworkinterface.h knetwortdeconfigparser.cpp knetwortdeconfigparser.h kadddnsserverdlg.ui kadddevicedlg.ui knetworkinfo.cpp knetworkinfo.h kdnsinfo.cpp kdnsinfo.h kaddressvalidator.cpp kaddressvalidator.h kreloadnetworkdlg.ui network_card.png kroutinginfo.cpp kroutinginfo.h knetwortdeconfmodule.cpp knetwortdeconfmodule.h kdetectdistrodlg.ui kaddknownhostdlg.ui kinterfaceupdowndlg.ui kadddnsserverdlg.ui.h kadddevicedlg.ui.h kaddknownhostdlg.ui.h kknownhostinfo.cpp kknownhostinfo.h kselectdistrodlg.ui kcm_knetwortdeconfmodule version.h
+
+xdg_apps_DATA = kcm_knetwortdeconfmodule.desktop 
+
+KDE_ICON = AUTO
+
+messages: rc.cpp
+	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	if test -n "$$LIST"; then \
+	 $(XGETTEXT) $$LIST -o $(podir)/knetwortdeconf.pot; \
+	fi
+
+noinst_HEADERS = kprofileslistviewtooltip.h

knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule

@@ -0,0 +1 @@
+?package(local.kcm_knetwortdeconfmodule.desktop):needs="x11" kde_filename="kcm_knetwortdeconfmodule" section="System/Configuration/KDE/Network" command="tdecmshell kcm_knetwortdeconfmodule" icon="locolor/32x32/apps/knetwortdeconf.png" longtitle="Configure your Network settings" title="Network Settings" kde_opt="Encoding=UTF-8\\nX-TDE-RootOnly=true\\nX-TDE-ModuleType=Library\\nX-TDE-Library=knetwortdeconfmodule\\nX-TDE-FactoryName=knetwortdeconfmodule\\nX-TDE-ParentApp=kcontrol\\nType=Application\\nDocPath=knetwortdeconf/index.docbook\\nComment[es]=Configurar las propiedades de Red\\nComment[de]=Netzwerkschnittstellen konfigurieren\\nTerminal=0\\nName[es]=Propiedades de Red\\nName[de]=Netzwerkschnittstellen konfigurieren\\nGenericName=Configure TCP/IP settings\\nGenericName[es]=Configurar las propiedades de red\\nKeywords=Network,DNS,routes,interfaces\\n"

knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule.desktop

@@ -2,12 +2,12 @@
 X-TDE-RootOnly=true
 Categories=Qt;TDE;Settings;X-TDE-settings-network;
 X-TDE-ModuleType=Library
-X-TDE-Library=knetworkconfmodule
-X-TDE-FactoryName=knetworkconfmodule
+X-TDE-Library=knetwortdeconfmodule
+X-TDE-FactoryName=knetwortdeconfmodule
 Type=Application
-Exec=kcmshell kcm_knetworkconfmodule
-Icon=knetworkconf
-DocPath=knetworkconf/index.html
+Exec=tdecmshell kcm_knetwortdeconfmodule
+Icon=knetwortdeconf
+DocPath=knetwortdeconf/index.html
 
 Comment=Configure Network Settings
 Comment[ar]=إعداد تعيينات الشبكة

knetwortdeconf/knetwortdeconf/knetwortdeconf.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-                          knetworkconf.cpp  -  description
+                          knetwortdeconf.cpp  -  description
                              -------------------
     begin                : Sun Jan 12 8:54:19 UTC 2003
     copyright            : (C) 2003 by Juan Luis Baptiste
@@ -17,7 +17,7 @@
 
 #include <kiconloader.h>
 
-#include "knetworkconf.h"
+#include "knetwortdeconf.h"
 
 KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name)
 {
@@ -44,7 +44,7 @@ KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNe
 
   // Register with DCOP - No longer needed as now we are a kcontrol module?
   if ( !kapp->dcopClient()->isRegistered() ) {
-    kapp->dcopClient()->registerAs( "knetworkconf" );
+    kapp->dcopClient()->registerAs( "knetwortdeconf" );
     kapp->dcopClient()->setDefaultObject( objId() );
   }
 
@@ -499,8 +499,8 @@ void KNetworkConf::helpSlot(){
 void KNetworkConf::aboutSlot(){
   KAboutApplication *about = new KAboutApplication(kapp->aboutData(),0);
 
- // about->setLogo(locate("icon","knetworkconf.png"));
-  //tqDebug("locate icon= %s",locate("icon","knetworkconf.png").latin1());
+ // about->setLogo(locate("icon","knetwortdeconf.png"));
+  //tqDebug("locate icon= %s",locate("icon","knetwortdeconf.png").latin1());
 
   about->show();
 }
@@ -1183,4 +1183,4 @@ void KNetworkConf::updateProfileSlot()
   }
 }
 
-#include "knetworkconf.moc"
+#include "knetwortdeconf.moc"

knetwortdeconf/knetwortdeconf/knetwortdeconf.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
-Exec=tdesu knetworkconf -caption "%c" %i %m
-Icon=knetworkconf
-DocPath=knetworkconf/index.html
+Exec=tdesu knetwortdeconf -caption "%c" %i %m
+Icon=knetwortdeconf
+DocPath=knetwortdeconf/index.html
 Comment=Configure TCP/IP settings
 Comment[ar]=إعداد تعيينات ميفاق التحكم بلنقل/ميفاق الإنترنت
 Comment[be]=Наставіць TCP/IP
@@ -67,7 +67,7 @@ Name[bn]=কে-নেটওয়ার্ক-কন্ফ
 Name[ne]=केडीई सञ्जाल कन्फिगरेसन
 Name[pa]=ਕੇ-ਨੈੱਟਵਰਕ-ਸੰਰਚਨਾ
 Name[pt_BR]=KNetworkConf 
-Name[sv]=Knetworkconf
+Name[sv]=Knetwortdeconf
 Name[th]=ปรับแต่งเครือข่าย - K
 GenericName=Configure TCP/IP Settings
 GenericName[ar]=إعداد تعيينات ميفاق التحكم بلنقل/ميفاق الإنترنت

knetwortdeconf/knetwortdeconf/knetwortdeconf.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-                          knetworkconf.h  -  description
+                          knetwortdeconf.h  -  description
                              -------------------
     begin                : Sun Jan 12 00:54:19 UTC 2003
     copyright            : (C) 2003 by Juan Luis Baptiste
@@ -56,20 +56,20 @@
 
 #include <dcopclient.h>
 
-#include "knetworkconfdlg.h"
+#include "knetwortdeconfdlg.h"
 #include "kadddnsserverdlg.h"
 #include "kadddevicecontainer.h"
 #include "kadddevicedlg.h"
 #include "kadddevicewifiext.h"
 #include "knetworkinfo.h"
 #include "kroutinginfo.h"
-#include "knetworkconfigparser.h"
+#include "knetwortdeconfigparser.h"
 #include "kdnsinfo.h"
 #include "kaddknownhostdlg.h"
 #include "kknownhostinfo.h"
 #include "knetworkinterface.h"
 #include "kadddevicedlgextension.h"
-#include "knetworkconfiface.h"
+#include "knetwortdeconfiface.h"
 #include "kprofileslistviewtooltip.h"
 
 /** KNetworkConf is the base class of the project */

knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui

@@ -1040,7 +1040,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in implementation">knetworkconfdlg.ui.h</include>
+    <include location="local" impldecl="in implementation">knetwortdeconfdlg.ui.h</include>
     <include location="local" impldecl="in declaration">tqlistview.h</include>
 </includes>
 <Q_SLOTS>

knetwortdeconf/knetwortdeconf/knetwortdeconfiface.h

@@ -1,6 +1,6 @@
 /* -*- c++ -*-
  *
- * knetworkconfiface.h
+ * knetwortdeconfiface.h
  *
  * Copyright (C) 2004 Juan Luis Baptiste <juan.baptiste@kdemail.net>
  *
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef knetworkconf_iface_h
-#define knetworkconf_iface_h
+#ifndef knetwortdeconf_iface_h
+#define knetwortdeconf_iface_h
 
 #include <dcopobject.h>
 

knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-                          knetworkconfigparser.cpp  -  description
+                          knetwortdeconfigparser.cpp  -  description
                              -------------------
     begin                : Mon Jan 13 2003
     copyright            : (C) 2003 by Juan Luis Baptiste
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "knetworkconfigparser.h"
-#include "knetworkconfigparser.moc"
+#include "knetwortdeconfigparser.h"
+#include "knetwortdeconfigparser.moc"
 
 KNetworkConfigParser::KNetworkConfigParser(){
   networkInfo = new KNetworkInfo();
@@ -69,7 +69,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){
   }
 }
 /** runs gst to find out the state of network devices.It runs the command:
-$knetworkconf_home/backends/networkconf [--platform platform] -d list_ifaces. */
+$knetwortdeconf_home/backends/networtdeconf [--platform platform] -d list_ifaces. */
 void KNetworkConfigParser::listIfaces(const TQString &platform){
   procDetect = new TQProcess(this);
   procDetect->addArgument( locate("data",BACKEND_PATH) );
@@ -367,7 +367,7 @@ void KNetworkConfigParser::addNetworkInterfacesToXMLDoc(TQDomDocument *doc, TQDo
   
     //Save in the configuration file the description of the interfaces as
   //the backend no longer handles this
-  KSimpleConfig cfg("knetworkconfrc");
+  KSimpleConfig cfg("knetwortdeconfrc");
   cfg.setGroup("Interfaces");
   
   //Add the network interfaces list
@@ -751,7 +751,7 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
     tempDevice->setType(type);
   
   TQString description;
-  KSimpleConfig cfg("knetworkconfrc");
+  KSimpleConfig cfg("knetwortdeconfrc");
   cfg.setGroup("Interfaces");
   description = cfg.readEntry(tempDevice->getDeviceName());
   if (!description.isEmpty())
@@ -818,7 +818,7 @@ void KNetworkConfigParser::readNetworkInfo()
   xmlOuput = xmlOuput.section('\n',1);
   tqDebug("--get XML:\n%s",xmlOuput.latin1());
 
-  //If the platform where knetworkconf is running isn't supported, show the
+  //If the platform where knetwortdeconf is running isn't supported, show the
   //user a dialog with all the supported platforms to choose.
   if (xmlErr.contains("platform_unsup::"))
   {    
@@ -1083,92 +1083,92 @@ void KNetworkConfigParser::showSupportedPlatformsDialogSlot(){
     name = name.section(":",1,1);
     if (key.contains("debian"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/debian.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/debian.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("mandriva"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/mandriva.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/mandriva.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("conectiva"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/conectiva.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/conectiva.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }    
     else if (key.contains("pld"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/pld.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/pld.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("redhat"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/redhat.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/redhat.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("suse"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/suse.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/suse.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("turbolinux"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/turbolinux.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/turbolinux.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("fedora"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/fedora.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/fedora.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("openna"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/openna.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/openna.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("slackware"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/slackware.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/slackware.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("freebsd"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/freebsd.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/freebsd.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("gentoo"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/gentoo.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/gentoo.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("blackpanther"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/blackpanther.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/blackpanther.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }
     else if (key.contains("rpath"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/rpath.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/rpath.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }    
     else if (key.contains("vine"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/vine.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/vine.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }    
     else if (key.contains("ubuntu"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/kubuntu.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/kubuntu.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }    
     else if (key.contains("yoper"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/yoper.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/yoper.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }    
     else if (key.contains("ark"))
     {
-      TQPixmap distroImg(locate("data","knetworkconf/pixmaps/ark.png"));
+      TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/ark.png"));
       dialog->klbDistroList->insertItem(distroImg, name);
     }    
   } 
@@ -1199,7 +1199,7 @@ void KNetworkConfigParser::showSupportedPlatformsDialogSlot(){
 
 void KNetworkConfigParser::saveAskAgain(const TQString &platform, bool askAgain)
 {
-  KSimpleConfig cfg("knetworkconfrc");
+  KSimpleConfig cfg("knetwortdeconfrc");
   cfg.setGroup("General");
   cfg.writeEntry("detectedPlatform",platform);
   cfg.writeEntry("askAgainPlatform",askAgain);
@@ -1208,7 +1208,7 @@ void KNetworkConfigParser::saveAskAgain(const TQString &platform, bool askAgain)
 
 bool KNetworkConfigParser::readAskAgain(TQString &platform)
 {
-  KSimpleConfig cfg("knetworkconfrc");
+  KSimpleConfig cfg("knetwortdeconfrc");
   cfg.setGroup("General");
   platform = cfg.readEntry("detectedPlatform");
   return cfg.readBoolEntry("askAgainPlatform");

knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-                          knetworkconfigparser.h  -  description
+                          knetwortdeconfigparser.h  -  description
                              -------------------
     begin                : Mon Jan 13 2003
     copyright            : (C) 2003 by Juan Luis Baptiste
@@ -18,7 +18,7 @@
 #ifndef KNETWORKCONFIGPARSER_H
 #define KNETWORKCONFIGPARSER_H
 
-#define BACKEND_PATH "knetworkconf/backends/network-conf"
+#define BACKEND_PATH "knetwortdeconf/backends/network-conf"
 #define ETHERNET_IFACE_TYPE "ethernet"
 #define WIRELESS_IFACE_TYPE "wireless"
 #define LOOPBACK_IFACE_TYPE "loopback"
@@ -83,7 +83,7 @@ class KNetworkConfigParser : public TQObject {
 
   public slots:
     /** runs gst to find out the state of network devices.It runs the command:
-    $knetworkconf_home/backends/networkconf [--platform platform] -d list_ifaces */
+    $knetwortdeconf_home/backends/networtdeconf [--platform platform] -d list_ifaces */
     void listIfaces(const TQString &platform);
 
   private slots:

knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-                          knetworkconfmodule.cpp  -  description
+                          knetwortdeconfmodule.cpp  -  description
                              -------------------
     begin                : Tue Apr 1 2003
     copyright            : (C) 2003 by Juan Luis Baptiste
@@ -19,7 +19,7 @@
 #include <tdecmodule.h>
 #include <tqlayout.h> 
 #include <version.h>
-#include "knetworkconfmodule.h"
+#include "knetwortdeconfmodule.h"
 
 
 
@@ -81,9 +81,9 @@ TQString KNetworkConfModule::rootOnlyMsg() const
 
 TDEAboutData* KNetworkConfModule::aboutData() const
 {
-  /*TDEAboutData* data = new TDEAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"),
+  /*TDEAboutData* data = new TDEAboutData( "knetwortdeconf", I18N_NOOP("KNetworkConf"),
     VERSION, description, TDEAboutData::License_GPL,
-    "(c) 2003, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetworkconf/", "jbaptiste@merlinux.org");
+    "(c) 2003, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetwortdeconf/", "jbaptiste@merlinux.org");
   data->addAuthor("Juan Luis Baptiste",I18N_NOOP("Lead Developer"),
                       "jbaptiste@merlinux.org");
   data->addCredit("David Sansome",I18N_NOOP("Various bugfixes and features"),
@@ -91,9 +91,9 @@ TDEAboutData* KNetworkConfModule::aboutData() const
 
   return data; // Memory leak, oh well...*/
   
-TDEAboutData *aboutData = new TDEAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"),
+TDEAboutData *aboutData = new TDEAboutData( "knetwortdeconf", I18N_NOOP("KNetworkConf"),
     VERSION, description, TDEAboutData::License_GPL,
-    "(c) 2003 - 2005, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetworkconf/", "juan.baptiste@kdemail.net");
+    "(c) 2003 - 2005, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetwortdeconf/", "juan.baptiste@kdemail.net");
   aboutData->addAuthor("Juan Luis Baptiste",I18N_NOOP("Lead Developer"),
                       "juan.baptiste@kdemail.net");
   aboutData->addCredit("Carlos Garnacho and the Gnome System Tools Team",I18N_NOOP("Provided the Network backend which KNetworkConf relies on."),
@@ -113,6 +113,6 @@ TQString KNetworkConfModule::quickHelp() const
   return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").arg("<h1>").arg("</h1><p>").arg("</p>");
 }
 
-//#include "knetworkconfmodule.moc"
+//#include "knetwortdeconfmodule.moc"
 
-#include "knetworkconfmodule.moc"
+#include "knetwortdeconfmodule.moc"

knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-                          knetworkconfmodule.h  -  description
+                          knetwortdeconfmodule.h  -  description
                              -------------------
     begin                : Tue Apr 1 2003
     copyright            : (C) 2003 by Juan Luis Baptiste
@@ -18,7 +18,7 @@
 #ifndef KNETWORKCONFMODULE_H
 #define KNETWORKCONFMODULE_H
 
-#include "knetworkconf.h"
+#include "knetwortdeconf.h"
 #include <kaboutdata.h>
 #include <tdecmodule.h>
 

knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.h

@@ -23,7 +23,7 @@
 #include <tqptrlist.h>
 
 #include "knetworkinfo.h"
-#include "knetworkconfigparser.h"
+#include "knetwortdeconfigparser.h"
 
 class KProfilesListViewToolTip : public TQToolTip
 {

knetwortdeconf/knetwortdeconf/main.cpp

@@ -25,8 +25,8 @@
 #include <kglobal.h>
 #include <kgenericfactory.h>
 
-//#include "knetworkconf.h"
-#include "knetworkconfmodule.h"
+//#include "knetwortdeconf.h"
+#include "knetwortdeconfmodule.h"
 #include "version.h"
 	
 	
@@ -36,13 +36,13 @@ static KCmdLineOptions options[] =
   // INSERT YOUR COMMANDLINE OPTIONS HERE
 };
 /*typedef KGenericFactory<KNetworkConfModule> KDEDFactory; 
-K_EXPORT_COMPONENT_FACTORY( knetworkconfmodule, KDEDFactory( "kcm_knetworkconfmodule" ) ); */
+K_EXPORT_COMPONENT_FACTORY( knetwortdeconfmodule, KDEDFactory( "kcm_knetwortdeconfmodule" ) ); */
 
 extern "C"
 {
-  KDE_EXPORT TDECModule *create_knetworkconfmodule(TQWidget *parent, const char *name)
+  KDE_EXPORT TDECModule *create_knetwortdeconfmodule(TQWidget *parent, const char *name)
   {
-    TDEGlobal::locale()->insertCatalogue("knetworkconf");
+    TDEGlobal::locale()->insertCatalogue("knetwortdeconf");
     return new KNetworkConfModule(parent, name);
   }
 }

knetwortdeconf/pasosRelease.txt

@@ -11,4 +11,4 @@ PASOS PARA HACER RELEASE DE KNETWORKCONF:
 9. Hacer anuncio en kde-apps.org y freshmeat.net
 10. Hacer anuncios en listas de correo:
 - Merlinux, Colibri y Linux Anuncio en espaniol
-- kde-announce, knetworkconf-announce, kde-debian en ingles
+- kde-announce, knetwortdeconf-announce, kde-debian en ingles

knetwortdeconf/pixmaps/Makefile.am

@@ -1,4 +1,4 @@
-iconsdir = $(kde_datadir)/knetworkconf/pixmaps/
+iconsdir = $(kde_datadir)/knetwortdeconf/pixmaps/
 icons_DATA = ark.png debian.png mandriva.png blackpanther.png pld.png \
 	redhat.png suse.png turbolinux.png conectiva.png fedora.png openna.png \
 	slackware.png freebsd.png gentoo.png vine.png kubuntu.png yoper.png rpath.png

kpackage/CHANGES

@@ -216,7 +216,7 @@ Fix compiling without RPM
 kpackage-0.9
 ------------
 Add searching  for package that includes a file (dialog with DND)
-Use kfile file selector
+Use tdefile file selector
 Only create file list when accessed
 Don't reload package tree after add or delete
 Add toolbar (prevent toolbar envy)

kpackage/kio.h

@@ -35,7 +35,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include "../config.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class Kio: public TQObject
 {

kpackage/kpackage.cpp

@@ -37,7 +37,7 @@
 
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <kurl.h>
 #include <kapplication.h>

kpackage/kpackage.h

@@ -183,7 +183,7 @@ public:
   // Widget modes
 
   TDEConfig *config;
-  // pointer to kconfig object
+  // pointer to tdeconfig object
 
   managementWidget *management;
   // management widget

kpackage/options.h

@@ -42,7 +42,7 @@
 
 // KDE headers
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kpackage.h>
 

ksysv/AUTHORS

@@ -4,7 +4,7 @@ Current Code
 Main developer:
 Peter Putzer <putzer@kde.org>
 
-leveldb.{h,c} (from chkconfig):
+leveldb.{h,c} (from chtdeconfig):
 Red Hat Software http://www.redhat.com
 
 Previous Versions

ksysv/TopWidget.cpp

@@ -67,7 +67,7 @@
 #include <kstdaccel.h>
 #include <kedittoolbar.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kaboutdata.h>
 #include <kcursor.h>
 

ksysv/ksv_conf.cpp

@@ -17,7 +17,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kmainwindow.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "ksv_core.h"
 #include "ksv_conf.h"

ksysv/ksvconfigwizard.cpp

@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <tqpushbutton.h>
 

ksysv/ksvpathconfig.cpp

@@ -26,7 +26,7 @@
 #include "ksvpathconfig.h"
 
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 /* 
  *  Constructs a KSVPathConfig which is a child of 'parent', with the 

ksysv/leveldb.c

@@ -111,7 +111,7 @@ int readServiceInfo(const char* RUNLEVELS, const char * name, struct service * s
 	while (isspace(*start) && start < end) start++;
 	if (start == end) continue;
 
-	if (!strncmp(start, "chkconfig:", 10)) {
+	if (!strncmp(start, "chtdeconfig:", 10)) {
       start += 10;
       while (isspace(*start) && start < end) start++;
       if (start == end) {

ksysv/leveldb.h

@@ -34,7 +34,7 @@ struct service {
 
 int parseLevels(const char * str, int emptyOk);
 
-/* returns 0 on success, 1 if the service is not chkconfig-able, -1 if an
+/* returns 0 on success, 1 if the service is not chtdeconfig-able, -1 if an
    I/O error occurs (in which case errno can be checked) */
 int readServiceInfo(const char* RUNLEVELS, const char* name, struct service * service);
 int currentRunlevel(void);

kuser/editDefaults.h

@@ -22,7 +22,7 @@
 #define _KU_EDITDEFAULTS_H_
 
 #include <tqmemarray.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kprogress.h>
 #include <kabc/ldif.h>
 #include "ldapsamba.h"

kuser/globals.h

@@ -27,7 +27,7 @@
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kuserprefs.h"
 
 #define KU_BACKUP_EXT ".bak"

kuser/kgroupldap.h

@@ -28,7 +28,7 @@
 #include <kprogress.h>
 #include <kabc/ldapurl.h>
 #include <kabc/ldif.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kgroup.h"
 

kuser/kuser.cpp

@@ -41,7 +41,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurl.h>
 
 // class KUser

kuser/kuserldap.cpp

@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
-#include <kio/tdentlm.h>
+#include <tdeio/tdentlm.h>
 
 #include "kglobal_.h"
 #include "kuserldap.h"

kuser/kuserldap.h

@@ -28,7 +28,7 @@
 #include <kprogress.h>
 #include <kabc/ldapurl.h>
 #include <kabc/ldif.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "kuser.h"
 

kuser/kuserprefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kuser.kcfg
 ClassName=KUserPrefsBase
 SetUserTexts=true

kuser/main.cpp

@@ -22,7 +22,7 @@
 
 #include <kiconloader.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>

lilo-config/kde-qt-common/ui.h

@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <ktabctl.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #define _(x) i18n(x)
 #define WarningYesNo(parent, caption, text) \
 	KMessageBox::warningYesNo(parent, text, caption)

lilo-config/kde/lilo.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell lilo
+Exec=tdecmshell lilo
 Icon=hdd_unmount
 Type=Application
 

tdefile-plugins/deb/Makefile.am

@@ -0,0 +1,22 @@
+## Makefile.am for deb file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_deb.h
+
+kde_module_LTLIBRARIES = tdefile_deb.la
+
+tdefile_deb_la_SOURCES = tdefile_deb.cpp
+tdefile_deb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_deb_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdefile_deb.pot
+
+services_DATA = tdefile_deb.desktop
+servicesdir = $(kde_servicesdir)

tdefile-plugins/deb/tdefile_deb.cpp

@@ -37,11 +37,11 @@
 #include <ktar.h>
 #include <kar.h>
 
-#include "kfile_deb.h"
+#include "tdefile_deb.h"
 
 typedef KGenericFactory<KDebPlugin> DebFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_deb, DebFactory( "kfile_deb" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_deb, DebFactory( "tdefile_deb" ))
 
 KDebPlugin::KDebPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -127,4 +127,4 @@ bool KDebPlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
     return true;
 }
 
-#include "kfile_deb.moc"
+#include "tdefile_deb.moc"

tdefile-plugins/deb/tdefile_deb.desktop

@@ -64,6 +64,6 @@ Name[zh_CN]=DEB 统计
 Name[zh_HK]=DEB 統計
 Name[zh_TW]=DEB 統計
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_deb
+X-TDE-Library=tdefile_deb
 MimeType=application/x-deb
 PreferredItems=Name,Version,Summary,Size

tdefile-plugins/deb/tdefile_deb.h

@@ -20,7 +20,7 @@
 #ifndef __KFILE_DEB_H__
 #define __KFILE_DEB_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 

tdefile-plugins/rpm/Makefile.am

@@ -0,0 +1,22 @@
+## Makefile.am for rpm file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_rpm.h
+
+kde_module_LTLIBRARIES = tdefile_rpm.la
+
+tdefile_rpm_la_SOURCES = tdefile_rpm.cpp
+tdefile_rpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_rpm_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages:
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdefile_rpm.pot
+
+services_DATA = tdefile_rpm.desktop
+servicesdir = $(kde_servicesdir)

tdefile-plugins/rpm/tdefile_rpm.cpp

@@ -30,11 +30,11 @@ typedef unsigned short uint16_t;
 typedef unsigned int   uint32_t;
 #endif
 
-#include "kfile_rpm.h"
+#include "tdefile_rpm.h"
 
 typedef KGenericFactory<KRpmPlugin> RpmFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_rpm, RpmFactory( "kfile_rpm" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_rpm, RpmFactory( "tdefile_rpm" ))
 
 KRpmPlugin::KRpmPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -149,4 +149,4 @@ bool KRpmPlugin::readInfo( KFileMetaInfo& info, uint what)
     return true;
 }
 
-#include "kfile_rpm.moc"
+#include "tdefile_rpm.moc"

tdefile-plugins/rpm/tdefile_rpm.desktop

@@ -64,6 +64,6 @@ Name[zh_CN]=RPM 统计
 Name[zh_HK]=RPM 統計
 Name[zh_TW]=RPM 統計
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_rpm
+X-TDE-Library=tdefile_rpm
 MimeType=application/x-rpm
 PreferredItems=Name,Version,Summary,Group,Size

tdefile-plugins/rpm/tdefile_rpm.h

@@ -20,7 +20,7 @@
 #ifndef __KFILE_RPM_H__
 #define __KFILE_RPM_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;