diff --git a/arch/tde-devel/tde-tdesdk/PKGBUILD b/arch/tde-devel/tde-tdesdk/PKGBUILD index 0b085d9e7..6c3ffc895 100644 --- a/arch/tde-devel/tde-tdesdk/PKGBUILD +++ b/arch/tde-devel/tde-tdesdk/PKGBUILD @@ -2,58 +2,45 @@ # Contributor: David C. Rankin pkgname=tde-tdesdk -pkgver=14.0.5 +pkgver=14.0.10 pkgrel=1 arch=('i686' 'x86_64') -url='http://scm.trinitydesktop.org/scm/git/tdesdk' +url='https://scm.trinitydesktop.org/scm/git/tdesdk' license=('GPL') groups=('tde-devel') pkgdesc="Trinity Desktop Development Tools" depends=('tde-tdebase') -makedepends=('pkgconfig' 'cmake' 'flex' 'subversion') +makedepends=('pkgconfig' 'cmake' 'flex' 'subversion' 'pod2man') provides=('tdesdk') conflicts=('trinity-tdesdk' 'trinity-kdesdk') replaces=('trinity-tdesdk') options=('staticlibs' 'libtool' '!strip') -source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdesdk-R${pkgver}.tar.bz2") -md5sums=('3821592afede20daf82ed2eef597955b') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdesdk-trinity-${pkgver}.tar.xz") +md5sums=('5d117cbbe1cd938624656917646eebab') # install='' -#prepare() { -# patch -Np1 -i "${srcdir}/../kautoconfig.patch" -#} +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - ## Generate config files and update with autoreconf - cd ${srcdir}/${pkgname#*-} + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build - msg "Copying system libtool files...." - cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in - cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} - msg "Running make -f admin/Makefile.common ...." - make -f admin/Makefile.common - - ## configure - msg "Configuring - ${pkgname}..." - CFLAGS="${CFLAGS} -fpermissive" \ - CXXFLAGS="${CXXFLAGS} -std=c++0x -fpermissive" \ - ./configure \ - --prefix=${TDEDIR} \ - --with-qt-dir=${QTDIR} \ - --with-qt-includes=${QTDIR}/include \ - --with-qt-libraries=${QTDIR}/lib \ - --sysconfdir=${TDEDIR}/etc \ - --localstatedir=/var \ - --enable-closure - msg "Building - ${pkgname#*-}..." - make $NUMJOBS + msg "Starting cmake..." + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DBUILD_ALL=ON + msg "Building - ${pkgname#*-}..." + make $NUMJOBS } package() { - msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${pkgname#*-} # use for libtool - + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build make -j1 DESTDIR="${pkgdir}" install } diff --git a/arch/tde-devel/tde-tdevelop/PKGBUILD b/arch/tde-devel/tde-tdevelop/PKGBUILD index 8c5d37be6..f22fb96ea 100644 --- a/arch/tde-devel/tde-tdevelop/PKGBUILD +++ b/arch/tde-devel/tde-tdevelop/PKGBUILD @@ -2,35 +2,39 @@ # Contributor: David C. Rankin pkgname=tde-tdevelop -pkgver=14.0.5 +pkgver=14.0.10 pkgrel=1 arch=('i686' 'x86_64') -url='http://scm.trinitydesktop.org/scm/git/tdevelop' +url='https://scm.trinitydesktop.org/scm/git/tdevelop' license=('GPL') groups=('tde-devel') pkgdesc="Trinity Desktop Developer Tools" depends=('tde-tdebase') -makedepends=('pkgconfig' 'cmake') +makedepends=('pkgconfig' 'cmake' 'tde-tdesdk') provides=('tdevelop') conflicts=('trinity-tdevelop' 'trinity-kdevelop') replaces=('trinity-tdevelop') options=('staticlibs' 'libtool' '!strip') -source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdevelop-R${pkgver}.tar.bz2" - "fix_tqt_error.patch") -md5sums=('ddc6fe1c7adc3c6284db806a8ea96e76' - 'da7c0a4793e98351d9f2d4122d3d2626') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdevelop-trinity-${pkgver}.tar.xz" + 'bp000-ba5f58bf.diff') +md5sums=('ec9eb0b745d984bf77f74bdc959d5fc8' + 'e7519ea06bd63b4fc9aa7e0ac5076576') # install='' +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 + build() { - cd ${srcdir}/${pkgname#*-} - patch -p1 -i ${srcdir}/fix_tqt_error.patch + cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} + patch -p1 < ${srcdir}/bp000-ba5f58bf.diff + cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p ${srcdir}/build cd ${srcdir}/build msg "Starting cmake..." - cmake ${srcdir}/${pkgname#*-} \ + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ -DWITH_BUILDTOOL_ALL=ON \ diff --git a/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff b/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff new file mode 100644 index 000000000..9cd176d3a --- /dev/null +++ b/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff @@ -0,0 +1,1238 @@ +From ba5f58bf38a62eb83990951168951274c96a8e24 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= +Date: Sun, 28 Feb 2021 00:15:56 +0000 +Subject: Fix ftbfs on Fedora 34 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +error: reference to ‘data’ is ambiguous + +Signed-off-by: François Andriot +--- + buildtools/ada/adaproject_part.cpp | 6 +++--- + buildtools/ant/antprojectpart.cpp | 6 +++--- + buildtools/autotools/autoprojectpart.cpp | 6 +++--- + buildtools/custommakefiles/customprojectpart.cpp | 6 +++--- + buildtools/pascal/pascalproject_part.cpp | 6 +++--- + buildtools/qmake/trollprojectpart.cpp | 6 +++--- + buildtools/script/scriptprojectpart.cpp | 6 +++--- + editors/editor-chooser/editorchooser_part.cpp | 6 +++--- + embedded/visualboyadvance/visualboyadvance_part.cpp | 6 +++--- + languages/ada/adasupportpart.cpp | 6 +++--- + languages/bash/bashsupport_part.cpp | 6 +++--- + languages/cpp/app_templates/kdevpart/kdevpart_part.cpp | 6 +++--- + languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp | 6 +++--- + languages/cpp/cppsupportfactory.cpp | 6 +++--- + languages/csharp/csharpsupportpart.cpp | 6 +++--- + languages/fortran/fortransupportpart.cpp | 6 +++--- + languages/java/javasupportfactory.cpp | 6 +++--- + languages/kjssupport/kjssupport_part.cpp | 6 +++--- + languages/pascal/pascalsupport_part.cpp | 6 +++--- + languages/perl/perlsupportpart.cpp | 6 +++--- + languages/php/phpsupportpart.cpp | 6 +++--- + languages/python/pythonsupportpart.cpp | 6 +++--- + languages/ruby/rubysupport_part.cpp | 6 +++--- + languages/sql/sqlsupport_part.cpp | 6 +++--- + lib/interfaces/kdevgenericfactory.h | 8 ++++---- + parts/astyle/astyle_part.cpp | 6 +++--- + parts/bookmarks/bookmarks_part.cpp | 6 +++--- + parts/classview/classviewpart.cpp | 8 ++++---- + parts/ctags2/ctags2_part.cpp | 6 +++--- + parts/diff/diffpart.cpp | 6 +++--- + parts/distpart/distpart_part.cpp | 6 +++--- + parts/documentation/documentation_part.cpp | 6 +++--- + parts/doxygen/doxygenpart.cpp | 6 +++--- + parts/filecreate/filecreate_part.cpp | 8 ++++---- + parts/fileselector/fileselector_part.cpp | 6 +++--- + parts/fileview/filegroupspart.cpp | 6 +++--- + parts/fileview/fileviewpart.cpp | 6 +++--- + parts/filter/filterpart.cpp | 6 +++--- + parts/fullscreen/fullscreen_part.cpp | 6 +++--- + parts/outputviews/appoutputviewpart.cpp | 6 +++--- + parts/outputviews/makeviewpart.cpp | 6 +++--- + parts/partexplorer/partexplorer_plugin.cpp | 6 +++--- + parts/quickopen/quickopen_part.cpp | 6 +++--- + parts/regexptest/regexptestpart.cpp | 6 +++--- + parts/scripting/scriptingpart.cpp | 6 +++--- + parts/snippet/snippet_part.cpp | 6 +++--- + parts/texttools/texttoolspart.cpp | 6 +++--- + parts/tipofday/tipofday_part.cpp | 6 +++--- + parts/tools/tools_part.cpp | 6 +++--- + parts/uimode/uichooser_part.cpp | 6 +++--- + parts/valgrind/valgrind_part.cpp | 6 +++--- + parts/vcsmanager/vcsmanagerpart.cpp | 6 +++--- + vcs/clearcase/clearcasepart.cpp | 6 +++--- + vcs/cvsservice/cvspart.cpp | 6 +++--- + vcs/perforce/perforcepart.cpp | 6 +++--- + vcs/subversion/subversion_part.cpp | 6 +++--- + 56 files changed, 171 insertions(+), 171 deletions(-) + +diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp +index 5eacf5d0..f778c9b2 100644 +--- a/buildtools/ada/adaproject_part.cpp ++++ b/buildtools/ada/adaproject_part.cpp +@@ -43,11 +43,11 @@ + #include "adaglobaloptionsdlg.h" + + typedef KDevGenericFactory AdaProjectFactory; +-static const KDevPluginInfo data("kdevadaproject"); +-K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevadaproject"); ++K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( pluginData ) ) + + AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& ) +- :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) ++ :KDevBuildTool(&pluginData, parent, name ? name : "AdaProjectPart" ) + { + setInstance(AdaProjectFactory::instance()); + setXMLFile("kdevadaproject.rc"); +diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp +index a9e5a2d4..f53357da 100644 +--- a/buildtools/ant/antprojectpart.cpp ++++ b/buildtools/ant/antprojectpart.cpp +@@ -35,8 +35,8 @@ + + + typedef KDevGenericFactory AntProjectFactory; +-static const KDevPluginInfo data("kdevantproject"); +-K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data )) ++static const KDevPluginInfo pluginData("kdevantproject"); ++K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( pluginData )) + + + AntOptions::AntOptions() +@@ -46,7 +46,7 @@ AntOptions::AntOptions() + + + AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") ++ : KDevBuildTool(&pluginData, parent, name ? name : "AntProjectPart") + { + setInstance(AntProjectFactory::instance()); + +diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp +index 014e8e2f..c1008072 100644 +--- a/buildtools/autotools/autoprojectpart.cpp ++++ b/buildtools/autotools/autoprojectpart.cpp +@@ -62,12 +62,12 @@ + #define RUN_OPTIONS 2 + #define MAKE_OPTIONS 3 + +-static const KDevPluginInfo data("kdevautoproject"); ++static const KDevPluginInfo pluginData("kdevautoproject"); + +-K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( pluginData ) ) + + AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) +- : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") ++ : KDevBuildTool(&pluginData, parent, name ? name : "AutoProjectPart") + , m_lastCompilationFailed(false) + { + setInstance(AutoProjectFactory::instance()); +diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp +index f61782ae..cbbb4315 100644 +--- a/buildtools/custommakefiles/customprojectpart.cpp ++++ b/buildtools/custommakefiles/customprojectpart.cpp +@@ -62,11 +62,11 @@ + #include + + typedef KDevGenericFactory CustomProjectFactory; +-static const KDevPluginInfo data( "kdevcustomproject" ); +-K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) ) ++static const KDevPluginInfo pluginData( "kdevcustomproject" ); ++K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( pluginData ) ) + + CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ) +- : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) ++ : KDevBuildTool( &pluginData, parent, name ? name : "CustomProjectPart" ) + , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false ) + { + setInstance( CustomProjectFactory::instance() ); +diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp +index 98127f0a..d4670adb 100644 +--- a/buildtools/pascal/pascalproject_part.cpp ++++ b/buildtools/pascal/pascalproject_part.cpp +@@ -49,11 +49,11 @@ + #include + + typedef KDevGenericFactory PascalProjectFactory; +-static const KDevPluginInfo data("kdevpascalproject"); +-K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevpascalproject"); ++K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( pluginData ) ) + + PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& ) +- :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) ++ :KDevBuildTool(&pluginData, parent, name ? name : "PascalProjectPart" ) + { + setInstance(PascalProjectFactory::instance()); + setXMLFile("kdevpascalproject.rc"); +diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp +index fe16d538..82bb7416 100644 +--- a/buildtools/qmake/trollprojectpart.cpp ++++ b/buildtools/qmake/trollprojectpart.cpp +@@ -57,11 +57,11 @@ + #include + + typedef KDevGenericFactory TrollProjectFactory; +-static const KDevPluginInfo data("kdevtrollproject"); +-K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevtrollproject"); ++K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( pluginData ) ) + + TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) +- : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") ++ : KDevBuildTool(&pluginData, parent, name ? name : "TrollProjectPart") + { + setInstance(TrollProjectFactory::instance()); + +diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp +index 8f6b5fb4..42ce8935 100644 +--- a/buildtools/script/scriptprojectpart.cpp ++++ b/buildtools/script/scriptprojectpart.cpp +@@ -37,11 +37,11 @@ + #include "kdevplugininfo.h" + + typedef KDevGenericFactory ScriptProjectFactory; +-static const KDevPluginInfo data("kdevscriptproject"); +-K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevscriptproject"); ++K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( pluginData ) ) + + ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") ++ : KDevBuildTool(&pluginData, parent, name ? name : "ScriptProjectPart") + { + setInstance(ScriptProjectFactory::instance()); + +diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp +index a9a4339a..c700823d 100644 +--- a/editors/editor-chooser/editorchooser_part.cpp ++++ b/editors/editor-chooser/editorchooser_part.cpp +@@ -13,11 +13,11 @@ + #include "editorchooser_widget.h" + + typedef KDevGenericFactory EditorChooserFactory; +-static const KDevPluginInfo data("kdeveditorchooser"); +-K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) ) ++static const KDevPluginInfo pluginData("kdeveditorchooser"); ++K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( pluginData ) ) + + EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name ? name : "EditorChooserPart") ++ : KDevPlugin(&pluginData, parent, name ? name : "EditorChooserPart") + { + setInstance(EditorChooserFactory::instance()); + +diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp +index 6abe66c5..effee085 100644 +--- a/embedded/visualboyadvance/visualboyadvance_part.cpp ++++ b/embedded/visualboyadvance/visualboyadvance_part.cpp +@@ -20,11 +20,11 @@ + using namespace VisualBoyAdvance; + + typedef KDevGenericFactory VisualBoyAdvanceFactory; +-static const KDevPluginInfo data("kdevvisualboyadvance"); +-K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevvisualboyadvance"); ++K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( pluginData ) ) + + VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name){ ++ : KDevPlugin(&pluginData, parent, name){ + setInstance(VisualBoyAdvanceFactory::instance()); + + setXMLFile("kdevpart_visualboyadvance.rc"); +diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp +index 0d87f0a7..1ca3abfd 100644 +--- a/languages/ada/adasupportpart.cpp ++++ b/languages/ada/adasupportpart.cpp +@@ -40,8 +40,8 @@ enum { KDEV_PCS_VERSION = 6 }; + + typedef KDevGenericFactory AdaSupportPartFactory; + +-static const KDevPluginInfo data("kdevadasupport"); +-K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data)) ++static const KDevPluginInfo pluginData("kdevadasupport"); ++K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (pluginData)) + + + struct AdaSupportPartData { +@@ -51,7 +51,7 @@ struct AdaSupportPartData { + }; + + AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &) +- : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) ++ : KDevLanguageSupport (&pluginData, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) + { + setInstance (AdaSupportPartFactory::instance ()); + +diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp +index 7e30b913..ca289234 100644 +--- a/languages/bash/bashsupport_part.cpp ++++ b/languages/bash/bashsupport_part.cpp +@@ -33,11 +33,11 @@ + #include + + typedef KDevGenericFactory BashSupportFactory; +-static const KDevPluginInfo data("kdevbashsupport"); +-K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevbashsupport"); ++K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( pluginData ) ) + + BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& ) +-: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" ) ++: KDevLanguageSupport (&pluginData, parent, name ? name : "BashSupportPart" ) + { + setInstance(BashSupportFactory::instance()); + setXMLFile("kdevbashsupport.rc"); +diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +index aa950c8a..6a2559ba 100644 +--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp ++++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +@@ -22,14 +22,14 @@ + #include "%{APPNAMELC}projectconfig.h" + + typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; +-KDevPluginInfo data("kdev%{APPNAMELC}"); +-K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); ++KDevPluginInfo pluginData("kdev%{APPNAMELC}"); ++K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) ); + + #define GLOBALDOC_OPTIONS 1 + #define PROJECTDOC_OPTIONS 2 + + %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) +- : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") ++ : KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part") + { + setInstance(%{APPNAME}Factory::instance()); + setXMLFile("kdev%{APPNAMELC}.rc"); +diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +index aa950c8a..6a2559ba 100644 +--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp ++++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +@@ -22,14 +22,14 @@ + #include "%{APPNAMELC}projectconfig.h" + + typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; +-KDevPluginInfo data("kdev%{APPNAMELC}"); +-K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); ++KDevPluginInfo pluginData("kdev%{APPNAMELC}"); ++K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) ); + + #define GLOBALDOC_OPTIONS 1 + #define PROJECTDOC_OPTIONS 2 + + %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) +- : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") ++ : KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part") + { + setInstance(%{APPNAME}Factory::instance()); + setXMLFile("kdev%{APPNAMELC}.rc"); +diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp +index 5d11ab04..cf5ff24a 100644 +--- a/languages/cpp/cppsupportfactory.cpp ++++ b/languages/cpp/cppsupportfactory.cpp +@@ -16,10 +16,10 @@ + + K_EXPORT_COMPONENT_FACTORY( libkdevcppsupport, CppSupportFactory ) + +-static const KDevPluginInfo data("kdevcppsupport"); ++static const KDevPluginInfo pluginData("kdevcppsupport"); + + CppSupportFactory::CppSupportFactory() +-: KDevGenericFactory( data ) ++: KDevGenericFactory( pluginData ) + { + } + +@@ -35,5 +35,5 @@ TDEInstance *CppSupportFactory::createInstance() + + const KDevPluginInfo * CppSupportFactory::info() + { +- return &data; ++ return &pluginData; + } +diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp +index 6da33030..8ecb44eb 100644 +--- a/languages/csharp/csharpsupportpart.cpp ++++ b/languages/csharp/csharpsupportpart.cpp +@@ -45,11 +45,11 @@ + //#include "programmingbycontract.h" + + typedef KDevGenericFactory CSharpSupportFactory; +-static const KDevPluginInfo data("kdevcsharpsupport"); +-K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevcsharpsupport"); ++K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( pluginData ) ) + + CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart") ++ : KDevLanguageSupport(&pluginData, parent, name ? name : "CSharpSupportPart") + { + setInstance(CSharpSupportFactory::instance()); + +diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp +index 4f749ed3..170ff230 100644 +--- a/languages/fortran/fortransupportpart.cpp ++++ b/languages/fortran/fortransupportpart.cpp +@@ -45,11 +45,11 @@ + + + typedef KDevGenericFactory FortranSupportFactory; +-static const KDevPluginInfo data("kdevfortransupport"); +-K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevfortransupport"); ++K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( pluginData ) ) + + FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart") ++ : KDevLanguageSupport(&pluginData, parent, name ? name : "FortranSupportPart") + { + setInstance(FortranSupportFactory::instance()); + +diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp +index 94e435f2..299e283f 100644 +--- a/languages/java/javasupportfactory.cpp ++++ b/languages/java/javasupportfactory.cpp +@@ -14,11 +14,11 @@ + #include + #include "javasupportfactory.h" + +-static const KDevPluginInfo data("kdevjavasupport"); ++static const KDevPluginInfo pluginData("kdevjavasupport"); + K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory ) + + JavaSupportFactory::JavaSupportFactory() +- : KDevGenericFactory( data ) ++ : KDevGenericFactory( pluginData ) + { + } + +@@ -34,6 +34,6 @@ TDEInstance *JavaSupportFactory::createInstance() + + const KDevPluginInfo *JavaSupportFactory::info() + { +- return &data; ++ return &pluginData; + } + +diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp +index 5a00e9c6..71c680b4 100644 +--- a/languages/kjssupport/kjssupport_part.cpp ++++ b/languages/kjssupport/kjssupport_part.cpp +@@ -50,8 +50,8 @@ + #include "subclassingdlg.h" + + typedef KDevGenericFactory kjsSupportFactory; +-static const KDevPluginInfo data("kdevkjssupport"); +-K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) ); ++static const KDevPluginInfo pluginData("kdevkjssupport"); ++K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( pluginData ) ); + + + class typeProperty +@@ -63,7 +63,7 @@ class typeProperty + }; + + kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& ) +-: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" ) ++: KDevLanguageSupport(&pluginData, parent, name ? name : "kjsSupportPart" ) + { + setInstance(kjsSupportFactory::instance()); + setXMLFile("kdevkjssupport.rc"); +diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp +index a61ab6a0..90532c22 100644 +--- a/languages/pascal/pascalsupport_part.cpp ++++ b/languages/pascal/pascalsupport_part.cpp +@@ -44,11 +44,11 @@ struct PascalSupportPartData{ + }; + + typedef KDevGenericFactory PascalSupportFactory; +-static const KDevPluginInfo data("kdevpascalsupport"); +-K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevpascalsupport"); ++K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( pluginData ) ) + + PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ), ++ : KDevLanguageSupport(&pluginData, parent, name ? name : "KDevPascalSupport" ), + d( new PascalSupportPartData() ) + { + setInstance(PascalSupportFactory::instance()); +diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp +index 3236e72e..1bcbb96b 100644 +--- a/languages/perl/perlsupportpart.cpp ++++ b/languages/perl/perlsupportpart.cpp +@@ -45,11 +45,11 @@ + //#include "programmingbycontract.h" + + typedef KDevGenericFactory PerlSupportFactory; +-static const KDevPluginInfo data("kdevperlsupport"); +-K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevperlsupport"); ++K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( pluginData ) ) + + PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart") ++ : KDevLanguageSupport(&pluginData, parent, name ? name : "PerlSupportPart") + { + setInstance(PerlSupportFactory::instance()); + +diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp +index c189cc5c..252b2167 100644 +--- a/languages/php/phpsupportpart.cpp ++++ b/languages/php/phpsupportpart.cpp +@@ -66,11 +66,11 @@ + + using namespace std; + +-static const KDevPluginInfo data("kdevphpsupport"); +-K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevphpsupport"); ++K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( pluginData ) ) + + PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart") ++ : KDevLanguageSupport(&pluginData, parent, name ? name : "PHPSupportPart") + { + m_htmlView = 0; + m_parser = 0; +diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp +index e7529c2f..68baf71e 100644 +--- a/languages/python/pythonsupportpart.cpp ++++ b/languages/python/pythonsupportpart.cpp +@@ -39,11 +39,11 @@ + #include "pythonimplementationwidget.h" + + typedef KDevGenericFactory PythonSupportFactory; +-static const KDevPluginInfo data("kdevpythonsupport"); +-K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevpythonsupport"); ++K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( pluginData ) ) + + PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart") ++ : KDevLanguageSupport(&pluginData, parent, name ? name : "PythonSupportPart") + { + setInstance(PythonSupportFactory::instance()); + +diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp +index e61d7cef..db9576b3 100644 +--- a/languages/ruby/rubysupport_part.cpp ++++ b/languages/ruby/rubysupport_part.cpp +@@ -38,11 +38,11 @@ + #include + + typedef KDevGenericFactory RubySupportFactory; +-static const KDevPluginInfo data("kdevrubysupport"); +-K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevrubysupport"); ++K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( pluginData ) ) + + RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& ) +- : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" ) ++ : KDevLanguageSupport (&pluginData, parent, name ? name : "RubySupportPart" ) + { + setInstance(RubySupportFactory::instance()); + setXMLFile("kdevrubysupport.rc"); +diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp +index e676cee5..96e8ed4f 100644 +--- a/languages/sql/sqlsupport_part.cpp ++++ b/languages/sql/sqlsupport_part.cpp +@@ -30,11 +30,11 @@ + #include "domutil.h" + + typedef KDevGenericFactory SQLSupportFactory; +-static const KDevPluginInfo data("kdevsqlsupport"); +-K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevsqlsupport"); ++K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( pluginData ) ) + + SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& ) +- : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) ++ : KDevLanguageSupport ( &pluginData, parent, name ? name : "SQLSupportPart" ) + { + setInstance( SQLSupportFactory::instance() ); + setXMLFile( "kdevsqlsupport.rc" ); +diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h +index 6f8d3dc9..7bca8db4 100644 +--- a/lib/interfaces/kdevgenericfactory.h ++++ b/lib/interfaces/kdevgenericfactory.h +@@ -33,7 +33,7 @@ to create factories for TDevelop plugins. For example, for DummyPlugin + the factory can be created (in dummyplugin.cpp file) as: + @code + typedef KDevGenericFactory DummyPluginFactory; +-K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( pluginData ) ) + @endcode + Data should be a const static object. This way it complies with the requirements + for data objecs of KDevGenericFactory constructor. +@@ -47,12 +47,12 @@ For example, dummyplugin.cpp file could contain: + @code + #include + +-static const KDevPluginInfo data("KDevDummyPlugin"); ++static const KDevPluginInfo pluginData("KDevDummyPlugin"); + typedef KDevGenericFactory DummyPluginFactory; +-K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( pluginData ) ) + + DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & ) +- :KDevPlugin(&data, parent, name) ++ :KDevPlugin(&pluginData, parent, name) + { + } + @endcode +diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp +index f5b5e2e7..6f9198b0 100644 +--- a/parts/astyle/astyle_part.cpp ++++ b/parts/astyle/astyle_part.cpp +@@ -33,7 +33,7 @@ + #include "astyle_widget.h" + #include "astyle_adaptor.h" + +-static const KDevPluginInfo data("kdevastyle"); ++static const KDevPluginInfo pluginData("kdevastyle"); + + namespace { + const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm"; +@@ -41,10 +41,10 @@ namespace { + + + typedef KDevGenericFactory AStyleFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( pluginData ) ) + + AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) +- : KDevSourceFormatter(&data, parent, name ? name : "AStylePart") ++ : KDevSourceFormatter(&pluginData, parent, name ? name : "AStylePart") + { + setInstance(AStyleFactory::instance()); + +diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp +index 2d5a0a10..04fee8d7 100644 +--- a/parts/bookmarks/bookmarks_part.cpp ++++ b/parts/bookmarks/bookmarks_part.cpp +@@ -41,11 +41,11 @@ + #define BOOKMARKSETTINGSPAGE 1 + + typedef KDevGenericFactory BookmarksFactory; +-static const KDevPluginInfo data("kdevbookmarks"); +-K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevbookmarks"); ++K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( pluginData ) ) + + BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& ) +- : KDevPlugin(&data, parent, name ? name : "BookmarksPart" ) ++ : KDevPlugin(&pluginData, parent, name ? name : "BookmarksPart" ) + { + setInstance(BookmarksFactory::instance()); + +diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp +index 92e26bd0..d068adaa 100644 +--- a/parts/classview/classviewpart.cpp ++++ b/parts/classview/classviewpart.cpp +@@ -139,12 +139,12 @@ class FunctionCompletion : public CustomCompleter { + + + typedef KDevGenericFactory ClassViewFactory; +-static const KDevPluginInfo data("kdevclassview"); +-K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevclassview"); ++K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( pluginData ) ) + + ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& ) +- :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ), +- KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ), ++ :/// KDevPlugin( &pluginData, parent, name ? name : "ClassViewPart" ), ++ KDevCodeBrowserFrontend( &pluginData, parent, name ? name : "ClassViewPart" ), + m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0) + { + setInstance(ClassViewFactory::instance()); +diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp +index 92dd4dc7..1333ac54 100644 +--- a/parts/ctags2/ctags2_part.cpp ++++ b/parts/ctags2/ctags2_part.cpp +@@ -55,11 +55,11 @@ namespace ctags + } + + typedef KDevGenericFactory CTags2Factory; +-static const KDevPluginInfo data("kdevctags2"); +-K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) ) ++static const KDevPluginInfo pluginData("kdevctags2"); ++K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( pluginData ) ) + + CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) +- : KDevPlugin(&data, parent, name ? name : "ctags2Part" ) ++ : KDevPlugin(&pluginData, parent, name ? name : "ctags2Part" ) + { + setInstance(CTags2Factory::instance()); + setXMLFile("kdevpart_ctags2.rc"); +diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp +index 01c703d0..eb2063c4 100644 +--- a/parts/diff/diffpart.cpp ++++ b/parts/diff/diffpart.cpp +@@ -36,13 +36,13 @@ + #include "diffdlg.h" + #include "diffwidget.h" + +-static const KDevPluginInfo data("kdevdiff"); ++static const KDevPluginInfo pluginData("kdevdiff"); + + typedef KDevGenericFactory DiffFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( pluginData ) ) + + DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0) ++ : KDevDiffFrontend(&pluginData, parent, name ? name : "DiffPart"), proc(0) + { + setInstance(DiffFactory::instance()); + setXMLFile("kdevdiff.rc"); +diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp +index e8a3e11a..fd235a0a 100644 +--- a/parts/distpart/distpart_part.cpp ++++ b/parts/distpart/distpart_part.cpp +@@ -34,11 +34,11 @@ + #include + + typedef KDevGenericFactory DistpartFactory; +-static const KDevPluginInfo data("kdevdistpart"); +-K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevdistpart"); ++K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( pluginData ) ) + + DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name ? name : "DistpartPart") { ++ : KDevPlugin(&pluginData, parent, name ? name : "DistpartPart") { + + kdDebug(9007) << "DistpartPart::DistpartPart()" << endl; + setInstance(DistpartFactory::instance()); +diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp +index 3b9e9b78..1d284a64 100644 +--- a/parts/documentation/documentation_part.cpp ++++ b/parts/documentation/documentation_part.cpp +@@ -72,13 +72,13 @@ + #define GLOBALDOC_OPTIONS 1 + #define PROJECTDOC_OPTIONS 2 + +-static const KDevPluginInfo data("kdevdocumentation"); ++static const KDevPluginInfo pluginData("kdevdocumentation"); + + typedef KDevGenericFactory DocumentationFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( pluginData ) ) + + DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& ) +- :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ), ++ :KDevPlugin(&pluginData, parent, name ? name : "DocumentationPart" ), + m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false) + { + setInstance(DocumentationFactory::instance()); +diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp +index d965d98b..36d41e8d 100644 +--- a/parts/doxygen/doxygenpart.cpp ++++ b/parts/doxygen/doxygenpart.cpp +@@ -48,11 +48,11 @@ + #define PROJECTOPTIONS 1 + + typedef KDevGenericFactory DoxygenFactory; +-static const KDevPluginInfo data("kdevdoxygen"); +-K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevdoxygen"); ++K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( pluginData ) ) + + DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) ++ : KDevPlugin(&pluginData, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) + { + setInstance(DoxygenFactory::instance()); + setXMLFile("kdevdoxygen.rc"); +diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp +index 1c371177..a1529097 100644 +--- a/parts/filecreate/filecreate_part.cpp ++++ b/parts/filecreate/filecreate_part.cpp +@@ -54,16 +54,16 @@ + + #include "config.h" + +-static const KDevPluginInfo data("kdevfilecreate"); ++static const KDevPluginInfo pluginData("kdevfilecreate"); + + typedef KDevGenericFactory FileCreateFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( pluginData ) ) + + using namespace FileCreate; + + FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & ) +-// : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) +- : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0) ++// : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) ++ : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_subPopups(0) + { + setInstance(FileCreateFactory::instance()); + setXMLFile("kdevpart_filecreate.rc"); +diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp +index b5f9961a..de9b5fef 100644 +--- a/parts/fileselector/fileselector_part.cpp ++++ b/parts/fileselector/fileselector_part.cpp +@@ -31,11 +31,11 @@ + #include "fileselector_widget.h" + + typedef KDevGenericFactory FileSelectorFactory; +-static const KDevPluginInfo data("kdevfileselector"); +-K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevfileselector"); ++K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( pluginData ) ) + + FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name ? name : "FileSelectorPart") ++ : KDevPlugin(&pluginData, parent, name ? name : "FileSelectorPart") + { + setInstance(FileSelectorFactory::instance()); + +diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp +index 77fc9646..91b1a0bc 100644 +--- a/parts/fileview/filegroupspart.cpp ++++ b/parts/fileview/filegroupspart.cpp +@@ -33,11 +33,11 @@ + #define FILEGROUPS_OPTIONS 1 + + typedef KDevGenericFactory FileGroupsFactory; +-static const KDevPluginInfo data("kdevfilegroups"); +-K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevfilegroups"); ++K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( pluginData ) ) + + FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name ? name : "FileGroupsPart") ++ : KDevPlugin(&pluginData, parent, name ? name : "FileGroupsPart") + { + deleteRequested = false; + setInstance(FileGroupsFactory::instance()); +diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp +index 414cea52..25aa8f62 100644 +--- a/parts/fileview/fileviewpart.cpp ++++ b/parts/fileview/fileviewpart.cpp +@@ -50,15 +50,15 @@ VCSColors FileViewPart::vcsColors; + /////////////////////////////////////////////////////////////////////////////// + + typedef KDevGenericFactory FileViewFactory; +-static const KDevPluginInfo data("kdevfileview"); +-K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevfileview"); ++K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( pluginData ) ) + + /////////////////////////////////////////////////////////////////////////////// + // class FileTreeWidget + /////////////////////////////////////////////////////////////////////////////// + + FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name ? name : "FileViewPart"), ++ : KDevPlugin(&pluginData, parent, name ? name : "FileViewPart"), + m_widget( 0 ) + { + setInstance( FileViewFactory::instance() ); +diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp +index 5ebd265e..3a1351ad 100644 +--- a/parts/filter/filterpart.cpp ++++ b/parts/filter/filterpart.cpp +@@ -26,11 +26,11 @@ + #include "shellinsertdlg.h" + #include "kdevfilterIface.h" + +-static const KDevPluginInfo data("kdevfilter"); +-K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevfilter"); ++K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( pluginData ) ) + + FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name ? name : "FilterPart") ++ : KDevPlugin(&pluginData, parent, name ? name : "FilterPart") + { + setInstance(FilterFactory::instance()); + setXMLFile("kdevfilter.rc"); +diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp +index 0bdc714f..98581a9c 100644 +--- a/parts/fullscreen/fullscreen_part.cpp ++++ b/parts/fullscreen/fullscreen_part.cpp +@@ -22,13 +22,13 @@ + + #include "fullscreen_part.h" + +-static const KDevPluginInfo data("kdevfullscreen"); ++static const KDevPluginInfo pluginData("kdevfullscreen"); + + typedef KDevGenericFactory FullScreenFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( pluginData ) ) + + FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& ) +- : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) ++ : KDevPlugin(&pluginData, parent, name ? name : "FullScreenPart" ) + { + setInstance(FullScreenFactory::instance()); + // const TDEAboutData &abdata1 = *(info()); +diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp +index 3a0e0e7d..3d8b47bf 100644 +--- a/parts/outputviews/appoutputviewpart.cpp ++++ b/parts/outputviews/appoutputviewpart.cpp +@@ -29,12 +29,12 @@ + #include "kdevpartcontroller.h" + #include "settings.h" + +-static const KDevPluginInfo data("kdevappoutputview"); ++static const KDevPluginInfo pluginData("kdevappoutputview"); + typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( pluginData ) ) + + AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") ++ : KDevAppFrontend(&pluginData, parent, name ? name : "AppOutputViewPart") + { + setInstance(AppViewFactory::instance()); + +diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp +index 8b441e94..2df7d384 100644 +--- a/parts/outputviews/makeviewpart.cpp ++++ b/parts/outputviews/makeviewpart.cpp +@@ -26,12 +26,12 @@ + + #include "makewidget.h" + +-static const KDevPluginInfo data("kdevmakeview"); ++static const KDevPluginInfo pluginData("kdevmakeview"); + typedef KDevGenericFactory< MakeViewPart > MakeViewFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( pluginData ) ) + + MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevMakeFrontend(&data, parent, name) ++ : KDevMakeFrontend(&pluginData, parent, name) + { + setInstance(MakeViewFactory::instance()); + +diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp +index d5240edb..57b1cd58 100644 +--- a/parts/partexplorer/partexplorer_plugin.cpp ++++ b/parts/partexplorer/partexplorer_plugin.cpp +@@ -23,13 +23,13 @@ + + #include "partexplorerform.h" + +-static const KDevPluginInfo data("kdevpartexplorer"); ++static const KDevPluginInfo pluginData("kdevpartexplorer"); + + typedef KDevGenericFactory PartExplorerPluginFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( pluginData ) ) + + PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ) +- : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" ) ++ : KDevPlugin( &pluginData, parent, name ? name : "PartExplorerPlugin" ) + { + // we need an instance + setInstance( PartExplorerPluginFactory::instance() ); +diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp +index 4d316e68..78c97eb6 100644 +--- a/parts/quickopen/quickopen_part.cpp ++++ b/parts/quickopen/quickopen_part.cpp +@@ -44,13 +44,13 @@ + #include "kdeveditorutil.h" + + typedef KDevGenericFactory QuickOpenFactory; +-static const KDevPluginInfo data("kdevquickopen"); +-K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevquickopen"); ++K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( pluginData ) ) + + using namespace KTextEditor; + + QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& ) +- : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" ) ++ : KDevQuickOpen(&pluginData, parent, name ? name : "QuickOpenPart" ) + { + setInstance(QuickOpenFactory::instance()); + setXMLFile("kdevpart_quickopen.rc"); +diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp +index 6c45a492..1e16d144 100644 +--- a/parts/regexptest/regexptestpart.cpp ++++ b/parts/regexptest/regexptestpart.cpp +@@ -19,13 +19,13 @@ + #include "kdevcore.h" + #include "regexptestdlg.h" + +-static const KDevPluginInfo data("kdevregexptest"); ++static const KDevPluginInfo pluginData("kdevregexptest"); + + typedef KDevGenericFactory RegexpTestFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( pluginData ) ) + + RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name ? name : "RegexpTestPart") ++ : KDevPlugin(&pluginData, parent, name ? name : "RegexpTestPart") + { + setInstance(RegexpTestFactory::instance()); + setXMLFile("kdevregexptest.rc"); +diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp +index 80a33c9e..d0558b79 100644 +--- a/parts/scripting/scriptingpart.cpp ++++ b/parts/scripting/scriptingpart.cpp +@@ -41,14 +41,14 @@ + #include "tdescriptactionmanager.h" + + typedef KDevGenericFactory scriptingFactory; +-KDevPluginInfo data("kdevscripting"); +-K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) ) ++KDevPluginInfo pluginData("kdevscripting"); ++K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( pluginData ) ) + + #define GLOBALDOC_OPTIONS 1 + #define PROJECTDOC_OPTIONS 2 + + scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/) +- : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L) ++ : KDevPlugin(&pluginData, parent, name ? name : "scriptingPart"), m_scripts(0L) + { + setInstance(scriptingFactory::instance()); + setXMLFile("kdevscripting.rc"); +diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp +index 82969151..1c650ce2 100644 +--- a/parts/snippet/snippet_part.cpp ++++ b/parts/snippet/snippet_part.cpp +@@ -33,12 +33,12 @@ + #include "snippetsettings.h" + #include "snippetconfig.h" + +-static const KDevPluginInfo data("kdevsnippet"); ++static const KDevPluginInfo pluginData("kdevsnippet"); + typedef KDevGenericFactory snippetFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( pluginData ) ) + + SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& ) +- : KDevPlugin(&data, parent, name ? name : "SnippetPart" ) ++ : KDevPlugin(&pluginData, parent, name ? name : "SnippetPart" ) + { + setInstance(snippetFactory::instance()); + setXMLFile("kdevpart_snippet.rc"); +diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp +index 4453030a..7e38f061 100644 +--- a/parts/texttools/texttoolspart.cpp ++++ b/parts/texttools/texttoolspart.cpp +@@ -25,11 +25,11 @@ + + + typedef KDevGenericFactory TextToolsFactory; +-static const KDevPluginInfo data("kdevtexttools"); +-K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevtexttools"); ++K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( pluginData ) ) + + TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name ? name : "TextToolsPart") ++ : KDevPlugin(&pluginData, parent, name ? name : "TextToolsPart") + { + setInstance(TextToolsFactory::instance()); + // setXMLFile("kdevfileview.rc"); +diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp +index 6cd63deb..9172d44b 100644 +--- a/parts/tipofday/tipofday_part.cpp ++++ b/parts/tipofday/tipofday_part.cpp +@@ -19,13 +19,13 @@ + #include "kdevapi.h" + #include "kdevcore.h" + +-static const KDevPluginInfo data("kdevtipofday"); ++static const KDevPluginInfo pluginData("kdevtipofday"); + + typedef KDevGenericFactory TipOfDayFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( pluginData ) ) + + TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin(&data, parent, name ? name : "TipOfDayPart") ++ : KDevPlugin(&pluginData, parent, name ? name : "TipOfDayPart") + { + setInstance(TipOfDayFactory::instance()); + +diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp +index 8734eadc..61f962ad 100644 +--- a/parts/tools/tools_part.cpp ++++ b/parts/tools/tools_part.cpp +@@ -34,13 +34,13 @@ + #define TOOLSSETTINGS 1 + #define EXTRATOOLSSETTINGS 2 + +-static const KDevPluginInfo data("kdevtools"); +-K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevtools"); ++K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( pluginData ) ) + + TQMap externalToolMenuEntries; + + ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin( &data, parent, name ? name : "ToolsPart") ++ : KDevPlugin( &pluginData, parent, name ? name : "ToolsPart") + { + setInstance(ToolsFactory::instance()); + +diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp +index fdc9fa6a..a547bdef 100644 +--- a/parts/uimode/uichooser_part.cpp ++++ b/parts/uimode/uichooser_part.cpp +@@ -15,11 +15,11 @@ + #define UICHOOSERSETTINGSPAGE 1 + + typedef KDevGenericFactory UIChooserFactory; +-static const KDevPluginInfo data("kdevuichooser"); +-K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevuichooser"); ++K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( pluginData ) ) + + UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &) +- : KDevPlugin( &data, parent, name ? name : "UIChooserPart") ++ : KDevPlugin( &pluginData, parent, name ? name : "UIChooserPart") + { + setInstance(UIChooserFactory::instance()); + +diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp +index 1b262175..5c78d952 100644 +--- a/parts/valgrind/valgrind_part.cpp ++++ b/parts/valgrind/valgrind_part.cpp +@@ -23,11 +23,11 @@ + #include "valgrinditem.h" + + typedef KDevGenericFactory ValgrindFactory; +-static const KDevPluginInfo data("kdevvalgrind"); +-K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) ) ++static const KDevPluginInfo pluginData("kdevvalgrind"); ++K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( pluginData ) ) + + ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& ) +- : KDevPlugin( &data, parent, name ? name : "ValgrindPart" ) ++ : KDevPlugin( &pluginData, parent, name ? name : "ValgrindPart" ) + { + setInstance( ValgrindFactory::instance() ); + setXMLFile( "kdevpart_valgrind.rc" ); +diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp +index ec176c47..e8606636 100644 +--- a/parts/vcsmanager/vcsmanagerpart.cpp ++++ b/parts/vcsmanager/vcsmanagerpart.cpp +@@ -42,14 +42,14 @@ + #include "vcsmanagerprojectconfig.h" + + typedef KDevGenericFactory VCSManagerFactory; +-KDevPluginInfo data("kdevvcsmanager"); +-K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) ) ++KDevPluginInfo pluginData("kdevvcsmanager"); ++K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( pluginData ) ) + + #define GLOBALDOC_OPTIONS 1 + #define PROJECTDOC_OPTIONS 2 + + VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/) +- : KDevPlugin(&data, parent, name ? name : "VCSManagerPart") ++ : KDevPlugin(&pluginData, parent, name ? name : "VCSManagerPart") + { + kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl; + +diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp +index aeb1eea9..8f05fbad 100644 +--- a/vcs/clearcase/clearcasepart.cpp ++++ b/vcs/clearcase/clearcasepart.cpp +@@ -37,13 +37,13 @@ + #include "clearcasemanipulator.h" + + +-static const KDevPluginInfo data("kdevclearcase"); ++static const KDevPluginInfo pluginData("kdevclearcase"); + + typedef KDevGenericFactory ClearcaseFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( pluginData ) ) + + ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & ) +- : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), ++ : KDevVersionControl( &pluginData, parent, name ? name : "ClearcasePart" ), + default_checkin(""), + default_checkout(""), + default_uncheckout("-rm"), +diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp +index 2bda55f1..6ded6ecb 100644 +--- a/vcs/cvsservice/cvspart.cpp ++++ b/vcs/cvsservice/cvspart.cpp +@@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false; + // Plugin factory + /////////////////////////////////////////////////////////////////////////////// + +-static const KDevPluginInfo data("kdevcvsservice"); ++static const KDevPluginInfo pluginData("kdevcvsservice"); + typedef KDevGenericFactory CvsFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( pluginData ) ) + + /////////////////////////////////////////////////////////////////////////////// + // class CvsServicePart + /////////////////////////////////////////////////////////////////////////////// + + CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & ) +- : KDevVersionControl( &data, parent, ++ : KDevVersionControl( &pluginData, parent, + name ? name : "CvsService" ), + actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ), + actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ), +diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp +index f92666b6..76a4456a 100644 +--- a/vcs/perforce/perforcepart.cpp ++++ b/vcs/perforce/perforcepart.cpp +@@ -33,13 +33,13 @@ + #include "commitdlg.h" + #include "execcommand.h" + +-static const KDevPluginInfo data("kdevperforce"); ++static const KDevPluginInfo pluginData("kdevperforce"); + + typedef KDevGenericFactory PerforceFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( pluginData ) ) + + PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & ) +- : KDevVersionControl( &data, parent, name ? name : "PerforcePart" ) ++ : KDevVersionControl( &pluginData, parent, name ? name : "PerforcePart" ) + { + setInstance(PerforceFactory::instance()); + setupActions(); +diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp +index f3f43cd9..98b44848 100644 +--- a/vcs/subversion/subversion_part.cpp ++++ b/vcs/subversion/subversion_part.cpp +@@ -56,15 +56,15 @@ + + using namespace SvnGlobal; + +-static const KDevPluginInfo data("kdevsubversion"); ++static const KDevPluginInfo pluginData("kdevsubversion"); + + typedef KDevGenericFactory subversionFactory; +-K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) ++K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( pluginData ) ) + + //bool g_projectWasJustCreated = false; + + subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) +- : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { ++ : KDevVersionControl(&pluginData, parent, name ? name : "Subversion" ) { + setInstance(subversionFactory::instance()); + m_projWidget = 0; + +-- +cgit v1.2.1 + diff --git a/arch/tde-devel/tde-tdevelop/fix_tqt_error.patch b/arch/tde-devel/tde-tdevelop/fix_tqt_error.patch deleted file mode 100644 index dfd0afcc2..000000000 --- a/arch/tde-devel/tde-tdevelop/fix_tqt_error.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur tdevelop-orig/lib/interfaces/external/CMakeLists.txt tdevelop/lib/interfaces/external/CMakeLists.txt ---- tdevelop-orig/lib/interfaces/external/CMakeLists.txt 2015-09-22 20:10:40.000000000 -0700 -+++ tdevelop/lib/interfaces/external/CMakeLists.txt 2017-06-29 04:29:48.095622130 -0700 -@@ -15,6 +15,9 @@ - ${TQT_INCLUDE_DIRS} - ) - -+link_directories ( -+ ${TQT_LIBRARY_DIRS} -+) - - ##### headers ################################### - -diff -Naur tdevelop-orig/src/newui/CMakeLists.txt tdevelop/src/newui/CMakeLists.txt ---- tdevelop-orig/src/newui/CMakeLists.txt 2015-09-22 20:10:40.000000000 -0700 -+++ tdevelop/src/newui/CMakeLists.txt 2017-06-29 04:34:10.788957492 -0700 -@@ -15,6 +15,9 @@ - ${TQT_INCLUDE_DIRS} - ) - -+link_directories( -+ ${TQT_LIBRARY_DIRS} -+) - - ##### d (shared) ################################ - diff --git a/arch/tde-devel/tde-tdewebdev/PKGBUILD b/arch/tde-devel/tde-tdewebdev/PKGBUILD index 943e0e31b..eb6ac68f5 100644 --- a/arch/tde-devel/tde-tdewebdev/PKGBUILD +++ b/arch/tde-devel/tde-tdewebdev/PKGBUILD @@ -1,10 +1,10 @@ # Contributor: e1z0 pkgname=tde-tdewebdev -pkgver=14.0.5 +pkgver=14.0.10 pkgrel=1 arch=('i686' 'x86_64') -url='http://scm.trinitydesktop.org/scm/git/tdewebdev' +url='https://scm.trinitydesktop.org/scm/git/tdewebdev' license=('GPL') groups=('tde-devel') pkgdesc="Trinity Web Developer Tools" @@ -14,10 +14,12 @@ provides=('tdewebdev') conflicts=('trinity-tdewebdev' 'trinity-kdewebdev') replaces=('trinity-tdewebdev') options=('staticlibs' 'libtool' '!strip') -source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdewebdev-R${pkgver}.tar.bz2") -md5sums=('a51df50c2a897883d3557421b6949620') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdewebdev-trinity-${pkgver}.tar.xz") +md5sums=('96bcdfdcd4308b0721ed23d7d5b9954f') # install='' +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity + build() { cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" @@ -25,11 +27,9 @@ build() { cd build msg "Starting cmake..." - cmake ${srcdir}/${pkgname#*-} \ + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ - -DWITH_SPEEX=ON \ - -DWITH_ARTS=ON \ -DBUILD_ALL=ON msg "Building - ${pkgname#*-}..."