From a433105e8dbba2231fb611d4514f9c66f0e99494 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 16 Jan 2026 15:26:43 +0900 Subject: Remove support for HPUX, which is discontinued and does not provide a c++17 complaint compiler. Signed-off-by: Michele Calgaro --- configure.in.in | 4 - .../glossary/tdeprintingglossary.docbook | 3 +- doc/tdeprint/cups-config.docbook | 6 - doc/tdeprint/lpd.docbook | 2 +- kcheckpass/checkpass_shadow.c | 3 - kcontrol/energy/energy.cpp | 4 +- kcontrol/info/Makefile.am | 2 +- kcontrol/info/info.cpp | 4 - kcontrol/info/info_aix.cpp | 6 +- kcontrol/info/info_hpux.cpp | 785 --------------------- kcontrol/info/memory.cpp | 2 - kcontrol/info/memory_hpux.cpp | 92 --- kcontrol/tdefontinst/configure.in.in | 1 - kcontrol/tdefontinst/tdefontinst/GetPid.c | 32 +- kcontrol/tdefontinst/tdefontinst/Main.cpp | 2 +- kicker/kicker/ui/panelmenuiteminfo.h | 16 +- konsole/README.ports | 1 - kpersonalizer/ksysinfo.cpp | 4 - nsplugins/sdk/npapi.h | 1 - nsplugins/sdk/obsolete/protypes.h | 14 +- nsplugins/sdk/prtypes.h | 6 +- nsplugins/wrapper/wrapper.c | 30 - tdeioslave/fish/fish.cpp | 2 +- tdm/backend/auth.c | 15 +- tdm/backend/choose.c | 2 +- tdm/backend/netaddr.c | 2 - tdm/backend/util.c | 4 - tdm/kfrontend/kconsole.cpp | 8 - 28 files changed, 28 insertions(+), 1025 deletions(-) delete mode 100644 kcontrol/info/info_hpux.cpp delete mode 100644 kcontrol/info/memory_hpux.cpp diff --git a/configure.in.in b/configure.in.in index 831a60cfb..9a6c38ebd 100644 --- a/configure.in.in +++ b/configure.in.in @@ -24,10 +24,6 @@ AC_CHECK_HEADER(pty.h) AC_CHECK_FUNC(ptsname,,) -dnl Checks for Alib on HP-UX (added by deller, Apr 29 1999) -AC_CHECK_LIB(Alib, main, [LIBALIB="-lAlib"]) dnl HP-UX network audio server -AC_SUBST(LIBALIB) - dnl Checks for RPC functions AC_CHECK_FUNC(clnttcp_create, , [ AC_CHECK_LIB(nsl, clnttcp_create, [LIBRPC="-lnsl"])]) diff --git a/doc/khelpcenter/glossary/tdeprintingglossary.docbook b/doc/khelpcenter/glossary/tdeprintingglossary.docbook index cec585741..10e6a7900 100644 --- a/doc/khelpcenter/glossary/tdeprintingglossary.docbook +++ b/doc/khelpcenter/glossary/tdeprintingglossary.docbook @@ -915,8 +915,7 @@ now. developed by &HP;. PCL started off in version 1 as a simple command set for ASCII printing; now, in its versions PCL6 and PCL-X, it is capable of printing graphics - and color -- mdash; but outside the &Microsoft; &Windows; realm and &HP-UX; - (&HP;'s own brand of &UNIX;), it is not commonly used... + and color -- mdash; but outside the &Microsoft; &Windows; realm ESC/P &HP;/GL PDL diff --git a/doc/tdeprint/cups-config.docbook b/doc/tdeprint/cups-config.docbook index 637ce9619..c786aefb4 100644 --- a/doc/tdeprint/cups-config.docbook +++ b/doc/tdeprint/cups-config.docbook @@ -1423,12 +1423,6 @@ to This option specifies a broadcast address to be used. By default, browsing information is broadcast to all active interfaces. - - -&HP-UX; 10.20 and earlier do not properly handle broadcast -unless you have a Class A, B, C or D netmask (&ie;, there is no -CIDR support). - diff --git a/doc/tdeprint/lpd.docbook b/doc/tdeprint/lpd.docbook index cc555e399..14037393c 100644 --- a/doc/tdeprint/lpd.docbook +++ b/doc/tdeprint/lpd.docbook @@ -9,7 +9,7 @@ Generic module that only allows sending of print jobs. No printer or job management supported. It is made to work on a wide variety of &UNIX; -flavors: &Linux;/LPR, &HP-UX;, Solaris, &IRIX;. +flavors: &Linux;/LPR, Solaris, &IRIX;. It also supports some LPRng extensions (like the absence of continuation character \ in printcap files). diff --git a/kcheckpass/checkpass_shadow.c b/kcheckpass/checkpass_shadow.c index e721582d5..98f134af5 100644 --- a/kcheckpass/checkpass_shadow.c +++ b/kcheckpass/checkpass_shadow.c @@ -35,10 +35,7 @@ #include #include #include - -#ifndef __hpux #include -#endif AuthReturn Authenticate(const char *method, const char *login, char *(*conv) (ConvRequest, const char *)) diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index 05aa07174..c7f18881d 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -58,7 +58,7 @@ Status DPMSInfo ( Display *, CARD16 *, BOOL * ); #endif } -#if defined(XIMStringConversionRetrival) || defined (__sun) || defined(__hpux) +#if defined(XIMStringConversionRetrival) || defined (__sun) extern "C" { #endif Bool DPMSQueryExtension(Display *, int *, int *); @@ -66,7 +66,7 @@ extern "C" { Status DPMSDisable(Display *); Bool DPMSGetTimeouts(Display *, CARD16 *, CARD16 *, CARD16 *); Bool DPMSSetTimeouts(Display *, CARD16, CARD16, CARD16); -#if defined(XIMStringConversionRetrival) || defined (__sun) || defined(__hpux) +#if defined(XIMStringConversionRetrival) || defined (__sun) } #endif #endif diff --git a/kcontrol/info/Makefile.am b/kcontrol/info/Makefile.am index 6db9c62b9..4dbaf9614 100644 --- a/kcontrol/info/Makefile.am +++ b/kcontrol/info/Makefile.am @@ -7,7 +7,7 @@ endif kcm_info_la_SOURCES = main.cpp memory.cpp opengl.cpp kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(FRAMEWORK_COREAUDIO) -kcm_info_la_LIBADD = $(LIBALIB) $(LIB_TDEUI) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) +kcm_info_la_LIBADD = $(LIB_TDEUI) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) METASOURCES = AUTO AM_CPPFLAGS= $(all_includes) $(GLINC) diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index 2d79f4f54..4539e6dd1 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -53,8 +53,6 @@ static bool sorting_allowed; /* is sorting allowed by user ? */ #if defined(__linux__) # define DEFAULT_ERRORSTRING TQString::null /* i18n("Maybe the proc-filesystem is not enabled in Linux-Kernel.") */ -#elif defined(__hpux) -# define DEFAULT_ERRORSTRING TQString::null #else #define DEFAULT_ERRORSTRING i18n("Maybe this system is not completely supported yet :-(") #endif @@ -470,8 +468,6 @@ static int GetInfo_ReadfromPipe( TQListView *lBox, const char *FileName, bool Wi #include "info_sgi.cpp" #elif defined(__FreeBSD__) || defined (__DragonFly__) #include "info_fbsd.cpp" -#elif __hpux -#include "info_hpux.cpp" #elif __NetBSD__ #include "info_netbsd.cpp" #elif __OpenBSD__ diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp index f4625813f..adae7c7fe 100644 --- a/kcontrol/info/info_aix.cpp +++ b/kcontrol/info/info_aix.cpp @@ -2,10 +2,6 @@ * info_aix.cpp * * Reza Arbab - * - * GetInfo_Partitions() and its helpers (get_fs_usage, fs_adjust_blocks) - * taken from info_hpux.cpp. - * */ #include @@ -411,7 +407,7 @@ static long fs_adjust_blocks(long blocks, int fromsize, int tosize) #define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), fsd.f_bsize, 512) static int get_fs_usage (char *path, long *l_total, long *l_avail) -{ struct statfs fsd; /* 4.3BSD, SunOS 4, HP-UX, AIX. */ +{ struct statfs fsd; /* 4.3BSD, SunOS 4, AIX. */ unsigned long fsu_blocks,fsu_bfree,fsu_bavail; *l_total = *l_avail = 0; diff --git a/kcontrol/info/info_hpux.cpp b/kcontrol/info/info_hpux.cpp deleted file mode 100644 index 82c7cbdad..000000000 --- a/kcontrol/info/info_hpux.cpp +++ /dev/null @@ -1,785 +0,0 @@ - -/* - !!!!! this file will be included by info.cpp !!!!! - - Mostly written 1998-1999 by Helge Deller (deller@gmx.de), - with some pieces of code from Aubert Pierre. - - Last modified: done: - 1999-06-21 added more models to the lookup-table (deller) - 1999-06-18 added support for 64-Bit HP-UX in CPU-detection(deller) - 1999-05-04 added audio(alib)-support (deller) - 1999-04-27 [tested with HP-UX 10.20 (HP9000/715/64-EISA)] - added support for nearly all categories - (means: not finished!) - 1998-11-01 first, nearly empty version (deller) - with a little source for CPU from Aubert Pierre -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#define INFO_CPU_AVAILABLE -# define INFO_CPU_MODEL "/bin/model" // as pipe !! - -#define INFO_IRQ_AVAILABLE - -#define INFO_DMA_AVAILABLE - -#define INFO_PCI_AVAILABLE -# define INFO_PCI "" // Please, who know it ???? -# define INFO_PCI_EISA "/etc/eisa/system.sci" // File ! - -#define INFO_IOPORTS_AVAILABLE -# define INFO_IOPORTS_1 "/etc/dmesg" // as pipe ! -# define INFO_IOPORTS_2 "/usr/sbin/dmesg" // as pipe ! - -#define INFO_SOUND_AVAILABLE - -#define INFO_DEVICES_AVAILABLE -# define INFO_DEVICES "/etc/ioscan" // as pipe !! - -#define INFO_SCSI_AVAILABLE - -#define INFO_PARTITIONS_AVAILABLE -# define INFO_PARTITIONS_1 FSTAB // = "/etc/fstab" (in fstab.h) -# define INFO_PARTITIONS_2 "/etc/checklist" - -#define INFO_XSERVER_AVAILABLE - - - -/* The following table is from an HP-UX 10.20 System - build out of the files - "/usr/lib/sched.models" - or - "/opt/langtools/lib/sched.models" - If you have more entries, then please add them or send them to me! -*/ - -// entries for PA_REVISION[] -enum V_ENTRIES - { V_1x0, - V_1x1, V_1x1a, V_1x1b, V_1x1c, V_1x1d, V_1x1e, - V_2x0, - V_LAST }; - -static const char PA_REVISION[V_LAST][7] - = { "1.0", - "1.1", "1.1a", "1.1b", "1.1c", "1.1d", "1.1e", - "2.0" }; - -// entries for PA_NAME[] -enum PA_ENTRIES - { PA7000, - PA7100, PA7100LC, PA7200, PA7300, - PA8000, PA8200, PA8500, - PARISC_PA_LAST }; - -static const char PA_NAME[PARISC_PA_LAST][11] - = { "PA7000", - "PA7100", "PA7100LC", "PA7200", "PA7300", - "PA8000", "PA8200", "PA8500" }; - -struct _type_LOOKUPTABLE { - char Name[8]; - unsigned short parisc_rev; // = enum V_ENTRIES - unsigned short parisc_name; // = enum PA_ENTRIES -}; - - -static const struct _type_LOOKUPTABLE PA_LOOKUPTABLE[] = { -/* VERSION A.00.07 - (there seems to exist several different files with same version-number !)*/ -{ "600" ,V_1x0 ,PA7000 }, -{ "635" ,V_1x0 ,PA7000 }, -{ "645" ,V_1x0 ,PA7000 }, -{ "700" ,V_1x1 ,PA7000 }, -{ "705" ,V_1x1a ,PA7000 }, -{ "710" ,V_1x1a ,PA7000 }, -{ "712" ,V_1x1c ,PA7100LC }, -{ "715" ,V_1x1c ,PA7100LC }, -{ "720" ,V_1x1a ,PA7000 }, -{ "722" ,V_1x1c ,PA7100LC }, -{ "725" ,V_1x1c ,PA7100LC }, -{ "728" ,V_1x1d ,PA7200 }, -{ "730" ,V_1x1a ,PA7000 }, -{ "735" ,V_1x1b ,PA7100 }, -{ "742" ,V_1x1b ,PA7100 }, -{ "743" ,V_1x1b ,PA7100 }, // or a 1.1c,PA7100LC !! -{ "744" ,V_1x1e ,PA7300 }, -{ "745" ,V_1x1b ,PA7100 }, -{ "747" ,V_1x1b ,PA7100 }, -{ "750" ,V_1x1a ,PA7000 }, -{ "755" ,V_1x1b ,PA7100 }, -{ "770" ,V_1x1d ,PA7200 }, -{ "777" ,V_1x1d ,PA7200 }, -{ "778" ,V_1x1e ,PA7300 }, -{ "779" ,V_1x1e ,PA7300 }, -{ "780" ,V_2x0 ,PA8000 }, -{ "781" ,V_2x0 ,PA8000 }, -{ "782" ,V_2x0 ,PA8200 }, -{ "783" ,V_2x0 ,PA8500 }, -{ "785" ,V_2x0 ,PA8500 }, -{ "800" ,V_1x0 ,PA7000 }, // and one with: 2.0 / PA8000 -{ "801" ,V_1x1c ,PA7100LC }, -{ "802" ,V_2x0 ,PA8000 }, -{ "803" ,V_1x1e ,PA7300 }, -{ "804" ,V_2x0 ,PA8000 }, -{ "806" ,V_1x1c ,PA7100LC }, -{ "807" ,V_1x1a ,PA7000 }, -{ "808" ,V_1x0 ,PA7000 }, -{ "809" ,V_1x1d ,PA7200 }, -{ "810" ,V_2x0 ,PA8000 }, -{ "811" ,V_1x1c ,PA7100LC }, -{ "813" ,V_1x1e ,PA7300 }, -{ "815" ,V_1x0 ,PA7000 }, -{ "816" ,V_1x1c ,PA7100LC }, -{ "817" ,V_1x1a ,PA7000 }, -{ "819" ,V_1x1d ,PA7200 }, -{ "820" ,V_2x0 ,PA8000 }, -{ "821" ,V_1x1d ,PA7200 }, -{ "822" ,V_1x0 ,PA7000 }, -{ "825" ,V_1x0 ,PA7000 }, -{ "826" ,V_1x1c ,PA7100LC }, -{ "827" ,V_1x1a ,PA7000 }, -{ "829" ,V_1x1d ,PA7200 }, -{ "831" ,V_1x1d ,PA7200 }, -{ "832" ,V_1x0 ,PA7000 }, -{ "834" ,V_1x0 ,PA7000 }, -{ "835" ,V_1x0 ,PA7000 }, -{ "837" ,V_1x1a ,PA7000 }, -{ "839" ,V_1x1d ,PA7200 }, -{ "840" ,V_1x0 ,PA7000 }, -{ "841" ,V_1x1d ,PA7200 }, -{ "842" ,V_1x0 ,PA7000 }, -{ "845" ,V_1x0 ,PA7000 }, -{ "847" ,V_1x1a ,PA7000 }, -{ "849" ,V_1x1d ,PA7200 }, -{ "850" ,V_1x0 ,PA7000 }, -{ "851" ,V_1x1d ,PA7200 }, -{ "852" ,V_1x0 ,PA7000 }, -{ "855" ,V_1x0 ,PA7000 }, -{ "856" ,V_1x1c ,PA7100LC }, -{ "857" ,V_1x1a ,PA7000 }, -{ "859" ,V_1x1d ,PA7200 }, -{ "860" ,V_1x0 ,PA7000 }, -{ "861" ,V_2x0 ,PA8000 }, -{ "865" ,V_1x0 ,PA7000 }, -{ "869" ,V_1x1d ,PA7200 }, -{ "870" ,V_1x0 ,PA7000 }, -{ "871" ,V_2x0 ,PA8000 }, -{ "877" ,V_1x1a ,PA7000 }, -{ "879" ,V_2x0 ,PA8000 }, -{ "887" ,V_1x1b ,PA7100 }, -{ "889" ,V_2x0 ,PA8000 }, -{ "890" ,V_1x0 ,PA7000 }, -{ "891" ,V_1x1b ,PA7100 }, -{ "892" ,V_1x1b ,PA7100 }, -{ "893" ,V_2x0 ,PA8000 }, -{ "895" ,V_2x0 ,PA8000 }, -{ "896" ,V_2x0 ,PA8000 }, -{ "897" ,V_1x1b ,PA7100 }, -{ "898" ,V_2x0 ,PA8200 }, -{ "899" ,V_2x0 ,PA8200 }, -{ "900" ,V_1x0 ,PA7000 }, -{ "B115" ,V_1x1e ,PA7300 }, -{ "B120" ,V_1x1e ,PA7300 }, -{ "B132L" ,V_1x1e ,PA7300 }, -{ "B160L" ,V_1x1e ,PA7300 }, -{ "B180L" ,V_1x1e ,PA7300 }, -{ "C100" ,V_1x1d ,PA7200 }, -{ "C110" ,V_1x1d ,PA7200 }, -{ "C115" ,V_1x1e ,PA7300 }, -{ "C120" ,V_1x1e ,PA7300 }, -{ "C130" ,V_2x0 ,PA8000 }, -{ "C140" ,V_2x0 ,PA8000 }, -{ "C160L" ,V_1x1e ,PA7300 }, -{ "C160" ,V_2x0 ,PA8000 }, -{ "C180L" ,V_1x1e ,PA7300 }, -{ "C180-XP" ,V_2x0 ,PA8000 }, -{ "C180" ,V_2x0 ,PA8000 }, -{ "C200+" ,V_2x0 ,PA8200 }, -{ "C230+" ,V_2x0 ,PA8200 }, -{ "C240+" ,V_2x0 ,PA8200 }, -{ "CB260" ,V_2x0 ,PA8200 }, -{ "D200" ,V_1x1d ,PA7200 }, // or: 1.1c, PA7100LC -{ "D210" ,V_1x1d ,PA7200 }, // or: 1.1c, PA7100LC -{ "D220" ,V_1x1e ,PA7300 }, -{ "D230" ,V_1x1e ,PA7300 }, -{ "D250" ,V_1x1d ,PA7200 }, -{ "D260" ,V_1x1d ,PA7200 }, -{ "D270" ,V_2x0 ,PA8000 }, -{ "D280" ,V_2x0 ,PA8000 }, -{ "D310" ,V_1x1c ,PA7100LC }, -{ "D320" ,V_1x1e ,PA7300 }, -{ "D330" ,V_1x1e ,PA7300 }, -{ "D350" ,V_1x1d ,PA7200 }, -{ "D360" ,V_1x1d ,PA7200 }, -{ "D370" ,V_2x0 ,PA8000 }, -{ "D380" ,V_2x0 ,PA8000 }, -{ "D400" ,V_1x1d ,PA7200 }, -{ "D410" ,V_1x1d ,PA7200 }, -{ "D650" ,V_2x0 ,PA8000 }, -{ "DX0" ,V_1x1c ,PA7100LC }, -{ "DX5" ,V_1x1c ,PA7100LC }, -{ "DXO" ,V_1x1c ,PA7100LC }, -{ "E25" ,V_1x1c ,PA7100LC }, -{ "E35" ,V_1x1c ,PA7100LC }, -{ "E45" ,V_1x1c ,PA7100LC }, -{ "E55" ,V_1x1c ,PA7100LC }, -{ "F10" ,V_1x1a ,PA7000 }, -{ "F20" ,V_1x1a ,PA7000 }, -{ "F30" ,V_1x1a ,PA7000 }, -{ "G30" ,V_1x1a ,PA7000 }, -{ "G40" ,V_1x1a ,PA7000 }, -{ "G50" ,V_1x1b ,PA7100 }, -{ "G60" ,V_1x1b ,PA7100 }, -{ "G70" ,V_1x1b ,PA7100 }, -{ "H20" ,V_1x1a ,PA7000 }, -{ "H30" ,V_1x1a ,PA7000 }, -{ "H40" ,V_1x1a ,PA7000 }, -{ "H50" ,V_1x1b ,PA7100 }, -{ "H60" ,V_1x1b ,PA7100 }, -{ "H70" ,V_1x1b ,PA7100 }, -{ "I30" ,V_1x1a ,PA7000 }, -{ "I40" ,V_1x1a ,PA7000 }, -{ "I50" ,V_1x1b ,PA7100 }, -{ "I60" ,V_1x1b ,PA7100 }, -{ "I70" ,V_1x1b ,PA7100 }, -{ "J200" ,V_1x1d ,PA7200 }, -{ "J210XC" ,V_1x1d ,PA7200 }, -{ "J210" ,V_1x1d ,PA7200 }, -{ "J220" ,V_2x0 ,PA8000 }, -{ "J2240" ,V_2x0 ,PA8200 }, -{ "J280" ,V_2x0 ,PA8000 }, -{ "J282" ,V_2x0 ,PA8000 }, -{ "J400" ,V_2x0 ,PA8000 }, -{ "J410" ,V_2x0 ,PA8000 }, -{ "K100" ,V_1x1d ,PA7200 }, -{ "K200" ,V_1x1d ,PA7200 }, -{ "K210" ,V_1x1d ,PA7200 }, -{ "K230" ,V_1x1d ,PA7200 }, -{ "K250" ,V_2x0 ,PA8000 }, -{ "K260" ,V_2x0 ,PA8000 }, -{ "K370" ,V_2x0 ,PA8200 }, -{ "K380" ,V_2x0 ,PA8200 }, -{ "K400" ,V_1x1d ,PA7200 }, -{ "K410" ,V_1x1d ,PA7200 }, -{ "K420" ,V_1x1d ,PA7200 }, -{ "K430" ,V_1x1d ,PA7200 }, -{ "K450" ,V_2x0 ,PA8000 }, -{ "K460" ,V_2x0 ,PA8000 }, -{ "K470" ,V_2x0 ,PA8200 }, -{ "K570" ,V_2x0 ,PA8200 }, -{ "K580" ,V_2x0 ,PA8200 }, -{ "S700i" ,V_1x1e ,PA7300 }, -{ "S715" ,V_1x1e ,PA7300 }, -{ "S744" ,V_1x1e ,PA7300 }, -{ "S760" ,V_1x1e ,PA7300 }, -{ "T500" ,V_1x1c ,PA7100LC }, // or: 1.1b, PA7100 -{ "T520" ,V_1x1b ,PA7100 }, -{ "T540" ,V_2x0 ,PA8000 }, -{ "T600" ,V_2x0 ,PA8000 }, -{ "V2000" ,V_2x0 ,PA8000 }, -{ "V2200" ,V_2x0 ,PA8200 }, -{ "V2250" ,V_2x0 ,PA8200 }, -{ "V2500" ,V_2x0 ,PA8500 }, - -{ "" ,0 ,0 } /* Last Entry has to be empty. */ -}; - - - -/* Helper-Functions */ - -// Value() is defined in info.cpp !!! - -static bool Find_in_LOOKUPTABLE( TQListView *lBox, char *machine ) -{ char *Machine; - int len; - const struct _type_LOOKUPTABLE *Entry = PA_LOOKUPTABLE; - TQString str; - TQListViewItem* olditem = 0; - - - Machine = machine; // machine is like: "9000/715/D" - while ((*Machine) && (*Machine!='/')) - ++Machine; - - if (*Machine) - ++Machine; - else - Machine=machine; - - len = strlen(Machine); - - while (Entry->Name[0]) - { if (strncmp(Entry->Name,Machine,len)==0) - { - olditem = new TQListViewItem(lBox, olditem, i18n("PA-RISC Processor"), - TQString(PA_NAME[Entry->parisc_name])); - olditem = new TQListViewItem(lBox, olditem, i18n("PA-RISC Revision"), - TQString("PA-RISC ") + TQString(PA_REVISION[Entry->parisc_rev])); - return true; - } - else - ++Entry; // next Entry ! - } - - return false; -} - - -/* all following functions should return true, when the Information - was filled into the lBox-Widget. - returning false indicates, that information was not available. -*/ - - -bool GetInfo_CPU( TQListView *lBox ) -{ - FILE *pipe; - TQFile *model; - - struct pst_dynamic psd; - struct pst_static pst; - struct pst_processor pro; - struct utsname info; - TQString str,str2; - TQListViewItem* olditem = 0; - int maxwidth,i; - - if((pstat_getstatic(&pst, sizeof(pst), (size_t)1, 0) == -1) || - (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0)== -1)) { - *GetInfo_ErrorString = i18n("Could not get Information."); /* Error */ - return false; - } - - maxwidth = 0; - lBox->addColumn(i18n("Information") ); - lBox->addColumn(i18n("Value") ); - - uname(&info); - - olditem = new TQListViewItem(lBox, olditem, i18n("Machine"), info.machine); - - model = new TQFile(INFO_CPU_MODEL); - if (model->exists()) - { if ((pipe = popen(INFO_CPU_MODEL, "r"))) - { TQTextStream *t = new TQTextStream(pipe, IO_ReadOnly); - str = t->readLine(); - olditem = new TQListViewItem(lBox, olditem, i18n("Model"), str); - delete t; - } - delete pipe; - } - delete model; - - olditem = new TQListViewItem(lBox, olditem, i18n("Machine Identification Number"), - strlen(info.__idnumber) ? TQString(info.__idnumber) : i18n("(none)") ); - - if (psd.psd_proc_cnt<=0) - psd.psd_proc_cnt=1; // Minimum one CPU ! - - olditem = new TQListViewItem(lBox, olditem, i18n("Number of Active Processors"), - Value(psd.psd_proc_cnt)); - - pstat_getprocessor( &pro, sizeof(pro), 1, 0 ); - olditem = new TQListViewItem(lBox, olditem, i18n("CPU Clock"), - Value(pro.psp_iticksperclktick/10000) + " " + i18n("MHz")); - - switch(sysconf(_SC_CPU_VERSION)) - { case CPU_HP_MC68020: str2 = "Motorola 68020"; break; - case CPU_HP_MC68030: str2 = "Motorola 68030"; break; - case CPU_HP_MC68040: str2 = "Motorola 68040"; break; - case CPU_PA_RISC1_0: str2 = "PA-RISC 1.0"; break; - case CPU_PA_RISC1_1: str2 = "PA-RISC 1.1"; break; - case CPU_PA_RISC1_2: str2 = "PA-RISC 1.2"; break; - case CPU_PA_RISC2_0: -#if defined(_SC_KERNEL_BITS) - switch (sysconf(_SC_KERNEL_BITS)) { - case 64: str2 = "PA-RISC 2.0w (64 bit)"; break; - case 32: str2 = "PA-RISC 2.0n (32 bit)"; break; - default: str2 = "PA-RISC 2.0"; break; - }; break; -#else /* !defined(_SC_KERNEL_BITS) */ - str2 = "PA-RISC 2.0"; break; -#endif - default: str2 = i18n("(unknown)"); break; - } - - olditem = new TQListViewItem(lBox, olditem, i18n("CPU Architecture"), str2); - - Find_in_LOOKUPTABLE( lBox, info.machine );// try to get extended Information. - - for (i=PS_PA83_FPU; i<=PS_PA89_FPU; ++i) { - if ((1<<(i-1)) & pro.psp_coprocessor.psc_present) { - str = TQString( (i==PS_PA83_FPU) ? "PS_PA83_FPU":"PS_PA89_FPU" ) - + TQString(" (") - + TQString(((1<<(i-1))&pro.psp_coprocessor.psc_enabled) ? - i18n("enabled") : i18n("disabled") ) - + TQString(")"); - - olditem = new TQListViewItem(lBox, olditem, i18n("Numerical Coprocessor (FPU)"), str); - } - }// for(coprocessor..) - - str = Value(((pst.physical_memory*pst.page_size)/1024/1024)) - + TQString(" ") - + i18n("MB"); // Mega-Byte - olditem = new TQListViewItem(lBox, olditem, i18n("Total Physical Memory"), str); - - str = Value(pst.page_size) + TQString(" ") + i18n("Bytes"); - olditem = new TQListViewItem(lBox, olditem, i18n("Size of One Page"), str); - - return true; -} - -bool GetInfo_ReadfromFile( TQListView *lBox, const char *Name ) -{ - char buf[2048]; - - TQFile *file = new TQFile(Name); - TQListViewItem* olditem = 0; - - if(!file->open(IO_ReadOnly)) { - delete file; - return false; - } - - while (file->readLine(buf,sizeof(buf)-1) >= 0) - { if (strlen(buf)) - olditem = new TQListViewItem(lBox, olditem, TQString::fromLocal8Bit(buf)); - } - - file->close(); - delete file; - return (lBox->childCount()); -} - - -bool GetInfo_IRQ( TQListView * ) -{ - return false; -} - -bool GetInfo_DMA( TQListView * ) -{ - return false; -} - -bool GetInfo_PCI( TQListView *lBox ) -{ - return( GetInfo_ReadfromFile(lBox,INFO_PCI) + - GetInfo_ReadfromFile(lBox,INFO_PCI_EISA) ); -} - -bool GetInfo_IO_Ports( TQListView *lBox ) -{ - if (GetInfo_ReadfromPipe( lBox, INFO_IOPORTS_1, false )) - return true; - else - return GetInfo_ReadfromPipe( lBox, INFO_IOPORTS_2, false ); -} - - -bool GetInfo_Devices( TQListView *lBox ) -{ - return GetInfo_ReadfromPipe( lBox, INFO_DEVICES, false ); -} - -bool GetInfo_SCSI( TQListView *lBox ) -{ - return GetInfo_Devices( lBox ); -} -/* Parts taken from fsusage.c from the Midnight Commander (mc) - - Copyright (C) 1991, 1992 Free Software Foundation, In - - Return the number of TOSIZE-byte blocks used by - BLOCKS FROMSIZE-byte blocks, rounding away from zero. - TOSIZE must be positive. Return -1 if FROMSIZE is not positive. */ - -static long fs_adjust_blocks(long blocks, int fromsize, int tosize) -{ - if (tosize <= 0) - abort (); - if (fromsize <= 0) - return -1; - - if (fromsize == tosize) /* E.g., from 512 to 512. */ - return blocks; - else if (fromsize > tosize) /* E.g., from 2048 to 512. */ - return blocks * (fromsize / tosize); - else /* E.g., from 256 to 512. */ - return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize); -} - -/* Fill in the fields of FSP with information about space usage for - the filesystem on which PATH resides. - Return 0 if successful, -1 if not. */ - -#define CONVERT_BLOCKS(b) fs_adjust_blocks ((b), fsd.f_bsize, 512) - -static int get_fs_usage (char *path, long *l_total, long *l_avail) -{ struct statfs fsd; /* 4.3BSD, SunOS 4, HP-UX, AIX. */ - unsigned long fsu_blocks,fsu_bfree,fsu_bavail; - - *l_total = *l_avail = 0; - if (statfs (path, &fsd) < 0) - return -1; - - fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks); - fsu_bfree = CONVERT_BLOCKS (fsd.f_bfree); - fsu_bavail = CONVERT_BLOCKS (fsd.f_bavail); - - *l_avail = getuid () ? fsu_bavail/2 : fsu_bfree/2; - *l_total = fsu_blocks/2; - - return 0; -} - - -// Some Ideas taken from garbazo from his source in info_fbsd.cpp - -bool GetInfo_Partitions (TQListView *lbox) -{ - #define NUMCOLS 5 - TQString Title[NUMCOLS]; - int n; - - struct fstab *fstab_ent; - struct statvfs svfs; - long total,avail; - TQString str; - TQString MB(i18n("MB")+ " "); // International Text for MB=Mega-Byte - - if (setfsent() != 1) // Try to open fstab - return false; - - Title[0] = i18n("Device"); - Title[1] = i18n("Mount Point"); - Title[2] = i18n("FS Type"); - Title[3] = i18n("Total Size"); - Title[4] = i18n("Free Size"); - - for (n=0; naddColumn(Title[n] ); - } - - while ((fstab_ent=getfsent())!=NULL) { - /* fstab_ent->fs_type holds only "rw","xx","ro"... */ - memset(&svfs,0,sizeof(svfs)); - statvfs(fstab_ent->fs_file,&svfs); - get_fs_usage(fstab_ent->fs_file, &total, &avail); - - if (!strcmp(fstab_ent->fs_type,FSTAB_XX)) // valid drive ? - svfs.f_basetype[0] = 0; - - if(svfs.f_basetype[0]) { - new TQListViewItem(lbox, TQString(fstab_ent->fs_spec), - TQString(fstab_ent->fs_file) + TQString(" "), - (svfs.f_basetype[0] ? TQString(svfs.f_basetype) : i18n("n/a")), - Value((total+512)/1024,6) + MB, - Value((avail+512)/1024,6) + MB); - } - else { - new TQListViewItem(lbox, TQString(fstab_ent->fs_spec), - TQString(fstab_ent->fs_file) + TQString(" "), - (svfs.f_basetype[0] ? TQString(svfs.f_basetype) : i18n("n/a"))); - } - - } - endfsent(); - - return true; -} - - -bool GetInfo_XServer_and_Video( TQListView *lBox ) -{ - lBox = lBox; - return GetInfo_XServer_Generic( lBox ); -} - - - - - -#ifndef HAVE_ALIB_H - -bool GetInfo_Sound( TQListView *lBox ) -{ lBox = lBox; - *GetInfo_ErrorString = i18n("Audio-Support (Alib) was disabled during configuration and compile-time."); - return false; -} - -#else // defined(HAVE_ALIB_H) - -#include "Alib.h" - -static const char formatNames[6][15] = { - "ADFUnknown", "ADFMuLaw", "ADFALaw", - "ADFLin16", "ADFLin8", "ADFLin8Offset" }; - -/* handle typo in 1st release of Alib.h */ -#ifndef ARightOutputChMask -#define ARightOutputChMask ARighOutputChMask -#endif - - -bool GetInfo_Sound( TQListView *lBox ) -{ - Audio *audio; - long status; - char server[80]; - int i; - - TQString str,str2; - TQListViewItem* olditem = 0; - - // server = Hostname.... - server[0] = 0; - audio = AOpenAudio( server, &status ); - if( status ) { - *GetInfo_ErrorString = i18n("Unable to open Audio-Server (Alib)."); - return false; - } - - lBox->addColumn(i18n("Information") ); - lBox->addColumn(i18n("Value") ); - - olditem = new TQListViewItem(lBox, olditem, i18n("Audio Name"), TQString(audio->audio_name)); - olditem = new TQListViewItem(lBox, olditem, i18n("Vendor"), TQString(audio->vendor)); - olditem = new TQListViewItem(lBox, olditem, i18n("Alib Version"), - Value(audio->alib_major_version) + TQString(".") + - Value(audio->alib_minor_version)); - - olditem = new TQListViewItem(lBox, olditem, i18n("Protocol Revision"), - Value(audio->proto_major_version) + TQString(".") + - Value(audio->proto_minor_version)); - - olditem = new TQListViewItem(lBox, olditem, i18n("Vendor Number"), - Value(audio->vnumber)); - - olditem = new TQListViewItem(lBox, olditem, i18n("Release"), - Value(audio->release)); - - olditem = new TQListViewItem(lBox, olditem, i18n("Byte Order"), - TQString((audio->byte_order==ALSBFirst)? i18n("ALSBFirst (LSB)"): - ((audio->byte_order==AMSBFirst)? i18n("AMSBFirst (MSB)"): - i18n("Invalid Byteorder.")) )); - - olditem = new TQListViewItem(lBox, olditem, i18n("Bit Order"), - TQString((audio->sound_bit_order==ALeastSignificant)? - i18n("ALeastSignificant (LSB)") : - ((audio->sound_bit_order==AMostSignificant) ? - i18n("AMostSignificant (MSB)"):i18n("Invalid Bitorder.")) )); - - olditem = new TQListViewItem(lBox, olditem, i18n("Data Formats")); - for ( i = 0; i < audio->n_data_format; i++ ) { - if (audio->data_format_list[i] <= ADFLin8Offset) - new TQListViewItem(olditem, TQString(formatNames[audio->data_format_list[i]])); - } - olditem->setOpen(true); - - olditem = new TQListViewItem(lBox, olditem, i18n("Sampling Rates")); - for ( i = 0; i < audio->n_sampling_rate; i++ ) { - new TQListViewItem(olditem, Value(audio->sampling_rate_list[i])); - } - olditem->setOpen(true); - - olditem = new TQListViewItem(lBox, olditem, i18n("Input Sources")); - if ( audio->input_sources & AMonoMicrophoneMask ) - new TQListViewItem(olditem, i18n("Mono-Microphone")); - if ( audio->input_sources & AMonoAuxiliaryMask ) - new TQListViewItem(olditem, i18n("Mono-Auxiliary")); - if ( audio->input_sources & ALeftMicrophoneMask ) - new TQListViewItem(olditem, i18n("Left-Microphone")); - if ( audio->input_sources & ARightMicrophoneMask ) - new TQListViewItem(olditem, i18n("Right-Microphone")); - if ( audio->input_sources & ALeftAuxiliaryMask ) - new TQListViewItem(olditem, i18n("Left-Auxiliary")); - if ( audio->input_sources & ARightAuxiliaryMask ) - new TQListViewItem(olditem, i18n("Right-Auxiliary")); - olditem->setOpen(true); - - olditem = new TQListViewItem(lBox, olditem,i18n("Input Channels")); - if ( audio->input_channels & AMonoInputChMask ) - new TQListViewItem(olditem, i18n("Mono-Channel")); - if ( audio->input_channels & ALeftInputChMask ) - new TQListViewItem(olditem, i18n("Left-Channel")); - if ( audio->input_channels & ARightInputChMask ) - new TQListViewItem(olditem, i18n("Right-Channel")); - olditem->setOpen(true); - - olditem = new TQListViewItem(lBox, olditem, i18n("Output Destinations")); - if ( audio->output_destinations & AMonoIntSpeakerMask ) - new TQListViewItem(olditem, i18n("Mono-InternalSpeaker")); - if ( audio->output_destinations & AMonoJackMask ) - new TQListViewItem(olditem, i18n("Mono-Jack")); - if ( audio->output_destinations & ALeftIntSpeakerMask ) - new TQListViewItem(olditem, i18n("Left-InternalSpeaker")); - if ( audio->output_destinations & ARightIntSpeakerMask ) - new TQListViewItem(olditem, i18n("Right-InternalSpeaker")); - if ( audio->output_destinations & ALeftJackMask ) - new TQListViewItem(olditem, i18n("Left-Jack")); - if ( audio->output_destinations & ARightJackMask ) - new TQListViewItem(olditem, i18n("Right-Jack")); - olditem->setOpen(true); - - olditem = new TQListViewItem(lBox, olditem, i18n("Output Channels")); - if ( audio->output_channels & AMonoOutputChMask ) - new TQListViewItem(olditem, i18n("Mono-Channel")); - if ( audio->output_channels & ALeftOutputChMask ) - new TQListViewItem(olditem, i18n("Left-Channel")); - if ( audio->output_channels & ARightOutputChMask ) - new TQListViewItem(olditem, i18n("Right-Channel")); - olditem->setOpen(true); - - - olditem = new TQListViewItem(lBox, olditem, i18n("Gain")); - new TQListViewItem(olditem, i18n("Input Gain Limits"), - Value(audio->max_input_gain)); - new TQListViewItem(olditem,i18n("Output Gain Limits"), - Value(audio->min_output_gain) + TQString(" ") - + Value(audio->max_output_gain)); - new TQListViewItem(olditem, i18n("Monitor Gain Limits"), - Value(audio->min_monitor_gain) + TQString(" ") - + Value(audio->max_monitor_gain)); - new TQListViewItem(olditem, i18n("Gain Restricted"), - Value(audio->gm_gain_restricted)); - olditem->setOpen(true); - - - olditem = new TQListViewItem(lBox, olditem,i18n("Lock"), - Value(audio->lock)); - olditem = new TQListViewItem(lBox, olditem, i18n("Queue Length"), - Value(audio->qlen)); - olditem = new TQListViewItem(lBox, olditem, i18n("Block Size"), - Value(audio->block_size)); - olditem = new TQListViewItem(lBox, olditem, i18n("Stream Port (decimal)"), - Value(audio->stream_port)); - olditem = new TQListViewItem(lBox, olditem, i18n("Ev Buffer Size"), - Value(audio->ev_buf_size)); - olditem = new TQListViewItem(lBox, olditem, i18n("Ext Number"), - Value(audio->ext_number)); - - ACloseAudio( audio, &status ); - - return true; -} - -#endif // defined(HAVE_ALIB_H) diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 71e7a1dc8..950062b2a 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -455,8 +455,6 @@ void KMemoryWidget::update_Values() #include "memory_solaris.cpp" #elif defined(__FreeBSD__) || defined(__DragonFly__) #include "memory_fbsd.cpp" -#elif defined(__hpux) -#include "memory_hpux.cpp" #elif defined(__NetBSD__) || defined(__OpenBSD__) #include "memory_netbsd.cpp" #else diff --git a/kcontrol/info/memory_hpux.cpp b/kcontrol/info/memory_hpux.cpp deleted file mode 100644 index 4fefdfb35..000000000 --- a/kcontrol/info/memory_hpux.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - - This file will be included by memory.cpp ! - - HP-UX is really ugly to retrieve information from ! - Implemented on 24.04.1999 by Helge Deller (deller@gmx.de) - Tested on an HP9000/715/64 under HPUX-10.20. - Updated for QT 2.0 on 27.04.1999 (deller) - - Sorry, but I don't know, who implemented the first (little) version of - update(), but it showed wrong sizes ! - - Many thanks goes also to Mike Romberg, who implemented such functions in - the program "xosview". Here's his copyright: - Copyright (c) 1994, 1995 by Mike Romberg ( romberg@fsl.noaa.gov ) - -*/ - -#include -#include -#include -#include - - -#define MAX_SWAP_AREAS 16 - -void KMemoryWidget::update() -{ - int page_size,i; - unsigned long total_mem, total_free, - total_physical, total_swap, free_physical, - used_physical, used_swap, free_swap; - - struct pst_static pststatic; - struct pst_dynamic stats; - struct pst_vminfo vmstats; - unsigned long fields_[4]; - struct pst_swapinfo swapinfo; - - pstat_getstatic( &pststatic, sizeof( struct pst_static ), (size_t)1, 0); - total_physical = pststatic.physical_memory; - page_size = (int)pststatic.page_size; - - pstat_getdynamic(&stats, sizeof( pst_dynamic ), (size_t)1, 0); - pstat_getvminfo(&vmstats, sizeof(vmstats), (size_t)1, 0); - - fields_[0] = stats.psd_rmtxt + stats.psd_arm; // TEXT - fields_[1] = stats.psd_rm - stats.psd_rmtxt; // USED - fields_[2] = total_physical - fields_[0] - fields_[1] - stats.psd_free; //OTHER - fields_[3] = stats.psd_free; // FREE - - used_physical = (total_physical - fields_[3]) * page_size; - total_physical *= page_size; - free_physical = (total_physical - used_physical); - - - /* Now check the SWAP-AREAS !! */ - - total_swap = free_swap = 0; - - for (i = 0 ; i < MAX_SWAP_AREAS ; i++) - { - pstat_getswap(&swapinfo, sizeof(swapinfo), (size_t)1, i); - if (swapinfo.pss_idx == (unsigned)i) - { - swapinfo.pss_nfpgs *= 4; // nfpgs is in 512 Byte Blocks.... - if (swapinfo.pss_nblksenabled == 0) // == 0 ?? - swapinfo.pss_nblksenabled = swapinfo.pss_nfpgs; - total_swap += (((unsigned long)swapinfo.pss_nblksenabled) * 1024); - free_swap += (((unsigned long)swapinfo.pss_nfpgs ) * 1024); - } - } - - used_swap = total_swap - free_swap; - - - /* Now display the results */ - - total_mem = total_physical; // + total_swap; - total_free = (total_physical - used_physical);// + free_swap; - - Memory_Info[TOTAL_MEM] = MEMORY(total_mem); // total physical memory (without swaps) - Memory_Info[FREE_MEM] = MEMORY(total_free);// total free physical memory (without swaps) - Memory_Info[SHARED_MEM] = NO_MEMORY_INFO; /* FIXME ?? */ - Memory_Info[BUFFER_MEM] = MEMORY(fields_[2])*page_size; /* FIXME ?? */ - Memory_Info[SWAP_MEM] = MEMORY(total_swap); // total size of all swap-partitions - Memory_Info[FREESWAP_MEM] = MEMORY(free_swap); // free memory in swap-partitions -#ifdef __GNUC__ -#warning "FIXME: Memory_Info[CACHED_MEM]" -#endif - Memory_Info[CACHED_MEM] = NO_MEMORY_INFO; // cached memory in ram -} diff --git a/kcontrol/tdefontinst/configure.in.in b/kcontrol/tdefontinst/configure.in.in index 65a5bc3f4..c0e617fe3 100644 --- a/kcontrol/tdefontinst/configure.in.in +++ b/kcontrol/tdefontinst/configure.in.in @@ -93,7 +93,6 @@ if test "$KFI_FOUND_FREETYPE" -eq 1; then *-*-solaris*) UNAME='Solaris' ;; *-*-irix*) UNAME='Irix' ;; *-*-aix*) UNAME='AIX' ;; - *-*-hpux*) UNAME='HPUX' ;; *-*-darwin*) UNAME='Darwin' ;; *) UNAME='Unknown' ;; esac diff --git a/kcontrol/tdefontinst/tdefontinst/GetPid.c b/kcontrol/tdefontinst/tdefontinst/GetPid.c index e4159f40a..11e2cf048 100644 --- a/kcontrol/tdefontinst/tdefontinst/GetPid.c +++ b/kcontrol/tdefontinst/tdefontinst/GetPid.c @@ -62,7 +62,6 @@ OpenBSD Irix Solaris Tested on Solaris 8 x86 by Torsten Kasch - HP-UX Tested on HP-UX B.11.11 U 9000/800 AIX ...else parse output of "ps -eaf" @@ -77,7 +76,7 @@ gcc GetPid.c -DTEST_GETPID -DOS_Linux -o tst ...replace OS_Linux with your particular OS type: OS_FreeBSD, OS_NetBSD, OS_Irix, OS_Solaris, - OS_HPUX, or OS_AIX + or OS_AIX 2. Start a program - such as "vi" 3. Do a "ps -eaf" to ensure there is *only one* process called "vi" @@ -341,35 +340,6 @@ unsigned int kfi_getPid(const char *proc, pid_t ppid) return error ? 0 : pid; } -#elif defined OS_HPUX - -#include -#define MAX_PROCS 50 - -unsigned int kfi_getPid(const char *proc, unsigned int ppid) -{ - bool error=false; - unsigned int pid=0; - int i, - count, - idx=0; - struct pst_status pst[MAX_PROCS]; - - while((count=pstat_getproc(&pst[0], sizeof(pst[0]), MAX_PROCS, idx)) > 0 && !error) - { - for (i = 0; i diff --git a/kcontrol/tdefontinst/tdefontinst/Main.cpp b/kcontrol/tdefontinst/tdefontinst/Main.cpp index 1b58d1a2f..c87f06665 100644 --- a/kcontrol/tdefontinst/tdefontinst/Main.cpp +++ b/kcontrol/tdefontinst/tdefontinst/Main.cpp @@ -102,7 +102,7 @@ KFI::CXConfig * getXCfg(bool root) { // // Try to determine location for X and xfs config files... - // ...note on some systems (Solaris and HP-UX) only the xfs file will be found + // ...note on some systems (Solaris) only the xfs file will be found bool xfs=false; KFI::CXConfig *xcfg=NULL; TQString xConfigFile=getFile(TQFile::encodeName(constXConfigFiles[0]), constXConfigFiles), diff --git a/kicker/kicker/ui/panelmenuiteminfo.h b/kicker/kicker/ui/panelmenuiteminfo.h index 66d0f7d9c..8ae765638 100644 --- a/kicker/kicker/ui/panelmenuiteminfo.h +++ b/kicker/kicker/ui/panelmenuiteminfo.h @@ -39,19 +39,19 @@ class PanelMenuItemInfo : m_recvr(0), m_id(-1) {} PanelMenuItemInfo(const TQString& iconName, const TQString& visibleName, const TQObject* recvr, const TQCString& slot, int id = -1) - : m_icon(iconName), m_name(visibleName), m_slot_(slot), m_recvr(recvr), m_id(id) {} + : m_icon(iconName), m_name(visibleName), m_slot(slot), m_recvr(recvr), m_id(id) {} PanelMenuItemInfo(const TQString& iconName, const TQString& visibleName, int id = -1) : m_icon(iconName), m_name(visibleName), m_recvr(0), m_id(id) {} PanelMenuItemInfo(const PanelMenuItemInfo& c) - : m_icon(c.m_icon), m_name(c.m_name), m_slot_(c.m_slot_), m_recvr(c.m_recvr), m_id(c.m_id) {} + : m_icon(c.m_icon), m_name(c.m_name), m_slot(c.m_slot), m_recvr(c.m_recvr), m_id(c.m_id) {} PanelMenuItemInfo& operator=(const PanelMenuItemInfo& c) { m_icon = c.m_icon; m_name = c.m_name; - m_slot_ = c.m_slot_; + m_slot = c.m_slot; m_recvr = c.m_recvr; m_id = c.m_id; return *this; @@ -76,16 +76,16 @@ class PanelMenuItemInfo { if (!m_icon.isEmpty() && m_icon != "unknown") { - if (m_recvr && !m_slot_.isEmpty()) + if (m_recvr && !m_slot.isEmpty()) { - return menu->insertItem(SmallIconSet(m_icon), m_name, m_recvr, m_slot_, 0, m_id); + return menu->insertItem(SmallIconSet(m_icon), m_name, m_recvr, m_slot, 0, m_id); } return menu->insertItem(SmallIconSet(m_icon), m_name, m_id); } - else if (m_recvr && !m_slot_.isEmpty()) + else if (m_recvr && !m_slot.isEmpty()) { - return menu->insertItem(m_name, m_recvr, m_slot_, 0, m_id); + return menu->insertItem(m_name, m_recvr, m_slot, 0, m_id); } return menu->insertItem(m_name, m_id); @@ -94,7 +94,7 @@ class PanelMenuItemInfo private: TQString m_icon; TQString m_name; - TQCString m_slot_; // HPUX namespace is polluted with m_slot + TQCString m_slot; const TQObject* m_recvr; int m_id; }; diff --git a/konsole/README.ports b/konsole/README.ports index 71f3ae154..1239a6567 100644 --- a/konsole/README.ports +++ b/konsole/README.ports @@ -21,7 +21,6 @@ Platform Experts - Solaris - Stephan Kulow - FreeBSD - ? -- HP-UX - ? - AIX - ? - OpenBSD - Marc Espie diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp index 551dad3f8..ff942954c 100644 --- a/kpersonalizer/ksysinfo.cpp +++ b/kpersonalizer/ksysinfo.cpp @@ -222,10 +222,6 @@ TQFont KSysInfo::getFixedWidthFont(){ //#elif __FreeBSD__ /////////////////// -/////////////////// -//#elif hpux -/////////////////// - /////////////////// //#elif __NetBSD__ /////////////////// diff --git a/nsplugins/sdk/npapi.h b/nsplugins/sdk/npapi.h index 92ccc6e60..467138946 100644 --- a/nsplugins/sdk/npapi.h +++ b/nsplugins/sdk/npapi.h @@ -50,7 +50,6 @@ #include "prtypes.h" /* Copied from xp_core.h */ -/* removed #ifdef for hpux defined in /usr/include/model.h */ #ifndef XP_MAC #ifndef _INT16 #define _INT16 diff --git a/nsplugins/sdk/obsolete/protypes.h b/nsplugins/sdk/obsolete/protypes.h index 5d9190aa2..efd2a1509 100644 --- a/nsplugins/sdk/obsolete/protypes.h +++ b/nsplugins/sdk/obsolete/protypes.h @@ -82,11 +82,6 @@ typedef PRIntn intn; #include #endif -/* model.h on HP-UX defines int8, int16, and int32. */ -#ifdef HPUX -#include -#endif - /* * uint */ @@ -146,8 +141,7 @@ typedef PRInt64 int64; */ #if !defined(XP_BEOS) && !defined(VMS) \ - && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \ - && !defined(HPUX) + && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) #if !defined(WIN32) || !defined(_WINSOCK2API_) /* defines its own "int32" */ #if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO) typedef PRInt32 int32; @@ -162,8 +156,7 @@ typedef long int32; */ #if !defined(XP_BEOS) && !defined(VMS) \ - && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \ - && !defined(HPUX) + && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) typedef PRInt16 int16; #endif @@ -172,8 +165,7 @@ typedef PRInt16 int16; */ #if !defined(XP_BEOS) && !defined(VMS) \ - && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \ - && !defined(HPUX) + && !defined(_PR_AIX_HAVE_BSD_INT_TYPES) typedef PRInt8 int8; #endif diff --git a/nsplugins/sdk/prtypes.h b/nsplugins/sdk/prtypes.h index 842013ee8..29bad8018 100644 --- a/nsplugins/sdk/prtypes.h +++ b/nsplugins/sdk/prtypes.h @@ -266,10 +266,8 @@ typedef unsigned char PRUint8; ** For these compilers, we have to define PRInt8 as plain 'char'. ** Make sure that plain 'char' is indeed signed under these compilers. */ -#if (defined(HPUX) && defined(__cplusplus) \ - && !defined(__GNUC__) && __cplusplus < 199707L) \ - || (defined(SCO) && defined(__cplusplus) \ - && !defined(__GNUC__) && __cplusplus == 1L) +#if defined(SCO) && defined(__cplusplus) \ + && !defined(__GNUC__) && __cplusplus == 1L typedef char PRInt8; #else typedef signed char PRInt8; diff --git a/nsplugins/wrapper/wrapper.c b/nsplugins/wrapper/wrapper.c index 965868426..7caf645cb 100644 --- a/nsplugins/wrapper/wrapper.c +++ b/nsplugins/wrapper/wrapper.c @@ -4,11 +4,7 @@ #include #include -#ifdef __hpux -#include -#else #include -#endif #define XP_UNIX 1 #include "sdk/npupp.h" @@ -28,26 +24,13 @@ NP_Initialize_t *gNP_Initialize = NULL; NP_Shutdown_t *gNP_Shutdown = NULL; NP_GetValue_t *gNP_GetValue = NULL; -#ifdef __hpux -shl_t gLib; -#else void *gLib = 0L; -#endif FILE *ef = 0L; #define DEB fprintf static void UnloadPlugin() { -#ifdef __hpux - if (gLib) { - DEB( ef, "-> UnloadPlugin\n" ); - shl_unload(gLib); - DEB( ef, "<- UnloadPlugin\n" ); - - gLib=0L; - } -#else if ( gLib ) { DEB( ef, "-> UnloadPlugin\n" ); dlclose( gLib ); @@ -57,7 +40,6 @@ void UnloadPlugin() { if (ef) fclose( ef ); } -#endif } static @@ -70,17 +52,6 @@ void LoadPlugin() { setvbuf( ef, NULL, _IONBF, 0 ); DEB( ef, "-> LoadPlugin\n" ); -#ifdef __hpux - gLib = shl_load("/tmp/plugin.so", BIND_IMMEDIATE, 0L); - if (shl_findsym(&gLib, "/tmp/plugin.so", (short) TYPE_PROCEDURE, (void *) &gNP_GetMIMEDescription)) - gNP_GetMIMEDescription = NULL; - if (shl_findsym(&gLib, "/tmp/plugin.so", (short) TYPE_PROCEDURE, (void *) &gNP_Initialize)) - gNP_Initialize = NULL; - if (shl_findsym(&gLib, "/tmp/plugin.so", (short) TYPE_PROCEDURE, (void *) &gNP_Shutdown)) - gNP_Shutdown = NULL; - if (shl_findsym(&gLib, "/tmp/plugin.so", (short) TYPE_PROCEDURE, (void *) &gNP_GetValue)) - gNP_GetValue = NULL; -#else gLib = dlopen( "/tmp/plugin.so", RTLD_NOW ); DEB( ef, "gLib = %x\n", gLib ); @@ -88,7 +59,6 @@ void LoadPlugin() { gNP_Initialize = dlsym( gLib, "NP_Initialize" ); gNP_Shutdown = dlsym( gLib, "NP_Shutdown" ); gNP_GetValue = dlsym( gLib, "NP_GetValue" ); -#endif DEB( ef, "gNP_GetMIMEDescription = %x\n", NP_GetMIMEDescription ); DEB( ef, "gNP_Initialize = %x\n", gNP_Initialize ); DEB( ef, "gNP_Shutdown = %x\n", gNP_Shutdown ); diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp index 70e42758b..3c9c9bbd4 100644 --- a/tdeioslave/fish/fish.cpp +++ b/tdeioslave/fish/fish.cpp @@ -441,7 +441,7 @@ bool fishProtocol::connectionStart() { #endif int pgrp = getpid(); -#if defined( _AIX) || defined( __hpux) +#if defined( _AIX) tcsetpgrp(0, pgrp); #else ioctl(0, TIOCSPGRP, (char *)&pgrp); diff --git a/tdm/backend/auth.c b/tdm/backend/auth.c index 9698816ad..6673c008d 100644 --- a/tdm/backend/auth.c +++ b/tdm/backend/auth.c @@ -52,7 +52,7 @@ from the copyright holder. # include #endif -#if (defined(_POSIX_SOURCE) && !defined(_AIX) && !defined(__QNX__)) || defined(__hpux) || defined(__svr4__) /* XXX */ +#if (defined(_POSIX_SOURCE) && !defined(_AIX) && !defined(__QNX__)) || defined(__svr4__) # define NEED_UTSNAME # include #endif @@ -515,7 +515,7 @@ writeAddr( int family, int addr_length, char *addr, static void DefineLocal( FILE *file, Xauth *auth, int *ok ) { -#if !defined(NEED_UTSNAME) || defined(__hpux) +#if !defined(NEED_UTSNAME) char displayname[100]; #endif #ifdef NEED_UTSNAME @@ -534,7 +534,7 @@ DefineLocal( FILE *file, Xauth *auth, int *ok ) #ifdef NEED_UTSNAME - /* hpux: + /* * Why not use gethostname()? Well, at least on my system, I've had to * make an ugly kernel patch to get a name longer than 8 characters, and * uname() lets me access to the whole string (it smashes release, you @@ -545,17 +545,12 @@ DefineLocal( FILE *file, Xauth *auth, int *ok ) file, auth, ok ); #endif -#if !defined(NEED_UTSNAME) || defined(__hpux) +#if !defined(NEED_UTSNAME) /* _AIX: * In _AIX, _POSIX_SOURCE is defined, but uname gives only first * field of hostname. Thus, we use gethostname instead. */ - /* - * For HP-UX, HP's Xlib expects a fully-qualified domain name, which - * is achieved by using gethostname(). For compatability, we must - * also still create the entry using uname() above. - */ displayname[0] = 0; if (!gethostname( displayname, sizeof(displayname) )) displayname[sizeof(displayname) - 1] = 0; @@ -934,7 +929,7 @@ DefineSelf( int fd, int file, int auth, int *ok ) struct sockaddr_in *inetaddr; - /* hpux: + /* * Why not use gethostname()? Well, at least on my system, I've had to * make an ugly kernel patch to get a name longer than 8 characters, and * uname() lets me access to the whole string (it smashes release, you diff --git a/tdm/backend/choose.c b/tdm/backend/choose.c index e66249862..bd6788590 100644 --- a/tdm/backend/choose.c +++ b/tdm/backend/choose.c @@ -60,7 +60,7 @@ from the copyright holder. # include #endif -#if !defined(__GNU__) && !defined(__hpux) /* XXX __hpux might be wrong */ +#if !defined(__GNU__) # include #endif diff --git a/tdm/backend/netaddr.c b/tdm/backend/netaddr.c index 349a53528..8a7dc0ebf 100644 --- a/tdm/backend/netaddr.c +++ b/tdm/backend/netaddr.c @@ -156,12 +156,10 @@ ConvertAddr( char *saddr, int *len, char **addr ) break; #endif #ifdef AF_UNIX -#ifndef __hpux case AF_UNIX: retval = FamilyLocal; break; #endif -#endif #ifdef TCPCONN case AF_INET: retval = FamilyInternet; diff --git a/tdm/backend/util.c b/tdm/backend/util.c index 4290c6db6..a1e01be62 100644 --- a/tdm/backend/util.c +++ b/tdm/backend/util.c @@ -44,10 +44,6 @@ from the copyright holder. #include #include -#if 0 /*def USG; this was hpux once upon a time */ -# define NEED_UTSNAME -#endif - #ifdef NEED_UTSNAME # include #endif diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp index e885b3b5a..b22c3e31f 100644 --- a/tdm/kfrontend/kconsole.cpp +++ b/tdm/kfrontend/kconsole.cpp @@ -33,8 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #ifdef HAVE_TERMIOS_H -/* for HP-UX (some versions) the extern C is needed, and for other - platforms it doesn't hurt */ extern "C" { #include } @@ -44,12 +42,6 @@ extern "C" { #include #endif -#if defined (_HPUX_SOURCE) -#define _TERMIOS_INCLUDED -#include -#endif - - #include "kconsole.h" #include "tdmconfig.h" #include "tdm_greet.h" -- cgit v1.2.3