*** 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 - #include - #else #include #include - #endif #include #include --- 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 - #else #include - #endif #include #include --- 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 - #else #include // For ULONG_MAX - #endif #include --- 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 - #ifdef __sgi - #include - #include - #else #include #include - #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 mhertha@hartmann-hertha.de *** 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 - #include - #else #include #include - #endif #include #include --- 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 - #else #include - #endif #include #include --- 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 - #else #include // For ULONG_MAX - #endif #include --- 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 - #ifdef __sgi - #include - #include - #else #include #include - #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);