diff options
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/colors/widgetcanvas.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/info/Makefile.am | 2 | ||||
| -rw-r--r-- | kcontrol/info/configure.in.in | 5 | ||||
| -rw-r--r-- | kcontrol/info/memory.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/info/memory_tru64.cpp | 83 | ||||
| -rw-r--r-- | kcontrol/style/kcmstyle.cpp | 2 |
6 files changed, 1 insertions, 95 deletions
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index d83b821bd..81399b438 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -324,9 +324,7 @@ void WidgetCanvas::drawSampleWidgets() TQPixmap pm( vertScrollBar->width(), vertScrollBar->height() ); pm.fill( back ); -#ifndef __osf__ TQPainter::redirect( vertScrollBar, &pm ); -#endif vertScrollBar->repaint(); TQPainter::redirect( vertScrollBar, 0 ); vertScrollBar->hide(); diff --git a/kcontrol/info/Makefile.am b/kcontrol/info/Makefile.am index 30eb5ebe8..6db9c62b9 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) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) +kcm_info_la_LIBADD = $(LIBALIB) $(LIB_TDEUI) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) METASOURCES = AUTO AM_CPPFLAGS= $(all_includes) $(GLINC) diff --git a/kcontrol/info/configure.in.in b/kcontrol/info/configure.in.in index 9bc6d1c4b..cee8a2deb 100644 --- a/kcontrol/info/configure.in.in +++ b/kcontrol/info/configure.in.in @@ -1,11 +1,7 @@ -# libmach for Tru64 # linux/raw.h for Linux # devinfo.h, libdevinfo for the list of {IRQ,DMA,IOPORTS/MEMRANGES} for FreeBSD case "$host" in - *-*-osf*) - AC_CHECK_LIB(mach, vm_statistics, LIB_TRU64_MACH="-lmach")dnl - ;; *-*-linux*) AC_CHECK_HEADERS(linux/raw.h sys/raw.h)dnl ;; @@ -14,7 +10,6 @@ case "$host" in AC_CHECK_LIB(devinfo, devinfo_foreach_rman, LIBDEVINFO="-ldevinfo") ;; esac -AC_SUBST(LIB_TRU64_MACH) AC_HAVE_GL( have_gl=yes, have_gl=no ) AM_CONDITIONAL(COMPILE_GL_INFO, test x$have_gl = xyes) diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 93da5ea20..71e7a1dc8 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -459,8 +459,6 @@ void KMemoryWidget::update_Values() #include "memory_hpux.cpp" #elif defined(__NetBSD__) || defined(__OpenBSD__) #include "memory_netbsd.cpp" -#elif __osf__ -#include "memory_tru64.cpp" #else /* Default for unsupported systems */ diff --git a/kcontrol/info/memory_tru64.cpp b/kcontrol/info/memory_tru64.cpp deleted file mode 100644 index c3cbb2fae..000000000 --- a/kcontrol/info/memory_tru64.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* - * This is memory_tru64.cpp to retrieve memory information under Tru64/Alpha. - * - * Implemented by Tom Leitner, [email protected] - * - * WARNING: This module requires linking with -lmach - * - * This routine is based on m_decosf1.c from the "top" program written by: - * - * AUTHOR: Anthony Baxter, <[email protected]> - * - */ - -#include <stdio.h> -#include <unistd.h> -#include <sys/socket.h> -#include <sys/mbuf.h> -#include <net/route.h> -#include <sys/table.h> -extern "C" { -#include <mach/mach_traps.h> -} -#include <mach/vm_statistics.h> - -#define pagetob(size) (MEMORY(1024L) * ((long) (size) << (long) pageshift)) -#define LOG1024 10 - -extern "C" void vm_statistics(task_t, vm_statistics_data_t*); - -void KMemoryWidget::update() -{ - int pageshift; /* log base 2 of the pagesize */ - int pagesize; - vm_statistics_data_t vmstats; - int swap_pages=0,swap_free=0,i; - struct tbl_swapinfo swbuf; - - /* get the page size with "getpagesize" and calculate pageshift from it */ - - pagesize = getpagesize(); - pageshift = 0; - while (pagesize > 1) { - pageshift++; - pagesize >>= 1; - } - - /* we only need the amount of log(2)1024 for our conversion */ - - pageshift -= LOG1024; - - /* memory information */ - /* this is possibly bogus - we work out total # pages by */ - /* adding up the free, active, inactive, wired down, and */ - /* zero filled. Anyone who knows a better way, TELL ME! */ - /* Change: dont use zero filled. */ - - (void) ::vm_statistics(::task_self(), &vmstats); - - /* thanks DEC for the table() command. No thanks at all for */ - /* omitting the man page for it from OSF/1 1.2, and failing */ - /* to document SWAPINFO in the 1.3 man page. Lets hear it for */ - /* include files. */ - - i=0; - while(table(TBL_SWAPINFO,i,&swbuf,1,sizeof(struct tbl_swapinfo))>0) { - swap_pages += swbuf.size; - swap_free += swbuf.free; - i++; - } - Memory_Info[TOTAL_MEM] = pagetob((vmstats.free_count + - vmstats.active_count + - vmstats.inactive_count + - vmstats.wire_count)); - Memory_Info[FREE_MEM] = pagetob(vmstats.free_count); - Memory_Info[SHARED_MEM] = NO_MEMORY_INFO; /* FIXME ?? */ - Memory_Info[BUFFER_MEM] = NO_MEMORY_INFO; /* FIXME ?? */ -#ifdef __GNUC__ -#warning "FIXME: Memory_Info[CACHED_MEM]" -#endif - Memory_Info[CACHED_MEM] = NO_MEMORY_INFO; /* cached memory in ram */ - Memory_Info[SWAP_MEM] = pagetob(swap_pages); - Memory_Info[FREESWAP_MEM] = pagetob(swap_free); -} diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 53f4fe048..c03157c40 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -92,7 +92,6 @@ extern "C" runRdb( flags ); // Write some Qt root property. -#ifndef __osf__ // this crashes under Tru64 randomly -- will fix later TQByteArray properties; TQDataStream d(properties, IO_WriteOnly); d.setVersion( 3 ); // Qt2 apps need this. @@ -105,7 +104,6 @@ extern "C" XChangeProperty(tqt_xdisplay(), RootWindow(tqt_xdisplay(), i), a, a, 8, PropModeReplace, (unsigned char*) properties.data(), properties.size()); -#endif } } |