CVS does not build

[Iztok Kobal]

F at lk Brettschneider wrote:

> Iztok Kobal wrote:
>
>> It seems that Falk has forgotten to commit src/mainwindow.h since 
>> m_pDocumentViews is reported unknown in MainWindow::fillWindowMenu 
>> method and src/mainwindow.cpp has been commited today.
>>
>> Iztok
>>
>>
> Oh... I forgot to adapt the compat lib for KDE-3.1 and 3.0... will 
> follow soon... The other guys must update their KDE-3.2 cvs version to 
> the latest kdeui.so and kmdi.so (in kdelibs).
>
> Ciao
> F at lk
>
>
>
Falk !

1. CVS build fails after your today's commits into lib/qextmdi (gcc-3.2, 
qt-3.0.5, kdelibs-3.0.5)

source='kmdichildfrm.cpp' object='kmdichildfrm.lo' libtool=yes \
depfile='.deps/kmdichildfrm.Plo' tmpdepfile='.deps/kmdichildfrm.TPlo' \
depmode=gcc3 /bin/sh ../../../admin/depcomp \
/bin/sh ../../../libtool --silent --mode=compile --tag=CXX g++ 
-DHAVE_CONFIG_H -I. -I. -I../../.. -I../../../lib/qextmdi/include 
-I../../../lib/qextmdi/res -I../../../lib/structure -I/opt/kde3/include 
-I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT 
-D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic 
-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 
-D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -fno-builtin 
-g -O2 -g3 -O0 -Wformat-security -Wmissing-format-attribute 
-fno-exceptions -fno-check-new -fno-common -c -o kmdichildfrm.lo `test 
-f 'kmdichildfrm.cpp' || echo './'`kmdichildfrm.cpp
In file included from ../../../lib/qextmdi/include/kmdimainfrm.h:49,
from kmdichildfrm.cpp:44:
../../../lib/qextmdi/include/kmdidockwidget.h:21:28: kdockwidget_p.h: No 
such file or directory
In file included from ../../../lib/qextmdi/include/kmdimainfrm.h:49,
from kmdichildfrm.cpp:44:
../../../lib/qextmdi/include/kmdidockwidget.h: In member function `void
KMdiDockWidget::setLatestKDockContainer(QWidget*)':
../../../lib/qextmdi/include/kmdidockwidget.h:46: no method `KDockWidget::
setLatestKDockContainer'
../../../lib/qextmdi/include/kmdidockwidget.h: At global scope:
../../../lib/qextmdi/include/kmdidockwidget.h:65: parse error before `{' 
token
In file included from kmdichildfrm.cpp:44:
../../../lib/qextmdi/include/kmdimainfrm.h:346:2: warning: #warning is a 
GCC extension
../../../lib/qextmdi/include/kmdimainfrm.h:346:2: warning: #warning fixme


2. Amilcar does not dare to apply this patch since you have originally 
commited CRLF EOL'd file from the *N*X machine and would change all 
 >3000 lines. Anyway, it is needed to compile gideon with the gcc-2.95.3

******StartOfPatch******
Index: lib/qextmdi/src/kdockwidget_compat.cpp
===================================================================
RCS file: /home/kde/kdevelop/lib/qextmdi/src/kdockwidget_compat.cpp,v
retrieving revision 1.1
diff -u -r1.1 kdockwidget_compat.cpp
--- lib/qextmdi/src/kdockwidget_compat.cpp 11 Jul 2003 01:42:14 -0000 1.1
+++ lib/qextmdi/src/kdockwidget_compat.cpp 20 Aug 2003 20:53:12 -0000
@@ -132,7 +132,12 @@
void setForcedFixedHeight(KDockWidget *dw,int h);
void restoreFromForcedFixedSize(KDockWidget *dw);

- Orientation orientation(){return m_orientation;}
+ Orientation orientation()
+#if __GNUC__ >= 3
+// gcc-2.95.3 won't swallow this so leave it out
+ {return m_orientation;}
+#endif
+;

protected:
friend class KDockContainer;
@@ -156,6 +161,12 @@
int fixedHeight0,fixedHeight1;
};

+#if __GNUC__ < 3
+ KDockSplitter::Orientation KDockSplitter::orientation() {
+ return m_orientation;
+ }
+#endif
+
/**
* A mini-button usually placed in the dockpanel.
* @internal
******EndOfPatch******


Regards, Iztok