This patch is for package: kdeedu-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments mhertha@hartmann-hertha.de



*** 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(