Success: kde 3.1 cvs running on sgi IRIX!
Jesse Barnes
jbarnes at sgi.com
Fri Aug 23 18:03:57 BST 2002
I just tried KDE CVS on my irix box and managed to get arts and
kdelibs to compile. I've attached the patches I had to apply for it
to work, hopefully I'll be able to put one together for kdebase next
week. I mainly ran into the MIPSpro namespace handling bug, but I
also had to fix some link order issues and other misc. stuff.
Please Cc: me on any replies as I'm not on the list.
Thanks,
Jesse
On Sun, Aug 11, 2002 at 03:36:21AM -0700, Andreas Sturm wrote:
> FYI: i have compiled a kde 3.1 cvs of around 8th august using MIPSpro
> compilers on sgi IRIX. It looks quite nicely; good work! I have attached a
> file with my changes to arts, libs, artwork and partly network (not yet
> finished). I would like you to comment this changes but please be gentle with
> me as i am not a c++ programmer yet (i am trying to get better with that;
> prommise!). Shurely you have better solutions than me.
> Again: realy great work; i do like the new desktop already!
-------------- next part --------------
Index: configure.in.in
===================================================================
RCS file: /home/kde/arts/configure.in.in,v
retrieving revision 1.77
diff -u -3 -p -u -r1.77 configure.in.in
--- configure.in.in 18 Jun 2002 00:20:09 -0000 1.77
+++ configure.in.in 23 Aug 2002 16:47:42 -0000
@@ -535,7 +535,7 @@ AC_SUBST(LIBASOUND)
dnl check for IRIX audio support
AC_MSG_CHECKING([for IRIX])
-if test `uname` = "IRIX" ; then
+if test `uname` = "IRIX" -o `uname` = "IRIX64" ; then
AC_DEFINE(HAVE_IRIX, 1, [Define if you compile under IRIX])
AC_MSG_RESULT("yes")
else
-------------- next part --------------
Index: interfaces/kmediaplayer/player.cpp
===================================================================
RCS file: /home/kde/kdelibs/interfaces/kmediaplayer/player.cpp,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 player.cpp
--- interfaces/kmediaplayer/player.cpp 12 Apr 2002 12:11:30 -0000 1.3
+++ interfaces/kmediaplayer/player.cpp 23 Aug 2002 16:47:05 -0000
@@ -76,4 +76,5 @@ int KMediaPlayer::Player::state(void) co
return (int)currentState;
}
+using namespace KParts;
#include "player.moc"
Index: interfaces/ktexteditor/ktexteditor.cpp
===================================================================
RCS file: /home/kde/kdelibs/interfaces/ktexteditor/ktexteditor.cpp,v
retrieving revision 1.36
diff -u -3 -p -u -r1.36 ktexteditor.cpp
--- interfaces/ktexteditor/ktexteditor.cpp 20 Jul 2002 22:40:59 -0000 1.36
+++ interfaces/ktexteditor/ktexteditor.cpp 23 Aug 2002 16:47:05 -0000
@@ -28,6 +28,7 @@
#include <kparts/factory.h>
#include <kparts/componentfactory.h>
+using namespace KParts;
#include "document.moc"
#include "view.moc"
#include "plugin.moc"
@@ -102,7 +103,7 @@ namespace KTextEditor
unsigned int Document::globalDocumentNumber = 0;
unsigned int View::globalViewNumber = 0;
-unsigned int Plugin::globalPluginNumber = 0;
+unsigned int KTextEditor::Plugin::globalPluginNumber = 0;
unsigned int PluginViewInterface::globalPluginViewInterfaceNumber = 0;
unsigned int Editor::globalEditorNumber = 0;
@@ -153,7 +154,7 @@ QCString View::viewDCOPSuffix () const
return num2 + "-" + num1;
}
-Plugin::Plugin( Document *document, const char *name ) : QObject (document, name )
+KTextEditor::Plugin::Plugin( Document *document, const char *name ) : QObject (document, name )
{
globalPluginNumber++;
myPluginNumber = globalPluginNumber;
@@ -161,16 +162,16 @@ Plugin::Plugin( Document *document, cons
d->m_doc = document;
}
-Plugin::~Plugin()
+KTextEditor::Plugin::~Plugin()
{
}
-unsigned int Plugin::pluginNumber () const
+unsigned int KTextEditor::Plugin::pluginNumber () const
{
return myPluginNumber;
}
-Document *Plugin::document () const
+Document *KTextEditor::Plugin::document () const
{
return d->m_doc;
}
@@ -215,7 +216,7 @@ Document *KTextEditor::createDocument (
return KParts::ComponentFactory::createPartInstanceFromLibrary<Document>( libname, 0, 0, parent, name );
}
-Plugin *KTextEditor::createPlugin ( const char* libname, Document *document, const char *name )
+KTextEditor::Plugin *KTextEditor::createPlugin ( const char* libname, Document *document, const char *name )
{
return KParts::ComponentFactory::createInstanceFromLibrary<Plugin>( libname, document, name );
}
Index: interfaces/ktexteditor/undodcopinterface.cpp
===================================================================
RCS file: /home/kde/kdelibs/interfaces/ktexteditor/undodcopinterface.cpp,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 undodcopinterface.cpp
--- interfaces/ktexteditor/undodcopinterface.cpp 20 Jul 2002 16:56:06 -0000 1.1
+++ interfaces/ktexteditor/undodcopinterface.cpp 23 Aug 2002 16:47:05 -0000
@@ -49,9 +49,9 @@ uint UndoDCOPInterface::undoSteps ()
}
void UndoDCOPInterface::setUndoSteps ( uint steps )
{
- return m_parent->setUndoSteps(steps);
+ m_parent->setUndoSteps(steps);
}
void UndoDCOPInterface::undoChanged ()
{
m_parent->undoChanged();
-}
\ No newline at end of file
+}
Index: kate/part/katebrowserextension.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/part/katebrowserextension.cpp,v
retrieving revision 1.5
diff -u -3 -p -u -r1.5 katebrowserextension.cpp
--- kate/part/katebrowserextension.cpp 20 May 2002 20:35:58 -0000 1.5
+++ kate/part/katebrowserextension.cpp 23 Aug 2002 16:47:05 -0000
@@ -21,6 +21,7 @@
// $Id: katebrowserextension.cpp,v 1.5 2002/05/20 20:35:58 cullmann Exp $
#include "katebrowserextension.h"
+using namespace KParts;
#include "katebrowserextension.moc"
#include "katedocument.h"
Index: kate/part/katebuffer.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/part/katebuffer.cpp,v
retrieving revision 1.60
diff -u -3 -p -u -r1.60 katebuffer.cpp
--- kate/part/katebuffer.cpp 28 Jul 2002 22:15:57 -0000 1.60
+++ kate/part/katebuffer.cpp 23 Aug 2002 16:47:06 -0000
@@ -611,7 +611,6 @@ KateBuffer::needHighlight(KateBufBlock *
}
while ((current_line < last_line) && ((current_line < endLine) || stillcontinue));
-#warning FIXME FIXME
#if 0
if (current_line>=endLine)
{
Index: kate/part/katecodefoldinghelpers.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/part/katecodefoldinghelpers.cpp,v
retrieving revision 1.19
diff -u -3 -p -u -r1.19 katecodefoldinghelpers.cpp
--- kate/part/katecodefoldinghelpers.cpp 16 Aug 2002 18:50:10 -0000 1.19
+++ kate/part/katecodefoldinghelpers.cpp 23 Aug 2002 16:47:06 -0000
@@ -1019,7 +1019,6 @@ void KateCodeFoldingTree::incrementBy1(K
void KateCodeFoldingTree::findAndMarkAllNodesforRemovalOpenedOrClosedAt(unsigned int line)
{
-#warning "FIXME: make this multiple region changes per line save";
// return;
markedForDeleting.clear();
KateCodeFoldingNode *node=findNodeForLine(line);
@@ -1046,7 +1045,6 @@ void KateCodeFoldingTree::findAndMarkAll
void KateCodeFoldingTree::addNodeToRemoveList(KateCodeFoldingNode *node,unsigned int line)
{
-#warning "FIXME: make this multiple region changes per line save";
unsigned int startLine=getStartLine(node);
if ((startLine==line) && (node->startLineValid))
node->deleteOpening=true;
Index: kate/part/katedialogs.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/part/katedialogs.cpp,v
retrieving revision 1.37
diff -u -3 -p -u -r1.37 katedialogs.cpp
--- kate/part/katedialogs.cpp 8 Aug 2002 11:06:23 -0000 1.37
+++ kate/part/katedialogs.cpp 23 Aug 2002 16:47:06 -0000
@@ -86,6 +86,7 @@
#include "hlparamedit.h"
+using namespace Kate;
#include "katedialogs.moc"
#include "katehighlightdownload.h"
#include "attribeditor.h"
Index: kate/part/katedocument.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/part/katedocument.cpp,v
retrieving revision 1.351
diff -u -3 -p -u -r1.351 katedocument.cpp
--- kate/part/katedocument.cpp 21 Aug 2002 22:26:47 -0000 1.351
+++ kate/part/katedocument.cpp 23 Aug 2002 16:47:08 -0000
@@ -22,6 +22,7 @@
//BEGIN includes
#include "katedocument.h"
+using namespace Kate;
#include "katedocument.moc"
#include <ktexteditor/plugin.h>
@@ -1838,24 +1839,24 @@ void KateDocument::clearMarks()
emit marksChanged();
}
-void KateDocument::setPixmap( MarkInterface::MarkTypes type, const QPixmap& pixmap )
+void KateDocument::setPixmap( KTextEditor::MarkInterface::MarkTypes type, const QPixmap& pixmap )
{
m_markPixmaps.replace( type, new QPixmap( pixmap ) );
}
-void KateDocument::setDescription( MarkInterface::MarkTypes type, const QString& description )
+void KateDocument::setDescription( KTextEditor::MarkInterface::MarkTypes type, const QString& description )
{
m_markDescriptions.replace( type, new QString( description ) );
}
-QPixmap KateDocument::markPixmap( MarkInterface::MarkTypes type )
+QPixmap KateDocument::markPixmap( KTextEditor::MarkInterface::MarkTypes type )
{
if( m_markPixmaps[type] )
return *m_markPixmaps[type];
return QPixmap();
}
-QString KateDocument::markDescription( MarkInterface::MarkTypes type )
+QString KateDocument::markDescription( KTextEditor::MarkInterface::MarkTypes type )
{
if( m_markDescriptions[type] )
return *m_markDescriptions[type];
Index: kate/part/katedocument.h
===================================================================
RCS file: /home/kde/kdelibs/kate/part/katedocument.h,v
retrieving revision 1.148
diff -u -3 -p -u -r1.148 katedocument.h
--- kate/part/katedocument.h 28 Jul 2002 21:57:42 -0000 1.148
+++ kate/part/katedocument.h 23 Aug 2002 16:47:09 -0000
@@ -340,10 +340,10 @@ class KateDocument : public Kate::Docume
QPtrList<KTextEditor::Mark> marks();
void clearMarks();
- void setPixmap( MarkInterface::MarkTypes, const QPixmap& );
- void setDescription( MarkInterface::MarkTypes, const QString& );
- QString markDescription( MarkInterface::MarkTypes );
- QPixmap markPixmap( MarkInterface::MarkTypes );
+ void setPixmap( KTextEditor::MarkInterface::MarkTypes, const QPixmap& );
+ void setDescription( KTextEditor::MarkInterface::MarkTypes, const QString& );
+ QString markDescription( KTextEditor::MarkInterface::MarkTypes );
+ QPixmap markPixmap( KTextEditor::MarkInterface::MarkTypes );
void setMarksUserChangable( uint markMask );
uint editableMarks();
Index: kate/part/kateexportaction.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/part/kateexportaction.cpp,v
retrieving revision 1.6
diff -u -3 -p -u -r1.6 kateexportaction.cpp
--- kate/part/kateexportaction.cpp 20 May 2002 20:35:58 -0000 1.6
+++ kate/part/kateexportaction.cpp 23 Aug 2002 16:47:09 -0000
@@ -19,6 +19,7 @@
// $Id: kateexportaction.cpp,v 1.6 2002/05/20 20:35:58 cullmann Exp $
#include "kateexportaction.h"
+using namespace Kate;
#include "kateexportaction.moc"
#include <kpopupmenu.h>
#include <klocale.h>
Index: kate/part/katefactory.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/part/katefactory.cpp,v
retrieving revision 1.28
diff -u -3 -p -u -r1.28 katefactory.cpp
--- kate/part/katefactory.cpp 18 Aug 2002 10:34:23 -0000 1.28
+++ kate/part/katefactory.cpp 23 Aug 2002 16:47:09 -0000
@@ -22,6 +22,7 @@
// $Id: katefactory.cpp,v 1.28 2002/08/18 10:34:23 cullmann Exp $
#include "katefactory.h"
+using namespace KParts;
#include "katefactory.moc"
#include "katedocument.h"
Index: kate/part/kateview.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/part/kateview.cpp,v
retrieving revision 1.206
diff -u -3 -p -u -r1.206 kateview.cpp
--- kate/part/kateview.cpp 3 Aug 2002 14:51:07 -0000 1.206
+++ kate/part/kateview.cpp 23 Aug 2002 16:47:09 -0000
@@ -22,6 +22,8 @@
// $Id: kateview.cpp,v 1.206 2002/08/03 14:51:07 binner Exp $
#include "kateview.h"
+using namespace Kate;
+using namespace KParts;
#include "kateview.moc"
#include <ktexteditor/plugin.h>
Index: kate/part/kateviewdialog.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/part/kateviewdialog.cpp,v
retrieving revision 1.64
diff -u -3 -p -u -r1.64 kateviewdialog.cpp
--- kate/part/kateviewdialog.cpp 3 Aug 2002 14:51:07 -0000 1.64
+++ kate/part/kateviewdialog.cpp 23 Aug 2002 16:47:09 -0000
@@ -749,6 +749,7 @@ void EditKeyConfiguration::apply()
m_keyChooser->save();
}
+using namespace Kate;
#include "kateviewdialog.moc"
Index: kate/part/kateviewhighlightaction.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/part/kateviewhighlightaction.cpp,v
retrieving revision 1.13
diff -u -3 -p -u -r1.13 kateviewhighlightaction.cpp
--- kate/part/kateviewhighlightaction.cpp 20 May 2002 20:35:58 -0000 1.13
+++ kate/part/kateviewhighlightaction.cpp 23 Aug 2002 16:47:09 -0000
@@ -20,6 +20,7 @@
// $Id: kateviewhighlightaction.cpp,v 1.13 2002/05/20 20:35:58 cullmann Exp $
#include "kateviewhighlightaction.h"
+using namespace Kate;
#include "kateviewhighlightaction.moc"
#include "kateview.h"
#include "katedocument.h"
Index: kate/plugins/insertfile/insertfileplugin.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/plugins/insertfile/insertfileplugin.cpp,v
retrieving revision 1.9
diff -u -3 -p -u -r1.9 insertfileplugin.cpp
--- kate/plugins/insertfile/insertfileplugin.cpp 12 Aug 2002 13:17:50 -0000 1.9
+++ kate/plugins/insertfile/insertfileplugin.cpp 23 Aug 2002 16:47:09 -0000
@@ -19,6 +19,7 @@
*/
#include "insertfileplugin.h"
+using namespace KTextEditor;
#include "insertfileplugin.moc"
#include <ktexteditor/document.h>
Index: kate/plugins/isearch/ISearchPlugin.cpp
===================================================================
RCS file: /home/kde/kdelibs/kate/plugins/isearch/ISearchPlugin.cpp,v
retrieving revision 1.16
diff -u -3 -p -u -r1.16 ISearchPlugin.cpp
--- kate/plugins/isearch/ISearchPlugin.cpp 28 Jun 2002 02:37:46 -0000 1.16
+++ kate/plugins/isearch/ISearchPlugin.cpp 23 Aug 2002 16:47:09 -0000
@@ -27,6 +27,7 @@
#include <kdebug.h>
#include "ISearchPlugin.h"
+using namespace KTextEditor;
#include "ISearchPlugin.moc"
K_EXPORT_COMPONENT_FACTORY( ktexteditor_isearch, KGenericFactory<ISearchPlugin>( "ktexteditor_isearch" ) );
Index: kcert/kcertpart.cc
===================================================================
RCS file: /home/kde/kdelibs/kcert/kcertpart.cc,v
retrieving revision 1.34
diff -u -3 -p -u -r1.34 kcertpart.cc
--- kcert/kcertpart.cc 3 Jul 2002 12:08:15 -0000 1.34
+++ kcert/kcertpart.cc 23 Aug 2002 16:47:11 -0000
@@ -852,6 +852,6 @@ KAboutData *KCertPart::createAboutData()
{
return new KAboutData("KCertPart", I18N_NOOP("KDE Certificate Part"), "1.0");
}
-
+using namespace KParts;
#include "kcertpart.moc"
Index: kdecore/Makefile.am
===================================================================
RCS file: /home/kde/kdelibs/kdecore/Makefile.am,v
retrieving revision 1.296
diff -u -3 -p -u -r1.296 Makefile.am
--- kdecore/Makefile.am 9 Aug 2002 14:28:05 -0000 1.296
+++ kdecore/Makefile.am 23 Aug 2002 16:47:11 -0000
@@ -88,7 +88,7 @@ libkdecore_la_SOURCES = libintl.cpp kapp
kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp
libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 5:0:1 -no-undefined
-libkdecore_la_LIBADD = malloc/libklmalloc.la ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBXINERAMA) $(LIB_DMALLOC) $(LIBART_LIBS) $(SVGICON_LIB)
+libkdecore_la_LIBADD = malloc/libklmalloc.la ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBXINERAMA) $(LIB_DMALLOC) $(SVGICON_LIB) $(LIBART_LIBS) $(LIB_QT)
libkdecore_la_METASOURCES = AUTO
Index: kdecore/svgicons/ksvgiconpainter.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdecore/svgicons/ksvgiconpainter.cpp,v
retrieving revision 1.16
diff -u -3 -p -u -r1.16 ksvgiconpainter.cpp
--- kdecore/svgicons/ksvgiconpainter.cpp 20 Aug 2002 11:51:34 -0000 1.16
+++ kdecore/svgicons/ksvgiconpainter.cpp 23 Aug 2002 16:47:12 -0000
@@ -207,7 +207,7 @@ public:
{
strokeColor = (qRed(m_strokeColor.rgb()) << 24) | (qGreen(m_strokeColor.rgb()) << 16) | (qBlue(m_strokeColor.rgb()) << 8) | (qAlpha(m_strokeColor.rgb()));
- double ratio = sqrt(pow(affine[0], 2) + pow(affine[3], 2)) / sqrt(2);
+ double ratio = sqrt(pow(affine[0], 2) + pow(affine[3], 2)) / sqrt(2.0);
double strokeWidth = m_strokeWidth * ratio;
ArtPathStrokeJoinType joinStyle = ART_PATH_STROKE_JOIN_MITER;
@@ -1332,8 +1332,8 @@ void KSVGIconPainter::drawEllipse(double
art_affine_scale(affine, rx * 10.0, ry * 10.0);
temp[i].code = ART_MOVETO;
- temp[i].x3 = cos(0);
- temp[i].y3 = sin(0);
+ temp[i].x3 = cos(0.0);
+ temp[i].y3 = sin(0.0);
i++;
@@ -1519,7 +1519,7 @@ const char *getCoord(const char *ptr, do
}
number = integer + decimal;
- number *= sign * pow(10, expsign * exponent);
+ number *= sign * pow(10.0, expsign * exponent);
// skip the following space
if(*ptr == ' ')
Index: kdeprint/cups/Makefile.am
===================================================================
RCS file: /home/kde/kdelibs/kdeprint/cups/Makefile.am,v
retrieving revision 1.33
diff -u -3 -p -u -r1.33 Makefile.am
--- kdeprint/cups/Makefile.am 25 May 2002 18:00:08 -0000 1.33
+++ kdeprint/cups/Makefile.am 23 Aug 2002 16:47:12 -0000
@@ -25,7 +25,7 @@ noinst_HEADERS = cupsinfos.h ipprequest.
bin_PROGRAMS = make_driver_db_cups cupsdoprint
make_driver_db_cups_SOURCES = make_driver_db_cups.c
-make_driver_db_cups_LDADD = -lz ../libdriverparse.a $(top_builddir)/kdecore/libkdefakes.la $(LIBDL)
+make_driver_db_cups_LDADD = ../libdriverparse.a $(top_builddir)/kdecore/libkdefakes.la $(LIBDL) -L/usr/local/lib -lz
cupsdoprint_SOURCES = cupsdoprint.c
cupsdoprint_LDADD = $(LIB_CUPS) $(top_builddir)/kdecore/libkdefakes.la
Index: khtml/khtml_ext.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/khtml_ext.cpp,v
retrieving revision 1.50
diff -u -3 -p -u -r1.50 khtml_ext.cpp
--- khtml/khtml_ext.cpp 3 Jul 2002 01:35:11 -0000 1.50
+++ khtml/khtml_ext.cpp 23 Aug 2002 16:47:15 -0000
@@ -593,5 +593,6 @@ void KHTMLZoomFactorAction::slotActivate
m_part->setZoomFactor(m_part->zoomFactor() + (m_direction ? 10 : -10) * idx);
}
+using namespace KParts;
#include "khtml_ext.moc"
Index: khtml/khtml_part.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
retrieving revision 1.732
diff -u -3 -p -u -r1.732 khtml_part.cpp
--- khtml/khtml_part.cpp 21 Aug 2002 19:01:58 -0000 1.732
+++ khtml/khtml_part.cpp 23 Aug 2002 16:47:15 -0000
@@ -3735,7 +3735,7 @@ void KHTMLPart::setStatusBarText( const
}
tobe = "<qt>"+tobe;
- emit ReadOnlyPart::setStatusBarText(tobe);
+ emit KParts::ReadOnlyPart::setStatusBarText(tobe);
}
Index: khtml/khtml_run.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/khtml_run.cpp,v
retrieving revision 1.28
diff -u -3 -p -u -r1.28 khtml_run.cpp
--- khtml/khtml_run.cpp 25 Jan 2002 16:33:03 -0000 1.28
+++ khtml/khtml_run.cpp 23 Aug 2002 16:47:15 -0000
@@ -82,4 +82,5 @@ void KHTMLRun::handleError( KIO::Job *jo
KRun::slotScanFinished( job ); // standard "show the error dialog" code
}
+using namespace KParts;
#include "khtml_run.moc"
Index: khtml/java/kjavaapplet.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/java/kjavaapplet.cpp,v
retrieving revision 1.22
diff -u -3 -p -u -r1.22 kjavaapplet.cpp
--- khtml/java/kjavaapplet.cpp 30 Jun 2002 19:17:16 -0000 1.22
+++ khtml/java/kjavaapplet.cpp 23 Aug 2002 16:47:15 -0000
@@ -227,4 +227,5 @@ void KJavaLiveConnect::unregister(const
context->derefObject(applet, objid);
}
+using namespace KParts;
#include "kjavaapplet.moc"
Index: khtml/kmultipart/kmultipart.cpp
===================================================================
RCS file: /home/kde/kdelibs/khtml/kmultipart/kmultipart.cpp,v
retrieving revision 1.4
diff -u -3 -p -u -r1.4 kmultipart.cpp
--- khtml/kmultipart/kmultipart.cpp 11 Jun 2002 11:21:32 -0000 1.4
+++ khtml/kmultipart/kmultipart.cpp 23 Aug 2002 16:47:15 -0000
@@ -390,6 +390,6 @@ void KMultiPartBrowserExtension::reparse
}
#endif
-//using namespace KParts;
+using namespace KParts;
#include "kmultipart.moc"
Index: kio/kpasswdserver/kpasswdserver.h
===================================================================
RCS file: /home/kde/kdelibs/kio/kpasswdserver/kpasswdserver.h,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 kpasswdserver.h
--- kio/kpasswdserver/kpasswdserver.h 26 Jun 2002 09:28:00 -0000 1.2
+++ kio/kpasswdserver/kpasswdserver.h 23 Aug 2002 16:47:17 -0000
@@ -59,7 +59,7 @@ protected:
void addAuthInfoItem(const QString &key, const KIO::AuthInfo &info, long windowId, long seqNr, bool canceled);
KIO::AuthInfo copyAuthInfo(const AuthInfo *);
-private:
+protected:
struct AuthInfo {
AuthInfo() { expire = expNever; isCanceled = false; seqNr = 0; }
@@ -78,6 +78,7 @@ private:
bool isCanceled;
};
+private:
class AuthInfoList : public QPtrList<AuthInfo>
{
public:
Index: kstyles/keramik/genembed.cpp
===================================================================
RCS file: /home/kde/kdelibs/kstyles/keramik/genembed.cpp,v
retrieving revision 1.6
diff -u -3 -p -u -r1.6 genembed.cpp
--- kstyles/keramik/genembed.cpp 11 Aug 2002 20:47:37 -0000 1.6
+++ kstyles/keramik/genembed.cpp 23 Aug 2002 16:47:17 -0000
@@ -32,13 +32,13 @@ DEALINGS IN THE SOFTWARE.
#include <kimageeffect.h>
-#include <iostream>
+#include <iostream.h>
#include <string.h>
#include <math.h>
//Force-touch-embedded-revision: 1
-using namespace std;
+//using namespace std;
#include "keramikimage.h"
@@ -365,7 +365,7 @@ int main(int argc, char** argv)
for (unsigned int c=0; c<images.size(); c++)
{
- cout<<"\t{ "<<(images[c].haveAlpha?"true":"false")<<","<<images[c].width<<", "<<images[c].height<<", "<<images[c].id<<", "<<images[c].data<<"},";
+ cout<<"\t{ "<<(images[c].haveAlpha?"true":"false")<<","<<images[c].width<<", "<<images[c].height<<", "<<images[c].id<<", "<<(char *)images[c].data<<"},";
cout<<"\n";
}
cout<<"\t{0, 0, 0, 0, 0}\n";
More information about the kde-core-devel
mailing list