*** ./kdm/kdmconfig.h Fri Mar 27 02:37:17 1998 --- ../kdebase-1.0/./kdm/kdmconfig.h Fri Aug 28 14:42:16 1998 *************** *** 47,53 **** enum { KNone, All, RootOnly, ConsoleOnly }; private: void getConfig(); ! KVItemList* getUsers( QString s = NULL, bool = false); KConfig* kc; QFont* _normalFont; --- 47,53 ---- enum { KNone, All, RootOnly, ConsoleOnly }; private: void getConfig(); ! KVItemList* getUsers( QString s = 0, bool = false); KConfig* kc; QFont* _normalFont; *** ./kdm/session.c Fri Mar 27 02:37:21 1998 --- ../kdebase-1.0/./kdm/session.c Fri Aug 28 14:51:00 1998 *************** *** 82,94 **** extern int PingServer(); extern int SessionPingFailed(); ! extern int Debug(); extern int RegisterCloseOnFork(); extern void SecureDisplay(); extern void UnsecureDisplay(); extern int ClearCloseOnFork(); extern int SetupDisplay(); ! extern int LogError(); extern void SessionExit(); extern void DeleteXloginResources(); extern int source(); --- 82,94 ---- extern int PingServer(); extern int SessionPingFailed(); ! /* extern int Debug(); */ extern int RegisterCloseOnFork(); extern void SecureDisplay(); extern void UnsecureDisplay(); extern int ClearCloseOnFork(); extern int SetupDisplay(); ! /* extern int LogError(); */ extern void SessionExit(); extern void DeleteXloginResources(); extern int source(); *************** *** 98,104 **** extern char **parseArgs(); extern int printEnv(); extern char **systemEnv(); ! extern int LogOutOfMem(); /*extern void setgrent(); extern struct group *getgrent(); extern void endgrent(); --- 98,104 ---- extern char **parseArgs(); extern int printEnv(); extern char **systemEnv(); ! /*extern int LogOutOfMem(); */ /*extern void setgrent(); extern struct group *getgrent(); extern void endgrent(); *** ./kfm/open-with.cpp Sat Jul 4 14:09:52 1998 --- ../kdebase-1.0/./kfm/open-with.cpp Fri Aug 28 11:40:46 1998 *************** *** 134,140 **** } } ! short KApplicationTree::parseKdelnkDir( QDir d, KTreeList *tree, KAppTreeListItem *item = 0) { if( !d.exists() ) return -1; --- 134,140 ---- } } ! short KApplicationTree::parseKdelnkDir( QDir d, KTreeList *tree, KAppTreeListItem *item/* = 0*/) { if( !d.exists() ) return -1; *** ./kvt/command.c Tue Jun 16 21:23:13 1998 --- ../kdebase-1.0/./kvt/command.c Tue Sep 1 10:58:22 1998 *************** *** 44,50 **** #include #endif /* sgis have /dev/ptmx [bmg] */ ! #ifdef __sgi__ #define SVR4 #endif --- 44,50 ---- #include #endif /* sgis have /dev/ptmx [bmg] */ ! #if (defined __sgi__) || (defined __sgi) #define SVR4 #endif *** ./kwm/manager.C Fri Jul 3 01:38:39 1998 --- ../kdebase-1.0/./kwm/manager.C Fri Sep 18 15:03:21 1998 *************** *** 6,12 **** */ - #include "manager.moc" #include "main.h" #include #include --- 6,11 ---- *************** *** 17,22 **** --- 16,25 ---- #include #include + + /* Should be after KAPP to prevent problem with index/strchar + * from X11/Xos.h - max */ + #include "manager.moc" #ifdef HAVE_CONFIG_H #include *** ./kwm/manager.h Fri Jul 3 01:38:40 1998 --- ../kdebase-1.0/./kwm/manager.h Tue Sep 15 13:11:06 1998 *************** *** 8,13 **** --- 8,15 ---- #ifndef MANAGER_H #define MANAGER_H + #include + #include #include #include *************** *** 22,27 **** --- 24,31 ---- #include #include #include + /* Should be before X11/Xos.h because Xos.h redefines index */ + /* #include */ #include "client.h" *************** *** 32,38 **** #include #include - #include class Manager : public QObject { Q_OBJECT --- 36,41 ---- *** ./kwmmodules/kwmsound/Makefile.am Wed Jul 8 22:59:38 1998 --- ../kdebase-1.0/./kwmmodules/kwmsound/Makefile.am Fri Aug 28 14:16:08 1998 *************** *** 1,8 **** INCLUDES = $(all_includes) ! LDFLAGS = $(all_libraries) $(KDE_RPATH) ! LDADD = -lkdeui -lkdecore -lmediatool -lqt -lXext -lX11 $(LIBSOCKET) $(LIBCOMPAT) bin_PROGRAMS = kwmsound kwmsound_SOURCES = kwmsound.C --- 1,8 ---- INCLUDES = $(all_includes) ! #LDFLAGS = $(all_libraries) $(KDE_RPATH) ! LDADD = $(all_libraries) -lkdeui -lkdecore -lmediatool -lqt -lXext -lX11 $(LIBSOCKET) $(LIBCOMPAT) $(KDE_RPATH) bin_PROGRAMS = kwmsound kwmsound_SOURCES = kwmsound.C *** ./kwmmodules/kwmsound/Makefile.in Sat Jul 11 04:35:43 1998 --- ../kdebase-1.0/./kwmmodules/kwmsound/Makefile.in Fri Aug 28 14:37:04 1998 *************** *** 149,156 **** INCLUDES = $(all_includes) ! LDFLAGS = $(all_libraries) $(KDE_RPATH) ! LDADD = -lkdeui -lkdecore -lmediatool -lqt -lXext -lX11 $(LIBSOCKET) $(LIBCOMPAT) bin_PROGRAMS = kwmsound kwmsound_SOURCES = kwmsound.C --- 149,156 ---- INCLUDES = $(all_includes) ! #LDFLAGS = $(all_libraries) $(KDE_RPATH) ! LDADD = $(all_libraries) -lkdeui -lkdecore -lmediatool -lqt -lXext -lX11 $(LIBSOCKET) $(LIBCOMPAT) $(KDE_RPATH) bin_PROGRAMS = kwmsound kwmsound_SOURCES = kwmsound.C *** ./kwmmodules/kwmsound/kwmsound.C Tue Jun 23 06:39:29 1998 --- ../kdebase-1.0/./kwmmodules/kwmsound/kwmsound.C Fri Aug 28 14:02:19 1998 *************** *** 130,137 **** } } if (tries==10) { ! printf("kwmsound: Failed connecting the audio server.\n ! Please check manually if you can start kaudioserver.\n"); exit(1); } --- 130,137 ---- } } if (tries==10) { ! printf("kwmsound: Failed connecting the audio server.\n" ! "Please check manually if you can start kaudioserver.\n"); exit(1); } *** ./kwmmodules/kbgndwm/bg.cpp Wed Jun 24 23:39:48 1998 --- ../kdebase-1.0/./kwmmodules/kbgndwm/bg.cpp Fri Aug 28 14:00:35 1998 *************** *** 311,317 **** QWMatrix matrix; matrix.scale( sx, sy ); ! bitBlt( bgPixmap, 0, 0, &wpPixmap->xForm( matrix ) ); } break; --- 311,318 ---- QWMatrix matrix; matrix.scale( sx, sy ); ! QPixmap xPmap = wpPixmap->xForm( matrix ); ! bitBlt( bgPixmap, 0, 0, &xPmap ); } break; *** ./mkinstalldirs Mon Apr 14 00:48:34 1997 --- ../kdebase-1.0/./mkinstalldirs Tue Sep 1 11:20:38 1998 *************** *** 5,10 **** --- 5,11 ---- # Last modified: 1994-03-25 # Public domain + errstatus=0 for file in ${1+"$@"} ; do *************** *** 19,26 **** esac if test ! -d "$pathcomp"; then ! echo "mkdir $pathcomp" 1>&2 ! mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$? fi if test ! -d "$pathcomp"; then --- 20,32 ---- esac if test ! -d "$pathcomp"; then ! if [ `uname -s | cut -c1-4` = "IRIX" ] ; then ! echo "install -F" `dirname $pathcomp` "-d" `basename $pathcomp` 1>&2 ! install -F `dirname $pathcomp` -d `basename $pathcom` ! else ! echo "mkdir $pathcomp" 1>&2 ! mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$? ! fi fi if test ! -d "$pathcomp"; then *** ./kfind/kftabdlg.cpp Wed Apr 22 05:59:42 1998 --- ../kdebase-1.0/./kfind/kftabdlg.cpp Fri Aug 28 11:44:52 1998 *************** *** 43,49 **** extern QList *types; ! typedef struct GUIItem { QWidget *w; bool enabled; }; --- 43,49 ---- extern QList *types; ! /* typedef */ struct GUIItem { QWidget *w; bool enabled; }; *************** *** 309,315 **** dict.clear(); sl.clear(); sl.append(dirBox->currentText()); ! for(int i = 0; i < dirBox->count(); i++) { if(!dict.find(dirBox->text(i))) { dict.insert(dirBox->text(i), "dummy"); sl.append(dirBox->text(i)); --- 309,315 ---- dict.clear(); sl.clear(); sl.append(dirBox->currentText()); ! for(/* int */i = 0; i < dirBox->count(); i++) { if(!dict.find(dirBox->text(i))) { dict.insert(dirBox->text(i), "dummy"); sl.append(dirBox->text(i)); *** ./kscreensaver/Makefile.in Sat Jul 11 04:35:40 1998 --- ../kdebase-1.0/./kscreensaver/Makefile.in Mon Aug 31 17:50:19 1998 *************** *** 152,162 **** INCLUDES = $(all_includes) LDADD = $(all_libraries) -lkdeui -lkdecore -lqt -lXext -lX11 $(PAMLIBS) \ ! $(LIBCRYPT) $(LIBSOCKET) $(KDE_RPATH) DISTCLEANFILES = $(BUILT_SOURCES) # for shadow passwords override the value ! INSTALL_PROGRAM = @INSTALL@ $(SETUIDFLAGS) bin_PROGRAMS = kpolygon.kss kswarm.kss klissie.kss kbanner.kss \ klines.kss kblankscrn.kss krock.kss kflame.kss klaser.kss \ --- 152,162 ---- INCLUDES = $(all_includes) LDADD = $(all_libraries) -lkdeui -lkdecore -lqt -lXext -lX11 $(PAMLIBS) \ ! $(LIBCRYPT) $(LIBSOCKET) -lm $(KDE_RPATH) DISTCLEANFILES = $(BUILT_SOURCES) # for shadow passwords override the value ! INSTALL_PROGRAM = $(INSTALL) $(SETUIDFLAGS) bin_PROGRAMS = kpolygon.kss kswarm.kss klissie.kss kbanner.kss \ klines.kss kblankscrn.kss krock.kss kflame.kss klaser.kss \ *** ./kscreensaver/saver.cpp Tue Jun 16 21:01:06 1998 --- ../kdebase-1.0/./kscreensaver/saver.cpp Fri Aug 28 14:53:15 1998 *************** *** 39,45 **** //----------------------------------------------------------------------------- ! KPasswordDlg::KPasswordDlg( QWidget *parent, bool s=true ) : QWidget( parent ) { setCursor( arrowCursor ); --- 39,45 ---- //----------------------------------------------------------------------------- ! KPasswordDlg::KPasswordDlg( QWidget *parent, bool s/*=true*/ ) : QWidget( parent ) { setCursor( arrowCursor ); *** ./kscreensaver/science.cpp Wed Jul 8 18:46:29 1998 --- ../kdebase-1.0/./kscreensaver/science.cpp Fri Aug 28 16:21:21 1998 *************** *** 201,207 **** saver->do_refresh( event->rect() ); } ! void KPreviewWidget::notifySaver( KScienceSaver *s = 0 ) { saver = s; } --- 201,207 ---- saver->do_refresh( event->rect() ); } ! void KPreviewWidget::notifySaver( KScienceSaver *s/* = 0*/ ) { saver = s; } *************** *** 210,216 **** // Screen Saver // ! KScienceSaver::KScienceSaver( Drawable drawable, bool s = false, bool gP = false ) : kScreenSaver( drawable ) { xRootWin = buffer = 0; dlg = 0; --- 210,217 ---- // Screen Saver // ! KScienceSaver::KScienceSaver( Drawable drawable, bool s/* = false */ ! , bool gP/* = false*/ ) : kScreenSaver( drawable ) { xRootWin = buffer = 0; dlg = 0; *** ./kcontrol/info/memory_sgi.cpp Wed Jun 17 12:52:52 1998 --- ../kdebase-1.0/./kcontrol/info/memory_sgi.cpp Fri Aug 28 16:41:40 1998 *************** *** 25,30 **** --- 25,31 ---- swapctl(SC_GETFREESWAP, &val); freeSwapMem->setText(format(val*UBSIZE)); + #if 0 /* has been changed for 6.5, so don't mess with it */ FILE *kmem = fopen("/dev/kmem", "r"); if( kmem == 0 ) { sharedMem->setText(klocale->translate("Not Available")); *************** *** 52,57 **** } } sharedMem->setText(format(val)); - fclose(kmem); } --- 53,61 ---- } } sharedMem->setText(format(val)); fclose(kmem); + #else + sharedMem->setText(klocale->translate("Not Available")); + #endif + } *** ./kcontrol/samba/ksmbstatus.cpp Tue Apr 21 18:18:07 1998 --- ../kdebase-1.0/./kcontrol/samba/ksmbstatus.cpp Fri Aug 28 16:24:54 1998 *************** *** 80,86 **** char s[250],*start,*end; size_t len; start = buffer; ! while ((end = index(start,'\n'))) // look for '\n' { len = end-start; strncpy(s,start,len); --- 80,86 ---- char s[250],*start,*end; size_t len; start = buffer; ! while ((end = strchr(start,'\n'))) // look for '\n' { len = end-start; strncpy(s,start,len); *** ./kcontrol/samba/ksmbstatus.h Sat Jun 27 19:19:53 1998 --- ../kdebase-1.0/./kcontrol/samba/ksmbstatus.h Fri Aug 28 16:24:28 1998 *************** *** 14,20 **** { Q_OBJECT public: ! NetMon::NetMon(QWidget *parent, const char * name=NULL); void applySettings() {}; void loadSettings() {}; --- 14,20 ---- { Q_OBJECT public: ! NetMon(QWidget *parent, const char * name=NULL); void applySettings() {}; void loadSettings() {}; *** ./kcontrol/display/general.cpp Fri Jul 10 19:26:46 1998 --- ../kdebase-1.0/./kcontrol/display/general.cpp Fri Aug 28 16:33:14 1998 *************** *** 47,53 **** extern int dropError(Display *, XErrorEvent *); ! FontUseItem::FontUseItem( const char *n, QFont default_fnt, bool f = false ) : selected(0) { _text = n; --- 47,53 ---- extern int dropError(Display *, XErrorEvent *); ! FontUseItem::FontUseItem( const char *n, QFont default_fnt, bool f /* = false*/ ) : selected(0) { _text = n; *** ./kcontrol/display/backgnd.cpp Tue Jun 16 23:36:39 1998 --- ../kdebase-1.0/./kcontrol/display/backgnd.cpp Fri Aug 28 16:30:25 1998 *************** *** 709,715 **** QWMatrix matrix; matrix.scale( sx, sy ); ! bitBlt( &wpPixmap, 0, 0, &tmp.xForm( matrix ) ); } break; --- 709,717 ---- QWMatrix matrix; matrix.scale( sx, sy ); ! QPixmap tPmap = tmp.xForm (matrix); ! ! bitBlt( &wpPixmap, 0, 0, & tPmap ); } break; *************** *** 917,934 **** if (!count) count = savePatterns(); ! QString name; for (i = 0; i < count; i++) { PatternEntry *entry = new PatternEntry(); ! name.sprintf("Name%d",i); ! entry->name = config->readEntry( name ); if (entry->name.isNull()) { delete entry; continue; } QStrList strl; ! name.sprintf("Pattern%d",i); ! config->readListEntry(name, strl); uint size = strl.count(); if (size > 8) size = 8; for (uint j = 0; j < 8; j++) --- 919,936 ---- if (!count) count = savePatterns(); ! QString qsName; for (i = 0; i < count; i++) { PatternEntry *entry = new PatternEntry(); ! qsName.sprintf("Name%d",i); ! entry->name = config->readEntry( qsName ); if (entry->name.isNull()) { delete entry; continue; } QStrList strl; ! qsName.sprintf("Pattern%d",i); ! config->readListEntry(qsName, strl); uint size = strl.count(); if (size > 8) size = 8; for (uint j = 0; j < 8; j++) *************** *** 1050,1056 **** listBox->insertItem( current->name ); } ! for ( PatternEntry *item=list.first(); item != 0; item=list.next() ) listBox->insertItem(item->name); listBox->setCurrentItem( index ); --- 1052,1058 ---- listBox->insertItem( current->name ); } ! for ( /*PatternEntry * */item=list.first(); item != 0; item=list.next() ) listBox->insertItem(item->name); listBox->setCurrentItem( index ); *** ./kcontrol/kcontrol/configlist.cpp Mon Jul 6 07:09:40 1998 --- ../kdebase-1.0/./kcontrol/kcontrol/configlist.cpp Fri Aug 28 16:47:27 1998 *************** *** 326,337 **** if (!entry) return; if (entry->isDirectory()) { // add directory item = new ConfigTreeItem(entry); item->setText(entry->getName()); ! item->setPixmap(&entry->getIcon()); if (path->top()) list->addChildItem(item, path); --- 326,338 ---- if (!entry) return; + QPixmap qpmap = entry->getIcon (); if (entry->isDirectory()) { // add directory item = new ConfigTreeItem(entry); item->setText(entry->getName()); ! item->setPixmap(& qpmap); if (path->top()) list->addChildItem(item, path); *************** *** 354,360 **** // add application item = new ConfigTreeItem(entry); item->setText(entry->getName()); ! item->setPixmap(&entry->getIcon()); if (path->count() > 0) list->addChildItem(item, path); else --- 355,361 ---- // add application item = new ConfigTreeItem(entry); item->setText(entry->getName()); ! item->setPixmap(& qpmap); if (path->count() > 0) list->addChildItem(item, path); else *** ./configure Sat Jul 11 04:35:52 1998 --- ../kdebase-1.0/./configure Fri Aug 28 10:55:02 1998 *************** *** 3236,3242 **** if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/ksock.h"; then { echo "configure: error: ! in the prefix, you've chosen, are no kde headers installed. This will fail. So, check this please and use another prefix!" 1>&2; exit 1; } fi --- 3236,3242 ---- if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/ksock.h"; then { echo "configure: error: ! in the prefix \"$ac_kde_includes\", you've chosen, are no kde headers installed. This will fail. So, check this please and use another prefix!" 1>&2; exit 1; } fi *************** *** 3255,3267 **** done done if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/libkdecore.la"; then { echo "configure: error: ! in the prefix, you've chosen, are no kde libraries installed. This will fail. So, check this please and use another prefix!" 1>&2; exit 1; } fi - ac_kde_libraries="$kde_libdir" if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO; then ac_cv_have_kde="have_kde=no" --- 3255,3267 ---- done done + ac_kde_libraries="$kde_libdir" if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/libkdecore.la"; then { echo "configure: error: ! in the prefix \"$ac_kde_libraries\", you've chosen, are no kde libraries installed. This will fail. So, check this please and use another prefix!" 1>&2; exit 1; } fi if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO; then ac_cv_have_kde="have_kde=no"