CVS commit by falkbr: - compiles/runs on KDE-3.0 as well again - backported KWidgetAction and KTextEditor::MarkInterfaceExtension from KDE-3.1 to KDE-3.0-compiled Gideon M +4 -0 ChangeLog 1.881 M +12 -2 lib/interfaces/Makefile.am 1.17 M +84 -1 parts/classview/classactions.cpp 1.10 M +44 -8 parts/classview/classactions.h 1.6 M +2 -0 parts/cppsupport/lexer.cpp 1.11 M +4 -4 parts/cppsupport/problemreporter.cpp 1.17 M +5 -0 parts/doctreeview/docindexdlg.cpp 1.14 [POSSIBLY UNSAFE: KShellProcess] M +5 -0 parts/doctreeview/doctreeviewwidget.cpp 1.42 [POSSIBLY UNSAFE: KShellProcess] M +5 -0 parts/doctreeview/htdigindex.cpp 1.12 [POSSIBLY UNSAFE: KShellProcess] M +3 -3 parts/javasupport/problemreporter.cpp 1.6 M +9 -0 parts/perlsupport/perldoc.cpp 1.6 [POSSIBLY UNSAFE: KShellProcess] M +9 -0 parts/pythonsupport/pydoc.cpp 1.7 [POSSIBLY UNSAFE: KShellProcess] M +2 -2 parts/qeditor/Makefile.am 1.21 M +3 -3 parts/qeditor/markerwidget.cpp 1.10 M +16 -1 parts/qeditor/qeditor_part.cpp 1.34 M +19 -2 parts/qeditor/qeditor_part.h 1.20 M +2 -6 src/debugger.cpp 1.7 M +2 -8 src/debugger.h 1.6 M +4 -1 src/editorproxy.h 1.8 --- kdevelop/ChangeLog #1.880:1.881 @@ -1,2 +1,6 @@ +2002-12-12 F@lk Brettschneider + * compiles/runs on KDE-3.0 as well again + * backported KWidgetAction and KTextEditor::MarkInterfaceExtension from KDE-3.1 to KDE-3.0-compiled Gideon + 2002-12-07 Jakob Simon-Gaarde * getActivedir() corrected in trollproject --- kdevelop/lib/interfaces/Makefile.am #1.16:1.17 @@ -3,5 +3,14 @@ noinst_LTLIBRARIES = libkdevinterfaces.la -libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp kdevlanguagesupport.cpp kdevversioncontrol.cpp kdevmakefrontend.cpp kdevappfrontend.cpp kdevcompileroptions.cpp kdevpartcontroller.cpp kdevapi.cpp kdevdifffrontend.cpp KDevMakeFrontendIface.skel KDevMakeFrontendIface.cpp KDevAppFrontendIface.skel KDevAppFrontendIface.cpp KDevCoreIface.skel KDevCoreIface.cpp kdevtoplevel.cpp KDevPartControllerIface.skel KDevPartControllerIface.cpp kdevplugin.cpp kdevdebugger.cpp kdevglobalversioncontrol.cpp kdevglobalversioncontrol.h +libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp kdevlanguagesupport.cpp \ + kdevversioncontrol.cpp kdevmakefrontend.cpp kdevappfrontend.cpp \ + kdevcompileroptions.cpp kdevpartcontroller.cpp kdevapi.cpp \ + kdevdifffrontend.cpp KDevMakeFrontendIface.skel KDevMakeFrontendIface.cpp \ + KDevAppFrontendIface.skel KDevAppFrontendIface.cpp \ + KDevCoreIface.skel KDevCoreIface.cpp kdevtoplevel.cpp \ + KDevPartControllerIface.skel KDevPartControllerIface.cpp \ + kdevplugin.cpp kdevdebugger.cpp kdevglobalversioncontrol.cpp \ + kdevglobalversioncontrol.h \ + kde30x_markinterfaceextension.cpp kdevelopincludedir = $(includedir)/kdevelop @@ -10,5 +19,6 @@ kdevmakefrontend.h kdevappfrontend.h kdevcompileroptions.h \ KDevMakeFrontendIface.h KDevAppFrontendIface.h KDevCoreIface.h \ - kdevplugin.h kdevdebugger.h + kdevplugin.h kdevdebugger.h \ + kde30x_markinterfaceextension.h noinst_HEADERS = kdevapi.h --- kdevelop/parts/cppsupport/lexer.cpp #1.10:1.11 @@ -558,2 +558,4 @@ const QChar* Lexer::handleDirective( con return ptr; } + +#include "lexer.moc" --- kdevelop/src/editorproxy.h #1.7:1.8 @@ -10,6 +10,9 @@ class QPopupMenu; #include #include +#include #if (KDE_VERSION > 305) -#include +# include +#else +# include "kde30x_markinterfaceextension.h" #endif