diff options
Diffstat (limited to 'knetworkconf')
21 files changed, 140 insertions, 571 deletions
diff --git a/knetworkconf/backends/guess_system.sh b/knetworkconf/backends/guess_system.sh index 9b7bfa9..48d4e2b 100755 --- a/knetworkconf/backends/guess_system.sh +++ b/knetworkconf/backends/guess_system.sh @@ -68,61 +68,6 @@ trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - cat <<EOF >$dummy.s - .globl main - .ent main -main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 - .end main -EOF - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - ./$dummy - case "$?" in - 7) - UNAME_MACHINE="alpha" - ;; - 15) - UNAME_MACHINE="alphaev5" - ;; - 14) - UNAME_MACHINE="alphaev56" - ;; - 10) - UNAME_MACHINE="alphapca56" - ;; - 16) - UNAME_MACHINE="alphaev6" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit 0 ;; @@ -328,22 +273,6 @@ EOF m88k:*:3*:R3*) echo m88k-motorola-sysv3 exit 0 ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit 0 ;; @@ -504,19 +433,6 @@ EOF *9??*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i?86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; @@ -868,9 +784,6 @@ EOF Intel:Mach:3*:*) echo i386-pc-mach3 exit 0 ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 @@ -913,20 +826,6 @@ EOF SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit 0 ;; PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> echo i586-unisys-sysv4 diff --git a/knetworkconf/backends/network-conf.in b/knetworkconf/backends/network-conf.in index 20fb5e0..296bcb2 100755 --- a/knetworkconf/backends/network-conf.in +++ b/knetworkconf/backends/network-conf.in @@ -76,9 +76,8 @@ $version = "@VERSION@"; "conectiva-9", "conectiva-10", "vine-3.0", "vine-3.1", "ark", - "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0", - "slackware-11.0.0", "slackware-12.0.0", "slackware-12.1.0", "slackware-12.2.0", "slackware-13.0.0", "slackware-13.1.0", "slackware-13.37.0", "slackware-14.0.0", - "slackware-14.1.0", "gentoo", "vlos-1.2", + "slackware-13.0.0.0.0", "slackware-13.1.0", "slackware-13.37.0", "slackware-14.0", + "slackware-14.1", "slackware-14.2", "slackware-15.0", "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7", "freebsd-8", "freebsd-9", "freebsd-10"); $description =<<"end_of_description;"; diff --git a/knetworkconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in index 53f9e8c..7183f15 100644 --- a/knetworkconf/backends/network.pl.in +++ b/knetworkconf/backends/network.pl.in @@ -573,19 +573,13 @@ sub gst_network_get_broadcast_ping_cmd "vine-3.0" => "redhat-6.2", "vine-3.1" => "redhat-6.2", "ark" => "redhat-6.2", - "slackware-9.1.0" => "redhat-6.2", - "slackware-10.0.0" => "redhat-6.2", - "slackware-10.1.0" => "redhat-6.2", - "slackware-10.2.0" => "redhat-6.2", - "slackware-11.0.0" => "redhat-6.2", - "slackware-12.0.0" => "redhat-6.2", - "slackware-12.1.0" => "redhat-6.2", - "slackware-12.2.0" => "redhat-6.2", - "slackware-13.0.0" => "redhat-6.2", + "slackware-13.0.0.0.0" => "redhat-6.2", "slackware-13.1.0" => "redhat-6.2", "slackware-13.37.0" => "redhat-6.2", - "slackware-14.0.0" => "redhat-6.2", - "slackware-14.1.0" => "redhat-6.2", + "slackware-14.0" => "redhat-6.2", + "slackware-14.1" => "redhat-6.2", + "slackware-14.2" => "redhat-6.2", + "slackware-15.0" => "redhat-6.2", "gentoo" => "debian-2.2", "vlos-1.2" => "debian-2.2", "freebsd-5" => "debian-2.2", @@ -1938,19 +1932,13 @@ sub gst_network_get_file "vine-3.0" => \&gst_network_rh62_get_file, "vine-3.1" => \&gst_network_rh62_get_file, "ark" => \&gst_network_rh62_get_file, - "slackware-9.1.0" => \&gst_network_deb22_get_file, - "slackware-10.0.0" => \&gst_network_deb22_get_file, - "slackware-10.1.0" => \&gst_network_deb22_get_file, - "slackware-10.2.0" => \&gst_network_deb22_get_file, - "slackware-11.0.0" => \&gst_network_deb22_get_file, - "slackware-12.0.0" => \&gst_network_deb22_get_file, - "slackware-12.1.0" => \&gst_network_deb22_get_file, - "slackware-12.2.0" => \&gst_network_deb22_get_file, - "slackware-13.0.0" => \&gst_network_deb22_get_file, + "slackware-13.0.0.0.0" => \&gst_network_deb22_get_file, "slackware-13.1.0" => \&gst_network_deb22_get_file, "slackware-13.37.0" => \&gst_network_deb22_get_file, - "slackware-14.0.0" => \&gst_network_deb22_get_file, - "slackware-14.1.0" => \&gst_network_deb22_get_file, + "slackware-14.0" => \&gst_network_deb22_get_file, + "slackware-14.1" => \&gst_network_deb22_get_file, + "slackware-14.2" => \&gst_network_deb22_get_file, + "slackware-15.0" => \&gst_network_deb22_get_file, "gentoo" => \&gst_network_deb22_get_file, "freebsd-5" => \&gst_network_deb22_get_file, "freebsd-6" => \&gst_network_deb22_get_file, @@ -4123,19 +4111,13 @@ sub gst_network_ensure_loopback_interface "vine-3.0" => "lo", "vine-3.1" => "lo", "ark" => "lo", - "slackware-9.1.0" => "", - "slackware-10.0.0" => "", - "slackware-10.1.0" => "", - "slackware-10.2.0" => "", - "slackware-11.0.0" => "", - "slackware-12.0.0" => "", - "slackware-12.1.0" => "", - "slackware-12.2.0" => "", - "slackware-13.0.0" => "", + "slackware-13.0.0.0.0" => "", "slackware-13.1.0" => "", "slackware-13.37.0" => "", - "slackware-14.0.0" => "", - "slackware-14.1.0" => "", + "slackware-14.0" => "", + "slackware-14.1" => "", + "slackware-14.2" => "", + "slackware-15.0" => "", "gentoo" => "", "vlos-1.2" => "", "freebsd-5" => "", @@ -4352,19 +4334,13 @@ sub gst_network_get_parse_table "vine-3.0" => "redhat-7.0", "vine-3.1" => "redhat-7.0", "ark" => "redhat-7.0", - "slackware-9.1.0" => "slackware-9.1.0", - "slackware-10.0.0" => "slackware-9.1.0", - "slackware-10.1.0" => "slackware-9.1.0", - "slackware-10.2.0" => "slackware-9.1.0", - "slackware-11.0.0" => "slackware-9.1.0", - "slackware-12.0.0" => "slackware-9.1.0", - "slackware-12.1.0" => "slackware-9.1.0", - "slackware-12.2.0" => "slackware-9.1.0", - "slackware-13.0.0" => "slackware-9.1.0", + "slackware-13.0.0.0.0" => "slackware-9.1.0", "slackware-13.1.0" => "slackware-9.1.0", "slackware-13.37.0" => "slackware-9.1.0", - "slackware-14.0.0" => "slackware-9.1.0", - "slackware-14.1.0" => "slackware-9.1.0", + "slackware-14.0" => "slackware-9.1.0", + "slackware-14.1" => "slackware-9.1.0", + "slackware-14.2" => "slackware-9.1.0", + "slackware-15.0" => "slackware-9.1.0", "gentoo" => "gentoo", "vlos-1.2" => "gentoo", "freebsd-5" => "freebsd-5", @@ -4827,19 +4803,13 @@ sub gst_network_get_interface_parse_table "vine-3.0" => "vine-3.0", "vine-3.1" => "vine-3.0", "ark" => "vine-3.0", - "slackware-9.1.0" => "slackware-9.1.0", - "slackware-10.0.0" => "slackware-9.1.0", - "slackware-10.1.0" => "slackware-9.1.0", - "slackware-10.2.0" => "slackware-9.1.0", - "slackware-11.0.0" => "slackware-9.1.0", - "slackware-12.0.0" => "slackware-9.1.0", - "slackware-12.1.0" => "slackware-9.1.0", - "slackware-12.2.0" => "slackware-9.1.0", - "slackware-13.0.0" => "slackware-9.1.0", + "slackware-13.0.0.0.0" => "slackware-9.1.0", "slackware-13.1.0" => "slackware-9.1.0", "slackware-13.37.0" => "slackware-9.1.0", - "slackware-14.0.0" => "slackware-9.1.0", - "slackware-14.1.0" => "slackware-9.1.0", + "slackware-14.0" => "slackware-9.1.0", + "slackware-14.1" => "slackware-9.1.0", + "slackware-14.2" => "slackware-9.1.0", + "slackware-15.0" => "slackware-9.1.0", "gentoo" => "gentoo", "vlos-1.2" => "gentoo", "freebsd-5" => "freebsd-5", @@ -5726,19 +5696,13 @@ sub gst_network_get_replace_table "vine-3.0" => "redhat-7.0", "vine-3.1" => "redhat-7.0", "ark" => "redhat-7.0", - "slackware-9.1.0" => "slackware-9.1.0", - "slackware-10.0.0" => "slackware-9.1.0", - "slackware-10.1.0" => "slackware-9.1.0", - "slackware-10.2.0" => "slackware-9.1.0", - "slackware-11.0.0" => "slackware-9.1.0", - "slackware-12.0.0" => "slackware-9.1.0", - "slackware-12.1.0" => "slackware-9.1.0", - "slackware-12.2.0" => "slackware-9.1.0", - "slackware-13.0.0" => "slackware-9.1.0", + "slackware-13.0.0.0.0" => "slackware-9.1.0", "slackware-13.1.0" => "slackware-9.1.0", "slackware-13.37.0" => "slackware-9.1.0", - "slackware-14.0.0" => "slackware-9.1.0", - "slackware-14.1.0" => "slackware-9.1.0", + "slackware-14.0" => "slackware-9.1.0", + "slackware-14.1" => "slackware-9.1.0", + "slackware-14.2" => "slackware-9.1.0", + "slackware-15.0" => "slackware-9.1.0", "gentoo" => "gentoo", "vlos-1.2" => "gentoo", "freebsd-5" => "freebsd-5", @@ -6193,19 +6157,13 @@ sub gst_network_get_interface_replace_table "vine-3.0" => "vine-3.0", "vine-3.1" => "vine-3.0", "ark" => "vine-3.0", - "slackware-9.1.0" => "slackware-9.1.0", - "slackware-10.0.0" => "slackware-9.1.0", - "slackware-10.1.0" => "slackware-9.1.0", - "slackware-10.2.0" => "slackware-9.1.0", - "slackware-11.0.0" => "slackware-9.1.0", - "slackware-12.0.0" => "slackware-9.1.0", - "slackware-12.1.0" => "slackware-9.1.0", - "slackware-12.2.0" => "slackware-9.1.0", - "slackware-13.0.0" => "slackware-9.1.0", + "slackware-13.0.0.0.0" => "slackware-9.1.0", "slackware-13.1.0" => "slackware-9.1.0", "slackware-13.37.0" => "slackware-9.1.0", - "slackware-14.0.0" => "slackware-9.1.0", - "slackware-14.1.0" => "slackware-9.1.0", + "slackware-14.0" => "slackware-9.1.0", + "slackware-14.1" => "slackware-9.1.0", + "slackware-14.2" => "slackware-9.1.0", + "slackware-15.0" => "slackware-9.1.0", "gentoo" => "gentoo", "vlos-1.2" => "gentoo", "freebsd-5" => "freebsd-5", diff --git a/knetworkconf/backends/platform.pl.in b/knetworkconf/backends/platform.pl.in index cbe006f..d479154 100644 --- a/knetworkconf/backends/platform.pl.in +++ b/knetworkconf/backends/platform.pl.in @@ -110,22 +110,13 @@ $PLATFORM_INFO = { "suse-11.2" => "SuSE Linux 11.2", "suse-11.3" => "SuSE Linux 11.3", "turbolinux-7.0" => "Turbolinux 7.0", - "slackware-8.0.0" => "Slackware 8.0.0", - "slackware-8.1" => "Slackware 8.1", - "slackware-9.0.0" => "Slackware 9.0.0", - "slackware-9.1.0" => "Slackware 9.1.0", - "slackware-10.0.0" => "Slackware 10.0.0", - "slackware-10.1.0" => "Slackware 10.1.0", - "slackware-10.2.0" => "Slackware 10.2.0", - "slackware-11.0.0" => "Slackware 11.0.0", - "slackware-12.0.0" => "Slackware 12.0.0", - "slackware-12.1.0" => "Slackware 12.1.0", - "slackware-12.2.0" => "Slackware 12.2.0", - "slackware-13.0.0" => "Slackware 13.0.0", - "slackware-13.1.0" => "Slackware 13.1.0", - "slackware-13.37.0" => "Slackware 13.37.0", - "slackware-14.0.0" => "Slackware 14.0.0", - "slackware-14.1.0" => "Slackware 14.1.0", + "slackware-13.0.0.0.0" => "Slackware 13.0", + "slackware-13.1.0" => "Slackware 13.1", + "slackware-13.37.0" => "Slackware 13.37", + "slackware-14.0" => "Slackware 14.0", + "slackware-14.1" => "Slackware 14.1", + "slackware-14.2" => "Slackware 14.2", + "slackware-15.0" => "Slackware 15.0", "freebsd-4" => "FreeBSD 4", "freebsd-5" => "FreeBSD 5", "freebsd-6" => "FreeBSD 6", diff --git a/knetworkconf/backends/service.pl.in b/knetworkconf/backends/service.pl.in index 72a149f..605fd10 100644 --- a/knetworkconf/backends/service.pl.in +++ b/knetworkconf/backends/service.pl.in @@ -387,19 +387,13 @@ sub gst_service_get_runlevel_roles "vine-3.1" => "redhat-5.2", "ark" => "redhat-5.2", - "slackware-9.1.0" => "slackware-9.1.0", - "slackware-10.0.0" => "slackware-9.1.0", - "slackware-10.1.0" => "slackware-9.1.0", - "slackware-10.2.0" => "slackware-9.1.0", - "slackware-11.0.0" => "slackware-9.1.0", - "slackware-12.0.0" => "slackware-9.1.0", - "slackware-12.1.0" => "slackware-9.1.0", - "slackware-12.2.0" => "slackware-9.1.0", - "slackware-13.0.0" => "slackware-9.1.0", + "slackware-13.0.0.0.0" => "slackware-9.1.0", "slackware-13.1.0" => "slackware-9.1.0", "slackware-13.37.0" => "slackware-9.1.0", - "slackware-14.0.0" => "slackware-9.1.0", - "slackware-14.1.0" => "slackware-9.1.0", + "slackware-14.0" => "slackware-9.1.0", + "slackware-14.1" => "slackware-9.1.0", + "slackware-14.2" => "slackware-9.1.0", + "slackware-15.0" => "slackware-9.1.0", "gentoo" => "gentoo", "vlos-1.2" => "gentoo", diff --git a/knetworkconf/backends/type1inst b/knetworkconf/backends/type1inst index 86d6425..ed88f9d 100755 --- a/knetworkconf/backends/type1inst +++ b/knetworkconf/backends/type1inst @@ -216,7 +216,6 @@ $copyright = "Copyright (C) 1996-1998 James Macnicol ($emailaddress)"; "ep:expert", "exp:expert", "ornaments:ornaments", - "osf:oldstylefigures", "outline:outline", "sc:smallcaps", "shaded:shaded", diff --git a/knetworkconf/knetworkconf-mdk.spec b/knetworkconf/knetworkconf-mdk.spec deleted file mode 100644 index 8c1e88f..0000000 --- a/knetworkconf/knetworkconf-mdk.spec +++ /dev/null @@ -1,159 +0,0 @@ -%define name knetworkconf -%define version 0.6.1 -%define release 1mdk -#%define _unpackaged_files_terminate_build 0 - -Summary: A Trinity Control Center Module to configure Network settings. -Name: %{name} -Version: %{version} -Release: %{release} -License: GPL -Url: http://www.merlinux.org/knetworkconf/ -Group: Networking/Other -Source: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-buildroot -Requires: %_bindir/tdesu -Patch1: knetworkconf-0.6-fix-menu.patch.bz2 - -%description -KNetworkConf is a Trinity Control Center module to configure the Network -settings in a Linux machine. I developed it because I couldn't find any -application to do this from within KDE, and I think this is a "must have" -app for a serious Desktop Enviroment like KDE. -KNetworkConf can configure installed network devices (you can't -add new ones for now), the default gateway,host and domain names, -add/remove DNS servers and add/remove static hosts. - -%prep -rm -rf $RPM_BUILD_ROOT - -%setup -q -%patch1 -p0 -b .fix_menu - -%build -make -f Makefile.cvs -TQTDIR=%qtdir -export LD_LIBRARY_PATH=$TQTDIR/%_lib:$LD_LIBRARY_PATH - -# Search for qt/kde libraries in the right directories (avoid patch) -# NOTE: please don't regenerate configure scripts below -perl -pi -e "s@/lib(\"|\b[^/])@/%_lib\1@g if /(kde|qt)_(libdirs|libraries)=/" configure - - -%{?__cputoolize: %{__cputoolize} } - - -%ifarch %ix86 -CFLAGS="%optflags" CXXFLAGS="`echo %optflags |sed -e 's/-fomit-frame-pointer//'`" \ -%else -CFLAGS="%optflags" CXXFLAGS="%optflags" \ -%endif - %configure --disable-debug - -%make - -%install - -%makeinstall_std - -%find_lang %name - -mkdir -p %buildroot/{%_miconsdir,%{_prefix}/share/pixmaps/} -install -m 644 %{name}/lo16-app-%{name}.png %buildroot/%{_miconsdir}/%{name}.png -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} - - -%post -/sbin/ldconfig -%{update_menus} - -%postun -/sbin/ldconfig -%{clean_menus} - -%clean -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 -#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 - -%defattr(-,root,root,0755) -%doc README COPYING AUTHORS LEAME - -%{_libdir}/menu/* - -%{_libdir}/trinity/*.la -%{_libdir}/trinity/*.so -%{_libdir}/pkgconfig/*.pc -%{_iconsdir}/*.png -%{_miconsdir}/%{name}.png -%_datadir/applications/tde/*.desktop -%_datadir/pixmaps/network_card.png - -%_datadir/icons/locolor/16x16/apps/*.png -%_datadir/icons/locolor/22x22/apps/*.png -%_datadir/icons/locolor/32x32/apps/*.png -%_datadir/icons/hicolor/22x22/actions/*.png - -#%dir %_docdir/HTML/en/%{name}/ -%_docdir/HTML/en/%{name}/ -#%dir %_docdir/HTML/de/%{name}/ -%_docdir/HTML/de/%{name}/ -#%dir %_docdir/HTML/es/%{name}/ -%_docdir/HTML/es/%{name}/ - -%dir %_datadir/apps/%{name}/backends/ -%_datadir/apps/%{name}/backends/* - -%dir %_datadir/apps/%{name}/pixmaps/ -%_datadir/apps/%{name}/pixmaps/*.png - - -%changelog -* Sun Feb 20 2005 Juan Luis Baptiste <juan.baptiste@kdemail.net> 0.6.1-1mdk -- 0.6.1 - -* Tue Feb 08 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-3mdk -- Fix section - -* Thu Sep 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-2mdk -- Fix menu - -* Tue Aug 10 2004 Lenny Cartier <lenny@mandrakesoft.com> 0.6-1mdk -- from Juan Luis Baptiste <juan.baptiste@kdemail.net> : - - 0.6 - -* Tue Jun 15 2004 Lenny Cartier <lenny@mandrakesoft.com> 0.5-2mdk -- rebuild - -* Thu Feb 26 2004 Lenny Cartier <lenny@mandrakesoft.com> 0.5-1mdk -- 0.5 - -* Thu Oct 02 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4.2-1mdk -- 0.4.2 - -* Fri Jul 18 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 0.4.1-2mdk -- Rebuild - -* Thu Apr 10 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4.1-1mdk -- 0.4.1 -- find lang macro - -* Fri Mar 28 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4-1mdk -- from Juan Luis Baptiste <juancho@linuxmail.org> : - - Initial release. diff --git a/knetworkconf/knetworkconf.spec b/knetworkconf/knetworkconf.spec deleted file mode 100644 index 11b0d5c..0000000 --- a/knetworkconf/knetworkconf.spec +++ /dev/null @@ -1,110 +0,0 @@ -# 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 version 0.5 -%define release 1mdk - -Summary: A KDE application to configure TCP/IP settings. -Name: %{name} -Version: %{version} -Release: %{release} -License: GPL -Url: http://www.merlinux.org/knetworkconf/ -Group: Networking/Other -Source: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-buildroot -Requires: %_bindir/tdesu - -%description -KNetworkConf is a KDE application to configure TCP/IP settings -in a Linux machine. I developed it because I couldn't find any -application to configure TCP/IP settings from within KDE, and I -think this is a "must have" app for a serious Desktop Enviroment -like KDE. -KNetworkConf can configure installed network devices (you can't -add new ones for now), the default gateway,host and domain names, -and add/remove DNS servers. This first version is a standalone -application, but the idea is to make it a Trinity Control Center -module and a KApplet to have a fast access to it from the KDE -panel. - -%prep -rm -rf $RPM_BUILD_ROOT - -%setup - -./configure --prefix=%_prefix --mandir=%_mandir --datadir=%_datadir --libdir=%_libdir - -%build - -%make - -%install -#icons -mkdir -p %buildroot/{%_miconsdir,%{_prefix}/share/pixmaps/} -#cd $RPM_BUILD_DIR/%{name}-%{version} -install -m 644 %{name}/lo16-app-%{name}.png %buildroot/%{_miconsdir}/%{name}.png -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 - -# Menu -mkdir -p %buildroot/%_menudir -cat <<EOF > %buildroot/%_menudir/%name -?package(%name): command="tdesu %_bindir/%name" needs="X11" \ -icon="%name.png" section="Configuration/Networking" \ -title="KNetworkConf" longtitle="Configure TCP/IP settings under KDE" -EOF - -make DESTDIR=$RPM_BUILD_ROOT bitsdata=$RPM_BUILD_ROOT/%{_datadir} bitssysconf=$RPM_BUILD_ROOT/%{_sysconfdir} install - -%find_lang %name - -%post -%{update_menus} - -%postun -%{clean_menus} - -%clean -rm -rf $RPM_BUILD_ROOT/* - - -%files -f %name.lang -%defattr(-,root,root,0755) -%doc README COPYING AUTHORS LEAME -%{_libdir}/menu/* -%{_bindir}/knetworkconf -%{_iconsdir}/*.png -%{_miconsdir}/%{name}.png -%_datadir/pixmaps/network_card.png -%_datadir/applnk-mdk/Configuration/Networking/* -%_datadir/applnk/System/* -#%_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/* -%{_libdir}/pkgconfig/system-tools-backends.pc - - -%changelog -* Sun Feb 22 2004 Juan Luis Baptiste <juan.baptiste@kdemail.net> 0.5-1mdk -- 0.5 - -* Thu Oct 02 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4.2-1mdk -- 0.4.2 - -* Fri Jul 18 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 0.4.1-2mdk -- Rebuild - -* Thu Apr 10 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4.1-1mdk -- 0.4.1 -- find lang macro - -* Fri Mar 28 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.4-1mdk -- from Juan Luis Baptiste <juancho@linuxmail.org> : - - Initial release. diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp index 529fb6f..aaeb48e 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp +++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp @@ -64,30 +64,30 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name) mainLayout->setResizeMode(TQLayout::Auto); //Setup connections - connect((KAddDeviceDlgExtension*)extension(),TQT_SIGNAL(valueChangedSignal(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - connect(addDlg->kleIPAddress,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); -// connect(addDlg->kleGateway,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(addDlg->kcbNetmask,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - connect(addDlg->kcbAutoBootProto,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(addDlg->kcbstartAtBoot,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggleAdvancedOptionsSlot(bool))); - connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),kpbAdvanced,TQT_SLOT(setDisabled(bool))); - connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kleIPAddress,TQT_SLOT(setDisabled(bool))); - // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kcbNetmask,TQT_SLOT(setDisabled(bool))); - // connect(addDlg->rbBootProtoManual,TQT_SIGNAL(toggled(bool)),addDlg->kcbAutoBootProto,TQT_SLOT(setDisabled(bool))); - connect(kpbCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelSlot())); - connect(kpbApply,TQT_SIGNAL(clicked()),this,TQT_SLOT(verifyDeviceInfoSlot())); - connect(kpbAdvanced,TQT_SIGNAL(clicked()),this,TQT_SLOT(advancedOptionsSlot())); + connect((KAddDeviceDlgExtension*)extension(),TQ_SIGNAL(valueChangedSignal(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + connect(addDlg->kleIPAddress,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); +// connect(addDlg->kleGateway,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(addDlg->kcbNetmask,TQ_SIGNAL(activated(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + connect(addDlg->kcbAutoBootProto,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(addDlg->kcbstartAtBoot,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(toggleAdvancedOptionsSlot(bool))); + connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),kpbAdvanced,TQ_SLOT(setDisabled(bool))); + connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + // connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),addDlg->kleIPAddress,TQ_SLOT(setDisabled(bool))); + // connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),addDlg->kcbNetmask,TQ_SLOT(setDisabled(bool))); + // connect(addDlg->rbBootProtoManual,TQ_SIGNAL(toggled(bool)),addDlg->kcbAutoBootProto,TQ_SLOT(setDisabled(bool))); + connect(kpbCancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelSlot())); + connect(kpbApply,TQ_SIGNAL(clicked()),this,TQ_SLOT(verifyDeviceInfoSlot())); + connect(kpbAdvanced,TQ_SIGNAL(clicked()),this,TQ_SLOT(advancedOptionsSlot())); } void KAddDeviceContainer::addWirelessWidget(){ extDlg = new KAddDeviceWifiExt(this); mainLayout->addWidget( extDlg ); - connect(extDlg->kleEssid,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(extDlg->kleWepKey,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(extDlg->qcbKeyType,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(extDlg->kleEssid,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(extDlg->kleWepKey,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(extDlg->qcbKeyType,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); } void KAddDeviceContainer::toggleApplyButtonSlot( const TQString & ) { diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui b/knetworkconf/knetworkconf/kadddevicedlgextension.ui index cbb59f0..27f15aa 100644 --- a/knetworkconf/knetworkconf/kadddevicedlgextension.ui +++ b/knetworkconf/knetworkconf/kadddevicedlgextension.ui @@ -138,12 +138,12 @@ <includes> <include location="local" impldecl="in implementation">kadddevicedlgextension.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>valueChangedSignal(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="private">valueChanged( const TQString & s )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> </functions> diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui index c47948c..5bcf80a 100644 --- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui +++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui @@ -147,9 +147,9 @@ <includes> <include location="local" impldecl="in implementation">kadddnsserverdlg.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">validateAddressSlot()</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual">setAddingAlias( bool add )</function> <function returnType="bool">modified()</function> diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui index 83b4ffe..8833928 100644 --- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui +++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui @@ -278,12 +278,12 @@ <includes> <include location="local" impldecl="in implementation">kaddknownhostdlg.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">validateAddressSlot()</slot> <slot access="private">editHostSlot()</slot> <slot access="private">removeHostSlot()</slot> <slot access="private">addHostSlot()</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> <function specifier="non virtual" returnType="bool">modified()</function> diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui index c392aaf..0447210 100644 --- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui +++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui @@ -94,9 +94,9 @@ <includes> <include location="local" impldecl="in implementation">kinterfaceupdowndlg.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>close()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index a92f5bc..b9912b5 100644 --- a/knetworkconf/knetworkconf/knetworkconf.cpp +++ b/knetworkconf/knetworkconf/knetworkconf.cpp @@ -33,19 +33,19 @@ KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNe tooltip = new KProfilesListViewToolTip(klvProfilesList); //Connect signals emmitted by the backend to know when data is ready to be painted. - connect(config,TQT_SIGNAL(readyLoadingNetworkInfo()),this,TQT_SLOT(getNetworkInfoSlot())); - connect(config,TQT_SIGNAL(readyLoadingNetworkInfo()),this,TQT_SLOT(showMainWindow())); - connect(config,TQT_SIGNAL(readyLoadingNetworkInfo()),this,TQT_SLOT(enableSignals())); - connect(config, TQT_SIGNAL(setReadOnly(bool)),this,TQT_SLOT(setReadOnlySlot(bool))); + connect(config,TQ_SIGNAL(readyLoadingNetworkInfo()),this,TQ_SLOT(getNetworkInfoSlot())); + connect(config,TQ_SIGNAL(readyLoadingNetworkInfo()),this,TQ_SLOT(showMainWindow())); + connect(config,TQ_SIGNAL(readyLoadingNetworkInfo()),this,TQ_SLOT(enableSignals())); + connect(config, TQ_SIGNAL(setReadOnly(bool)),this,TQ_SLOT(setReadOnlySlot(bool))); connect(klvCardList, - TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), + TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), this, - TQT_SLOT(showInterfaceContextMenuSlot(TDEListView*,TQListViewItem*, const TQPoint&))); + TQ_SLOT(showInterfaceContextMenuSlot(TDEListView*,TQListViewItem*, const TQPoint&))); // Register with DCOP - No longer needed as now we are a kcontrol module? - if ( !kapp->dcopClient()->isRegistered() ) { - kapp->dcopClient()->registerAs( "knetworkconf" ); - kapp->dcopClient()->setDefaultObject( objId() ); + if ( !tdeApp->dcopClient()->isRegistered() ) { + tdeApp->dcopClient()->registerAs( "knetworkconf" ); + tdeApp->dcopClient()->setDefaultObject( objId() ); } //Temporarly added while gst supports routing option. @@ -65,7 +65,7 @@ void KNetworkConf::getNetworkInfoSlot() KMessageBox::error(this, i18n("Could not load network configuration information."), i18n("Error Reading Configuration File")); - //kapp->quit(); + //tdeApp->quit(); //exit(1); } else @@ -151,7 +151,7 @@ void KNetworkConf::loadNetworkDevicesInfo() */ void KNetworkConf::quitSlot(){ int code = 0; - connect( config, TQT_SIGNAL(readyLoadingNetworkInfo()), this, TQT_SLOT(quitSlot()) ); + connect( config, TQ_SIGNAL(readyLoadingNetworkInfo()), this, TQ_SLOT(quitSlot()) ); if (modified) { code = KMessageBox::warningYesNoCancel(this, @@ -160,10 +160,10 @@ void KNetworkConf::quitSlot(){ if (code == KMessageBox::Yes) saveInfoSlot(); else if (code == KMessageBox::No) - kapp->quit(); + tdeApp->quit(); } else - kapp->quit(); + tdeApp->quit(); } /** Enables the configure and remove buttons. */ void KNetworkConf::enableButtonsSlot(){ @@ -492,12 +492,12 @@ void KNetworkConf::loadNetworkProfiles(){ /** Shows the help browser. Hopefully some day it will be one :-). */ void KNetworkConf::helpSlot(){ - kapp->invokeHelp(); + tdeApp->invokeHelp(); } /** No descriptions */ void KNetworkConf::aboutSlot(){ - TDEAboutApplication *about = new TDEAboutApplication(kapp->aboutData(),0); + TDEAboutApplication *about = new TDEAboutApplication(tdeApp->aboutData(),0); // about->setLogo(locate("icon","knetworkconf.png")); //tqDebug("locate icon= %s",locate("icon","knetworkconf.png").latin1()); @@ -570,7 +570,7 @@ void KNetworkConf::disableAll(){ kleDomainName->setReadOnly(true); tlDomainName->setEnabled(false); tlHostName->setEnabled(false); - disconnect(klvCardList,TQT_SIGNAL(doubleClicked(TQListViewItem *)),this,TQT_SLOT(configureDeviceSlot())); + disconnect(klvCardList,TQ_SIGNAL(doubleClicked(TQListViewItem *)),this,TQ_SLOT(configureDeviceSlot())); klvCardList->setEnabled(false); kpbUpButton->setEnabled(false); kpbDownButton->setEnabled(false); @@ -685,7 +685,7 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){ dialog->setModal(true); dialog->show(); - procDeviceState = new TQProcess(TQT_TQOBJECT(this)); + procDeviceState = new TQProcess(this); TQString cmd; procDeviceState->addArgument( locate("data",BACKEND_PATH) ); @@ -702,10 +702,10 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){ else if (state == DEVICE_DOWN) procDeviceState->addArgument("enable_iface::"+dev+"::0" ); - connect( procDeviceState, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(readFromStdoutUpDown()) ); - connect( procDeviceState, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readFromStdErrUpDown()) ); - connect( procDeviceState, TQT_SIGNAL(processExited()),this, TQT_SLOT(verifyDeviceStateChanged()) ); - connect( procDeviceState, TQT_SIGNAL(processExited()), dialog, TQT_SLOT(close()) ); + connect( procDeviceState, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(readFromStdoutUpDown()) ); + connect( procDeviceState, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readFromStdErrUpDown()) ); + connect( procDeviceState, TQ_SIGNAL(processExited()),this, TQ_SLOT(verifyDeviceStateChanged()) ); + connect( procDeviceState, TQ_SIGNAL(processExited()), dialog, TQ_SLOT(close()) ); currentDevice = dev; commandOutput = ""; @@ -971,8 +971,8 @@ void KNetworkConf::showInterfaceContextMenuSlot(TDEListView* lv, TQListViewItem* TDEPopupMenu *context = new TDEPopupMenu( this ); TQ_CHECK_PTR( context ); - context->insertItem( "&Enable Interface", this, TQT_SLOT(enableInterfaceSlot())); - context->insertItem( "&Disable Interface", this, TQT_SLOT(disableInterfaceSlot())); + context->insertItem( "&Enable Interface", this, TQ_SLOT(enableInterfaceSlot())); + context->insertItem( "&Disable Interface", this, TQ_SLOT(disableInterfaceSlot())); TQListViewItem *item = klvCardList->currentItem(); TQString currentDevice = item->text(0); KNetworkInterface *dev = getDeviceInfo(currentDevice); @@ -988,17 +988,17 @@ void KNetworkConf::showInterfaceContextMenuSlot(TDEListView* lv, TQListViewItem* context->setItemEnabled(1,false); } context->insertSeparator(2); - context->insertItem( "&Configure Interface...", this, TQT_SLOT(configureDeviceSlot())); + context->insertItem( "&Configure Interface...", this, TQ_SLOT(configureDeviceSlot())); context->popup(pt); - //context->insertItem( "About &TQt", this, TQT_SLOT(aboutTQt()) ); + //context->insertItem( "About &TQt", this, TQ_SLOT(aboutTQt()) ); } void KNetworkConf::enableSignals() { tooltip->setProfiles(netInfo->getProfilesList()); - connect(kleDefaultRoute,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(enableApplyButtonSlot(const TQString&))); - connect(kleDomainName,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(enableApplyButtonSlot(const TQString&))); - connect(kleHostName,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(enableApplyButtonSlot(const TQString&))); + connect(kleDefaultRoute,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(enableApplyButtonSlot(const TQString&))); + connect(kleDomainName,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(enableApplyButtonSlot(const TQString&))); + connect(kleHostName,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(enableApplyButtonSlot(const TQString&))); } void KNetworkConf::enableProfileSlot() @@ -1017,7 +1017,7 @@ void KNetworkConf::enableProfileSlot() profile->setProfilesList(netInfo->getProfilesList()); config->saveNetworkInfo(profile); modified = false; - //connect( config, TQT_SIGNAL(readyLoadingNetworkInfo()), this, TQT_SLOT(showSelectedProfile(selectedProfile)) ); + //connect( config, TQ_SIGNAL(readyLoadingNetworkInfo()), this, TQ_SLOT(showSelectedProfile(selectedProfile)) ); } else KMessageBox::error(this, diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h index cb2d8b4..6c6080d 100644 --- a/knetworkconf/knetworkconf/knetworkconf.h +++ b/knetworkconf/knetworkconf/knetworkconf.h @@ -28,7 +28,6 @@ #include <unistd.h> #include <sys/types.h> -#include <kapp.h> #include <tqwidget.h> #include <tqpixmap.h> #include <tqprocess.h> @@ -52,7 +51,7 @@ #include <tdemessagebox.h> #include <tdeaboutapplication.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <dcopobject.h> diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui index dc77b40..3b83884 100644 --- a/knetworkconf/knetworkconf/knetworkconfdlg.ui +++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui @@ -1043,7 +1043,7 @@ <include location="local" impldecl="in implementation">knetworkconfdlg.ui.h</include> <include location="local" impldecl="in declaration">tqlistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">enableButtonsSlot()</slot> <slot access="private">quitSlot()</slot> <slot access="private">moveUpServerSlot()</slot> @@ -1072,7 +1072,7 @@ <slot access="private">updateProfileNameSlot(TQListViewItem *item)</slot> <slot access="private">removeProfileSlot()</slot> <slot access="private">updateProfileSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp index cab83c6..2ffa4c3 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp +++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp @@ -41,7 +41,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){ i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that \n{TDE_PATH}/%1 \nfile is present.").arg(BACKEND_PATH), i18n("Could Not Find Network Configuration Backend Script")); dialog->close(); - //kapp->quit(); + //tdeApp->quit(); } else { @@ -52,11 +52,11 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){ procDetect->addArgument( platform ); } procDetect->addArgument( "--get" ); - connect( this, TQT_SIGNAL(readyLoadingNetworkInfo()), dialog, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(errorDetectingPlatform()), dialog, TQT_SLOT(close()) ); - connect( procDetect, TQT_SIGNAL(processExited()), this, TQT_SLOT(readNetworkInfo()) ); - connect( procDetect, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(concatXMLOutputSlot())); - connect( procDetect, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readXMLErrSlot())); + connect( this, TQ_SIGNAL(readyLoadingNetworkInfo()), dialog, TQ_SLOT(close()) ); + connect( this, TQ_SIGNAL(errorDetectingPlatform()), dialog, TQ_SLOT(close()) ); + connect( procDetect, TQ_SIGNAL(processExited()), this, TQ_SLOT(readNetworkInfo()) ); + connect( procDetect, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(concatXMLOutputSlot())); + connect( procDetect, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readXMLErrSlot())); if ( !procDetect->start() ) { @@ -82,9 +82,9 @@ void KNetworkConfigParser::listIfaces(const TQString &platform){ procDetect->addArgument( "-d" ); procDetect->addArgument( "list_ifaces" ); - connect( procDetect, TQT_SIGNAL(processExited()), this, TQT_SLOT(readListIfacesSlot()) ); - connect( procDetect, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(concatXMLOutputSlot())); - connect( procDetect, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readXMLErrSlot())); + connect( procDetect, TQ_SIGNAL(processExited()), this, TQ_SLOT(readListIfacesSlot()) ); + connect( procDetect, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(concatXMLOutputSlot())); + connect( procDetect, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readXMLErrSlot())); xmlOuput = ""; xmlErr = ""; @@ -306,13 +306,13 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo) xmlOuput = ""; - connect( this, TQT_SIGNAL(readyLoadingNetworkInfo()), dialog, TQT_SLOT(close()) ); - connect(procSaveNetworkInfo,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(readFromStdoutSaveNetworkInfo())); - connect(procSaveNetworkInfo,TQT_SIGNAL(wroteToStdin()),this,TQT_SLOT(sendNetworkInfoSavedSignalSlot())); - connect(procSaveNetworkInfo,TQT_SIGNAL(processExited()),this,TQT_SLOT(listIfacesSlot())); + connect( this, TQ_SIGNAL(readyLoadingNetworkInfo()), dialog, TQ_SLOT(close()) ); + connect(procSaveNetworkInfo,TQ_SIGNAL(readyReadStdout()),this,TQ_SLOT(readFromStdoutSaveNetworkInfo())); + connect(procSaveNetworkInfo,TQ_SIGNAL(wroteToStdin()),this,TQ_SLOT(sendNetworkInfoSavedSignalSlot())); + connect(procSaveNetworkInfo,TQ_SIGNAL(processExited()),this,TQ_SLOT(listIfacesSlot())); processRunning = true; - connect( procSaveNetworkInfo, TQT_SIGNAL(processExited()), this, TQT_SLOT(processExitedSlot()) ); + connect( procSaveNetworkInfo, TQ_SIGNAL(processExited()), this, TQ_SLOT(processExitedSlot()) ); if ( !procSaveNetworkInfo->start() ) { @@ -325,7 +325,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo) //wait around until the process has finished, otherwise it becomes a zombie while (processRunning) { - kapp->processEvents(); + tdeApp->processEvents(); } } @@ -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"); + TDESimpleConfig cfg("knetworkconfrc"); 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"); + TDESimpleConfig cfg("knetworkconfrc"); cfg.setGroup("Interfaces"); description = cfg.readEntry(tempDevice->getDeviceName()); if (!description.isEmpty()) @@ -822,7 +822,7 @@ void KNetworkConfigParser::readNetworkInfo() //user a dialog with all the supported platforms to choose. if (xmlErr.contains("platform_unsup::")) { - connect( this, TQT_SIGNAL(readyLoadingSupportedPlatforms()), this, TQT_SLOT(showSupportedPlatformsDialogSlot()) ); + connect( this, TQ_SIGNAL(readyLoadingSupportedPlatforms()), this, TQ_SLOT(showSupportedPlatformsDialogSlot()) ); loadSupportedPlatforms(); emit errorDetectingPlatform(); } @@ -1004,10 +1004,10 @@ void KNetworkConfigParser::loadSupportedPlatforms(){ procDetect->addArgument( locate("data",BACKEND_PATH) ); procDetect->addArgument( "-d" ); procDetect->addArgument( "platforms" ); - connect( procDetect, TQT_SIGNAL(processExited()), this, TQT_SLOT(readSupportedPlatformsSlot()) ); + connect( procDetect, TQ_SIGNAL(processExited()), this, TQ_SLOT(readSupportedPlatformsSlot()) ); xmlOuput = ""; - connect( procDetect, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(concatXMLOutputSlot())); -// connect( procDetect, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readXMLErrSlot())); + connect( procDetect, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(concatXMLOutputSlot())); +// connect( procDetect, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readXMLErrSlot())); if ( !procDetect->start() ) { @@ -1199,7 +1199,7 @@ void KNetworkConfigParser::showSupportedPlatformsDialogSlot(){ void KNetworkConfigParser::saveAskAgain(const TQString &platform, bool askAgain) { - KSimpleConfig cfg("knetworkconfrc"); + TDESimpleConfig cfg("knetworkconfrc"); 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"); + TDESimpleConfig cfg("knetworkconfrc"); cfg.setGroup("General"); platform = cfg.readEntry("detectedPlatform"); return cfg.readBoolEntry("askAgainPlatform"); diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.h b/knetworkconf/knetworkconf/knetworkconfigparser.h index e8b65d9..ef9950d 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.h +++ b/knetworkconf/knetworkconf/knetworkconfigparser.h @@ -30,7 +30,7 @@ #include <unistd.h> #include <stdlib.h> -#include <kapp.h> +#include <tdeapplication.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tqobject.h> @@ -43,8 +43,8 @@ #include <tqcheckbox.h> #include <tdelistbox.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "knetworkinfo.h" @@ -144,7 +144,7 @@ class KNetworkConfigParser : public TQObject { TQPtrList<KNetworkInterface> tempDevList; /** Parses all of the <statichost>...</statichost> entries in the xml configuration file. */ KKnownHostInfo * getStaticHostInfo(TQDomElement host); - /** Saves the option to show again or not the platform using KSimpleConfig*/ + /** Saves the option to show again or not the platform using TDESimpleConfig*/ void saveAskAgain(const TQString &platform, bool askAgain); /**Returns if the show platform should be shown again or not and the saved platform*/ bool readAskAgain(TQString &platform); diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp index 774bde0..4e3d520 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp +++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp @@ -39,7 +39,7 @@ KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQS conf->setReadOnly(true); } - connect(conf,TQT_SIGNAL(networkStateChanged(bool)),TQT_SLOT(configChanged(bool))); + connect(conf,TQ_SIGNAL(networkStateChanged(bool)),TQ_SLOT(configChanged(bool))); setButtons(TDECModule::Apply|TDECModule::Help); } diff --git a/knetworkconf/knetworkconf/main.cpp b/knetworkconf/knetworkconf/main.cpp index 8411d76..6baba68 100644 --- a/knetworkconf/knetworkconf/main.cpp +++ b/knetworkconf/knetworkconf/main.cpp @@ -20,7 +20,6 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <tdelocale.h> -#include <kuniqueapplication.h> #include <dcopclient.h> #include <tdeglobal.h> #include <kgenericfactory.h> @@ -40,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( knetworkconfmodule, KDEDFactory( "kcm_knetworkconfmo extern "C" { - KDE_EXPORT TDECModule *create_knetworkconfmodule(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_knetworkconfmodule(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("knetworkconf"); return new KNetworkConfModule(parent, name); diff --git a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui index 8dcb8d8..ebec1cf 100644 --- a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui +++ b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui @@ -123,9 +123,9 @@ <slot>accept()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>exitSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> |