[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: error compiling kdelibs rc5
From: Herr Maik HERTHA <maik.hertha () volkswagen ! de>
Date: 2002-12-12 15:08:00
[Download RAW message or body]
Compiling RC5 on a sgi-box stops with several errors:
The MipsPro compiler suite (current 7.3.1.3m) requires several changes.
Not all of type using namespace, also a lot with clean classname access.
I enclose the unified patches for the kdelibs-3.1.0rc5 to compile the
package successful on a sgi-box.
I hope you will update the HEAD-branch that all users of an sgi will
have success
maik ./
--
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
maik.hertha@volkswagen.de
---------------------------------------------------
hartmann+hertha
it (beratung / entwicklung / support)
http://www.hartmann-hertha.de
mhertha@hartmann-hertha.de
--------------------------------------------------- h+h
["kdelibs-3.1rc5.patch" (text/plain)]
This patch is for package: kdelibs-3.1rc5
Main purpose is updating the kde sources for mips-sgi-irix
Comments mhertha@hartmann-hertha.de
--- kdelibs-3.1rc5/kio/kfile/kfilesharedlg.cpp.ORG Thu Dec 12 14:50:43 2002
+++ kdelibs-3.1rc5/kio/kfile/kfilesharedlg.cpp Thu Dec 12 14:51:36 2002
@@ -34,7 +34,6 @@
#include <stdlib.h>
#include <errno.h>
#include <kio/kfileshare.h>
-#include <libintl.h>
#include <kseparator.h>
#include <qpushbutton.h>
#include <kapplication.h>
--- kdelibs-3.1rc5/interfaces/ktexteditor/ktexteditor.cpp.ORG Thu Dec 12 15:17:03 \
2002
+++ kdelibs-3.1rc5/interfaces/ktexteditor/ktexteditor.cpp Thu Dec 12 15:20:26 2002
@@ -28,6 +28,10 @@
#include <kparts/factory.h>
#include <kparts/componentfactory.h>
+#if defined(__sgi) && !defined(__GNUC__)
+using namespace KParts;
+#endif
+
#include "document.moc"
#include "view.moc"
#include "plugin.moc"
--- kdelibs-3.1rc5/kate/part/katedialogs.cpp.ORG Thu Dec 12 15:44:00 2002
+++ kdelibs-3.1rc5/kate/part/katedialogs.cpp Thu Dec 12 15:44:58 2002
@@ -86,12 +86,12 @@
#include "hlparamedit.h"
+using namespace Kate;
+
#include "katedialogs.moc"
#include "katehighlightdownload.h"
#include "attribeditor.h"
#include "katefactory.h"
-
-using namespace Kate;
#define TAG_DETECTCHAR "DetectChar"
#define TAG_DETECT2CHARS "Detect2Chars"
--- kdelibs-3.1rc5/kate/part/katefactory.cpp.ORG Thu Dec 12 15:46:02 2002
+++ kdelibs-3.1rc5/kate/part/katefactory.cpp Thu Dec 12 15:51:08 2002
@@ -22,6 +22,11 @@
// $Id: katefactory.cpp,v 1.29 2002/09/19 16:34:34 cullmann Exp $
#include "katefactory.h"
+
+#if defined(__sgi) && !defined(__GNUC__)
+using namespace KParts;
+#endif
+
#include "katefactory.moc"
#include "katedocument.h"
--- kdelibs-3.1rc5/kcert/kcertpart.cc.ORG Thu Dec 12 15:10:32 2002
+++ kdelibs-3.1rc5/kcert/kcertpart.cc Thu Dec 12 15:10:47 2002
@@ -49,6 +49,10 @@
#include <kparts/browserinterface.h>
#include <kio/kservicetypefactory.h>
+#if defined(__sgi) && !defined(__GNUC__)
+using namespace KParts;
+#endif
+
K_EXPORT_COMPONENT_FACTORY( libkcertpart, KParts::GenericFactory<KCertPart> )
--- kdelibs-3.1rc5/interfaces/ktexteditor/ktexteditor.cpp.ORG Wed Nov 20 17:47:07 \
2002
+++ kdelibs-3.1rc5/interfaces/ktexteditor/ktexteditor.cpp Wed Nov 20 17:50:19 2002
@@ -106,7 +106,7 @@
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;
@@ -157,7 +157,7 @@
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;
@@ -165,16 +165,16 @@
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;
}
@@ -219,12 +219,12 @@
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 ); + return \
KParts::ComponentFactory::createInstanceFromLibrary<KTextEditor::Plugin>( libname, \
document, name ); }
-PluginViewInterface *KTextEditor::pluginViewInterface (Plugin *plugin)
+PluginViewInterface *KTextEditor::pluginViewInterface (KTextEditor::Plugin *plugin)
{
if (!plugin)
return 0;
--- kdelibs-3.1rc5/interfaces/kmediaplayer/player.cpp.ORG Wed Nov 20 17:54:00 2002
+++ kdelibs-3.1rc5/interfaces/kmediaplayer/player.cpp Wed Nov 20 17:55:54 2002
@@ -23,6 +23,10 @@
#include <kmediaplayer/player.h>
+#if defined(__sgi) && !defined(__GNUC__)
+using namespace KParts;
+#endif
+
KMediaPlayer::PlayerDCOPObject::PlayerDCOPObject(void)
: DCOPObject("KMediaPlayer")
{
--- kdelibs-3.1rc5/kate/part/kateiconborder.cpp.ORG Thu Nov 21 07:17:45 2002
+++ kdelibs-3.1rc5/kate/part/kateiconborder.cpp Thu Nov 21 07:18:50 2002
@@ -207,7 +207,7 @@
int KateIconBorder::lineNumberWidth() const
{
- return ((int)log10(m_view->doc()->numLines()) + 1) * m_maxCharWidth + 4;
+ return ((int)log10((float)m_view->doc()->numLines()) + 1) * m_maxCharWidth + 4;
}
void KateIconBorder::paintEvent(QPaintEvent* e)
--- kdelibs-3.1rc5/kate/part/katedocument.cpp.ORG Thu Nov 21 12:14:46 2002
+++ kdelibs-3.1rc5/kate/part/katedocument.cpp Thu Nov 21 14:18:48 2002
@@ -23,10 +23,6 @@
//BEGIN includes
#include "katedocument.h"
-#if defined(__sgi) && !defined(__GNUC__)
-using namespace Kate;
-#endif
-
#include "katedocument.moc"
#include <ktexteditor/plugin.h>
@@ -1915,17 +1911,17 @@
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];
@@ -1932,7 +1928,7 @@
return QPixmap();
}
-QString KateDocument::markDescription( MarkInterface::MarkTypes type )
+QString KateDocument::markDescription( KTextEditor::MarkInterface::MarkTypes type )
{
if( m_markDescriptions[type] )
return *m_markDescriptions[type];
--- kdelibs-3.1rc5/kate/part/katedocument.h.ORG Thu Nov 21 14:23:59 2002
+++ kdelibs-3.1rc5/kate/part/katedocument.h Thu Nov 21 14:24:19 2002
@@ -371,10 +371,10 @@
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();
--- kdelibs-3.1rc5/kate/plugins/insertfile/insertfileplugin.cpp.ORG Thu Nov 21 \
15:15:37 2002
+++ kdelibs-3.1rc5/kate/plugins/insertfile/insertfileplugin.cpp Wed Dec 4 13:51:19 \
2002 @@ -18,12 +18,15 @@
$Id: insertfileplugin.cpp,v 1.9 2002/08/12 13:17:50 binner Exp $
*/
-#include "insertfileplugin.h"
-#include "insertfileplugin.moc"
-
#include <ktexteditor/document.h>
#include <ktexteditor/viewcursorinterface.h>
#include <ktexteditor/editinterface.h>
+
+#if defined (__sgi) && !defined(__GNUC__)
+using namespace KTextEditor;
+#endif
+#include "insertfileplugin.h"
+#include "insertfileplugin.moc"
#include <assert.h>
#include <kio/job.h>
--- kdelibs-3.1rc5/kate/plugins/isearch/ISearchPlugin.cpp.ORG Thu Nov 21 14:42:51 \
2002
+++ kdelibs-3.1rc5/kate/plugins/isearch/ISearchPlugin.cpp Thu Nov 21 15:14:03 2002
@@ -26,6 +26,11 @@
#include <kconfig.h>
#include <kdebug.h>
+#if defined(__sgi) && !defined(__GNUC__)
+#include <ktexteditor/plugin.h>
+using namespace KTextEditor;
+#endif
+
#include "ISearchPlugin.h"
#include "ISearchPlugin.moc"
--- kdelibs-3.1rc5/khtml/dom/dom2_events.cpp.ORG Wed Nov 20 18:10:06 2002
+++ kdelibs-3.1rc5/khtml/dom/dom2_events.cpp Wed Nov 20 18:10:22 2002
@@ -470,7 +470,7 @@
if (!impl)
throw DOMException(DOMException::INVALID_STATE_ERR);
- return static_cast<TextEventImpl*>(impl)->initTextEvent(typeArg, canBubbleArg, \
cancelableArg, viewArg, detailArg, outputStringArg, keyValArg, virtKeyValArg, \
inputGeneratedArg, numPadArg); + \
static_cast<TextEventImpl*>(impl)->initTextEvent(typeArg, canBubbleArg, \
cancelableArg, viewArg, detailArg, outputStringArg, keyValArg, virtKeyValArg, \
inputGeneratedArg, numPadArg); }
unsigned long TextEvent::keyVal() const
@@ -502,7 +502,7 @@
if (!impl)
throw DOMException(DOMException::INVALID_STATE_ERR);
- return static_cast<TextEventImpl*>(impl)->initModifier(modifierArg,valueArg);
+ static_cast<TextEventImpl*>(impl)->initModifier(modifierArg,valueArg);
}
bool TextEvent::checkModifier(unsigned long modiferArg)
--- kdelibs-3.1rc5/khtml/java/kjavaapplet.cpp.ORG Wed Nov 20 18:23:11 2002
+++ kdelibs-3.1rc5/khtml/java/kjavaapplet.cpp Wed Nov 20 18:23:47 2002
@@ -25,7 +25,9 @@
#include <klocale.h>
#include <kdebug.h>
-
+#if defined(__sgi) && !defined(__GNUC__)
+using namespace KParts;
+#endif
class KJavaAppletPrivate
--- kdelibs-3.1rc5/khtml/kmultipart/kmultipart.cpp.ORG Wed Nov 20 18:35:05 2002
+++ kdelibs-3.1rc5/khtml/kmultipart/kmultipart.cpp Wed Nov 20 18:35:07 2002
@@ -33,6 +33,10 @@
#include <unistd.h>
#include <kxmlguifactory.h>
+#if defined(__sgi) && !defined(__GNUC__)
+using namespace KParts;
+#endif
+
typedef KParts::GenericFactory<KMultiPart> KMultiPartFactory; // factory for the \
part K_EXPORT_COMPONENT_FACTORY( libkmultipart /*library name*/, KMultiPartFactory \
);
--- kdelibs-3.1rc5/khtml/khtml_part.cpp.ORG Wed Nov 20 18:28:12 2002
+++ kdelibs-3.1rc5/khtml/khtml_part.cpp Wed Nov 20 18:30:17 2002
@@ -93,6 +93,10 @@
#include "khtmlpart_p.h"
+#if defined(__sgi) && !defined(__GNUC__)
+using namespace KParts;
+#endif
+
namespace khtml {
class PartStyleSheetLoader : public CachedObjectClient
{
@@ -5014,5 +5018,4 @@
d->m_pluginPageQuestionAsked.append(mimetype);
}
-using namespace KParts;
#include "khtml_part.moc"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic