[prev in list] [next in list] [prev in thread] [next in thread]
List: kdevelop-devel
Subject: Re: Hmm - here's a possible problem (Re: class libs/widget/KTabBar conflicts with class kdelibs/kdeu
From: jbb <jbb () kdevelop ! org>
Date: 2003-10-15 18:30:19
[Download RAW message or body]
Hi,
This (corrected) patch works on kde cvs and I'm not crashing on exit anymore.
jbb
On Wed, 15 Oct 2003 23:03, jbb wrote:
> On Wed, 15 Oct 2003 22:19, jbb wrote:
> Seems to be a night for replying to myself
>
> Here's a patch that could fix this problem. I'm compiling at the moment so
> it's untested. Could someone test on kdecvs kde3.1 and kde3.0 and apply. It
> moves ktabwidget.* from lib/widgets to lib/compat as well as fixes the
> compat includes on cvs.
>
> Seems to be compiling on kde cvs so far :-)
>
> 'Nite folks,
>
> jbb
>
> > On Mon, 13 Oct 2003 19:20, Falk Brettschneider wrote:
> > (snip)
> >
> > > > > P.S.: Put KTabBar in a compat namespace similar like in
> > > > > lib/qextmdi/*_compat.h/cpp
> > > >
> > > > So they're the same thing then?
> > >
> > > Not sure but why do they have the same name?
> >
> > Hmm - was about to add ktabwidget.* to lib/compat but then noticed that
> > the following files
> >
> > /languages/cpp/Makefile.am:
> > ./languages/sql/Makefile.am:
> > ./languages/java/Makefile.am
> > ./lib/util/Makefile.am:
> > ./lib/widgets/Makefile.am
> > ./lib/widgets/propeditor/Makefile.am
> > ./vcs/cvs/Makefile.am:
> > ./parts/fileview/Makefile.am:
> > ./parts/classview/Makefile.am:
> >
> > all contain something like...
> > INCLUDES = ... -I$(top_srcdir)/lib/compat ...
> >
> > which will include the headers to the compat library, which on a kde cvs
> > version could cause problems?
> >
> > I think this should be removed for kde cvs. Is my reading of this
> > correct? If not, I have to hide the ktabwidget.* files somewhere else.
> >
> > See ya,
> >
> > jbb
> >
> >
> >
> > _______________________________________________
> > Kdevelop-devel mailing list
> > Kdevelop-devel@barney.cs.uni-potsdam.de
> > http://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel
["kdevelop.patch" (text/x-diff)]
? lib/compat/ktabwidget.cpp
? lib/compat/ktabwidget.h
Index: kdevelop.kdevelop
===================================================================
RCS file: /home/kde/kdevelop/Attic/kdevelop.kdevelop,v
retrieving revision 1.1
diff -u -r1.1 kdevelop.kdevelop
--- kdevelop.kdevelop 5 Oct 2003 15:10:27 -0000 1.1
+++ kdevelop.kdevelop 15 Oct 2003 18:25:01 -0000
@@ -27,7 +27,7 @@
<group pattern="*.png" name="Icons" />
<group pattern="*.po;*.ts" name="Translations" />
<group pattern="*" name="Others" />
- <hidenonprojectfiles>true</hidenonprojectfiles>
+ <hidenonprojectfiles>false</hidenonprojectfiles>
</groups>
<tree>
<hidenonprojectfiles>false</hidenonprojectfiles>
@@ -75,16 +75,16 @@
</kdevdoctreeview>
<kdevdebugger>
<general>
- <dbgshell></dbgshell>
- <programargs></programargs>
- <gdbpath></gdbpath>
+ <dbgshell>libtool</dbgshell>
+ <programargs/>
+ <gdbpath/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
<runappinappdirectory>true</runappinappdirectory>
- <configGdbScript></configGdbScript>
- <runShellScript></runShellScript>
- <runGdbScript></runGdbScript>
+ <configGdbScript/>
+ <runShellScript/>
+ <runGdbScript/>
</general>
<display>
<staticmembers>false</staticmembers>
@@ -100,38 +100,54 @@
<abortonerror>false</abortonerror>
<numberofjobs>1</numberofjobs>
<dontact>false</dontact>
- <makebin></makebin>
+ <makebin/>
</make>
<run>
- <mainprogram>0:1:notrans</mainprogram>
- <programargs></programargs>
+ <mainprogram>src/kdevelop</mainprogram>
+ <programargs/>
<terminal>false</terminal>
<envvars/>
<autocompile>true</autocompile>
- <directoryradio>build</directoryradio>
+ <directoryradio>executable</directoryradio>
<customdirectory>/</customdirectory>
</run>
<general>
- <useconfiguration>default</useconfiguration>
+ <useconfiguration>debug</useconfiguration>
<activetarget>buildtools/qmake/libkdevtrollproject.la</activetarget>
</general>
<configurations>
<default>
<configargs>--enable-debug=full --prefix=$KDEDIR \
--with-kdelibsdoxy-dir=$KDEDIR/share/doc/HTML/en/kdelibs-apidocs</configargs>
- <builddir></builddir>
- <topsourcedir></topsourcedir>
- <cppflags></cppflags>
- <ldflags></ldflags>
+ <builddir/>
+ <topsourcedir/>
+ <cppflags/>
+ <ldflags/>
<ccompiler>kdevgccoptions</ccompiler>
<cxxcompiler>kdevgppoptions</cxxcompiler>
<f77compiler>kdevpgf77options</f77compiler>
- <ccompilerbinary></ccompilerbinary>
- <cxxcompilerbinary></cxxcompilerbinary>
- <f77compilerbinary></f77compilerbinary>
- <cflags></cflags>
+ <ccompilerbinary/>
+ <cxxcompilerbinary/>
+ <f77compilerbinary/>
+ <cflags/>
<cxxflags>-O0 -g3</cxxflags>
- <f77flags></f77flags>
+ <f77flags/>
</default>
+ <debug>
+ <configargs>--enable-debug=full</configargs>
+ <builddir>/home/okuti/kde-src/kde-3/kde_build_dir/kdevelop-3.0</builddir>
+ <topsourcedir>/home/okuti/kde-src/kde-3/kdevelop-3.0</topsourcedir>
+ <cppflags/>
+ <ldflags/>
+ <ccompiler>kdevgccoptions</ccompiler>
+ <cxxcompiler>kdevgppoptions</cxxcompiler>
+ <f77compiler>kdevpgf77options</f77compiler>
+ <ccompilerbinary/>
+ <cxxcompilerbinary/>
+ <f77compilerbinary/>
+ <cflags/>
+ <cxxflags/>
+ <f77flags/>
+ </debug>
</configurations>
</kdevautoproject>
<kdevfilecreate>
@@ -171,4 +187,22 @@
<pcs>KDElibs</pcs>
</references>
</kdevcppsupport>
+ <kdevcvs>
+ <cvsoptions>-f</cvsoptions>
+ <commitoptions></commitoptions>
+ <addoptions></addoptions>
+ <logoptions></logoptions>
+ <updateoptions>-dP</updateoptions>
+ <removeoptions>-f</removeoptions>
+ <revertoptions>-C -d -P</revertoptions>
+ <diffoptions>-u3 -p</diffoptions>
+ <rshoptions></rshoptions>
+ </kdevcvs>
+ <kdevcvsservice>
+ <recursivewhenupdate>true</recursivewhenupdate>
+ <prunedirswhenupdate>true</prunedirswhenupdate>
+ <createdirswhenupdate>true</createdirswhenupdate>
+ <recursivewhencommitremove>true</recursivewhencommitremove>
+ <revertoptions>-C</revertoptions>
+ </kdevcvsservice>
</kdevelop>
Index: kdevelop.m4.in
===================================================================
RCS file: /home/kde/kdevelop/kdevelop.m4.in,v
retrieving revision 1.30
diff -u -r1.30 kdevelop.m4.in
--- kdevelop.m4.in 10 Oct 2003 00:47:27 -0000 1.30
+++ kdevelop.m4.in 15 Oct 2003 18:25:03 -0000
@@ -555,12 +555,21 @@
if test "$ac_cv_qt31_setup" = "yes"; then
AC_MSG_RESULT(no)
+ KDEVCOMPAT=""
+ LIB_KDEVCOMPAT=""
+ KDEVCOMPAT_INCLUDES=""
else
AC_MSG_RESULT(yes)
- COMPAT=compat
+ KDEVCOMPAT=compat
+ LIB_KDEVCOMPAT="$(top_builddir)/lib/compat/libkdevcompat.la"
+ KDEVCOMPAT_INCLUDES="'-I$(top_srcdir)/lib/compat'"
+ AC_MSG_RESULT(yes)
fi
-AC_SUBST(COMPAT)
-AM_CONDITIONAL(include_compat, test -n "$COMPAT")
+
+ AC_SUBST(KDEVCOMPAT)
+ AC_SUBST(LIB_KDEVCOMPAT)
+ AC_SUBST(KDEVCOMPAT_INCLUDES)
+ AM_CONDITIONAL(include_compat, test -n "$KDEVCOMPAT")
])
dnl **********
Index: languages/cpp/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/languages/cpp/Makefile.am,v
retrieving revision 1.74
diff -u -r1.74 Makefile.am
--- languages/cpp/Makefile.am 13 Oct 2003 10:10:57 -0000 1.74
+++ languages/cpp/Makefile.am 15 Oct 2003 18:25:08 -0000
@@ -2,7 +2,7 @@
SUBDIRS = templates subclassing_template newclass_templates file_templates \
app_templates compiler pcsimporter debugger doc
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/compat \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/catalog -I$(top_srcdir)/lib/cppparser \
$(all_includes) +INCLUDES = -I$(top_srcdir)/lib/interfaces $(KDEVCOMPAT_INCLUDES) \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/catalog -I$(top_srcdir)/lib/cppparser \
$(all_includes)
kde_module_LTLIBRARIES = libkdevcppsupport.la
libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
Index: languages/java/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/languages/java/Makefile.am,v
retrieving revision 1.32
diff -u -r1.32 Makefile.am
--- languages/java/Makefile.am 13 Oct 2003 10:10:57 -0000 1.32
+++ languages/java/Makefile.am 15 Oct 2003 18:25:12 -0000
@@ -5,7 +5,7 @@
# SUBDIRS = templates subclassing_template newclass_templates file_templates
SUBDIRS = file_templates app_templates debugger doc
-INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/interfaces \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/catalog -I$(top_srcdir)/lib/compat \
$(all_includes) +INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/interfaces \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/catalog $(KDEVCOMPAT_INCLUDES) \
$(all_includes)
kde_module_LTLIBRARIES = libkdevjavasupport.la
libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
Index: languages/sql/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/languages/sql/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- languages/sql/Makefile.am 13 Oct 2003 10:10:57 -0000 1.4
+++ languages/sql/Makefile.am 15 Oct 2003 18:25:14 -0000
@@ -1,6 +1,6 @@
#Here resides the SQL support part.
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/sourceinfo \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/compat $(all_includes) +INCLUDES \
= -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/sourceinfo \
-I$(top_srcdir)/lib/util $(KDEVCOMPAT_INCLUDES) $(all_includes) SUBDIRS = \
app_templates doc
kde_module_LTLIBRARIES = libkdevsqlsupport.la
Index: lib/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/lib/Makefile.am,v
retrieving revision 1.31
diff -u -r1.31 Makefile.am
--- lib/Makefile.am 13 Sep 2003 17:41:57 -0000 1.31
+++ lib/Makefile.am 15 Oct 2003 18:25:14 -0000
@@ -10,7 +10,6 @@
if include_compat
COMPAT_SUBDIR=compat
-LIB_KDEVCOMPAT=$(top_builddir)/lib/compat/libkdevcompat.la
endif
lib_LTLIBRARIES = libkdevelop.la
Index: lib/compat/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/lib/compat/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- lib/compat/Makefile.am 22 Apr 2003 12:46:43 -0000 1.1
+++ lib/compat/Makefile.am 15 Oct 2003 18:25:15 -0000
@@ -4,4 +4,4 @@
noinst_LTLIBRARIES = libkdevcompat.la
-libkdevcompat_la_SOURCES = kdevwidgetaction.cpp kdeveditlistbox.cpp
+libkdevcompat_la_SOURCES = kdevwidgetaction.cpp kdeveditlistbox.cpp ktabwidget.cpp
Index: lib/util/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/lib/util/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- lib/util/Makefile.am 8 Oct 2003 13:02:02 -0000 1.14
+++ lib/util/Makefile.am 15 Oct 2003 18:25:17 -0000
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \
-I$(top_srcdir)/lib/sourceinfo $(all_includes) +INCLUDES = $(KDEVCOMPAT_INCLUDES) \
-I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/sourceinfo $(all_includes)
noinst_LTLIBRARIES = libkdevutil.la
Index: lib/widgets/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/lib/widgets/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- lib/widgets/Makefile.am 9 Oct 2003 10:46:03 -0000 1.17
+++ lib/widgets/Makefile.am 15 Oct 2003 18:25:17 -0000
@@ -1,9 +1,9 @@
-INCLUDES = -I$(top_srcdir)/lib/compat $(all_includes)
+INCLUDES = $(KDEVCOMPAT_INCLUDES) $(all_includes)
METASOURCES = AUTO
noinst_LTLIBRARIES = libwidgets.la
-libwidgets_la_SOURCES = ktabzoomwidget.cpp ktabzoombar.cpp ktabzoombutton.cpp \
ktabzoomframe.cpp ktabzoombarlayout.cpp ktabwidget.cpp flagboxes.cpp qcomboview.cpp \
klistviewaction.cpp kcomboview.cpp resizablecombo.cpp doclineedit.cpp \
+libwidgets_la_SOURCES = ktabzoomwidget.cpp ktabzoombar.cpp ktabzoombutton.cpp \
ktabzoomframe.cpp ktabzoombarlayout.cpp flagboxes.cpp qcomboview.cpp \
klistviewaction.cpp kcomboview.cpp resizablecombo.cpp doclineedit.cpp noinst_HEADERS \
= resizablecombo.h doclineedit.h SUBDIRS = propeditor
Index: lib/widgets/propeditor/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/lib/widgets/propeditor/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- lib/widgets/propeditor/Makefile.am 9 Oct 2003 10:46:03 -0000 1.4
+++ lib/widgets/propeditor/Makefile.am 15 Oct 2003 18:25:17 -0000
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/lib/compat $(all_includes)
+INCLUDES = $(KDEVCOMPAT_INCLUDES) $(all_includes)
METASOURCES = AUTO
lib_LTLIBRARIES = libpropertyeditor.la
Index: parts/classview/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/parts/classview/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- parts/classview/Makefile.am 7 Aug 2003 18:51:08 -0000 1.10
+++ parts/classview/Makefile.am 15 Oct 2003 18:25:19 -0000
@@ -1,6 +1,6 @@
# Here resides the class view part.
-INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \
-I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes) +INCLUDES = \
$(KDEVCOMPAT_INCLUDES) -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
-I$(top_srcdir)/lib/widgets $(all_includes)
kde_module_LTLIBRARIES = libkdevclassview.la
libkdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
Index: parts/fileview/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/parts/fileview/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- parts/fileview/Makefile.am 9 Oct 2003 10:48:50 -0000 1.11
+++ parts/fileview/Makefile.am 15 Oct 2003 18:25:21 -0000
@@ -1,6 +1,6 @@
# Here resides the file view part.
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/compat \
-I$(top_srcdir)/lib/sourceinfo -I$(top_srcdir)/lib/util $(all_includes) +INCLUDES = \
-I$(top_srcdir)/lib/interfaces $(KDEVCOMPAT_INCLUDES) -I$(top_srcdir)/lib/sourceinfo \
-I$(top_srcdir)/lib/util $(all_includes)
kde_module_LTLIBRARIES = libkdevfileview.la libkdevfilegroups.la
Index: src/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/src/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- src/Makefile.am 2 Oct 2003 15:22:03 -0000 1.38
+++ src/Makefile.am 15 Oct 2003 18:25:24 -0000
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
-I$(top_srcdir)/lib $(KDEVMDI_INCLUDES) -I$(top_srcdir)/lib/structure $(all_includes) \
+INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
-I$(top_srcdir)/lib $(KDEVMDI_INCLUDES) -I$(top_srcdir)/lib/structure \
-I$(top_srcdir)/lib/widgets $(all_includes)
bin_PROGRAMS = kdevelop
Index: src/mainwindowideal.cpp
===================================================================
RCS file: /home/kde/kdevelop/src/mainwindowideal.cpp,v
retrieving revision 1.45
diff -u -r1.45 mainwindowideal.cpp
--- src/mainwindowideal.cpp 2 Oct 2003 15:22:03 -0000 1.45
+++ src/mainwindowideal.cpp 15 Oct 2003 18:25:29 -0000
@@ -44,8 +44,8 @@
#include <kedittoolbar.h>
-#include "widgets/ktabzoomwidget.h"
-#include "widgets/ktabwidget.h"
+#include "ktabzoomwidget.h"
+#include "ktabwidget.h"
#include "kdevplugin.h"
Index: src/mainwindowideal.h
===================================================================
RCS file: /home/kde/kdevelop/src/mainwindowideal.h,v
retrieving revision 1.15
diff -u -r1.15 mainwindowideal.h
--- src/mainwindowideal.h 30 Jul 2003 15:50:42 -0000 1.15
+++ src/mainwindowideal.h 15 Oct 2003 18:25:29 -0000
@@ -18,7 +18,7 @@
#define _MAINWINDOWIDEAL_H_
-#include "widgets/ktabwidget.h"
+#include "ktabwidget.h"
#include <kparts/mainwindow.h>
Index: vcs/cvs/Makefile.am
===================================================================
RCS file: /home/kde/kdevelop/vcs/cvs/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- vcs/cvs/Makefile.am 8 Oct 2003 13:02:02 -0000 1.21
+++ vcs/cvs/Makefile.am 15 Oct 2003 18:25:30 -0000
@@ -1,6 +1,6 @@
# Here resides the cvs part
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/compat \
-I$(top_srcdir)/lib/util $(all_includes) +INCLUDES = -I$(top_srcdir)/lib/interfaces \
$(KDEVCOMPAT_INCLUDES) -I$(top_srcdir)/lib/util $(all_includes)
kde_module_LTLIBRARIES = libkdevcvs.la
libkdevcvs_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
_______________________________________________
Kdevelop-devel mailing list
Kdevelop-devel@barney.cs.uni-potsdam.de
http://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic