diff --git a/README b/README
index a87928e..5b0a74a 100644
--- a/README
+++ b/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
diff --git a/doc/knetworkconf/Makefile.am b/doc/knetworkconf/Makefile.am
deleted file mode 100644
index 01c1911..0000000
--- a/doc/knetworkconf/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = knetworkconf
-
-
diff --git a/doc/knetworkconf/01.png b/doc/knetwortdeconf/01.png
similarity index 100%
rename from doc/knetworkconf/01.png
rename to doc/knetwortdeconf/01.png
diff --git a/doc/knetworkconf/02.png b/doc/knetwortdeconf/02.png
similarity index 100%
rename from doc/knetworkconf/02.png
rename to doc/knetwortdeconf/02.png
diff --git a/doc/knetworkconf/03.png b/doc/knetwortdeconf/03.png
similarity index 100%
rename from doc/knetworkconf/03.png
rename to doc/knetwortdeconf/03.png
diff --git a/doc/knetworkconf/04.png b/doc/knetwortdeconf/04.png
similarity index 100%
rename from doc/knetworkconf/04.png
rename to doc/knetwortdeconf/04.png
diff --git a/doc/knetworkconf/05.png b/doc/knetwortdeconf/05.png
similarity index 100%
rename from doc/knetworkconf/05.png
rename to doc/knetwortdeconf/05.png
diff --git a/doc/knetworkconf/06.png b/doc/knetwortdeconf/06.png
similarity index 100%
rename from doc/knetworkconf/06.png
rename to doc/knetwortdeconf/06.png
diff --git a/doc/knetworkconf/07.png b/doc/knetwortdeconf/07.png
similarity index 100%
rename from doc/knetworkconf/07.png
rename to doc/knetwortdeconf/07.png
diff --git a/doc/knetworkconf/08.png b/doc/knetwortdeconf/08.png
similarity index 100%
rename from doc/knetworkconf/08.png
rename to doc/knetwortdeconf/08.png
diff --git a/doc/knetworkconf/09.png b/doc/knetwortdeconf/09.png
similarity index 100%
rename from doc/knetworkconf/09.png
rename to doc/knetwortdeconf/09.png
diff --git a/doc/knetworkconf/11.png b/doc/knetwortdeconf/11.png
similarity index 100%
rename from doc/knetworkconf/11.png
rename to doc/knetwortdeconf/11.png
diff --git a/doc/knetwortdeconf/Makefile.am b/doc/knetwortdeconf/Makefile.am
new file mode 100644
index 0000000..19c4bed
--- /dev/null
+++ b/doc/knetwortdeconf/Makefile.am
@@ -0,0 +1,4 @@
+KDE_LANG = en
+KDE_DOCS = knetwortdeconf
+
+
diff --git a/doc/knetworkconf/about1.png b/doc/knetwortdeconf/about1.png
similarity index 100%
rename from doc/knetworkconf/about1.png
rename to doc/knetwortdeconf/about1.png
diff --git a/doc/knetworkconf/index.docbook b/doc/knetwortdeconf/index.docbook
similarity index 96%
rename from doc/knetworkconf/index.docbook
rename to doc/knetwortdeconf/index.docbook
index 2483880..0858115 100644
--- a/doc/knetworkconf/index.docbook
+++ b/doc/knetwortdeconf/index.docbook
@@ -1,7 +1,7 @@
KNetworkConf">
-
+ KNetworkConf">
+
@@ -65,7 +65,7 @@ document.
1.0
-This manual explains how to install and use &knetworkconf;, a module for
+This manual explains how to install and use &knetwortdeconf;, a module for
&kcontrolcenter; that enables management of Network Interfaces, Routing and DNS
properties.
@@ -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
TDE Menu&kcontrolcenter;.
-The &knetworkconf; package was developed to enable users to manage TCP/IP
+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:
@@ -117,7 +117,7 @@ interface from which to perform the following tasks:
Once installed a new module called Network
Settings is displayed in the &kcontrolcenter;.
-To start the Network Settings (&knetworkconf;) module select
+To start the Network Settings (&knetwortdeconf;) module select
&kcontrolcenter; Internet & Network
Network Settings in the &kmenu;.
@@ -126,13 +126,13 @@ To start the Network Settings (&knetworkconf;) module
-&knetworkconf; in user mode
+&knetwortdeconf; in user mode
-It is important to understand that &knetworkconf; cannot install
+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.
In most cases drivers for networking hardware and other devices are
@@ -211,14 +211,14 @@ click the Administrator Mode button located bottom
left of the module. Enter your password when prompted.
-&knetworkconf; in administrator mode
+&knetwortdeconf; in administrator mode
-&knetworkconf; in administrator mode
+&knetwortdeconf; in administrator mode
@@ -277,7 +277,7 @@ fileref="03.png"
format="PNG"/>
-The &knetworkconf; interface
+The &knetwortdeconf; interface
@@ -748,8 +748,8 @@ following command.
How to obtain knetwork-conf
knetwork-conf's home page is at http://knetworkconf.sourceforge.net where you at least can download
+url="http://knetwortdeconf.sourceforge.net"
+>http://knetwortdeconf.sourceforge.net where you at least can download
source packages.
@@ -778,7 +778,7 @@ packages. Install them from &konsole; using
installed; you also need the development packages which include libraries
and other stuff.
-Recommended for advanced users only. Otherwise, compiling &knetworkconf;
+Recommended for advanced users only. Otherwise, compiling &knetwortdeconf;
is not difficult. The following commands should do it.
@@ -801,7 +801,7 @@ let us know.
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.
+on your disk which can be changed by &knetwortdeconf; will be discussed.
IPv4 Networking
@@ -894,7 +894,7 @@ gateway-computer.
Configuration files
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.
diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp
index 8efbb05..9f00362 100644
--- a/kcron/ktapp.cpp
+++ b/kcron/ktapp.cpp
@@ -13,7 +13,7 @@
#include
#include
#include
-#include
+#include
#include
#include // i18n()
#include
diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp
index 7706644..8465d3d 100644
--- a/kcron/kttask.cpp
+++ b/kcron/kttask.cpp
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index 37d1715..c3056ef 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -35,7 +35,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kdat/LoggerWidget.cpp b/kdat/LoggerWidget.cpp
index 6adc0f1..53166ba 100644
--- a/kdat/LoggerWidget.cpp
+++ b/kdat/LoggerWidget.cpp
@@ -21,7 +21,7 @@
#include
#include
-#include
+#include
#include "LoggerWidget.h"
#include
diff --git a/kdat/Options.cpp b/kdat/Options.cpp
index e3475f9..ff77c30 100644
--- a/kdat/Options.cpp
+++ b/kdat/Options.cpp
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include
-#include
+#include
#include "Options.h"
diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui
index c79be05..9a5950a 100644
--- a/kdat/OptionsDlgWidget.ui
+++ b/kdat/OptionsDlgWidget.ui
@@ -364,7 +364,7 @@ You must still specify the block size.
kapplication.h
- kfiledialog.h
+ tdefiledialog.h
kmessagebox.h
kglobal.h
kdialog.h
diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp
index f65d41f..6416277 100644
--- a/kdat/VerifyOptDlg.cpp
+++ b/kdat/VerifyOptDlg.cpp
@@ -24,7 +24,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/kfile-plugins/deb/Makefile.am b/kfile-plugins/deb/Makefile.am
deleted file mode 100644
index 65e69c3..0000000
--- a/kfile-plugins/deb/Makefile.am
+++ /dev/null
@@ -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)
diff --git a/kfile-plugins/rpm/Makefile.am b/kfile-plugins/rpm/Makefile.am
deleted file mode 100644
index db4e8cc..0000000
--- a/kfile-plugins/rpm/Makefile.am
+++ /dev/null
@@ -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)
diff --git a/knetworkconf/Makefile.am b/knetworkconf/Makefile.am
deleted file mode 100644
index cb7b17e..0000000
--- a/knetworkconf/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = knetworkconf backends pixmaps
\ No newline at end of file
diff --git a/knetworkconf/backends/configure.in.in b/knetworkconf/backends/configure.in.in
deleted file mode 100644
index 44cfc14..0000000
--- a/knetworkconf/backends/configure.in.in
+++ /dev/null
@@ -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."
diff --git a/knetworkconf/knetworkconf/Makefile.am b/knetworkconf/knetworkconf/Makefile.am
deleted file mode 100644
index 8d664bf..0000000
--- a/knetworkconf/knetworkconf/Makefile.am
+++ /dev/null
@@ -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
diff --git a/knetworkconf/knetworkconf/kcm_knetworkconfmodule b/knetworkconf/knetworkconf/kcm_knetworkconfmodule
deleted file mode 100644
index 177239c..0000000
--- a/knetworkconf/knetworkconf/kcm_knetworkconfmodule
+++ /dev/null
@@ -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"
diff --git a/knetworkconf/AUTHORS b/knetwortdeconf/AUTHORS
similarity index 100%
rename from knetworkconf/AUTHORS
rename to knetwortdeconf/AUTHORS
diff --git a/knetworkconf/COPYING b/knetwortdeconf/COPYING
similarity index 100%
rename from knetworkconf/COPYING
rename to knetwortdeconf/COPYING
diff --git a/knetworkconf/ChangeLog b/knetwortdeconf/ChangeLog
similarity index 100%
rename from knetworkconf/ChangeLog
rename to knetwortdeconf/ChangeLog
diff --git a/knetworkconf/Doxyfile b/knetwortdeconf/Doxyfile
similarity index 98%
rename from knetworkconf/Doxyfile
rename to knetwortdeconf/Doxyfile
index c227a40..bd68031 100644
--- a/knetworkconf/Doxyfile
+++ b/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 \
diff --git a/knetworkconf/INSTALL b/knetwortdeconf/INSTALL
similarity index 100%
rename from knetworkconf/INSTALL
rename to knetwortdeconf/INSTALL
diff --git a/knetworkconf/LEAME b/knetwortdeconf/LEAME
similarity index 95%
rename from knetworkconf/LEAME
rename to knetwortdeconf/LEAME
index 8925c6c..89cf46a 100644
--- a/knetworkconf/LEAME
+++ b/knetwortdeconf/LEAME
@@ -2,7 +2,7 @@ KNetworkConf 0.6.1 - Un m
para configurar las propiedades de red.
Juan Luis Baptiste M.
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.
diff --git a/knetwortdeconf/Makefile.am b/knetwortdeconf/Makefile.am
new file mode 100644
index 0000000..93aadb2
--- /dev/null
+++ b/knetwortdeconf/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = knetwortdeconf backends pixmaps
\ No newline at end of file
diff --git a/knetworkconf/README b/knetwortdeconf/README
similarity index 92%
rename from knetworkconf/README
rename to knetwortdeconf/README
index db16fe9..edf3377 100644
--- a/knetworkconf/README
+++ b/knetwortdeconf/README
@@ -1,7 +1,7 @@
KNetworkConf 0.6.1 - A KDE control Center Module to confiure Network settings.
Juan Luis Baptiste M.
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.
diff --git a/knetworkconf/TODO b/knetwortdeconf/TODO
similarity index 100%
rename from knetworkconf/TODO
rename to knetwortdeconf/TODO
diff --git a/knetworkconf/backends/AUTHORS b/knetwortdeconf/backends/AUTHORS
similarity index 100%
rename from knetworkconf/backends/AUTHORS
rename to knetwortdeconf/backends/AUTHORS
diff --git a/knetworkconf/backends/Makefile.am b/knetwortdeconf/backends/Makefile.am
similarity index 100%
rename from knetworkconf/backends/Makefile.am
rename to knetwortdeconf/backends/Makefile.am
diff --git a/knetworkconf/backends/NEWS b/knetwortdeconf/backends/NEWS
similarity index 100%
rename from knetworkconf/backends/NEWS
rename to knetwortdeconf/backends/NEWS
diff --git a/knetworkconf/backends/README b/knetwortdeconf/backends/README
similarity index 100%
rename from knetworkconf/backends/README
rename to knetwortdeconf/backends/README
diff --git a/knetworkconf/backends/README.NEW_PLATFORMS b/knetwortdeconf/backends/README.NEW_PLATFORMS
similarity index 100%
rename from knetworkconf/backends/README.NEW_PLATFORMS
rename to knetwortdeconf/backends/README.NEW_PLATFORMS
diff --git a/knetwortdeconf/backends/configure.in.in b/knetwortdeconf/backends/configure.in.in
new file mode 100644
index 0000000..1d867c1
--- /dev/null
+++ b/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."
diff --git a/knetworkconf/backends/debug.pl.in b/knetwortdeconf/backends/debug.pl.in
similarity index 100%
rename from knetworkconf/backends/debug.pl.in
rename to knetwortdeconf/backends/debug.pl.in
diff --git a/knetworkconf/backends/file.pl.in b/knetwortdeconf/backends/file.pl.in
similarity index 100%
rename from knetworkconf/backends/file.pl.in
rename to knetwortdeconf/backends/file.pl.in
diff --git a/knetworkconf/backends/general.pl.in b/knetwortdeconf/backends/general.pl.in
similarity index 100%
rename from knetworkconf/backends/general.pl.in
rename to knetwortdeconf/backends/general.pl.in
diff --git a/knetworkconf/backends/guess_system.sh b/knetwortdeconf/backends/guess_system.sh
similarity index 100%
rename from knetworkconf/backends/guess_system.sh
rename to knetwortdeconf/backends/guess_system.sh
diff --git a/knetworkconf/backends/mkinstalldirs b/knetwortdeconf/backends/mkinstalldirs
similarity index 100%
rename from knetworkconf/backends/mkinstalldirs
rename to knetwortdeconf/backends/mkinstalldirs
diff --git a/knetworkconf/backends/network-conf.in b/knetwortdeconf/backends/network-conf.in
similarity index 100%
rename from knetworkconf/backends/network-conf.in
rename to knetwortdeconf/backends/network-conf.in
diff --git a/knetworkconf/backends/network.pl.in b/knetwortdeconf/backends/network.pl.in
similarity index 100%
rename from knetworkconf/backends/network.pl.in
rename to knetwortdeconf/backends/network.pl.in
diff --git a/knetworkconf/backends/parse.pl.in b/knetwortdeconf/backends/parse.pl.in
similarity index 100%
rename from knetworkconf/backends/parse.pl.in
rename to knetwortdeconf/backends/parse.pl.in
diff --git a/knetworkconf/backends/platform.pl.in b/knetwortdeconf/backends/platform.pl.in
similarity index 100%
rename from knetworkconf/backends/platform.pl.in
rename to knetwortdeconf/backends/platform.pl.in
diff --git a/knetworkconf/backends/process.pl.in b/knetwortdeconf/backends/process.pl.in
similarity index 100%
rename from knetworkconf/backends/process.pl.in
rename to knetwortdeconf/backends/process.pl.in
diff --git a/knetworkconf/backends/replace.pl.in b/knetwortdeconf/backends/replace.pl.in
similarity index 100%
rename from knetworkconf/backends/replace.pl.in
rename to knetwortdeconf/backends/replace.pl.in
diff --git a/knetworkconf/backends/report.pl.in b/knetwortdeconf/backends/report.pl.in
similarity index 100%
rename from knetworkconf/backends/report.pl.in
rename to knetwortdeconf/backends/report.pl.in
diff --git a/knetworkconf/backends/service-list.pl.in b/knetwortdeconf/backends/service-list.pl.in
similarity index 100%
rename from knetworkconf/backends/service-list.pl.in
rename to knetwortdeconf/backends/service-list.pl.in
diff --git a/knetworkconf/backends/service.pl.in b/knetwortdeconf/backends/service.pl.in
similarity index 100%
rename from knetworkconf/backends/service.pl.in
rename to knetwortdeconf/backends/service.pl.in
diff --git a/knetworkconf/backends/system-tools-backends.pc.in b/knetwortdeconf/backends/system-tools-backends.pc.in
similarity index 100%
rename from knetworkconf/backends/system-tools-backends.pc.in
rename to knetwortdeconf/backends/system-tools-backends.pc.in
diff --git a/knetworkconf/backends/type1inst b/knetwortdeconf/backends/type1inst
similarity index 100%
rename from knetworkconf/backends/type1inst
rename to knetwortdeconf/backends/type1inst
diff --git a/knetworkconf/backends/util.pl.in b/knetwortdeconf/backends/util.pl.in
similarity index 100%
rename from knetworkconf/backends/util.pl.in
rename to knetwortdeconf/backends/util.pl.in
diff --git a/knetworkconf/backends/xml.pl.in b/knetwortdeconf/backends/xml.pl.in
similarity index 100%
rename from knetworkconf/backends/xml.pl.in
rename to knetwortdeconf/backends/xml.pl.in
diff --git a/knetworkconf/config.h.in b/knetwortdeconf/config.h.in
similarity index 100%
rename from knetworkconf/config.h.in
rename to knetwortdeconf/config.h.in
diff --git a/knetworkconf/knetworkconf-mdk.spec b/knetwortdeconf/knetwortdeconf-mdk.spec
similarity index 81%
rename from knetworkconf/knetworkconf-mdk.spec
rename to knetwortdeconf/knetwortdeconf-mdk.spec
index d2bb210..8322e55 100644
--- a/knetworkconf/knetworkconf-mdk.spec
+++ b/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
diff --git a/knetworkconf/knetworkconf.lsm b/knetwortdeconf/knetwortdeconf.lsm
similarity index 100%
rename from knetworkconf/knetworkconf.lsm
rename to knetwortdeconf/knetwortdeconf.lsm
diff --git a/knetworkconf/knetworkconf.spec b/knetwortdeconf/knetwortdeconf.spec
similarity index 91%
rename from knetworkconf/knetworkconf.spec
rename to knetwortdeconf/knetwortdeconf.spec
index e47e964..89a3414 100644
--- a/knetworkconf/knetworkconf.spec
+++ b/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
-%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
diff --git a/knetwortdeconf/knetwortdeconf/Makefile.am b/knetwortdeconf/knetwortdeconf/Makefile.am
new file mode 100644
index 0000000..3fc914f
--- /dev/null
+++ b/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
diff --git a/knetworkconf/knetworkconf/hi16-app-knetworkconf.png b/knetwortdeconf/knetwortdeconf/hi16-app-knetwortdeconf.png
similarity index 100%
rename from knetworkconf/knetworkconf/hi16-app-knetworkconf.png
rename to knetwortdeconf/knetwortdeconf/hi16-app-knetwortdeconf.png
diff --git a/knetworkconf/knetworkconf/hi22-app-knetworkconf.png b/knetwortdeconf/knetwortdeconf/hi22-app-knetwortdeconf.png
similarity index 100%
rename from knetworkconf/knetworkconf/hi22-app-knetworkconf.png
rename to knetwortdeconf/knetwortdeconf/hi22-app-knetwortdeconf.png
diff --git a/knetworkconf/knetworkconf/hi32-app-knetworkconf.png b/knetwortdeconf/knetwortdeconf/hi32-app-knetwortdeconf.png
similarity index 100%
rename from knetworkconf/knetworkconf/hi32-app-knetworkconf.png
rename to knetwortdeconf/knetwortdeconf/hi32-app-knetwortdeconf.png
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetwortdeconf/knetwortdeconf/kadddevicecontainer.cpp
similarity index 100%
rename from knetworkconf/knetworkconf/kadddevicecontainer.cpp
rename to knetwortdeconf/knetwortdeconf/kadddevicecontainer.cpp
diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetwortdeconf/knetwortdeconf/kadddevicecontainer.h
similarity index 100%
rename from knetworkconf/knetworkconf/kadddevicecontainer.h
rename to knetwortdeconf/knetwortdeconf/kadddevicecontainer.h
diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui b/knetwortdeconf/knetwortdeconf/kadddevicedlg.ui
similarity index 100%
rename from knetworkconf/knetworkconf/kadddevicedlg.ui
rename to knetwortdeconf/knetwortdeconf/kadddevicedlg.ui
diff --git a/knetworkconf/knetworkconf/kadddevicedlg.ui.h b/knetwortdeconf/knetwortdeconf/kadddevicedlg.ui.h
similarity index 100%
rename from knetworkconf/knetworkconf/kadddevicedlg.ui.h
rename to knetwortdeconf/knetwortdeconf/kadddevicedlg.ui.h
diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui b/knetwortdeconf/knetwortdeconf/kadddevicedlgextension.ui
similarity index 100%
rename from knetworkconf/knetworkconf/kadddevicedlgextension.ui
rename to knetwortdeconf/knetwortdeconf/kadddevicedlgextension.ui
diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui.h b/knetwortdeconf/knetwortdeconf/kadddevicedlgextension.ui.h
similarity index 100%
rename from knetworkconf/knetworkconf/kadddevicedlgextension.ui.h
rename to knetwortdeconf/knetwortdeconf/kadddevicedlgextension.ui.h
diff --git a/knetworkconf/knetworkconf/kadddevicewifiext.ui b/knetwortdeconf/knetwortdeconf/kadddevicewifiext.ui
similarity index 100%
rename from knetworkconf/knetworkconf/kadddevicewifiext.ui
rename to knetwortdeconf/knetwortdeconf/kadddevicewifiext.ui
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetwortdeconf/knetwortdeconf/kadddnsserverdlg.ui
similarity index 100%
rename from knetworkconf/knetworkconf/kadddnsserverdlg.ui
rename to knetwortdeconf/knetwortdeconf/kadddnsserverdlg.ui
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h b/knetwortdeconf/knetwortdeconf/kadddnsserverdlg.ui.h
similarity index 100%
rename from knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
rename to knetwortdeconf/knetwortdeconf/kadddnsserverdlg.ui.h
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui
similarity index 100%
rename from knetworkconf/knetworkconf/kaddknownhostdlg.ui
rename to knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h b/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui.h
similarity index 100%
rename from knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
rename to knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui.h
diff --git a/knetworkconf/knetworkconf/kaddressvalidator.cpp b/knetwortdeconf/knetwortdeconf/kaddressvalidator.cpp
similarity index 100%
rename from knetworkconf/knetworkconf/kaddressvalidator.cpp
rename to knetwortdeconf/knetwortdeconf/kaddressvalidator.cpp
diff --git a/knetworkconf/knetworkconf/kaddressvalidator.h b/knetwortdeconf/knetwortdeconf/kaddressvalidator.h
similarity index 100%
rename from knetworkconf/knetworkconf/kaddressvalidator.h
rename to knetwortdeconf/knetwortdeconf/kaddressvalidator.h
diff --git a/knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule b/knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule
new file mode 100644
index 0000000..dd4137d
--- /dev/null
+++ b/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"
diff --git a/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop b/knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule.desktop
similarity index 97%
rename from knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
rename to knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule.desktop
index 06ef031..d51ca0f 100644
--- a/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
+++ b/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]=إعداد تعيينات الشبكة
diff --git a/knetworkconf/knetworkconf/kdetectdistrodlg.ui b/knetwortdeconf/knetwortdeconf/kdetectdistrodlg.ui
similarity index 100%
rename from knetworkconf/knetworkconf/kdetectdistrodlg.ui
rename to knetwortdeconf/knetwortdeconf/kdetectdistrodlg.ui
diff --git a/knetworkconf/knetworkconf/kdnsinfo.cpp b/knetwortdeconf/knetwortdeconf/kdnsinfo.cpp
similarity index 100%
rename from knetworkconf/knetworkconf/kdnsinfo.cpp
rename to knetwortdeconf/knetwortdeconf/kdnsinfo.cpp
diff --git a/knetworkconf/knetworkconf/kdnsinfo.h b/knetwortdeconf/knetwortdeconf/kdnsinfo.h
similarity index 100%
rename from knetworkconf/knetworkconf/kdnsinfo.h
rename to knetwortdeconf/knetwortdeconf/kdnsinfo.h
diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetwortdeconf/knetwortdeconf/kinterfaceupdowndlg.ui
similarity index 100%
rename from knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
rename to knetwortdeconf/knetwortdeconf/kinterfaceupdowndlg.ui
diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h b/knetwortdeconf/knetwortdeconf/kinterfaceupdowndlg.ui.h
similarity index 100%
rename from knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h
rename to knetwortdeconf/knetwortdeconf/kinterfaceupdowndlg.ui.h
diff --git a/knetworkconf/knetworkconf/kknownhostinfo.cpp b/knetwortdeconf/knetwortdeconf/kknownhostinfo.cpp
similarity index 100%
rename from knetworkconf/knetworkconf/kknownhostinfo.cpp
rename to knetwortdeconf/knetwortdeconf/kknownhostinfo.cpp
diff --git a/knetworkconf/knetworkconf/kknownhostinfo.h b/knetwortdeconf/knetwortdeconf/kknownhostinfo.h
similarity index 100%
rename from knetworkconf/knetworkconf/kknownhostinfo.h
rename to knetwortdeconf/knetwortdeconf/kknownhostinfo.h
diff --git a/knetworkconf/knetworkconf/knetworkinfo.cpp b/knetwortdeconf/knetwortdeconf/knetworkinfo.cpp
similarity index 100%
rename from knetworkconf/knetworkconf/knetworkinfo.cpp
rename to knetwortdeconf/knetwortdeconf/knetworkinfo.cpp
diff --git a/knetworkconf/knetworkconf/knetworkinfo.h b/knetwortdeconf/knetwortdeconf/knetworkinfo.h
similarity index 100%
rename from knetworkconf/knetworkconf/knetworkinfo.h
rename to knetwortdeconf/knetwortdeconf/knetworkinfo.h
diff --git a/knetworkconf/knetworkconf/knetworkinterface.cpp b/knetwortdeconf/knetwortdeconf/knetworkinterface.cpp
similarity index 100%
rename from knetworkconf/knetworkconf/knetworkinterface.cpp
rename to knetwortdeconf/knetwortdeconf/knetworkinterface.cpp
diff --git a/knetworkconf/knetworkconf/knetworkinterface.h b/knetwortdeconf/knetwortdeconf/knetworkinterface.h
similarity index 100%
rename from knetworkconf/knetworkconf/knetworkinterface.h
rename to knetwortdeconf/knetwortdeconf/knetworkinterface.h
diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetwortdeconf/knetwortdeconf/knetwortdeconf.cpp
similarity index 99%
rename from knetworkconf/knetworkconf/knetworkconf.cpp
rename to knetwortdeconf/knetwortdeconf/knetwortdeconf.cpp
index f0df35d..3a01a60 100644
--- a/knetworkconf/knetworkconf/knetworkconf.cpp
+++ b/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
-#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"
diff --git a/knetworkconf/knetworkconf/knetworkconf.desktop b/knetwortdeconf/knetwortdeconf/knetwortdeconf.desktop
similarity index 97%
rename from knetworkconf/knetworkconf/knetworkconf.desktop
rename to knetwortdeconf/knetwortdeconf/knetwortdeconf.desktop
index b7471c1..7b24479 100644
--- a/knetworkconf/knetworkconf/knetworkconf.desktop
+++ b/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]=إعداد تعيينات ميفاق التحكم بلنقل/ميفاق الإنترنت
diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetwortdeconf/knetwortdeconf/knetwortdeconf.h
similarity index 97%
rename from knetworkconf/knetworkconf/knetworkconf.h
rename to knetwortdeconf/knetwortdeconf/knetwortdeconf.h
index eec10da..ce1bf15 100644
--- a/knetworkconf/knetworkconf/knetworkconf.h
+++ b/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
-#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 */
diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui
similarity index 99%
rename from knetworkconf/knetworkconf/knetworkconfdlg.ui
rename to knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui
index c878373..4834ca4 100644
--- a/knetworkconf/knetworkconf/knetworkconfdlg.ui
+++ b/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui
@@ -1040,7 +1040,7 @@
- knetworkconfdlg.ui.h
+ knetwortdeconfdlg.ui.h
tqlistview.h
diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui.h b/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui.h
similarity index 100%
rename from knetworkconf/knetworkconf/knetworkconfdlg.ui.h
rename to knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui.h
diff --git a/knetworkconf/knetworkconf/knetworkconfiface.h b/knetwortdeconf/knetwortdeconf/knetwortdeconfiface.h
similarity index 91%
rename from knetworkconf/knetworkconf/knetworkconfiface.h
rename to knetwortdeconf/knetwortdeconf/knetwortdeconfiface.h
index 36dfb14..e1dc2c9 100644
--- a/knetworkconf/knetworkconf/knetworkconfiface.h
+++ b/knetwortdeconf/knetwortdeconf/knetwortdeconfiface.h
@@ -1,6 +1,6 @@
/* -*- c++ -*-
*
- * knetworkconfiface.h
+ * knetwortdeconfiface.h
*
* Copyright (C) 2004 Juan Luis Baptiste
*
@@ -20,8 +20,8 @@
*
*/
-#ifndef knetworkconf_iface_h
-#define knetworkconf_iface_h
+#ifndef knetwortdeconf_iface_h
+#define knetwortdeconf_iface_h
#include
diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.cpp
similarity index 95%
rename from knetworkconf/knetworkconf/knetworkconfigparser.cpp
rename to knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.cpp
index 1404838..a9fa230 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp
+++ b/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");
diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.h b/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h
similarity index 97%
rename from knetworkconf/knetworkconf/knetworkconfigparser.h
rename to knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h
index a18434d..8161da5 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.h
+++ b/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:
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.cpp
similarity index 89%
rename from knetworkconf/knetworkconf/knetworkconfmodule.cpp
rename to knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.cpp
index 93a930c..0982379 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp
+++ b/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
#include
#include
-#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("").arg("
").arg("
");
}
-//#include "knetworkconfmodule.moc"
+//#include "knetwortdeconfmodule.moc"
-#include "knetworkconfmodule.moc"
+#include "knetwortdeconfmodule.moc"
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.h b/knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.h
similarity index 94%
rename from knetworkconf/knetworkconf/knetworkconfmodule.h
rename to knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.h
index 0e56706..e4321b9 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.h
+++ b/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
#include
diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.cpp b/knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.cpp
similarity index 100%
rename from knetworkconf/knetworkconf/kprofileslistviewtooltip.cpp
rename to knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.cpp
diff --git a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h b/knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.h
similarity index 99%
rename from knetworkconf/knetworkconf/kprofileslistviewtooltip.h
rename to knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.h
index dc30c12..deec161 100644
--- a/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
+++ b/knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.h
@@ -23,7 +23,7 @@
#include
#include "knetworkinfo.h"
-#include "knetworkconfigparser.h"
+#include "knetwortdeconfigparser.h"
class KProfilesListViewToolTip : public TQToolTip
{
diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetwortdeconf/knetwortdeconf/kreloadnetworkdlg.ui
similarity index 100%
rename from knetworkconf/knetworkconf/kreloadnetworkdlg.ui
rename to knetwortdeconf/knetwortdeconf/kreloadnetworkdlg.ui
diff --git a/knetworkconf/knetworkconf/kroutinginfo.cpp b/knetwortdeconf/knetwortdeconf/kroutinginfo.cpp
similarity index 100%
rename from knetworkconf/knetworkconf/kroutinginfo.cpp
rename to knetwortdeconf/knetwortdeconf/kroutinginfo.cpp
diff --git a/knetworkconf/knetworkconf/kroutinginfo.h b/knetwortdeconf/knetwortdeconf/kroutinginfo.h
similarity index 100%
rename from knetworkconf/knetworkconf/kroutinginfo.h
rename to knetwortdeconf/knetwortdeconf/kroutinginfo.h
diff --git a/knetworkconf/knetworkconf/kselectdistrodlg.ui b/knetwortdeconf/knetwortdeconf/kselectdistrodlg.ui
similarity index 100%
rename from knetworkconf/knetworkconf/kselectdistrodlg.ui
rename to knetwortdeconf/knetwortdeconf/kselectdistrodlg.ui
diff --git a/knetworkconf/knetworkconf/kwirelessinterface.cpp b/knetwortdeconf/knetwortdeconf/kwirelessinterface.cpp
similarity index 100%
rename from knetworkconf/knetworkconf/kwirelessinterface.cpp
rename to knetwortdeconf/knetwortdeconf/kwirelessinterface.cpp
diff --git a/knetworkconf/knetworkconf/kwirelessinterface.h b/knetwortdeconf/knetwortdeconf/kwirelessinterface.h
similarity index 100%
rename from knetworkconf/knetworkconf/kwirelessinterface.h
rename to knetwortdeconf/knetwortdeconf/kwirelessinterface.h
diff --git a/knetworkconf/knetworkconf/main.cpp b/knetwortdeconf/knetwortdeconf/main.cpp
similarity index 83%
rename from knetworkconf/knetworkconf/main.cpp
rename to knetwortdeconf/knetwortdeconf/main.cpp
index 710d977..d7cded7 100644
--- a/knetworkconf/knetworkconf/main.cpp
+++ b/knetwortdeconf/knetwortdeconf/main.cpp
@@ -25,8 +25,8 @@
#include
#include
-//#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 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);
}
}
diff --git a/knetworkconf/knetworkconf/version.h b/knetwortdeconf/knetwortdeconf/version.h
similarity index 100%
rename from knetworkconf/knetworkconf/version.h
rename to knetwortdeconf/knetwortdeconf/version.h
diff --git a/knetworkconf/pasosRelease.txt b/knetwortdeconf/pasosRelease.txt
similarity index 88%
rename from knetworkconf/pasosRelease.txt
rename to knetwortdeconf/pasosRelease.txt
index 9abaa5a..2fce150 100644
--- a/knetworkconf/pasosRelease.txt
+++ b/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
\ No newline at end of file
+- kde-announce, knetwortdeconf-announce, kde-debian en ingles
\ No newline at end of file
diff --git a/knetworkconf/pixmaps/Makefile.am b/knetwortdeconf/pixmaps/Makefile.am
similarity index 88%
rename from knetworkconf/pixmaps/Makefile.am
rename to knetwortdeconf/pixmaps/Makefile.am
index 250a3a7..0e0e1d8 100644
--- a/knetworkconf/pixmaps/Makefile.am
+++ b/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
diff --git a/knetworkconf/pixmaps/ark.png b/knetwortdeconf/pixmaps/ark.png
similarity index 100%
rename from knetworkconf/pixmaps/ark.png
rename to knetwortdeconf/pixmaps/ark.png
diff --git a/knetworkconf/pixmaps/blackpanther.png b/knetwortdeconf/pixmaps/blackpanther.png
similarity index 100%
rename from knetworkconf/pixmaps/blackpanther.png
rename to knetwortdeconf/pixmaps/blackpanther.png
diff --git a/knetworkconf/pixmaps/conectiva.png b/knetwortdeconf/pixmaps/conectiva.png
similarity index 100%
rename from knetworkconf/pixmaps/conectiva.png
rename to knetwortdeconf/pixmaps/conectiva.png
diff --git a/knetworkconf/pixmaps/debian.png b/knetwortdeconf/pixmaps/debian.png
similarity index 100%
rename from knetworkconf/pixmaps/debian.png
rename to knetwortdeconf/pixmaps/debian.png
diff --git a/knetworkconf/pixmaps/fedora.png b/knetwortdeconf/pixmaps/fedora.png
similarity index 100%
rename from knetworkconf/pixmaps/fedora.png
rename to knetwortdeconf/pixmaps/fedora.png
diff --git a/knetworkconf/pixmaps/freebsd.png b/knetwortdeconf/pixmaps/freebsd.png
similarity index 100%
rename from knetworkconf/pixmaps/freebsd.png
rename to knetwortdeconf/pixmaps/freebsd.png
diff --git a/knetworkconf/pixmaps/gentoo.png b/knetwortdeconf/pixmaps/gentoo.png
similarity index 100%
rename from knetworkconf/pixmaps/gentoo.png
rename to knetwortdeconf/pixmaps/gentoo.png
diff --git a/knetworkconf/pixmaps/hi22-action-network_connected_lan_knc.png b/knetwortdeconf/pixmaps/hi22-action-network_connected_lan_knc.png
similarity index 100%
rename from knetworkconf/pixmaps/hi22-action-network_connected_lan_knc.png
rename to knetwortdeconf/pixmaps/hi22-action-network_connected_lan_knc.png
diff --git a/knetworkconf/pixmaps/hi22-action-network_disconnected_lan.png b/knetwortdeconf/pixmaps/hi22-action-network_disconnected_lan.png
similarity index 100%
rename from knetworkconf/pixmaps/hi22-action-network_disconnected_lan.png
rename to knetwortdeconf/pixmaps/hi22-action-network_disconnected_lan.png
diff --git a/knetworkconf/pixmaps/hi22-action-network_disconnected_wlan.png b/knetwortdeconf/pixmaps/hi22-action-network_disconnected_wlan.png
similarity index 100%
rename from knetworkconf/pixmaps/hi22-action-network_disconnected_wlan.png
rename to knetwortdeconf/pixmaps/hi22-action-network_disconnected_wlan.png
diff --git a/knetworkconf/pixmaps/hi22-action-network_traffic_wlan.png b/knetwortdeconf/pixmaps/hi22-action-network_traffic_wlan.png
similarity index 100%
rename from knetworkconf/pixmaps/hi22-action-network_traffic_wlan.png
rename to knetwortdeconf/pixmaps/hi22-action-network_traffic_wlan.png
diff --git a/knetworkconf/pixmaps/kubuntu.png b/knetwortdeconf/pixmaps/kubuntu.png
similarity index 100%
rename from knetworkconf/pixmaps/kubuntu.png
rename to knetwortdeconf/pixmaps/kubuntu.png
diff --git a/knetworkconf/pixmaps/mandriva.png b/knetwortdeconf/pixmaps/mandriva.png
similarity index 100%
rename from knetworkconf/pixmaps/mandriva.png
rename to knetwortdeconf/pixmaps/mandriva.png
diff --git a/knetworkconf/pixmaps/openna.png b/knetwortdeconf/pixmaps/openna.png
similarity index 100%
rename from knetworkconf/pixmaps/openna.png
rename to knetwortdeconf/pixmaps/openna.png
diff --git a/knetworkconf/pixmaps/pld.png b/knetwortdeconf/pixmaps/pld.png
similarity index 100%
rename from knetworkconf/pixmaps/pld.png
rename to knetwortdeconf/pixmaps/pld.png
diff --git a/knetworkconf/pixmaps/redhat.png b/knetwortdeconf/pixmaps/redhat.png
similarity index 100%
rename from knetworkconf/pixmaps/redhat.png
rename to knetwortdeconf/pixmaps/redhat.png
diff --git a/knetworkconf/pixmaps/rpath.png b/knetwortdeconf/pixmaps/rpath.png
similarity index 100%
rename from knetworkconf/pixmaps/rpath.png
rename to knetwortdeconf/pixmaps/rpath.png
diff --git a/knetworkconf/pixmaps/slackware.png b/knetwortdeconf/pixmaps/slackware.png
similarity index 100%
rename from knetworkconf/pixmaps/slackware.png
rename to knetwortdeconf/pixmaps/slackware.png
diff --git a/knetworkconf/pixmaps/suse.png b/knetwortdeconf/pixmaps/suse.png
similarity index 100%
rename from knetworkconf/pixmaps/suse.png
rename to knetwortdeconf/pixmaps/suse.png
diff --git a/knetworkconf/pixmaps/turbolinux.png b/knetwortdeconf/pixmaps/turbolinux.png
similarity index 100%
rename from knetworkconf/pixmaps/turbolinux.png
rename to knetwortdeconf/pixmaps/turbolinux.png
diff --git a/knetworkconf/pixmaps/vine.png b/knetwortdeconf/pixmaps/vine.png
similarity index 100%
rename from knetworkconf/pixmaps/vine.png
rename to knetwortdeconf/pixmaps/vine.png
diff --git a/knetworkconf/pixmaps/yoper.png b/knetwortdeconf/pixmaps/yoper.png
similarity index 100%
rename from knetworkconf/pixmaps/yoper.png
rename to knetwortdeconf/pixmaps/yoper.png
diff --git a/knetworkconf/update_backends.sh b/knetwortdeconf/update_backends.sh
similarity index 100%
rename from knetworkconf/update_backends.sh
rename to knetwortdeconf/update_backends.sh
diff --git a/kpackage/CHANGES b/kpackage/CHANGES
index e9a8fb2..6385956 100644
--- a/kpackage/CHANGES
+++ b/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)
diff --git a/kpackage/kio.h b/kpackage/kio.h
index 6698d67..83e9794 100644
--- a/kpackage/kio.h
+++ b/kpackage/kio.h
@@ -35,7 +35,7 @@
#include
#include
#include "../config.h"
-#include
+#include
class Kio: public TQObject
{
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index add161e..7c24e17 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -37,7 +37,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h
index 18e6e85..c552b81 100644
--- a/kpackage/kpackage.h
+++ b/kpackage/kpackage.h
@@ -183,7 +183,7 @@ public:
// Widget modes
TDEConfig *config;
- // pointer to kconfig object
+ // pointer to tdeconfig object
managementWidget *management;
// management widget
diff --git a/kpackage/options.h b/kpackage/options.h
index 433a08c..5eb5d46 100644
--- a/kpackage/options.h
+++ b/kpackage/options.h
@@ -42,7 +42,7 @@
// KDE headers
#include
-#include
+#include
#include
diff --git a/ksysv/AUTHORS b/ksysv/AUTHORS
index a2a59a9..dad4d1f 100644
--- a/ksysv/AUTHORS
+++ b/ksysv/AUTHORS
@@ -4,7 +4,7 @@ Current Code
Main developer:
Peter Putzer
-leveldb.{h,c} (from chkconfig):
+leveldb.{h,c} (from chtdeconfig):
Red Hat Software http://www.redhat.com
Previous Versions
diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp
index 26bea71..4724eb7 100644
--- a/ksysv/TopWidget.cpp
+++ b/ksysv/TopWidget.cpp
@@ -67,7 +67,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp
index 0b63438..37a24ee 100644
--- a/ksysv/ksv_conf.cpp
+++ b/ksysv/ksv_conf.cpp
@@ -17,7 +17,7 @@
#include
#include
#include
-#include
+#include
#include "ksv_core.h"
#include "ksv_conf.h"
diff --git a/ksysv/ksvconfigwizard.cpp b/ksysv/ksvconfigwizard.cpp
index a869d46..54450fa 100644
--- a/ksysv/ksvconfigwizard.cpp
+++ b/ksysv/ksvconfigwizard.cpp
@@ -28,7 +28,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/ksysv/ksvpathconfig.cpp b/ksysv/ksvpathconfig.cpp
index 5f1193a..8c713d8 100644
--- a/ksysv/ksvpathconfig.cpp
+++ b/ksysv/ksvpathconfig.cpp
@@ -26,7 +26,7 @@
#include "ksvpathconfig.h"
#include
-#include
+#include
/*
* Constructs a KSVPathConfig which is a child of 'parent', with the
diff --git a/ksysv/leveldb.c b/ksysv/leveldb.c
index 149cb3b..030e941 100644
--- a/ksysv/leveldb.c
+++ b/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) {
diff --git a/ksysv/leveldb.h b/ksysv/leveldb.h
index e18d202..ef6dea9 100644
--- a/ksysv/leveldb.h
+++ b/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);
diff --git a/kuser/editDefaults.h b/kuser/editDefaults.h
index 954ae80..0c39f67 100644
--- a/kuser/editDefaults.h
+++ b/kuser/editDefaults.h
@@ -22,7 +22,7 @@
#define _KU_EDITDEFAULTS_H_
#include
-#include
+#include
#include
#include
#include "ldapsamba.h"
diff --git a/kuser/globals.h b/kuser/globals.h
index dde58a5..5e0e2f1 100644
--- a/kuser/globals.h
+++ b/kuser/globals.h
@@ -27,7 +27,7 @@
#ifdef HAVE_PATHS_H
#include
#endif
-#include
+#include
#include "kuserprefs.h"
#define KU_BACKUP_EXT ".bak"
diff --git a/kuser/kgroupldap.h b/kuser/kgroupldap.h
index acb2ba9..6695619 100644
--- a/kuser/kgroupldap.h
+++ b/kuser/kgroupldap.h
@@ -28,7 +28,7 @@
#include
#include
#include
-#include
+#include
#include "kgroup.h"
diff --git a/kuser/kuser.cpp b/kuser/kuser.cpp
index c903500..c1abe52 100644
--- a/kuser/kuser.cpp
+++ b/kuser/kuser.cpp
@@ -41,7 +41,7 @@
#include
#include
#include
-#include
+#include
#include
// class KUser
diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp
index 36de3b4..c274031 100644
--- a/kuser/kuserldap.cpp
+++ b/kuser/kuserldap.cpp
@@ -21,7 +21,7 @@
#include
#include
#include
-#include
+#include
#include "kglobal_.h"
#include "kuserldap.h"
diff --git a/kuser/kuserldap.h b/kuser/kuserldap.h
index d60227d..e39c131 100644
--- a/kuser/kuserldap.h
+++ b/kuser/kuserldap.h
@@ -28,7 +28,7 @@
#include
#include
#include
-#include
+#include
#include "kuser.h"
diff --git a/kuser/kuserprefs.kcfgc b/kuser/kuserprefs.kcfgc
index 923cb4d..3efe9ea 100644
--- a/kuser/kuserprefs.kcfgc
+++ b/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
diff --git a/kuser/main.cpp b/kuser/main.cpp
index f22e8b4..4bc9186 100644
--- a/kuser/main.cpp
+++ b/kuser/main.cpp
@@ -22,7 +22,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/lilo-config/kde-qt-common/ui.h b/lilo-config/kde-qt-common/ui.h
index 6f65124..1fb2573 100644
--- a/lilo-config/kde-qt-common/ui.h
+++ b/lilo-config/kde-qt-common/ui.h
@@ -37,7 +37,7 @@
#include
#include
#include
-#include
+#include
#define _(x) i18n(x)
#define WarningYesNo(parent, caption, text) \
KMessageBox::warningYesNo(parent, text, caption)
diff --git a/lilo-config/kde/lilo.desktop b/lilo-config/kde/lilo.desktop
index 637f65c..75f41cd 100644
--- a/lilo-config/kde/lilo.desktop
+++ b/lilo-config/kde/lilo.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell lilo
+Exec=tdecmshell lilo
Icon=hdd_unmount
Type=Application
diff --git a/kfile-plugins/Makefile.am b/tdefile-plugins/Makefile.am
similarity index 100%
rename from kfile-plugins/Makefile.am
rename to tdefile-plugins/Makefile.am
diff --git a/tdefile-plugins/deb/Makefile.am b/tdefile-plugins/deb/Makefile.am
new file mode 100644
index 0000000..60de00c
--- /dev/null
+++ b/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)
diff --git a/kfile-plugins/deb/kfile_deb.cpp b/tdefile-plugins/deb/tdefile_deb.cpp
similarity index 97%
rename from kfile-plugins/deb/kfile_deb.cpp
rename to tdefile-plugins/deb/tdefile_deb.cpp
index b2ca328..0fb86ee 100644
--- a/kfile-plugins/deb/kfile_deb.cpp
+++ b/tdefile-plugins/deb/tdefile_deb.cpp
@@ -37,11 +37,11 @@
#include
#include
-#include "kfile_deb.h"
+#include "tdefile_deb.h"
typedef KGenericFactory 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"
diff --git a/kfile-plugins/deb/kfile_deb.desktop b/tdefile-plugins/deb/tdefile_deb.desktop
similarity index 98%
rename from kfile-plugins/deb/kfile_deb.desktop
rename to tdefile-plugins/deb/tdefile_deb.desktop
index 255baaf..403cf2d 100644
--- a/kfile-plugins/deb/kfile_deb.desktop
+++ b/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
diff --git a/kfile-plugins/deb/kfile_deb.h b/tdefile-plugins/deb/tdefile_deb.h
similarity index 97%
rename from kfile-plugins/deb/kfile_deb.h
rename to tdefile-plugins/deb/tdefile_deb.h
index 48446e0..ef6979f 100644
--- a/kfile-plugins/deb/kfile_deb.h
+++ b/tdefile-plugins/deb/tdefile_deb.h
@@ -20,7 +20,7 @@
#ifndef __KFILE_DEB_H__
#define __KFILE_DEB_H__
-#include
+#include
class TQStringList;
diff --git a/tdefile-plugins/rpm/Makefile.am b/tdefile-plugins/rpm/Makefile.am
new file mode 100644
index 0000000..e97997c
--- /dev/null
+++ b/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)
diff --git a/kfile-plugins/rpm/kfile_rpm.cpp b/tdefile-plugins/rpm/tdefile_rpm.cpp
similarity index 97%
rename from kfile-plugins/rpm/kfile_rpm.cpp
rename to tdefile-plugins/rpm/tdefile_rpm.cpp
index 39ef9c1..3adb742 100644
--- a/kfile-plugins/rpm/kfile_rpm.cpp
+++ b/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 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"
diff --git a/kfile-plugins/rpm/kfile_rpm.desktop b/tdefile-plugins/rpm/tdefile_rpm.desktop
similarity index 98%
rename from kfile-plugins/rpm/kfile_rpm.desktop
rename to tdefile-plugins/rpm/tdefile_rpm.desktop
index 5bc63bf..713a514 100644
--- a/kfile-plugins/rpm/kfile_rpm.desktop
+++ b/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
diff --git a/kfile-plugins/rpm/kfile_rpm.h b/tdefile-plugins/rpm/tdefile_rpm.h
similarity index 98%
rename from kfile-plugins/rpm/kfile_rpm.h
rename to tdefile-plugins/rpm/tdefile_rpm.h
index bf884c5..534650a 100644
--- a/kfile-plugins/rpm/kfile_rpm.h
+++ b/tdefile-plugins/rpm/tdefile_rpm.h
@@ -20,7 +20,7 @@
#ifndef __KFILE_RPM_H__
#define __KFILE_RPM_H__
-#include
+#include
class TQStringList;