kde 3.0.3 sgi patches

Herr Maik HERTHA <[email protected]> Thu, 29 Aug 2002 14:33:13 +0200

Newsgroups	gmane.comp.kde.non-linux,gmane.comp.kde.devel.general
Organization	Volkswagen AG
Message-ID	<[email protected]>

Hi there;

Andreas and Jesse have send some information for kde 3.0.2 on sgi. I 
want to provide you with patches for kde 3.0.3 for a better sgi 
integration of the kde project.
Andreas has currently not compiled all packages fro 3.0.2. So I started 
with 3.0.3 and included some patches which I made for kde2 series and 
hopefull all the stuff, to compile kde with the native sgi MipsPro 
compiler (current: 7.3.1.3m).

There are some main issues for the kde developer as a recommendation for 
sgi integration.
On sgi workstations there are no include files with c* (<cstdlib, ctime, 
cassert...>). Please wrap those includes with
#ifdef __sgi #else #endif. Use instead the normal c pendants (stdlib.h, 
time.h, assert.h).
If you need streams (filestreams, stringstreams) don't use the one which 
ends on *.h (fstream.h, iosrteam.h). Please wrap this too in a #ifdef 
__sgi #else #endif and use their cousins without .h extension (fstream, 
iostream ...)
Each time you use a #define socklen_t in config.h you should also 
#define _SOCKLEN_T 1. Otherwise the type will be redefined in socket.h 
with an incompatible type.
Using namespaces is critical. Jesse wrote, that there is a bug in the 
mips pro compiler. After some studies of Bjarne Stroustup "The C++ 
Programming Language" 3d edition, I'm not quite sure. As off page 177 
(german edition), "Namespace and Exceptions", he wrotes, that it is a 
good coding practice to show in the declaration which dependencies 
(namespaces etc.) exits. So you could apply a namespace in a 
ifdef-else-endif clause.

I'm working now on the mixer_irix.cpp version, to make kmix usable on 
sgi. Its working, but not stable :-(.

Thanks for the nice software. I hope you will apply the patches to make 
the "sgi-comilers" the life easier :-).

-- 

mit freundlichem GruÃ /
best regards

Maik Hertha

--------------------------------------------------- h+h
EBSP Anwenderbetreuung, +49 5361 9-74950
Volkswagen AG / Brieffach 1721 / D-38436 Wolfsburg
http://ebsp.wob.vw.de              
[email protected]
---------------------------------------------------
hartmann+hertha
it (beratung / entwicklung / support)
http://www.hartmann-hertha.de
[email protected]
--------------------------------------------------- h+h

kdeaddons-3.0.3.patch (text/plain, 10 KB)

	This patch is for package: kdeaddons-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments [email protected]



*** kdeaddons-3.0.3/kate/htmltools/plugin_katehtmltools.cpp	Tue Aug 27 19:35:06 2002
--- kdeaddons-3.0.3/kate/htmltools/plugin_katehtmltools.cpp.ORG	Tue Aug 27 19:29:12 2002
***************
*** 16,34 ****
   ***************************************************************************/
  
  #include "plugin_katehtmltools.h"
- 
- using namespace Kate;
- 
  #include "plugin_katehtmltools.moc"
  
  #include <qinputdialog.h>
  #include <kaction.h>
  #include <klocale.h>
- #ifdef __sgi
- #include <assert.h>
- #else
  #include <cassert>
- #endif
  #include <kdebug.h>
  
  extern "C"
--- 16,27 ----




*** kdeaddons-3.0.3/kate/insertcommand/plugin_kateinsertcommand.cpp	Tue Aug 27 20:19:01 2002
--- kdeaddons-3.0.3/kate/insertcommand/plugin_kateinsertcommand.cpp.ORG	Tue Aug 27 20:17:58 2002
***************
*** 16,24 ****
   ***************************************************************************/
  
  #include "plugin_kateinsertcommand.h"
- 
- using namespace Kate;
- 
  #include "plugin_kateinsertcommand.moc"
  
  #include <qcheckbox.h>
--- 16,21 ----




*** kdeaddons-3.0.3/kate/xmltools/plugin_katexmltools.cpp	Tue Aug 27 20:20:14 2002
--- kdeaddons-3.0.3/kate/xmltools/plugin_katexmltools.cpp.ORG	Tue Aug 27 20:20:09 2002
***************
*** 57,65 ****
  */
  
  #include "plugin_katexmltools.h"
- 
- using namespace Kate;
- 
  #include "plugin_katexmltools.moc"
  
  #include <qdatetime.h>
--- 57,62 ----




*** kdeaddons-3.0.3/kate/projectmanager/piper/piper.h	Tue Aug 27 19:41:40 2002
--- kdeaddons-3.0.3/kate/projectmanager/piper/piper.h.ORG	Tue Aug 27 19:39:25 2002
***************
*** 1,19 ****
  
  #ifndef PIPER_H_
  #	define PIPER_H_
- #ifdef __sgi
- #	include <stdlib.h>  //  for size_t
- #	include <assert.h>
- #else
  #	include <cstdlib>  //  for size_t
  #	include <cassert>
- #endif
  #	include <string>
  #	include <list>
  
- #ifndef __sgi
  	using std::size_t;
- #endif
  	using std::string;
  
  
--- 1,12 ----




*** kdeaddons-3.0.3/kate/projectmanager/piper/piper.cpp	Tue Aug 27 19:41:08 2002
--- kdeaddons-3.0.3/kate/projectmanager/piper/piper.cpp.ORG	Tue Aug 27 19:41:05 2002
***************
*** 7,19 ****
    */
  
  #include "piper.h"
! #ifdef __sgi
! #include <stdlib.h>  //  for size_t
! #include <assert.h>
! #else
! #include <cstdlib>  //  for size_t
  #include <cassert>
- #endif
  #include <qregexp.h>
  
  
--- 7,14 ----
    */
  
  #include "piper.h"
! #include <cstring>
  #include <cassert>
  #include <qregexp.h>
  
  




*** kdeaddons-3.0.3/kate/projectmanager/kateprojectmanager.cpp	Tue Aug 27 19:46:38 2002
--- kdeaddons-3.0.3/kate/projectmanager/kateprojectmanager.cpp.ORG	Tue Aug 27 19:42:48 2002
***************
*** 15,25 ****
   *                                                                         *
   ***************************************************************************/
  
- 
  #include "kateprojectmanager.h"
- 
- using namespace Kate;
- 
  #include "kateprojectmanager.moc"
  
  #include "kateprojectdialog.h"
--- 15,21 ----




*** kdeaddons-3.0.3/kate/openheader/plugin_kateopenheader.cpp	Tue Aug 27 19:37:02 2002
--- kdeaddons-3.0.3/kate/openheader/plugin_kateopenheader.cpp.ORG	Tue Aug 27 19:36:59 2002
***************
*** 16,24 ****
   ***************************************************************************/
  
  #include "plugin_kateopenheader.h"
- 
- using namespace Kate;
- 
  #include "plugin_kateopenheader.moc"
  
  #include <qinputdialog.h>
--- 16,21 ----
***************
*** 26,36 ****
  #include <kinstance.h>
  #include <kmessagebox.h>
  #include <klocale.h>
- #ifdef __sgi
- #include <assert.h>
- #else
  #include <cassert>
- #endif
  #include <kdebug.h>
  #include <qstring.h>
  #include <kurl.h>
--- 23,29 ----




*** kdeaddons-3.0.3/kate/textfilter/plugin_katetextfilter.cpp	Tue Aug 27 20:16:49 2002
--- kdeaddons-3.0.3/kate/textfilter/plugin_katetextfilter.cpp.ORG	Tue Aug 27 20:14:04 2002
***************
*** 16,24 ****
   ***************************************************************************/
  
  #include "plugin_katetextfilter.h"
- 
- using namespace Kate;
- 
  #include "plugin_katetextfilter.moc"
  
  #include <qinputdialog.h>
--- 16,21 ----
***************
*** 26,36 ****
  #include <kinstance.h>
  #include <kmessagebox.h>
  #include <klocale.h>
- #ifdef __sgi
- #include <assert.h>
- #else
  #include <cassert>
- #endif
  #include <kdebug.h>
  #include <qstring.h>
  
--- 23,29 ----




*** kdeaddons-3.0.3/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp	Tue Aug 27 19:50:24 2002
--- kdeaddons-3.0.3/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp.ORG	Tue Aug 27 19:49:55 2002
***************
*** 33,40 ****
  
  #include "settingsplugin.h"
  
- using namespace KParts;
- 
  typedef KGenericFactory<SettingsPlugin> SettingsPluginFactory;
  K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin,
                              SettingsPluginFactory( "khtmlsettingsplugin" ) );
--- 33,38 ----




*** kdeaddons-3.0.3/konq-plugins/uachanger/uachangerplugin.cpp	Tue Aug 27 19:56:42 2002
--- kdeaddons-3.0.3/konq-plugins/uachanger/uachangerplugin.cpp.ORG	Tue Aug 27 19:56:39 2002
***************
*** 40,47 ****
  
  #include "uachangerplugin.h"
  
- using namespace KParts;
- 
  #define UA_PTOS(x) (*it)->property(x).toString()
  #define QFL(x) QString::fromLatin1(x)
  
--- 40,45 ----




*** kdeaddons-3.0.3/konq-plugins/webarchiver/plugin_webarchiver.cpp	Tue Aug 27 20:03:01 2002
--- kdeaddons-3.0.3/konq-plugins/webarchiver/plugin_webarchiver.cpp.ORG	Tue Aug 27 20:02:56 2002
***************
*** 48,55 ****
  
  #include "plugin_webarchiver.h"
  
- using namespace KParts;
- 
  typedef KGenericFactory<PluginWebArchiver> PluginWebArchiverFactory;
  K_EXPORT_COMPONENT_FACTORY( libwebarchiverplugin,
  	                    PluginWebArchiverFactory( "webarchiver" ) );
--- 48,53 ----




*** kdeaddons-3.0.3/konq-plugins/validators/plugin_validators.cpp	Tue Aug 27 20:00:03 2002
--- kdeaddons-3.0.3/konq-plugins/validators/plugin_validators.cpp.ORG	Tue Aug 27 19:59:59 2002
***************
*** 37,44 ****
  #include "plugin_validators.h"
  #include "validatorsdialog.h"
  
- using namespace KParts;
- 
  typedef KGenericFactory<PluginValidators> PluginValidatorsFactory;
  K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin,
  	                    PluginValidatorsFactory( "validatorsplugin" ) );
--- 37,42 ----




*** kdeaddons-3.0.3/konq-plugins/babelfish/plugin_babelfish.cpp	Tue Aug 27 19:58:50 2002
--- kdeaddons-3.0.3/konq-plugins/babelfish/plugin_babelfish.cpp.ORG	Tue Aug 27 19:58:48 2002
***************
*** 25,32 ****
  
  #include <khtml_part.h>
  
- using namespace KParts;
- 
  typedef KGenericFactory<PluginBabelFish> BabelFishFactory;
  K_EXPORT_COMPONENT_FACTORY( libbabelfishplugin, BabelFishFactory( "babelfish" ) );
  
--- 25,30 ----




*** kdeaddons-3.0.3/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp	Tue Aug 27 19:52:43 2002
--- kdeaddons-3.0.3/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp.ORG	Tue Aug 27 19:52:41 2002
***************
*** 40,47 ****
  
  #include "imgalleryplugin.h"
  
- using namespace KParts;
- 
  typedef KGenericFactory<KImGalleryPlugin> KImGalleryPluginFactory;
  K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgalleryplugin" ) );
  
--- 40,45 ----




*** kdeaddons-3.0.3/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp	Tue Aug 27 20:01:33 2002
--- kdeaddons-3.0.3/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp.ORG	Tue Aug 27 20:01:28 2002
***************
*** 12,19 ****
  
  #include <domtreeview.h>
  
- using namespace KParts;
- 
  typedef KGenericFactory<PluginDomtreeviewer> DomtreeviewerFactory;
  K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtreeviewer" ) );
  
--- 12,17 ----




*** kdeaddons-3.0.3/konq-plugins/dirfilter/dirfilterplugin.cpp	Tue Aug 27 19:55:07 2002
--- kdeaddons-3.0.3/konq-plugins/dirfilter/dirfilterplugin.cpp.ORG	Tue Aug 27 19:55:04 2002
***************
*** 39,46 ****
  
  #include "dirfilterplugin.h"
  
- using namespace KParts;
- 
  typedef KGenericFactory<DirFilterPlugin> DirFilterFactory;
  K_EXPORT_COMPONENT_FACTORY(libdirfilterplugin,
                             DirFilterFactory("dirfilterplugin"));
--- 39,44 ----




*** kdeaddons-3.0.3/noatun-plugins/alsaplayer/userinterface.cpp	Tue Aug 27 20:30:50 2002
--- kdeaddons-3.0.3/noatun-plugins/alsaplayer/userinterface.cpp.ORG	Tue Aug 27 20:30:35 2002
***************
*** 254,262 ****
  	if (e->button() == RightButton)
  	{
  		NoatunStdAction::ContextMenu::showContextMenu();
  	}
  
! 	QWidget::mousePressEvent(e);
  }
  
  void AlsaPlayer::wheelEvent(QWheelEvent * e)
--- 254,263 ----
  	if (e->button() == RightButton)
  	{
  		NoatunStdAction::ContextMenu::showContextMenu();
+ 		return;
  	}
  
! 	return QWidget::mousePressEvent(e);
  }
  
  void AlsaPlayer::wheelEvent(QWheelEvent * e)




*** kdeaddons-3.0.3/noatun-plugins/noatunmadness/madness.cpp	Tue Aug 27 20:27:15 2002
--- kdeaddons-3.0.3/noatun-plugins/noatunmadness/madness.cpp.ORG	Tue Aug 27 20:27:14 2002
***************
*** 71,77 ****
  	int delta=0; // in pixels
  	for (int count=0; count<size; count++)
  	{
! 		delta+=(int)((log10(d[count]+1)/log(2.))*(size-count))/2;
  	}
  	
  //	cout << "delta: " << delta << endl;
--- 71,77 ----
  	int delta=0; // in pixels
  	for (int count=0; count<size; count++)
  	{
! 		delta+=(int)((log10(d[count]+1)/log(2))*(size-count))/2;
  	}
  	
  //	cout << "delta: " << delta << endl;




*** kdeaddons-3.0.3/noatun-plugins/charlatan/userinterface.cpp	Tue Aug 27 20:29:12 2002
--- kdeaddons-3.0.3/noatun-plugins/charlatan/userinterface.cpp.ORG	Tue Aug 27 20:29:10 2002
***************
*** 291,299 ****
  	if (e->button() == RightButton)
  	{
  		NoatunStdAction::ContextMenu::showContextMenu();
  	}
  
! 	QWidget::mousePressEvent(e);
  }
  
  void Charlatan::wheelEvent(QWheelEvent * e)
--- 291,300 ----
  	if (e->button() == RightButton)
  	{
  		NoatunStdAction::ContextMenu::showContextMenu();
+ 		return;
  	}
  
! 	return QWidget::mousePressEvent(e);
  }
  
  void Charlatan::wheelEvent(QWheelEvent * e)

kdeadmin-3.0.3.patch (text/plain, 1.1 KB)

	This patch is for package: kdeadmin-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments [email protected]



*** kdeadmin-3.0.3/kpackage/fbsdInterface.cpp	Tue Aug 27 14:32:45 2002
--- kdeadmin-3.0.3/kpackage/fbsdInterface.cpp.ORG	Tue Aug 27 14:32:23 2002
***************
*** 12,20 ****
  #include <sys/stat.h>
  #include <unistd.h>
  #include <fcntl.h>
! #ifdef __sgi
! #include <string.h>
! #endif
  #include <klocale.h>
  #include <kglobal.h>
  #include <kiconloader.h>
--- 12,18 ----
  #include <sys/stat.h>
  #include <unistd.h>
  #include <fcntl.h>
! 
  #include <klocale.h>
  #include <kglobal.h>
  #include <kiconloader.h>








*** kdeadmin-3.0.3/kpackage/TEPty.cpp	Wed Aug 28 12:54:15 2002
--- kdeadmin-3.0.3/kpackage/TEPty.cpp.ORG	Wed Aug 28 12:27:06 2002
***************
*** 64,71 ****
  #include <config.h>
  #endif
  
! /* MipsPro compiler has no makro __sgi__, [email protected] */
! #if defined(__sgi__) || defined(__sgi)
  #define __svr4__
  #endif
  
--- 64,70 ----
  #include <config.h>
  #endif
  
! #ifdef __sgi__
  #define __svr4__
  #endif

kdeartwork-3.0.3.patch (text/plain, 546 B)

	This patch is for package: kdeartwork-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments [email protected]



*** kdeartwork-3.0.3/styles/dotnet/dotnet.cpp	Wed Aug 28 07:13:05 2002
--- kdeartwork-3.0.3/styles/dotnet/dotnet.cpp.ORG	Wed Aug 28 07:11:27 2002
***************
*** 429,435 ****
  		}
  
  		default: {
! 			winstyle->drawPrimitive(pe, p, r, cg, flags, opt);
  		}
  	}
  }
--- 429,435 ----
  		}
  
  		default: {
! 			return winstyle->drawPrimitive(pe, p, r, cg, flags, opt);
  		}
  	}
  }

kdeedu-3.0.3.patch (text/plain, 10.6 KB)

	This patch is for package: kdeedu-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments [email protected]



*** kdeedu-3.0.3/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp	Wed Aug 28 16:00:47 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp.ORG	Wed Aug 28 15:59:04 2002
***************
*** 42,52 ****
  #include <qstringlist.h>
  
  #ifdef DEBUG
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif /* __sgi */
  #endif
  
  #include "MySpinBox.h"
--- 42,48 ----
***************
*** 78,84 ****
  }
  
  
! int MySpinBox::mapTextToValue( bool* ok )
  {
    return 0;
  }
--- 74,80 ----
  }
  
  
! int MySpinBox::MySpinBox::mapTextToValue( bool* ok )
  {
    return 0;
  }




*** kdeedu-3.0.3/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp	Wed Aug 28 15:59:26 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp.ORG	Wed Aug 28 15:59:10 2002
***************
*** 100,110 ****
  #include <kvoctraindoc.h>
  #include <kmainwindow.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif /* __sgi */
  
  #include <qpixmap.h>
  #include <qlayout.h>
--- 100,106 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp	Wed Aug 28 15:05:45 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp.ORG	Wed Aug 28 15:05:41 2002
***************
*** 95,105 ****
  #include <qgroupbox.h>
  #include <qlineedit.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  
  
  
--- 95,101 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp	Wed Aug 28 15:46:30 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp.ORG	Wed Aug 28 15:03:05 2002
***************
*** 100,110 ****
  #include <qbuttongroup.h>
  #include <qpushbutton.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  #include <algorithm>
  using namespace std;
  
--- 100,106 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp	Wed Aug 28 15:04:43 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp.ORG	Wed Aug 28 15:04:41 2002
***************
*** 98,108 ****
  #include <qkeycode.h>
  #include <qpainter.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  
  
  RandomQueryDlg::RandomQueryDlg(
--- 98,104 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp	Wed Aug 28 15:46:26 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp.ORG	Wed Aug 28 15:05:08 2002
***************
*** 83,93 ****
  #include <qgroupbox.h>
  #include <qpushbutton.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  
  #include <kapplication.h>
  #include <kstandarddirs.h>
--- 83,89 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/MyProgress.cpp	Wed Aug 28 15:03:41 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/MyProgress.cpp.ORG	Wed Aug 28 15:03:38 2002
***************
*** 50,60 ****
  #include <kstandarddirs.h>
  #include <klocale.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  
  #define Inherited QFrame
  
--- 50,56 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp	Wed Aug 28 15:04:08 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp.ORG	Wed Aug 28 15:04:06 2002
***************
*** 58,68 ****
  #include <qradiobutton.h>
  #include <qfont.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  
  #include <LineList.h>
  
--- 58,64 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/spotlight2kvtml.cpp	Wed Aug 28 16:12:47 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/spotlight2kvtml.cpp.ORG	Wed Aug 28 16:12:03 2002
***************
*** 46,56 ****
  #include <qfile.h>
  #include <qtextstream.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  #include <vector>
  using namespace std;
  
--- 46,52 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/option-dialogs/PasteOptPage.cpp	Wed Aug 28 15:56:17 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/option-dialogs/PasteOptPage.cpp.ORG	Wed Aug 28 15:56:15 2002
***************
*** 58,68 ****
  #include <qcombobox.h>
  #include <qcheckbox.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  
  #include <kapplication.h>
  #include <klocale.h>
--- 58,64 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp	Wed Aug 28 16:06:24 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp.ORG	Wed Aug 28 16:03:52 2002
***************
*** 59,69 ****
  
  #include <kvoctraindoc.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  #include <vector>
  using namespace std;
  
--- 59,65 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp	Wed Aug 28 16:06:58 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp.ORG	Wed Aug 28 16:07:51 2002
***************
*** 123,133 ****
  using namespace std;
  
  #include <iostream>
- #ifdef __sgi
- #include <fstream>
- #else
  #include <fstream.h>
- #endif
  
  #include <float.h>
  
--- 123,129 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp	Wed Aug 28 16:07:33 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp.ORG	Wed Aug 28 16:03:45 2002
***************
*** 68,78 ****
  
  #include <kvoctraindoc.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  #include <vector>
  using namespace std;
  
--- 68,74 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/kvt-core/langset.cpp	Wed Aug 28 16:04:13 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/kvt-core/langset.cpp.ORG	Wed Aug 28 16:03:58 2002
***************
*** 41,51 ****
  
  
  #include "langset.h"
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
! #endif
  
  void LangSet::addSet (QString _shortId, QString _longId,
                        QString _PixMapFile)
--- 41,48 ----
  
  
  #include "langset.h"
  #include <iostream.h>
! 
  
  void LangSet::addSet (QString _shortId, QString _longId,
                        QString _PixMapFile)




*** kdeedu-3.0.3/kvoctrain/kvoctrain/rowtable.cpp	Wed Aug 28 16:12:53 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/rowtable.cpp.ORG	Wed Aug 28 16:12:03 2002
***************
*** 106,116 ****
  #include <klocale.h>
  #include <kdebug.h>
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  
  #include "kvoctraindoc.h"
  #include "rowtable.h"
--- 106,112 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/main.cpp	Wed Aug 28 16:13:07 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/main.cpp.ORG	Wed Aug 28 16:12:03 2002
***************
*** 96,107 ****
  
  #include "kvoctrain.h"
  #include "kvoctraincore.h"
- 
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  
  # include <kcmdlineargs.h>
  # include <kaboutdata.h>
--- 96,102 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/kvoctrain.cpp	Wed Aug 28 16:13:21 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/kvoctrain.cpp.ORG	Wed Aug 28 16:12:03 2002
***************
*** 200,211 ****
  
  #include <time.h>
  #include <ctype.h>
- 
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  
  #include <kvoctraincore.h>
  #include "kvoctraindoc.h"
--- 200,206 ----




*** kdeedu-3.0.3/kvoctrain/kvoctrain/queryoption-dialogs/ThreshOptPage.cpp	Wed Aug 28 15:54:36 2002
--- kdeedu-3.0.3/kvoctrain/kvoctrain/queryoption-dialogs/ThreshOptPage.cpp.ORG	Wed Aug 28 15:54:33 2002
***************
*** 61,71 ****
  
  #include "ThreshOptPage.h"
  
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  #include <vector>
  using namespace std;
  
--- 61,67 ----




*** kdeedu-3.0.3/ktouch/ktouch/touchKeyboard.cpp	Wed Aug 28 14:59:09 2002
--- kdeedu-3.0.3/ktouch/ktouch/touchKeyboard.cpp.ORG	Wed Aug 28 14:41:39 2002
***************
*** 18,30 ****
  #include "touchkeyboard.h"
  #include "touchkeyboard.moc"
  #include "touchkey.h"
- #ifdef __sgi
- #include <iostream>
- #include <fstream>
- #else
  #include <iostream.h>
  #include <fstream.h>
- #endif
  #include <stdlib.h>
  #include <string>
  
--- 18,25 ----
***************
*** 158,166 ****
  	const int maxPara=10;
  	if(lang.isEmpty())
  		lang="en";
! 	ifstream ifs(dirs->findResource("data","ktouch/keyboard." + lang).latin1());
  	if (!ifs)
! 		std::cerr << "Error: unable to open keyboard" << dirs->findResource("data","ktouch/keyboard." + lang).latin1() << endl;
  	else
  	{
  		clearKeyboard();
--- 153,161 ----
  	const int maxPara=10;
  	if(lang.isEmpty())
  		lang="en";
! 	ifstream ifs(dirs->findResource("data","ktouch/keyboard." + lang).latin1(), ios::in);
  	if (!ifs)
! 		cerr << "Error: unable to open keyboard" << dirs->findResource("data","ktouch/keyboard." + lang).latin1() << endl;
  	else
  	{
  		clearKeyboard();
***************
*** 246,252 ****
  					{
  						if(!keyArray[atoi(keyBoardVector[5].c_str())])
  						{
! 							std::cerr << "Error in line: " << lineNumber << " FingerKey " << keyBoardVector[5] << " key don't exists" << endl;
  						}
  
  						string *s;
--- 241,247 ----
  					{
  						if(!keyArray[atoi(keyBoardVector[5].c_str())])
  						{
! 							cerr << "Error in line: " << lineNumber << " FingerKey " << keyBoardVector[5] << " key don't exists" << endl;
  						}
  
  						string *s;
***************
*** 281,297 ****
  					{
  						if(!keyArray[atoi(keyBoardVector[2].c_str())])
  						{
! 							std::cerr << "Error in line: " << lineNumber << " TargetKey " << keyBoardVector[2] << " key don't exists" << endl;
  						}
  
  						if(!keyArray[atoi(keyBoardVector[3].c_str())])
  						{
! 							std::cerr << "Error in line: " << lineNumber << " FingerKey " << keyBoardVector[3] << " key don't exists" << endl;
  						}
  
  						if(!keyArray[atoi(keyBoardVector[4].c_str())])
  						{
! 							std::cerr << "Error in line: " << lineNumber << " ControlKey " << keyBoardVector[4] << " key don't exists" << endl;
  						}
  
  						keyArray[atoi(keyBoardVector[1].c_str())]=new HiddenKey(
--- 276,292 ----
  					{
  						if(!keyArray[atoi(keyBoardVector[2].c_str())])
  						{
! 							cerr << "Error in line: " << lineNumber << " TargetKey " << keyBoardVector[2] << " key don't exists" << endl;
  						}
  
  						if(!keyArray[atoi(keyBoardVector[3].c_str())])
  						{
! 							cerr << "Error in line: " << lineNumber << " FingerKey " << keyBoardVector[3] << " key don't exists" << endl;
  						}
  
  						if(!keyArray[atoi(keyBoardVector[4].c_str())])
  						{
! 							cerr << "Error in line: " << lineNumber << " ControlKey " << keyBoardVector[4] << " key don't exists" << endl;
  						}
  
  						keyArray[atoi(keyBoardVector[1].c_str())]=new HiddenKey(

kdegames-3.0.3.patch (text/plain, 3.8 KB)

	This patch is for package: kdegames-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments [email protected]



*** kdegames-3.0.3/ksnake/snake.cpp	Wed Aug 28 11:11:55 2002
--- kdegames-3.0.3/ksnake/snake.cpp.ORG	Wed Aug 28 09:17:40 2002
***************
*** 139,149 ****
  }
  
  
! // CompuSnake::CompuSnake( Board *b, PixServer *p)
! // 	: Snake( b, p, NORTH_GATE, CompuSnakePix )
! // {
! //     init();
! // }
  
  bool CompuSnake::init()
  {
--- 139,149 ----
  }
  
  
! CompuSnake::CompuSnake( Board *b, PixServer *p)
!     : Snake( b, p, NORTH_GATE, CompuSnakePix )
! {
!     init();
! }
  
  bool CompuSnake::init()
  {
***************
*** 456,466 ****
      }
  }
  
! // SamySnake::SamySnake( Board *b, PixServer *p)
! //     : Snake( b, p, SOUTH_GATE, SamyPix )
! // {
! // 	init();
! // }
  
  void SamySnake::init()
  {
--- 456,466 ----
      }
  }
  
! SamySnake::SamySnake( Board *b, PixServer *p)
!     : Snake( b, p, SOUTH_GATE, SamyPix )
! {
! 
! }
  
  void SamySnake::init()
  {




*** kdegames-3.0.3/katomic/gamewidget.cpp	Wed Aug 28 08:42:17 2002
--- kdegames-3.0.3/katomic/gamewidget.cpp.ORG	Wed Aug 28 08:41:19 2002
***************
*** 105,112 ****
      level=l;
      QString levelFile = locate("appdata", QString("levels/level_%1").arg(l));
      if (levelFile.isNull()) {
! 	  updateLevel(1);
! 	  return;
      }
  
      KSimpleConfig cfg(levelFile, true);
--- 105,111 ----
      level=l;
      QString levelFile = locate("appdata", QString("levels/level_%1").arg(l));
      if (levelFile.isNull()) {
! 	return updateLevel(1);
      }
  
      KSimpleConfig cfg(levelFile, true);




*** kdegames-3.0.3/kjumpingcube/cubebox.cpp	Wed Aug 28 08:53:32 2002
--- kdegames-3.0.3/kjumpingcube/cubebox.cpp.ORG	Wed Aug 28 08:52:14 2002
***************
*** 196,205 ****
  
     if(player==One)
     {
!       return (int)pow((float)cubesOne,2)+pointsOne-(int)pow((float)cubesTwo,2)-pointsTwo;
     }
     else
!       return (int)pow((float)cubesTwo,2)+pointsTwo-(int)pow((float)cubesOne,2)-pointsOne;
  
  }
  
--- 196,205 ----
  
     if(player==One)
     {
!       return (int)pow((float)cubesOne,2)+pointsOne-(int)pow(cubesTwo,2)-pointsTwo;
     }
     else
!       return (int)pow((float)cubesTwo,2)+pointsTwo-(int)pow(cubesOne,2)-pointsOne;
  
  }
  




*** kdegames-3.0.3/kjumpingcube/brain.cpp	Wed Aug 28 08:55:45 2002
--- kdegames-3.0.3/kjumpingcube/brain.cpp.ORG	Wed Aug 28 08:55:02 2002
***************
*** 109,115 ****
        worth[i]=new double[box.dim()];
  
     // alle Werte auf kleinstmöglichen Wert setzen
!    double min=-pow(2.0,(int)sizeof(long int)*8-1);  // Maximum auf kleinst möglichen Wert setzen
  
     for(i=0;i<box.dim();i++)
       for(j=0;j<box.dim();j++)
--- 109,115 ----
        worth[i]=new double[box.dim()];
  
     // alle Werte auf kleinstmöglichen Wert setzen
!    double min=-pow(2.0,sizeof(long int)*8-1);  // Maximum auf kleinst möglichen Wert setzen
  
     for(i=0;i<box.dim();i++)
       for(j=0;j<box.dim();j++)




*** kdegames-3.0.3/ksirtet/kfouleggs/piece.cpp	Wed Aug 28 09:15:14 2002
--- kdegames-3.0.3/ksirtet/kfouleggs/piece.cpp.ORG	Wed Aug 28 09:14:54 2002
***************
*** 40,52 ****
  
  	// base circle
      int w = pixmap->width();
! 	int d = (int)((sqrt(2.)-2./3)*w);
  	QRect cr = QRect(0, 0, d, d);
  	cr.moveCenter(QPoint(w/2, w/2));
  	p.drawEllipse(cr);
  
  	if (blockMode) {
!         int a  = (int)(w/(3.*sqrt(2.)));
          int ra = 2*w/3+1;
          cr = QRect(0, 0, ra, ra);
  
--- 40,52 ----
  
  	// base circle
      int w = pixmap->width();
! 	int d = (int)((sqrt(2)-2./3)*w);
  	QRect cr = QRect(0, 0, d, d);
  	cr.moveCenter(QPoint(w/2, w/2));
  	p.drawEllipse(cr);
  
  	if (blockMode) {
!         int a  = (int)(w/(3.*sqrt(2)));
          int ra = 2*w/3+1;
          cr = QRect(0, 0, ra, ra);

kdegraphics-3.0.3.patch (text/plain, 146 B)

	This patch is for package: kdegraphics-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments [email protected]

kdemultimedia-3.0.3.patch (text/plain, 10.6 KB)

	This patch is for package: kdemultimedia-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments [email protected]



*** kdemultimedia-3.0.3/arts/gui/kde/kgraph.cpp	Tue Aug 27 11:44:33 2002
--- kdemultimedia-3.0.3/arts/gui/kde/kgraph.cpp.ORG	Tue Aug 27 11:34:09 2002
***************
*** 126,136 ****
  				int dx = e->x() - p.x();
  				int dy = e->y() - p.y();
  
! #ifdef __sgi
! 				if(sqrt(float(dx*dx + dy*dy)) < 5.0)
! #else
! 				if(::sqrt((dx*dx + dy*dy) < 5.0)
! #endif
  				{
  					selectedIndex = index;
  					selectedLine = gline;
--- 126,132 ----
  				int dx = e->x() - p.x();
  				int dy = e->y() - p.y();
  
! 				if(::sqrt(dx*dx + dy*dy) < 5.0)
  				{
  					selectedIndex = index;
  					selectedLine = gline;








*** kdemultimedia-3.0.3/arts/modules/synth_play_pat_impl.cc	Tue Aug 27 11:51:12 2002
--- kdemultimedia-3.0.3/arts/modules/synth_play_pat_impl.cc.ORG	Tue Aug 27 11:52:06 2002
***************
*** 439,449 ****
  			list<CachedPat::Data*>::iterator i;
  			for(i = pat->dList.begin(); i != pat->dList.end(); i++)
  			{
- #if __sgi
- 				int diff = abs(float(ifreq - (*i)->patch.origFreq));
- #else
  				int diff = ::abs(ifreq - (*i)->patch.origFreq);
- #endif
  				if(diff < bestdiff)
  				{
  					selected = *i;
--- 439,445 ----




*** kdemultimedia-3.0.3/arts/modules/synth_freeverb_impl.cc	Tue Aug 27 11:55:07 2002
--- kdemultimedia-3.0.3/arts/modules/synth_freeverb_impl.cc.ORG	Tue Aug 27 11:46:39 2002
***************
*** 31,56 ****
  {
  	revmodel *model;
  public:
- #ifdef __sgi
  	float	roomsize()				{ return model->getroomsize(); }
- 	void	roomsize(float newval)	{ model->setroomsize(newval); }
- 
- 	float	damp()					{ return model->getdamp(); }
- 	void	damp(float newval)		{ model->setdamp(newval); }
- 
- 	float	wet()					{ return model->getwet(); }
- 	void	wet(float newval)		{ model->setwet(newval); }
- 
- 	float	dry()					{ return model->getdry(); }
- 	void	dry(float newval)		{ model->setdry(newval); }
- 
- 	float	width()					{ return model->getwidth(); }
- 	void	width(float newval)		{ model->setwidth(newval); }
- 
- 	float	mode()					{ return model->getmode(); }
- 	void	mode(float newval)		{ model->setmode(newval); }
- #else
- 	float	roomsize()				{ return model->getroomsize(); }
  	void	roomsize(float newval)	{ return model->setroomsize(newval); }
  
  	float	damp()					{ return model->getdamp(); }
--- 31,37 ----
***************
*** 67,74 ****
  
  	float	mode()					{ return model->getmode(); }
  	void	mode(float newval)		{ return model->setmode(newval); }
- #endif
- 
  
  	void streamInit()
  	{
--- 48,53 ----




*** kdemultimedia-3.0.3/arts/builder/structure.cpp	Tue Aug 27 12:07:09 2002
--- kdemultimedia-3.0.3/arts/builder/structure.cpp.ORG	Tue Aug 27 12:06:45 2002
***************
*** 23,33 ****
  #include "soundserver.h"
  #include "kartsserver.h"
  #include <stdio.h>
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  #include <fstream>
  #include <arts/debug.h>
  
--- 23,29 ----




*** kdemultimedia-3.0.3/arts/runtime/artsbuilderloader_impl.cc	Tue Aug 27 11:21:29 2002
--- kdemultimedia-3.0.3/arts/runtime/artsbuilderloader_impl.cc.ORG	Tue Aug 27 11:21:46 2002
***************
*** 22,32 ****
  
  #include "artsbuilder.h"
  #include "debug.h"
- #ifdef __sgi
- #include <fstream>
- #else
  #include <fstream.h>
- #endif
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <stdio.h>
--- 22,28 ----




*** kdemultimedia-3.0.3/kmid/kmid_part.cpp	Tue Aug 27 12:37:04 2002
--- kdemultimedia-3.0.3/kmid/kmid_part.cpp.ORG	Tue Aug 27 12:36:52 2002
***************
*** 12,19 ****
  #include "kmidclient.h"
  #include <qtimer.h>
  
- using namespace KParts;
- 
  extern "C"
  {
    /**
--- 12,17 ----




*** kdemultimedia-3.0.3/kmix/mixer_irix.h	Tue Aug 27 16:04:04 2002
--- kdemultimedia-3.0.3/kmix/mixer_irix.h.ORG	Tue Aug 27 13:53:33 2002
***************
*** 1,42 ****
- /*
-  *              KMix -- KDE's full featured mini mixer
-  *
-  *
-  *              Copyright (C) ?
-  *                            2002 Maik Hertha <[email protected]>
-  *                       
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Library General Public
-  * License as published by the Free Software Foundation; either
-  * version 2 of the License, or (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  * Library General Public License for more details.
-  *
-  * You should have received a copy of the GNU Library General Public
-  * License along with this program; if not, write to the Free
-  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
  #ifndef MIXER_IRIX_H
  #define MIXER_IRIX_H
  
  #include <dmedia/audio.h>
  
  class Mixer_IRIX : public Mixer
  {
  public:
    Mixer_IRIX(int devnum, int SetNum);
    virtual ~Mixer_IRIX() {};
  
!   virtual int readVolumeFromHW( int devnum, Volume& volume );
!   virtual int writeVolumeToHW( int devnum, Volume volume );
  
  protected:
!   virtual bool setRecsrcHW( int devnum, bool on = true );
!   virtual bool isRecsrcHW( int devnum );
    virtual int openMixer();
    virtual int releaseMixer();
  
--- 1,22 ----
  #ifndef MIXER_IRIX_H
  #define MIXER_IRIX_H
  
+ #define _LANGUAGE_C_PLUS_PLUS
  #include <dmedia/audio.h>
  
  class Mixer_IRIX : public Mixer
  {
  public:
+   Mixer_IRIX();
    Mixer_IRIX(int devnum, int SetNum);
    virtual ~Mixer_IRIX() {};
  
!   virtual void setRecsrc(unsigned int newRecsrc);
!   virtual int readVolumeFromHW( int devnum, int *VolLeft, int *VolRight );
!   virtual int writeVolumeToHW( int devnum, int volLeft, int volRight );
  
  protected:
!   virtual void setDevNumName_I(int devnum);
    virtual int openMixer();
    virtual int releaseMixer();
  




*** kdemultimedia-3.0.3/kscd/libwm/plat_irix.c	Tue Aug 27 16:53:49 2002
--- kdemultimedia-3.0.3/kscd/libwm/plat_irix.c.ORG	Tue Aug 27 16:53:43 2002
***************
*** 63,69 ****
  
  #include "include/wm_struct.h"
  #include "include/wm_cdtext.h"
! #include "include/wm_helpers.h"
  #define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM
  
  void *malloc();
--- 63,69 ----
  
  #include "include/wm_struct.h"
  #include "include/wm_cdtext.h"
! 
  #define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM
  
  void *malloc();




*** kdemultimedia-3.0.3/kmidi/TIMIDITY/timidity.c	Tue Aug 27 12:54:57 2002
--- kdemultimedia-3.0.3/kmidi/TIMIDITY/timidity.c.ORG	Tue Aug 27 12:40:05 2002
***************
*** 21,31 ****
  #include <stdio.h>
  #include <stdlib.h>
  
- #ifdef __sgi
- #include <strings.h>
- #else
  #include <string.h>
- #endif
  
  #if defined(__linux__) || defined(__FreeBSD__) || defined(__bsdi__)
  #ifndef AU_LINUX
--- 21,27 ----
***************
*** 464,470 ****
  #endif
  
  
!   if ( (program_name=rindex(argv[0], '/')) ) program_name++;
    else program_name=argv[0];
  #ifndef KMIDI
    if (argc==1)
--- 460,466 ----
  #endif
  
  
!   if ((program_name=rindex(argv[0], '/'))) program_name++;
    else program_name=argv[0];
  #ifndef KMIDI
    if (argc==1)




*** kdemultimedia-3.0.3/aktion/aktion_part.cpp	Tue Aug 27 10:02:53 2002
--- kdemultimedia-3.0.3/aktion/aktion_part.cpp.ORG	Tue Aug 27 10:02:31 2002
***************
*** 18,24 ****
  */
  
  #include "aktion_part.h"
- using namespace KParts;
  
  #include <klocale.h>
  #include <kiconloader.h>
--- 18,23 ----




*** kdemultimedia-3.0.3/noatun/library/app.cpp	Tue Aug 27 14:47:04 2002
--- kdemultimedia-3.0.3/noatun/library/app.cpp.ORG	Tue Aug 27 14:47:01 2002
***************
*** 236,246 ****
  {
  	KConfig *c=KGlobal::config();
  	c->setGroup("");
- #ifdef __sgi
- 	c->writeEntry("TitleFormat", format);
- #else
  	return c->writeEntry("TitleFormat", format);
- #endif
  }
  
  void NoatunApp::setClearOnOpen(bool b)
--- 236,242 ----




*** kdemultimedia-3.0.3/noatun/library/noatun/playlist.h	Tue Aug 27 14:43:23 2002
--- kdemultimedia-3.0.3/noatun/library/noatun/playlist.h.ORG	Tue Aug 27 14:43:20 2002
***************
*** 5,15 ****
  #include <kurl.h>
  #include <qdict.h>
  #include <qstringlist.h>
- #ifdef __sgi
- #include <assert.h>
- #else
  #include <cassert>
- #endif
  
  class PlaylistItem;
  
--- 5,11 ----




*** kdemultimedia-3.0.3/noatun/modules/voiceprint/voiceprint.cpp	Tue Aug 27 15:03:28 2002
--- kdemultimedia-3.0.3/noatun/modules/voiceprint/voiceprint.cpp.ORG	Tue Aug 27 15:03:25 2002
***************
*** 93,99 ****
  	for (int i=0; i<bands ; i++)
  	{
  		float b=data[bands-i-1]+1.0;
! 		b=log10(b)/log(2.)*255.0*16;
  		int band=(int)b;
  		if (band>255) band=255;
  		else if (band<0) band=0;
--- 93,99 ----
  	for (int i=0; i<bands ; i++)
  	{
  		float b=data[bands-i-1]+1.0;
! 		b=log10(b)/log(2)*255.0*16;
  		int band=(int)b;
  		if (band>255) band=255;
  		else if (band<0) band=0;




*** kdemultimedia-3.0.3/noatun/modules/winskin/vis/winSkinFFT_impl.cpp	Tue Aug 27 15:08:01 2002
--- kdemultimedia-3.0.3/noatun/modules/winskin/vis/winSkinFFT_impl.cpp.ORG	Tue Aug 27 15:07:56 2002
***************
*** 96,106 ****
      tmp=re*re+im*im;  
      // Here I check a new idea. We remove all low values
      // and all values over xyz to xyz.
! #ifdef __sgi
!     fftArray[pos]=(int)(::sqrt(::sqrt(float(tmp))));
! #else
!     fftArray[pos]=(int)(::sqrt(::sqrt(tmp))));
! #endif    
      if (fftArray[pos]<=15) {
        max+=fftArray[pos];
      } else {
--- 96,103 ----
      tmp=re*re+im*im;  
      // Here I check a new idea. We remove all low values
      // and all values over xyz to xyz.
!     fftArray[pos]=(int)(::sqrt(::sqrt(tmp)));
!     
      if (fftArray[pos]<=15) {
        max+=fftArray[pos];
      } else {




*** kdemultimedia-3.0.3/noatun/modules/winskin/waColor.cpp	Tue Aug 27 15:19:52 2002
--- kdemultimedia-3.0.3/noatun/modules/winskin/waColor.cpp.ORG	Tue Aug 27 15:19:49 2002
***************
*** 1,8 ****
- #ifdef __sgi
- #include <fstream>
- #else
  #include <fstream.h>
- #endif
  #include <qfile.h>
  
  #include "waColor.h"
--- 1,4 ----




*** kdemultimedia-3.0.3/kaboodle/userinterface.cpp	Tue Aug 27 12:33:02 2002
--- kdemultimedia-3.0.3/kaboodle/userinterface.cpp.ORG	Tue Aug 27 12:32:54 2002
***************
*** 43,50 ****
  #include "userinterface.h"
  #include <kstatusbar.h>
  
- using namespace KParts;
- 
  UserInterface::UserInterface(QWidget *parent, const KURL &initialFile)
  	: KParts::MainWindow(parent)
  {
--- 43,48 ----




*** kdemultimedia-3.0.3/kaboodle/kaboodle_factory.cpp	Tue Aug 27 12:18:19 2002
--- kdemultimedia-3.0.3/kaboodle/kaboodle_factory.cpp.ORG	Tue Aug 27 12:18:09 2002
***************
*** 23,30 ****
  
  #include <klocale.h>
  
- using namespace KParts;
- 
  #include "kaboodle_part.h"
  #include "kaboodle_factory.moc"
  
--- 23,28 ----

kdenetwork-3.0.3.patch (text/plain, 7.1 KB)

*** kdenetwork-3.0.3/kpf/src/ActiveMonitorItem.cpp	Tue Aug 27 06:46:20 2002
--- kdenetwork-3.0.3/kpf/src/ActiveMonitorItem.cpp.ORG	Tue Aug 27 06:45:53 2002
***************
*** 62,72 ****
    )
    {
      if (c != Progress)
- #ifdef __sgi
-       QListViewItem::paintCell(p, g, c, w, a);
- #else
        return QListViewItem::paintCell(p, g, c, w, a);
! #endif
      p->setPen(g.dark());
  
      p->setPen(g.base());
--- 62,69 ----
    )
    {
      if (c != Progress)
        return QListViewItem::paintCell(p, g, c, w, a);
! 
      p->setPen(g.dark());
  
      p->setPen(g.base());
*** kdenetwork-3.0.3/kpf/src/Utils.cpp	Tue Aug 27 06:42:45 2002
--- kdenetwork-3.0.3/kpf/src/Utils.cpp.ORG	Tue Aug 27 06:42:15 2002
***************
*** 21,33 ****
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
  
- #ifdef __sgi
- #include <time.h>
- #include <locale.h>
- #else
  #include <ctime>
  #include <clocale>
- #endif
  
  #include <qfile.h>
  #include <qregexp.h>
--- 21,28 ----
*** kdenetwork-3.0.3/kpf/src/DirectoryLister.cpp	Tue Aug 27 06:43:43 2002
--- kdenetwork-3.0.3/kpf/src/DirectoryLister.cpp.ORG	Tue Aug 27 06:43:37 2002
***************
*** 21,31 ****
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
  
- #ifdef __sgi
- #include <math.h>
- #else
  #include <cmath>
- #endif
  
  #include <qapplication.h>
  #include <qdir.h>
--- 21,27 ----
*** kdenetwork-3.0.3/kpf/src/Request.cpp	Tue Aug 27 06:45:03 2002
--- kdenetwork-3.0.3/kpf/src/Request.cpp.ORG	Tue Aug 27 06:44:50 2002
***************
*** 21,31 ****
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
  
- #ifdef __sgi
- #include <limits.h>
- #else
  #include <climits> // For ULONG_MAX
- #endif
  
  #include <kurl.h>
  
--- 21,27 ----
*** kdenetwork-3.0.3/libkdenetwork/kmime_codecs.cpp	Tue Aug 27 06:41:33 2002
--- kdenetwork-3.0.3/libkdenetwork/kmime_codecs.cpp.ORG	Tue Aug 27 06:37:09 2002
***************
*** 19,31 ****
  
  #include <kdebug.h>
  
- #ifdef __sgi
- #include <assert.h>
- #include <string.h>
- #else
  #include <cassert>
  #include <cstring>
- #endif
  
  using namespace KMime;
  
--- 19,26 ----
***************
*** 1105,1115 ****
  
    if ( i && i < mOutputBufferCursor ) {
      // adjust output buffer:
- #ifdef __sgi
-     memmove( mOutputBuffer, &mOutputBuffer[i], mOutputBufferCursor - i );
- #else
      std::memmove( mOutputBuffer, &mOutputBuffer[i], mOutputBufferCursor - i );
- #endif
      mOutputBufferCursor -= i;
    } else if ( i == mOutputBufferCursor ) {
      mOutputBufferCursor = i = 0;
--- 1100,1106 ----
*** kdenetwork-3.0.3/libkdenetwork/kmime_headers.h	Tue Aug 27 06:39:54 2002
--- kdenetwork-3.0.3/libkdenetwork/kmime_headers.h.ORG	Tue Aug 27 06:38:55 2002
***************
*** 768,775 ****
        : Generics::GUnstructured( p, s, cs ), t_ype(0) { setType(t); }
      ~Generic() { delete[] t_ype; }
  
!     virtual void clear()            { delete[] t_ype; Generics::GUnstructured::clear(); }
!     virtual bool isEmpty()          { return (t_ype==0 || Generics::GUnstructured::isEmpty()); }
      virtual const char* type()      { return t_ype; }
      void setType(const char *type);
  
--- 768,775 ----
        : Generics::GUnstructured( p, s, cs ), t_ype(0) { setType(t); }
      ~Generic() { delete[] t_ype; }
  
!     virtual void clear()            { delete[] t_ype; GUnstructured::clear(); }
!     virtual bool isEmpty()          { return (t_ype==0 || GUnstructured::isEmpty()); }
      virtual const char* type()      { return t_ype; }
      void setType(const char *type);
  
	This patch is for package: kdenetwork-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments [email protected]



*** kdenetwork-3.0.3/kpf/src/ActiveMonitorItem.cpp	Tue Aug 27 06:46:20 2002
--- kdenetwork-3.0.3/kpf/src/ActiveMonitorItem.cpp.ORG	Tue Aug 27 06:45:53 2002
***************
*** 62,72 ****
    )
    {
      if (c != Progress)
- #ifdef __sgi
-       QListViewItem::paintCell(p, g, c, w, a);
- #else
        return QListViewItem::paintCell(p, g, c, w, a);
! #endif
      p->setPen(g.dark());
  
      p->setPen(g.base());
--- 62,69 ----
    )
    {
      if (c != Progress)
        return QListViewItem::paintCell(p, g, c, w, a);
! 
      p->setPen(g.dark());
  
      p->setPen(g.base());




*** kdenetwork-3.0.3/kpf/src/Utils.cpp	Tue Aug 27 06:42:45 2002
--- kdenetwork-3.0.3/kpf/src/Utils.cpp.ORG	Tue Aug 27 06:42:15 2002
***************
*** 21,33 ****
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
  
- #ifdef __sgi
- #include <time.h>
- #include <locale.h>
- #else
  #include <ctime>
  #include <clocale>
- #endif
  
  #include <qfile.h>
  #include <qregexp.h>
--- 21,28 ----




*** kdenetwork-3.0.3/kpf/src/DirectoryLister.cpp	Tue Aug 27 06:43:43 2002
--- kdenetwork-3.0.3/kpf/src/DirectoryLister.cpp.ORG	Tue Aug 27 06:43:37 2002
***************
*** 21,31 ****
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
  
- #ifdef __sgi
- #include <math.h>
- #else
  #include <cmath>
- #endif
  
  #include <qapplication.h>
  #include <qdir.h>
--- 21,27 ----




*** kdenetwork-3.0.3/kpf/src/Request.cpp	Tue Aug 27 06:45:03 2002
--- kdenetwork-3.0.3/kpf/src/Request.cpp.ORG	Tue Aug 27 06:44:50 2002
***************
*** 21,31 ****
    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
  
- #ifdef __sgi
- #include <limits.h>
- #else
  #include <climits> // For ULONG_MAX
- #endif
  
  #include <kurl.h>
  
--- 21,27 ----




*** kdenetwork-3.0.3/libkdenetwork/kmime_codecs.cpp	Tue Aug 27 06:41:33 2002
--- kdenetwork-3.0.3/libkdenetwork/kmime_codecs.cpp.ORG	Tue Aug 27 06:37:09 2002
***************
*** 19,31 ****
  
  #include <kdebug.h>
  
- #ifdef __sgi
- #include <assert.h>
- #include <string.h>
- #else
  #include <cassert>
  #include <cstring>
- #endif
  
  using namespace KMime;
  
--- 19,26 ----
***************
*** 1105,1115 ****
  
    if ( i && i < mOutputBufferCursor ) {
      // adjust output buffer:
- #ifdef __sgi
-     memmove( mOutputBuffer, &mOutputBuffer[i], mOutputBufferCursor - i );
- #else
      std::memmove( mOutputBuffer, &mOutputBuffer[i], mOutputBufferCursor - i );
- #endif
      mOutputBufferCursor -= i;
    } else if ( i == mOutputBufferCursor ) {
      mOutputBufferCursor = i = 0;
--- 1100,1106 ----




*** kdenetwork-3.0.3/libkdenetwork/kmime_headers.h	Tue Aug 27 06:39:54 2002
--- kdenetwork-3.0.3/libkdenetwork/kmime_headers.h.ORG	Tue Aug 27 06:38:55 2002
***************
*** 768,775 ****
        : Generics::GUnstructured( p, s, cs ), t_ype(0) { setType(t); }
      ~Generic() { delete[] t_ype; }
  
!     virtual void clear()            { delete[] t_ype; Generics::GUnstructured::clear(); }
!     virtual bool isEmpty()          { return (t_ype==0 || Generics::GUnstructured::isEmpty()); }
      virtual const char* type()      { return t_ype; }
      void setType(const char *type);
  
--- 768,775 ----
        : Generics::GUnstructured( p, s, cs ), t_ype(0) { setType(t); }
      ~Generic() { delete[] t_ype; }
  
!     virtual void clear()            { delete[] t_ype; GUnstructured::clear(); }
!     virtual bool isEmpty()          { return (t_ype==0 || GUnstructured::isEmpty()); }
      virtual const char* type()      { return t_ype; }
      void setType(const char *type);

kdeutils-3.0.3.patch (text/plain, 5.1 KB)

	This patch is for package: kdeutils-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments [email protected]



*** kdeutils-3.0.3/ark/ark_part.cpp	Tue Aug 27 08:18:41 2002
--- kdeutils-3.0.3/ark/ark_part.cpp.ORG	Tue Aug 27 08:15:58 2002
***************
*** 26,34 ****
  #include <kaction.h>
  #include <kaboutdata.h>
  
- #ifdef __sgi
- using namespace KParts;
- #endif
  
  #include "arkwidgetpart.h"
  
--- 26,31 ----




*** kdeutils-3.0.3/ark/arkwidget.cpp	Tue Aug 27 08:37:38 2002
--- kdeutils-3.0.3/ark/arkwidget.cpp.ORG	Tue Aug 27 08:29:42 2002
***************
*** 74,80 ****
  #elif defined(__sun)
  #include <sys/statvfs.h>
  #define STATFS statvfs
! #elif defined(_AIX) || defined(__sgi)
  #include <sys/statfs.h>
  #endif
  
--- 74,80 ----
  #elif defined(__sun)
  #include <sys/statvfs.h>
  #define STATFS statvfs
! #elif defined(_AIX)
  #include <sys/statfs.h>
  #endif
  
***************
*** 130,146 ****
  {
    fprintf(stderr, "Size: %ld\n", size);
    struct STATFS buf;
- #ifdef __sgi
-   if (STATFS(QFile::encodeName(dir), &buf, NULL, NULL) == 0)
- #else
    if (STATFS(QFile::encodeName(dir), &buf) == 0)
- #endif
      {
- #ifdef __sgi
-       double nAvailable = (double)buf.f_bfree * buf.f_bsize;
- #else
        double nAvailable = (double)buf.f_bavail * buf.f_bsize;
- #endif
        if (nAvailable < (double)size)
          {
            KMessageBox::error(0, i18n("You have run out of disk space."));
--- 130,138 ----




*** kdeutils-3.0.3/kdf/disklist.h	Tue Aug 27 18:23:15 2002
--- kdeutils-3.0.3/kdf/disklist.h.ORG	Tue Aug 27 18:18:24 2002
***************
*** 42,53 ****
  #define NO_FS_TYPE    false
  #else
  #define DF_ARGS       "-k"
- #ifdef __sgi
- /*  sgi has fs_type field, 2002-08-27: [email protected]  */
- #define NO_FS_TYPE    false
- #else
  #define NO_FS_TYPE    true
- #endif		
  #endif		
  
  #ifdef _OS_SOLARIS_
--- 42,48 ----




*** kdeutils-3.0.3/kcalc/kcalc_core.cpp	Tue Aug 27 09:08:58 2002
--- kdeutils-3.0.3/kcalc/kcalc_core.cpp.ORG	Tue Aug 27 08:59:29 2002
***************
*** 380,399 ****
  		if (DISPLAY_AMOUNT < 0)
  			DISPLAY_AMOUNT = decimal_point ?
  			DISPLAY_AMOUNT - ((CALCAMNT)data /
- #ifdef __sgi
- 			POW(float(current_base), decimal_point++)) :
- #else
  			POW(current_base, decimal_point++)) :
- #endif
  			(current_base * DISPLAY_AMOUNT) - data;
  		else
  			DISPLAY_AMOUNT = decimal_point ?
  			DISPLAY_AMOUNT + ((CALCAMNT)data /
- #ifdef __sgi
- 			POW(float(current_base), decimal_point++)) :
- #else
  			POW(current_base, decimal_point++)) :
- #endif
  			(current_base * DISPLAY_AMOUNT) + data;
  
  		if (decimal_point)
--- 380,391 ----
***************
*** 425,437 ****
                          else
                          {
                              --decimal_point;
- #ifdef __sgi
-                             DISPLAY_AMOUNT = floor(DISPLAY_AMOUNT * POW(float(current_base), decimal_point - 1)) /
-                                              POW(float(current_base), (decimal_point - 1));
- #else
                              DISPLAY_AMOUNT = floor(DISPLAY_AMOUNT * POW(current_base, decimal_point - 1)) /
                                               POW(current_base, (decimal_point - 1));
- #endif
                          }
                  }
                  else
--- 417,424 ----
***************
*** 1350,1360 ****
  		}
  		else
  		{
- #ifdef __sgi
- 			DISPLAY_AMOUNT = POW(float(10), int(DISPLAY_AMOUNT));
- #else
  			DISPLAY_AMOUNT = POW(10, DISPLAY_AMOUNT);
- #endif
  			inverse = false;
  		}
  		break;
--- 1337,1343 ----
***************
*** 2162,2178 ****
  		return 1L;
  
  	if (left_op < 0 && isoddint(1 / right_op))
- #ifdef __sgi
- 		left_op = -1L * POW(float(-1L * left_op), int(right_op));
- #else
  		left_op = -1L * POW((-1L * left_op), right_op);
- #endif
  	else
- #ifdef __sgi
- 		left_op = POW(float(left_op), int(right_op));
- #else
  		left_op = POW(left_op, right_op);
- #endif
  
  	if (errno == EDOM || errno == ERANGE)
  	{
--- 2145,2153 ----
***************
*** 2196,2212 ****
  	}
  
  	if (left_op < 0 && isoddint(right_op))
- #ifdef __sgi
- 		left_op = -1L * POW(float(-1L * left_op), float((1L)/right_op));
- #else
  		left_op = -1L * POW((-1L * left_op), (1L)/right_op);
- #endif
  	else
- #ifdef __sgi
- 		left_op = POW(float(left_op), float((1L)/right_op));
- #else
  		left_op = POW(left_op, (1L)/right_op);
- #endif
  
  	if (errno == EDOM || errno == ERANGE)
  	{
--- 2171,2179 ----




*** kdeutils-3.0.3/kcalc/kcalc.cpp	Tue Aug 27 08:51:44 2002
--- kdeutils-3.0.3/kcalc/kcalc.cpp.ORG	Tue Aug 27 08:47:54 2002
***************
*** 67,77 ****
  #include "version.h"
  
  // Initalize static members
- #ifdef __sgi
- const CALCAMNT QtCalculator::pi = (ASIN(double(1L)) * 2L);
- #else
  const CALCAMNT QtCalculator::pi = (ASIN(1L) * 2L);
! #endif
  
  static const char *description = I18N_NOOP("KDE Calculator");
  static const char *version = KCALCVERSION;
--- 67,74 ----
  #include "version.h"
  
  // Initalize static members
  const CALCAMNT QtCalculator::pi = (ASIN(1L) * 2L);
! 
  
  static const char *description = I18N_NOOP("KDE Calculator");
  static const char *version = KCALCVERSION;

kdetoys-3.0.3.patch (text/plain, 142 B)

	This patch is for package: kdetoys-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments [email protected]