diff options
483 files changed, 990 insertions, 1699 deletions
diff --git a/.gitmodules b/.gitmodules index ee64d062..30a10a14 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "admin"] path = admin url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin -[submodule "cmake"] - path = cmake - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake [submodule "parts/appwizard/common/admin"] path = parts/appwizard/common/admin url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 4f41ba43..d13abf78 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 2.8 ) +cmake_minimum_required( VERSION 3.1 ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2dce0bd..6a3ae224 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,13 +9,12 @@ # ################################################# -cmake_minimum_required( VERSION 2.8 ) +cmake_minimum_required( VERSION 3.1 ) ##### general package setup ##################### project( tdevelop ) -set( VERSION R14.0.9 ) ##### include essential cmake modules ########### @@ -32,10 +31,14 @@ include( FindPkgConfig ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) +##### set version number ######################## + +tde_set_project_version( ) + + ##### setup install paths ####################### include( TDESetupPaths ) @@ -44,13 +47,42 @@ tde_setup_paths( ) ##### add apidox targets ############ -add_custom_target(apidox - COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/tqt3/doc/html" - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/") +if( "${CMAKE_VERSION}" VERSION_LESS "3.1" ) + set( CMAKE_ENV "env" ) +else() + set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" ) +endif() + +add_custom_target( apidox + COMMAND ${CMAKE_ENV} + "QTDOCDIR=/usr/share/tqt3/doc/html" + "DOXDATA=${HTML_INSTALL_DIR}/en/common" + ${CMAKE_SOURCE_DIR}/admin/doxygen.sh + --no-modulename + ${CMAKE_SOURCE_DIR} + COMMAND + find ${CMAKE_BINARY_DIR}/apidocs -name '*.html' | + xargs -r sed -i 's|${CMAKE_BINARY_DIR}/apidocs|${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs|g' + COMMAND + find ${CMAKE_BINARY_DIR}/apidocs -name '*.tag' | + xargs -r sed -i 's|${CMAKE_SOURCE_DIR}/|${PROJECT_NAME}/|g' + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +) -add_custom_target(install-apidox - COMMAND "./install_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}" - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/") +add_custom_target( install-apidox + COMMAND ${CMAKE_COMMAND} -E echo Apidox installed in ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs +) + +install( CODE " + if( EXISTS ${CMAKE_BINARY_DIR}/apidocs ) + file( + INSTALL ${CMAKE_BINARY_DIR}/apidocs/ + DESTINATION ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs + PATTERN doxygen_sqlite3.db EXCLUDE + PATTERN installdox-slow EXCLUDE + ) + endif()" +) ##### build tools ############################### diff --git a/Doxyfile.am b/Doxyfile.am index e35e931a..8729e59e 100644 --- a/Doxyfile.am +++ b/Doxyfile.am @@ -179,8 +179,3 @@ apidox-am-toplevel-yes: rm -f Doxyfile .PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes - - -# Local Variables: -# mode: makefile -# End: diff --git a/Doxyfile_full.am b/Doxyfile_full.am index aa723d17..7354612a 100644 --- a/Doxyfile_full.am +++ b/Doxyfile_full.am @@ -208,8 +208,3 @@ apidox: fi .PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox - - -# Local Variables: -# mode: makefile -# End: diff --git a/Makefile.am b/Makefile.am index 10a75db6..791e596c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,6 @@ messages: done dirs=`cat dirs` ;\ find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\ - find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\ find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\ $(EXTRACTRC) `find $$dirs -maxdepth 1 -name "*.rc"` > rc.cpp ;\ $(EXTRACTRC) `find $$dirs -maxdepth 1 -name "*.ui"` >> rc.cpp ;\ diff --git a/admin b/admin -Subproject d498a4c5dd9bca5c80b1fd244778962f6414327 +Subproject a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3 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<AdaProjectPart> 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<AntProjectPart> 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/addapplicationdlg.h b/buildtools/autotools/addapplicationdlg.h index f2c0ecb4..285a4d77 100644 --- a/buildtools/autotools/addapplicationdlg.h +++ b/buildtools/autotools/addapplicationdlg.h @@ -42,5 +42,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index 6af3be99..efdff38f 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -384,5 +384,3 @@ void AddExistingDirectoriesDialog::slotDropped ( TQDropEvent* ev ) } #include "addexistingdirectoriesdlg.moc" - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/buildtools/autotools/addexistingdirectoriesdlg.h b/buildtools/autotools/addexistingdirectoriesdlg.h index 7b1d9c8e..521ddd35 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.h +++ b/buildtools/autotools/addexistingdirectoriesdlg.h @@ -71,5 +71,3 @@ protected slots: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/addexistingfilesdlg.h b/buildtools/autotools/addexistingfilesdlg.h index 2b44bba1..467307f7 100644 --- a/buildtools/autotools/addexistingfilesdlg.h +++ b/buildtools/autotools/addexistingfilesdlg.h @@ -75,4 +75,3 @@ protected slots: }; #endif // ADDEXISTINGFILESDLG_H -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index a9215cab..936f7eb1 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -724,5 +724,3 @@ void AutoDetailsView::focusOutEvent(TQFocusEvent */*e*/) } #include "autodetailsview.moc" - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h index c2ad1afb..081842ee 100644 --- a/buildtools/autotools/autodetailsview.h +++ b/buildtools/autotools/autodetailsview.h @@ -86,4 +86,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h index 9a82b025..277918a9 100644 --- a/buildtools/autotools/autolistviewitems.h +++ b/buildtools/autotools/autolistviewitems.h @@ -139,5 +139,3 @@ public: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 6640a353..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()); @@ -1547,5 +1547,3 @@ TQString AutoProjectPart::getAutoConfFile(const TQString& dir){ } #include "autoprojectpart.moc" - -// kate: space-indent on; indent-width 4; diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index 83066c3c..c4a9949b 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -154,4 +154,3 @@ private: typedef KDevGenericFactory<AutoProjectPart> AutoProjectFactory; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 12037bff..2c98ed35 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -744,5 +744,3 @@ MakefileHandler* AutoProjectWidget::makefileHandler() { return m_makefileHandler; } -//kate: indent-mode csands; tab-width 4; space-indent off; - diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index b3f6eaef..df392c59 100644 --- a/buildtools/autotools/autoprojectwidget.h +++ b/buildtools/autotools/autoprojectwidget.h @@ -227,4 +227,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 005ae123..6d6b6c01 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -1133,5 +1133,3 @@ void AutoSubprojectView::expandCollapse( TQListViewItem * item, bool expand ) } #include "autosubprojectview.moc" - -// kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h index fab7c546..5f6f10b3 100644 --- a/buildtools/autotools/autosubprojectview.h +++ b/buildtools/autotools/autosubprojectview.h @@ -127,5 +127,3 @@ private slots: }; #endif - -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index cf1e37d6..820c4bd9 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -150,7 +150,3 @@ void AutoToolsAction::updateEnabled( int i ) else TDEAction::updateEnabled( i ) ; } - - - -//kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h index dd9ddda5..758cbaef 100644 --- a/buildtools/autotools/autotoolsaction.h +++ b/buildtools/autotools/autotoolsaction.h @@ -66,5 +66,3 @@ public: }; #endif - -//kate: indent-mode csands; tab-width 4; auto-insert-doxygen on; diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index 8b59545f..fc67a82e 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -345,4 +345,3 @@ bool ChooseTargetDialog::alwaysUseActiveTarget() const #include "choosetargetdialog.moc" -//kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/choosetargetdialog.h b/buildtools/autotools/choosetargetdialog.h index b1e4f12d..bcc3ba64 100644 --- a/buildtools/autotools/choosetargetdialog.h +++ b/buildtools/autotools/choosetargetdialog.h @@ -55,4 +55,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index e40874de..dc4f7ffa 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -67,4 +67,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/fileselectorwidget.h b/buildtools/autotools/fileselectorwidget.h index d7107e7a..0de3f189 100644 --- a/buildtools/autotools/fileselectorwidget.h +++ b/buildtools/autotools/fileselectorwidget.h @@ -94,5 +94,3 @@ signals: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/kimporticonview.h b/buildtools/autotools/kimporticonview.h index d66c74ba..26ec4d96 100644 --- a/buildtools/autotools/kimporticonview.h +++ b/buildtools/autotools/kimporticonview.h @@ -41,5 +41,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp index 27f4512e..f1de18c1 100644 --- a/buildtools/autotools/makefilehandler.cpp +++ b/buildtools/autotools/makefilehandler.cpp @@ -163,4 +163,3 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools:: return variable; } -//kate: space-indent on; indent-width 4; diff --git a/buildtools/autotools/makefilehandler.h b/buildtools/autotools/makefilehandler.h index 0311500b..70cbcd2e 100644 --- a/buildtools/autotools/makefilehandler.h +++ b/buildtools/autotools/makefilehandler.h @@ -71,6 +71,3 @@ private: }; #endif - -//kate: space-indent on; indent-width 4; - diff --git a/buildtools/autotools/managecustomcommand.h b/buildtools/autotools/managecustomcommand.h index 659959ca..ad3ea250 100644 --- a/buildtools/autotools/managecustomcommand.h +++ b/buildtools/autotools/managecustomcommand.h @@ -35,4 +35,3 @@ public slots: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index ec58b54c..6c4bac8c 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -995,5 +995,3 @@ void AutoProjectTool::configureinSaveMakefiles(TQString fileName, TQStringList m TQDir().rename(fileName + "#", fileName); } - -//kate: indent-mode csands; space-indent off; tab-width 4; diff --git a/buildtools/autotools/misc.h b/buildtools/autotools/misc.h index def8ce20..223022f1 100644 --- a/buildtools/autotools/misc.h +++ b/buildtools/autotools/misc.h @@ -61,5 +61,3 @@ public: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/removefiledlg.h b/buildtools/autotools/removefiledlg.h index f3b86bff..138f9ad5 100644 --- a/buildtools/autotools/removefiledlg.h +++ b/buildtools/autotools/removefiledlg.h @@ -49,4 +49,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/removetargetdlg.h b/buildtools/autotools/removetargetdlg.h index a9981007..9a5c82f3 100644 --- a/buildtools/autotools/removetargetdlg.h +++ b/buildtools/autotools/removetargetdlg.h @@ -52,4 +52,3 @@ protected: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/subprojectoptionsdlg.h b/buildtools/autotools/subprojectoptionsdlg.h index 659d89fb..d53b34c1 100644 --- a/buildtools/autotools/subprojectoptionsdlg.h +++ b/buildtools/autotools/subprojectoptionsdlg.h @@ -60,5 +60,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp index 866661ae..ac2767a7 100644 --- a/buildtools/autotools/targetoptionsdlg.cpp +++ b/buildtools/autotools/targetoptionsdlg.cpp @@ -354,4 +354,3 @@ void TargetOptionsDialog::accept() } #include "targetoptionsdlg.moc" -// kate: indent-mode csands; space-indent on; indent-width 4; replace-tabs on; diff --git a/buildtools/autotools/targetoptionsdlg.h b/buildtools/autotools/targetoptionsdlg.h index 5238080f..205086c9 100644 --- a/buildtools/autotools/targetoptionsdlg.h +++ b/buildtools/autotools/targetoptionsdlg.h @@ -46,5 +46,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/buildtools/autotools/tdefilednddetailview.h b/buildtools/autotools/tdefilednddetailview.h index 43165a06..bb65d40f 100644 --- a/buildtools/autotools/tdefilednddetailview.h +++ b/buildtools/autotools/tdefilednddetailview.h @@ -134,4 +134,3 @@ protected: // Private attributes }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/tdefiledndiconview.h b/buildtools/autotools/tdefiledndiconview.h index 6d699185..8bd36d51 100644 --- a/buildtools/autotools/tdefiledndiconview.h +++ b/buildtools/autotools/tdefiledndiconview.h @@ -125,5 +125,3 @@ protected: bool m_dndEnabled; }; #endif -// kate: indent-mode csands; tab-width 4; auto-insert-doxygen on; - diff --git a/buildtools/custommakefiles/custombuildoptionswidget.cpp b/buildtools/custommakefiles/custombuildoptionswidget.cpp index 20931698..74c0d08f 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.cpp +++ b/buildtools/custommakefiles/custombuildoptionswidget.cpp @@ -95,5 +95,3 @@ void CustomBuildOptionsWidget::makeToggled(bool b) } #include "custombuildoptionswidget.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custombuildoptionswidget.h b/buildtools/custommakefiles/custombuildoptionswidget.h index 91b4e5c4..7295a7e9 100644 --- a/buildtools/custommakefiles/custombuildoptionswidget.h +++ b/buildtools/custommakefiles/custombuildoptionswidget.h @@ -43,5 +43,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui index bea1e872..2b1bfdff 100644 --- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui +++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui @@ -56,9 +56,6 @@ <property name="text"> <string>Other</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>other custom build tool, e.g. script</string> </property> diff --git a/buildtools/custommakefiles/custommanagerwidget.cpp b/buildtools/custommakefiles/custommanagerwidget.cpp index 85f77d52..9dfad3e5 100644 --- a/buildtools/custommakefiles/custommanagerwidget.cpp +++ b/buildtools/custommakefiles/custommanagerwidget.cpp @@ -76,5 +76,3 @@ void CustomManagerWidget::accept() #include "custommanagerwidget.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/custommanagerwidget.h b/buildtools/custommakefiles/custommanagerwidget.h index 657bae9f..655e0447 100644 --- a/buildtools/custommakefiles/custommanagerwidget.h +++ b/buildtools/custommakefiles/custommanagerwidget.h @@ -38,5 +38,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp index 945d7c91..8049d37a 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.cpp +++ b/buildtools/custommakefiles/customotherconfigwidget.cpp @@ -121,5 +121,3 @@ void CustomOtherConfigWidget::accept() } #include "customotherconfigwidget.moc" -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/custommakefiles/customotherconfigwidget.h b/buildtools/custommakefiles/customotherconfigwidget.h index 64f3a5bd..a92d816d 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.h +++ b/buildtools/custommakefiles/customotherconfigwidget.h @@ -53,6 +53,3 @@ protected: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - 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 <kdevplugininfo.h> typedef KDevGenericFactory<CustomProjectPart> 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/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index 67223e92..b6cb6fe5 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -156,4 +156,3 @@ private: }; #endif -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/selectnewfilesdialog.cpp b/buildtools/custommakefiles/selectnewfilesdialog.cpp index a223c87a..2ccf9593 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.cpp +++ b/buildtools/custommakefiles/selectnewfilesdialog.cpp @@ -127,5 +127,3 @@ TQStringList SelectNewFilesDialog::includedPaths() const } #include "selectnewfilesdialog.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/custommakefiles/selectnewfilesdialog.h b/buildtools/custommakefiles/selectnewfilesdialog.h index 3c8d9c14..446936ac 100644 --- a/buildtools/custommakefiles/selectnewfilesdialog.h +++ b/buildtools/custommakefiles/selectnewfilesdialog.h @@ -50,5 +50,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am index 340d0e38..950d6571 100644 --- a/buildtools/lib/parsers/autotools/Makefile.am +++ b/buildtools/lib/parsers/autotools/Makefile.am @@ -13,7 +13,7 @@ libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotoo parser: cd $(srcdir) ; \ bison -d autotools.yy -o autotools_yacc.cpp ; \ - mv -f autotools_yacc.hpp autotools_yacc.h ; \ + mv -f autotools_yacc.h autotools_yacc.h ; \ flex -oautotools_lex.cpp autotools.ll EXTRA_DIST = autotools.yy autotools.ll diff --git a/buildtools/lib/parsers/autotools/autotoolsast.cpp b/buildtools/lib/parsers/autotools/autotoolsast.cpp index ddcbddc3..4b70428b 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsast.cpp @@ -113,5 +113,3 @@ void CommentAST::writeBack(TQString &buffer) } } - -// kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/buildtools/lib/parsers/autotools/autotoolsast.h b/buildtools/lib/parsers/autotools/autotoolsast.h index 768e3e07..94047845 100644 --- a/buildtools/lib/parsers/autotools/autotoolsast.h +++ b/buildtools/lib/parsers/autotools/autotoolsast.h @@ -265,5 +265,3 @@ public: } #endif - -// kate: indent-mode csands; space-indent off; tab-width 4; auto-insert-doxygen on; diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp index 1c2efaea..cd013d29 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.cpp +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.cpp @@ -65,6 +65,3 @@ int Driver::parseFile(KURL fileName, ProjectAST **ast) } } - -//kate: indent-mode csands; space-indent off; tab-width 4; - diff --git a/buildtools/lib/parsers/autotools/autotoolsdriver.h b/buildtools/lib/parsers/autotools/autotoolsdriver.h index 8e29bec6..ecf6fea7 100644 --- a/buildtools/lib/parsers/autotools/autotoolsdriver.h +++ b/buildtools/lib/parsers/autotools/autotoolsdriver.h @@ -72,5 +72,3 @@ public: } #endif - -// kate: indent-mode csands; tab-width 4; space-indent off; auto-insert-doxygen on; diff --git a/buildtools/lib/parsers/qmake/FlexLexer.h b/buildtools/lib/parsers/qmake/FlexLexer.h index 1db844da..edea96ca 100644 --- a/buildtools/lib/parsers/qmake/FlexLexer.h +++ b/buildtools/lib/parsers/qmake/FlexLexer.h @@ -1,5 +1,3 @@ - -// -*-C++-*- // FlexLexer.h -- define interfaces for lexical analyzer classes generated // by flex diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.h index d6247645..f97af783 100644 --- a/buildtools/lib/parsers/qmake/location.hh +++ b/buildtools/lib/parsers/qmake/location.h @@ -33,16 +33,16 @@ version 2.2 of Bison. */ /** - ** \file location.hh + ** \file location.h ** Define the TQMake::location class. */ -#ifndef BISON_LOCATION_HH -# define BISON_LOCATION_HH +#ifndef BISON_LOCATION_H +# define BISON_LOCATION_H # include <iostream> # include <string> -# include "position.hh" +# include "position.h" namespace TQMake { @@ -142,4 +142,4 @@ namespace TQMake } -#endif // not BISON_LOCATION_HH +#endif // not BISON_LOCATION_H diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.h index 6e95eb95..9f5951f0 100644 --- a/buildtools/lib/parsers/qmake/position.hh +++ b/buildtools/lib/parsers/qmake/position.h @@ -33,12 +33,12 @@ version 2.2 of Bison. */ /** - ** \file position.hh + ** \file position.h ** Define the TQMake::position class. */ -#ifndef BISON_POSITION_HH -# define BISON_POSITION_HH +#ifndef BISON_POSITION_H +# define BISON_POSITION_H # include <iostream> # include <string> @@ -139,4 +139,4 @@ namespace TQMake } } -#endif // not BISON_POSITION_HH +#endif // not BISON_POSITION_H diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy index 3cc0b79d..2c3e866d 100644 --- a/buildtools/lib/parsers/qmake/qmake.yy +++ b/buildtools/lib/parsers/qmake/qmake.yy @@ -109,7 +109,7 @@ Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp. */ %} -%skeleton "lalr1.cc" +%skeleton "lalr1.cpp" %define "parser_class_name" "Parser" %name-prefix="QMake" %parse-param { QMake::Lexer* lexer } diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h index fe133946..4bed35dd 100644 --- a/buildtools/lib/parsers/qmake/qmake_lex.h +++ b/buildtools/lib/parsers/qmake/qmake_lex.h @@ -20,7 +20,7 @@ #ifndef TQMAKE_LEX_H #define TQMAKE_LEX_H -#include "qmake_yacc.hpp" +#include "qmake_yacc.h" #include <iostream> #ifndef DONT_INCLUDE_FLEXLEXER @@ -45,5 +45,3 @@ namespace TQMake } #endif - -// kate: space-indent on; indent-width 4; tab-width: 4; replace-tabs on; auto-insert-doxygen on diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp index f9dea804..25ae0e85 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp @@ -35,12 +35,12 @@ // Take the name prefix into account. #define yylex TQMakelex -#include "qmake_yacc.hpp" +#include "qmake_yacc.h" /* User implementation prologue. */ -/* Line 317 of lalr1.cc. */ +/* Line 317 of lalr1.cpp. */ #line 45 "tqmake_yacc.cpp" #ifndef YY_ @@ -751,7 +751,7 @@ namespace TQMake break; - /* Line 675 of lalr1.cc. */ + /* Line 675 of lalr1.cpp. */ #line 756 "tqmake_yacc.cpp" default: break; } diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.h index fd130e65..4c4e3042 100644 --- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp +++ b/buildtools/lib/parsers/qmake/qmake_yacc.h @@ -39,7 +39,7 @@ #include <string> #include <iostream> -#include "stack.hh" +#include "stack.h" namespace TQMake { @@ -160,10 +160,10 @@ Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp. */ -/* Line 35 of lalr1.cc. */ -#line 165 "qmake_yacc.hpp" +/* Line 35 of lalr1.cpp. */ +#line 165 "qmake_yacc.h" -#include "location.hh" +#include "location.h" /* Enabling traces. */ #ifndef YYDEBUG diff --git a/buildtools/lib/parsers/qmake/qmakeast.cpp b/buildtools/lib/parsers/qmake/qmakeast.cpp index 504303b5..1b4bcb87 100644 --- a/buildtools/lib/parsers/qmake/qmakeast.cpp +++ b/buildtools/lib/parsers/qmake/qmakeast.cpp @@ -164,7 +164,3 @@ void IncludeAST::writeBack(TQString &/*buffer*/) } } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - - diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp index 40fd9bd9..8b9b722a 100644 --- a/buildtools/lib/parsers/qmake/qmakedriver.cpp +++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp @@ -28,7 +28,7 @@ #include <sstream> #include "qmake_lex.h" -#include "qmake_yacc.hpp" +#include "qmake_yacc.h" namespace TQMake { diff --git a/buildtools/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.h index dfc6c67e..1c18d4d0 100644 --- a/buildtools/lib/parsers/qmake/stack.hh +++ b/buildtools/lib/parsers/qmake/stack.h @@ -32,8 +32,8 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -#ifndef BISON_STACK_HH -# define BISON_STACK_HH +#ifndef BISON_STACK_H +# define BISON_STACK_H #include <deque> @@ -126,4 +126,4 @@ namespace TQMake }; } -#endif // not BISON_STACK_HH +#endif // not BISON_STACK_H 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 <kdevplugininfo.h> typedef KDevGenericFactory<PascalProjectPart> 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/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 815a6ef7..22388b2d 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -109,6 +109,3 @@ QMakeScopeItem * ChooseSubprojectDlg::selectedSubproject( ) #include "choosesubprojectdlg.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index e59ed6b9..d2759adb 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -61,5 +61,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index 854966b3..cd595be1 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/buildtools/qmake/createscopedlg.cpp b/buildtools/qmake/createscopedlg.cpp index dfb8683a..abdd9e5b 100644 --- a/buildtools/qmake/createscopedlg.cpp +++ b/buildtools/qmake/createscopedlg.cpp @@ -96,5 +96,3 @@ void CreateScopeDlg::accept() } #include "createscopedlg.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/createscopedlg.h b/buildtools/qmake/createscopedlg.h index 6596c021..bac4ded6 100644 --- a/buildtools/qmake/createscopedlg.h +++ b/buildtools/qmake/createscopedlg.h @@ -41,6 +41,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/disablesubprojectdlg.cpp b/buildtools/qmake/disablesubprojectdlg.cpp index 9a5fbb1d..37aa79ea 100644 --- a/buildtools/qmake/disablesubprojectdlg.cpp +++ b/buildtools/qmake/disablesubprojectdlg.cpp @@ -45,6 +45,3 @@ TQStringList DisableSubprojectDlg::selectedProjects() } #include "disablesubprojectdlg.moc" - - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/disablesubprojectdlg.h b/buildtools/qmake/disablesubprojectdlg.h index 5ca64451..0dec8e94 100644 --- a/buildtools/qmake/disablesubprojectdlg.h +++ b/buildtools/qmake/disablesubprojectdlg.h @@ -38,6 +38,3 @@ protected slots: }; #endif - - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index 2adc1544..1d522c84 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -90,9 +90,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index e2ebe9a2..fec743cb 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -2170,5 +2170,3 @@ void ProjectConfigurationDlg::customVarChanged() } activateApply( 0 ); } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index 7452e9e6..c4c9740b 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -141,5 +141,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 686240fe..28003188 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -415,9 +415,6 @@ <property name="text"> <string>Debug && Release</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Set project to be built in debug_and_release mode</string> </property> @@ -579,9 +576,6 @@ <property name="text"> <string>Console</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Check to build a win32 console app</string> </property> @@ -849,9 +843,6 @@ <property name="text"> <string>Designer Plugin</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp index 8c34c34b..fdbcad64 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -87,5 +87,3 @@ const TQStringList& TQMakeDefaultOpts::variables() const { return m_keys; } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h index 1b38d80c..575f832f 100644 --- a/buildtools/qmake/qmakedefaultopts.h +++ b/buildtools/qmake/qmakedefaultopts.h @@ -44,6 +44,3 @@ private: }; #endif - - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakeoptionswidget.cpp b/buildtools/qmake/qmakeoptionswidget.cpp index c2f4cfdd..3aafb3a0 100644 --- a/buildtools/qmake/qmakeoptionswidget.cpp +++ b/buildtools/qmake/qmakeoptionswidget.cpp @@ -59,5 +59,3 @@ void QMakeOptionsWidget::accept() } #include "qmakeoptionswidget.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakeoptionswidget.h b/buildtools/qmake/qmakeoptionswidget.h index be1cc534..05bed8c2 100644 --- a/buildtools/qmake/qmakeoptionswidget.h +++ b/buildtools/qmake/qmakeoptionswidget.h @@ -34,7 +34,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - - diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp index 496adad8..6549a557 100644 --- a/buildtools/qmake/qmakescopeitem.cpp +++ b/buildtools/qmake/qmakescopeitem.cpp @@ -925,5 +925,3 @@ TQMap<TQString, TQString> QMakeScopeItem::getLibInfos( TQString basePath ) kdDebug(9024) << "Running getLibInfo for" << scope->projectName() << "|" << map << endl; return result; } - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/qmakescopeitem.h b/buildtools/qmake/qmakescopeitem.h index 2e275511..09b3bd06 100644 --- a/buildtools/qmake/qmakescopeitem.h +++ b/buildtools/qmake/qmakescopeitem.h @@ -124,5 +124,3 @@ private: #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp index 6cf86bf8..84052970 100644 --- a/buildtools/qmake/scope.cpp +++ b/buildtools/qmake/scope.cpp @@ -1706,5 +1706,3 @@ TQString Scope::PrintAST::getIndent() return ind; } #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/buildtools/qmake/scope.h b/buildtools/qmake/scope.h index 98519bdf..5be259bd 100644 --- a/buildtools/qmake/scope.h +++ b/buildtools/qmake/scope.h @@ -303,6 +303,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index eeccf445..273db855 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -57,11 +57,11 @@ #include <urlutil.h> typedef KDevGenericFactory<TrollProjectPart> 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()); @@ -925,7 +925,3 @@ void TrollProjectPart::slotBuild() } #include "trollprojectpart.moc" - -//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - - diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 8a5fd12b..d9235760 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -2542,6 +2542,3 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const } #include "trollprojectwidget.moc" - -//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index dac889c9..04a07ed9 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -215,5 +215,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on 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<ScriptProjectPart> 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/cmake b/cmake deleted file mode 160000 -Subproject 4397680ce96d859f37f5afbc9bfa07b5a800f19 diff --git a/doc/tools/index-python b/doc/tools/index-python index 96cfcd8f..2a91e372 100644 --- a/doc/tools/index-python +++ b/doc/tools/index-python @@ -45,8 +45,3 @@ sub dehtml return $str; } - -# Local Variables: -# mode: perl -# fill-column: 120 -# End: diff --git a/doc/tools/index-texi b/doc/tools/index-texi index 8aa85184..8bd02dd9 100755 --- a/doc/tools/index-texi +++ b/doc/tools/index-texi @@ -53,8 +53,3 @@ sub dehtml return $str; } - -# Local Variables: -# mode: perl -# fill-column: 120 -# End: diff --git a/doc/tools/toc-python b/doc/tools/toc-python index c91cdcf2..7564787a 100644 --- a/doc/tools/toc-python +++ b/doc/tools/toc-python @@ -50,8 +50,3 @@ sub dehtml return $str; } - -# Local Variables: -# mode: perl -# fill-column: 120 -# End: 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<EditorChooserPart> 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<VisualBoyAdvancePart> 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/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index 65778c41..c9741b83 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -201,12 +201,7 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons singleProject = single; statusBar()->clear(); -#if defined(TQT_NON_COMMERCIAL) - statusBar()->addWidget( new TQLabel(i18n("Ready - This is the non-commercial version of TQt - " - "For commercial evaluations, use the help menu to register with Trolltech."), statusBar()), 1 ); -#else statusBar()->addWidget( new TQLabel("Ready", statusBar()), 1 ); -#endif set_splash_status( "Setting up GUI..." ); diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h index 1b68c14d..d37bbc4a 100644 --- a/kdevdesigner/designer/mainwindow.h +++ b/kdevdesigner/designer/mainwindow.h @@ -408,9 +408,6 @@ private: TQAction* actionCurrentTool; DesignerAction *actionHelpContents, *actionHelpAbout, *actionHelpAboutTQt, *actionHelpWhatsThis; DesignerAction *actionHelpManual; -#if defined(TQT_NON_COMMERCIAL) - DesignerAction *actionHelpRegister; -#endif DesignerAction *actionToolsCustomWidget, *actionEditPreferences; DesignerAction *actionWindowTile, *actionWindowCascade, *actionWindowClose, *actionWindowCloseAll; DesignerAction *actionWindowNext, *actionWindowPrevious; diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index c937236b..f94eeb49 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -999,14 +999,6 @@ void MainWindow::setupHelpActions() actionHelpAboutTQt->setWhatsThis( whatsThisFrom( "Help|About TQt" ) ); connect( actionHelpAboutTQt, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpAboutTQt() ) ); -#if 0 //defined(TQT_NON_COMMERCIAL) - // ### not used anymore -- should be deleted? - actionHelpRegister = new DesignerAction( i18n("Register TQt"), TQPixmap(), i18n("&Register TQt..."), 0, TQT_TQOBJECT(this), 0 ); - actionHelpRegister->setStatusTip( i18n("Opens a web browser at the evaluation form on www.trolltech.com") ); - actionHelpRegister->setWhatsThis( i18n("Register with Trolltech") ); - connect( actionHelpRegister, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpRegister() ) ); -#endif - actionHelpWhatsThis = new DesignerAction( i18n("What's This?"), TQIconSet( whatsthis_image, whatsthis_image ), i18n("What's This?"), SHIFT + Key_F1, TQT_TQOBJECT(this), 0 ); actionHelpWhatsThis->setStatusTip( i18n("\"What's This?\" context sensitive help") ); @@ -1027,11 +1019,6 @@ void MainWindow::setupHelpActions() menu->insertSeparator(); actionHelpAbout->addTo( menu ); actionHelpAboutTQt->addTo( menu ); -#if 0 //defined(TQT_NON_COMMERCIAL) - // ### not used anymore -- should be deleted? - actionHelpRegister->addTo( menu ); -#endif - menu->insertSeparator(); actionHelpWhatsThis->addTo( menu ); } diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index 8397fc22..bba6734a 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -2310,11 +2310,7 @@ void PropertyPaletteItem::getPalette() if ( ::tqqt_cast<TQScrollView*>(w) ) w = ( (TQScrollView*)w )->viewport(); TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), -#if defined(TQT_NON_COMMERCIAL) - w->backgroundMode(), listview->topLevelWidget(), -#else w->backgroundMode(), listview, -#endif "choose_palette", listview->propertyEditor()->formWindow() ); if ( !ok ) return; diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index a6285db5..718329b6 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -429,7 +429,20 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) inc.implDecl = "in implementation"; inc.header = e.firstChild().toText().data(); if ( inc.header.right( 5 ) != ".ui.h" ) { - metaIncludes.append( inc ); + bool found = false; + TQValueList<MetaDataBase::Include>::Iterator it; + for ( it = metaIncludes.begin(); it != metaIncludes.end(); ++it ) { + MetaDataBase::Include currInc = *it; + if ( currInc.location == inc.location && currInc.implDecl == inc.implDecl && + currInc.header == inc.header) { + found = true; + break; + } + } + if ( !found ) + { + metaIncludes.append( inc ); + } } else { if ( formwindow->formFile() ) formwindow->formFile()->setCodeFileState( FormFile::Ok ); @@ -478,17 +491,8 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) if ( !customWidgets.isNull() ) loadCustomWidgets( customWidgets, this ); -#if defined (TQT_NON_COMMERCIAL) - bool previewMode = MainWindow::self ? MainWindow::self->isPreviewing() : FALSE; - TQWidget *w = (TQWidget*)createObject( widget, !previewMode ? (TQWidget*)formwindow : MainWindow::self ); - if ( !w ) - return FALSE; - if ( previewMode ) - w->reparent( MainWindow::self, TQt::WType_TopLevel, w->pos(), TRUE ); -#else if ( !createObject( widget, formwindow) ) return FALSE; -#endif if ( !forwards.isNull() ) { for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) @@ -509,7 +513,20 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) inc.implDecl = "in implementation"; inc.header = n.firstChild().toText().data(); if ( inc.header.right( 5 ) != ".ui.h" ) { - metaIncludes.append( inc ); + bool found = false; + TQValueList<MetaDataBase::Include>::Iterator it; + for ( it = metaIncludes.begin(); it != metaIncludes.end(); ++it ) { + MetaDataBase::Include currInc = *it; + if ( currInc.location == inc.location && currInc.implDecl == inc.implDecl && + currInc.header == inc.header) { + found = true; + break; + } + } + if ( !found ) + { + metaIncludes.append( inc ); + } } else { if ( formwindow->formFile() ) formwindow->formFile()->setCodeFileState( FormFile::Ok ); @@ -718,7 +735,6 @@ bool Resource::save( TQIODevice* dev ) saveConnections( ts, 0 ); saveTabOrder( ts, 0 ); saveMetaInfoAfter( ts, 0 ); - saveIncludeHints( ts, 0 ); ts << "</UI>" << endl; bool ok = saveFormCode( formwindow->formFile(), langIface ); images.clear(); @@ -843,7 +859,26 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea if ( obj->isWidgetType() ) { if ( obj->isA("CustomWidget") || isPlugin ) { usedCustomWidgets << TQString( className ); - includeHints << WidgetDatabase::includeFile( classID ); + MetaDataBase::Include inc; + inc.location = "global"; + inc.implDecl = "in implementation"; + inc.header = WidgetDatabase::includeFile( classID ); + bool found = false; + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Include>::Iterator it; + for ( it = includes.begin(); it != includes.end(); ++it ) { + MetaDataBase::Include currInc = *it; + if ( currInc.location == inc.location && currInc.implDecl == inc.implDecl && + currInc.header == inc.header) { + found = true; + break; + } + } + if ( !found ) + { + includes << inc; + } + MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), includes ); } if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->find( (TQWidget*)obj ) ) @@ -2905,18 +2940,6 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) } } -void Resource::saveIncludeHints( TQTextStream &ts, int indent ) -{ - if ( includeHints.isEmpty() ) - return; - ts << makeIndent( indent ) << "<includehints>" << endl; - indent++; - for ( TQStringList::Iterator it = includeHints.begin(); it != includeHints.end(); ++it ) - ts << makeIndent( indent ) << "<includehint>" << *it << "</includehint>" << endl; - indent--; - ts << makeIndent( indent ) << "</includehints>" << endl; -} - TQColorGroup Resource::loadColorGroup( const TQDomElement &e ) { TQColorGroup cg; diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h index 06598254..4926e004 100644 --- a/kdevdesigner/designer/resource.h +++ b/kdevdesigner/designer/resource.h @@ -103,7 +103,6 @@ private: void saveColor( TQTextStream &ts, int indent, const TQColor &c ); void saveMetaInfoBefore( TQTextStream &ts, int indent ); void saveMetaInfoAfter( TQTextStream &ts, int indent ); - void saveIncludeHints( TQTextStream &ts, int indent ); void savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, const TQString &tagname = "pixmap" ); void saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts, int indent ); void saveChildActions( TQAction *a, TQTextStream &ts, int indent ); @@ -157,7 +156,6 @@ private: TQString currFileName; LanguageInterface *langIface; bool hasFunctions; - TQStringList includeHints; TQString uiFileVersion; }; diff --git a/kdevdesigner/designer/startdialog.ui b/kdevdesigner/designer/startdialog.ui index 383fdfda..5f36d6db 100644 --- a/kdevdesigner/designer/startdialog.ui +++ b/kdevdesigner/designer/startdialog.ui @@ -199,9 +199,6 @@ <property name="text"> <string>&Help</string> </property> - <property name="accel"> - <number>4144</number> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -230,9 +227,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <number>0</number> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -247,9 +241,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <number>0</number> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index 9d04535a..e2252cf4 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -853,20 +853,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare dia = new QDesignerDialog( (FormWindow*)parent, parent, name ); else dia = new TQDialog( parent, name ); -#if defined(TQT_NON_COMMERCIAL) - if ( ::tqqt_cast<MainWindow*>(parent) ) -#else if ( parent ) -#endif dia->reparent( parent, TQPoint( 0, 0 ), TRUE ); return dia; } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) { TQWizard *wiz = new QDesignerWizard( parent, name ); -#if defined(TQT_NON_COMMERCIAL) - if ( ::tqqt_cast<MainWindow*>(parent) ) -#else if ( parent ) -#endif wiz->reparent( parent, TQPoint( 0, 0 ), TRUE ); if ( init && ::tqqt_cast<FormWindow*>(parent) ) { QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" ); diff --git a/languages/ada/AdaAST.hpp b/languages/ada/AdaAST.h index 1bb2bd07..35b734b4 100644 --- a/languages/ada/AdaAST.hpp +++ b/languages/ada/AdaAST.h @@ -1,7 +1,7 @@ #ifndef ADAAST_HPP #define ADAAST_HPP -#include <antlr/CommonAST.hpp> +#include <antlr/CommonAST.h> class AdaAST; typedef antlr::ASTRefCount<AdaAST> RefAdaAST; diff --git a/languages/ada/AdaLexer.cpp b/languages/ada/AdaLexer.cpp index 2ac19416..07e0cdd0 100644 --- a/languages/ada/AdaLexer.cpp +++ b/languages/ada/AdaLexer.cpp @@ -1,12 +1,12 @@ /* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaLexer.cpp"$ */ -#include "AdaLexer.hpp" -#include <antlr/CharBuffer.hpp> -#include <antlr/TokenStreamException.hpp> -#include <antlr/TokenStreamIOException.hpp> -#include <antlr/TokenStreamRecognitionException.hpp> -#include <antlr/CharStreamException.hpp> -#include <antlr/CharStreamIOException.hpp> -#include <antlr/NoViableAltForCharException.hpp> +#include "AdaLexer.h" +#include <antlr/CharBuffer.h> +#include <antlr/TokenStreamException.h> +#include <antlr/TokenStreamIOException.h> +#include <antlr/TokenStreamRecognitionException.h> +#include <antlr/CharStreamException.h> +#include <antlr/CharStreamIOException.h> +#include <antlr/NoViableAltForCharException.h> #line 1531 "ada.g" diff --git a/languages/ada/AdaLexer.hpp b/languages/ada/AdaLexer.h index 795c7bba..f004b971 100644 --- a/languages/ada/AdaLexer.hpp +++ b/languages/ada/AdaLexer.h @@ -1,20 +1,20 @@ -#ifndef INC_AdaLexer_hpp_ -#define INC_AdaLexer_hpp_ +#ifndef INC_AdaLexer_h_ +#define INC_AdaLexer_h_ #line 29 "ada.g" -#include <antlr/SemanticException.hpp> // antlr wants this -#include "AdaAST.hpp" +#include <antlr/SemanticException.h> // antlr wants this +#include "AdaAST.h" #include "preambles.h" -#line 11 "AdaLexer.hpp" -#include <antlr/config.hpp> -/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaLexer.hpp"$ */ -#include <antlr/CommonToken.hpp> -#include <antlr/InputBuffer.hpp> -#include <antlr/BitSet.hpp> -#include "AdaTokenTypes.hpp" -#include <antlr/CharScanner.hpp> +#line 11 "AdaLexer.h" +#include <antlr/config.h> +/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaLexer.h"$ */ +#include <antlr/CommonToken.h> +#include <antlr/InputBuffer.h> +#include <antlr/BitSet.h> +#include "AdaTokenTypes.h" +#include <antlr/CharScanner.h> class CUSTOM_API AdaLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public AdaTokenTypes { #line 1879 "ada.g" @@ -22,7 +22,7 @@ class CUSTOM_API AdaLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public ANTLR_LEXER_PREAMBLE private: bool lastTokenWasTicCompatible; -#line 22 "AdaLexer.hpp" +#line 22 "AdaLexer.h" private: void initLiterals(); public: @@ -83,4 +83,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_3; }; -#endif /*INC_AdaLexer_hpp_*/ +#endif /*INC_AdaLexer_h_*/ diff --git a/languages/ada/AdaParser.cpp b/languages/ada/AdaParser.cpp index e783595e..fed95180 100644 --- a/languages/ada/AdaParser.cpp +++ b/languages/ada/AdaParser.cpp @@ -1,8 +1,8 @@ /* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaParser.cpp"$ */ -#include "AdaParser.hpp" -#include <antlr/NoViableAltException.hpp> -#include <antlr/SemanticException.hpp> -#include <antlr/ASTFactory.hpp> +#include "AdaParser.h" +#include <antlr/NoViableAltException.h> +#include <antlr/SemanticException.h> +#include <antlr/ASTFactory.h> #line 1 "ada.g" #line 8 "AdaParser.cpp" AdaParser::AdaParser(ANTLR_USE_NAMESPACE(antlr)TokenBuffer& tokenBuf, int k) diff --git a/languages/ada/AdaParser.hpp b/languages/ada/AdaParser.h index 0074c820..9ceb8811 100644 --- a/languages/ada/AdaParser.hpp +++ b/languages/ada/AdaParser.h @@ -1,19 +1,19 @@ -#ifndef INC_AdaParser_hpp_ -#define INC_AdaParser_hpp_ +#ifndef INC_AdaParser_h_ +#define INC_AdaParser_h_ #line 29 "ada.g" -#include <antlr/SemanticException.hpp> // antlr wants this -#include "AdaAST.hpp" +#include <antlr/SemanticException.h> // antlr wants this +#include "AdaAST.h" #include "preambles.h" -#line 11 "AdaParser.hpp" -#include <antlr/config.hpp> -/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaParser.hpp"$ */ -#include <antlr/TokenStream.hpp> -#include <antlr/TokenBuffer.hpp> -#include "AdaTokenTypes.hpp" -#include <antlr/LLkParser.hpp> +#line 11 "AdaParser.h" +#include <antlr/config.h> +/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaParser.h"$ */ +#include <antlr/TokenStream.h> +#include <antlr/TokenBuffer.h> +#include "AdaTokenTypes.h" +#include <antlr/LLkParser.h> class CUSTOM_API AdaParser : public ANTLR_USE_NAMESPACE(antlr)LLkParser, public AdaTokenTypes { @@ -28,7 +28,7 @@ public: bool end_id_matches_def_id (const RefAdaAST& endid); bool definable_operator (const char *string); // operator_symbol sans "/=" bool is_operator_symbol (const char *string); -#line 22 "AdaParser.hpp" +#line 22 "AdaParser.h" public: void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory ); protected: @@ -386,4 +386,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_30; }; -#endif /*INC_AdaParser_hpp_*/ +#endif /*INC_AdaParser_h_*/ diff --git a/languages/ada/AdaStoreWalker.cpp b/languages/ada/AdaStoreWalker.cpp index 167d671c..51cd0067 100644 --- a/languages/ada/AdaStoreWalker.cpp +++ b/languages/ada/AdaStoreWalker.cpp @@ -1,11 +1,11 @@ /* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalker.cpp"$ */ -#include "AdaStoreWalker.hpp" -#include <antlr/Token.hpp> -#include <antlr/AST.hpp> -#include <antlr/NoViableAltException.hpp> -#include <antlr/MismatchedTokenException.hpp> -#include <antlr/SemanticException.hpp> -#include <antlr/BitSet.hpp> +#include "AdaStoreWalker.h" +#include <antlr/Token.h> +#include <antlr/AST.h> +#include <antlr/NoViableAltException.h> +#include <antlr/MismatchedTokenException.h> +#include <antlr/SemanticException.h> +#include <antlr/BitSet.h> #line 1 "expandedada.store.g" #line 11 "AdaStoreWalker.cpp" AdaStoreWalker::AdaStoreWalker() diff --git a/languages/ada/AdaStoreWalker.hpp b/languages/ada/AdaStoreWalker.h index c18f5dcd..79b0ce76 100644 --- a/languages/ada/AdaStoreWalker.hpp +++ b/languages/ada/AdaStoreWalker.h @@ -1,5 +1,5 @@ -#ifndef INC_AdaStoreWalker_hpp_ -#define INC_AdaStoreWalker_hpp_ +#ifndef INC_AdaStoreWalker_h_ +#define INC_AdaStoreWalker_h_ #line 1 "expandedada.store.g" @@ -8,21 +8,21 @@ #include <tqfileinfo.h> #include <codemodel.h> -#include "AdaAST.hpp" -#include "ada_utils.hpp" +#include "AdaAST.h" +#include "ada_utils.h" -#line 15 "AdaStoreWalker.hpp" -#include <antlr/config.hpp> -#include "AdaStoreWalkerTokenTypes.hpp" -/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalker.hpp"$ */ -#include <antlr/TreeParser.hpp> +#line 15 "AdaStoreWalker.h" +#include <antlr/config.h> +#include "AdaStoreWalkerTokenTypes.h" +/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalker.h"$ */ +#include <antlr/TreeParser.h> #line 10 "expandedada.store.g" #include <codemodel.h> #include <kdebug.h> -#line 26 "AdaStoreWalker.hpp" +#line 26 "AdaStoreWalker.h" class CUSTOM_API AdaStoreWalker : public ANTLR_USE_NAMESPACE(antlr)TreeParser, public AdaStoreWalkerTokenTypes { #line 25 "expandedada.store.g" @@ -116,7 +116,7 @@ public: // kdDebug() << "defineScope return" << endl; return psc; } -#line 30 "AdaStoreWalker.hpp" +#line 30 "AdaStoreWalker.h" public: AdaStoreWalker(); static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory ); @@ -347,4 +347,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4; }; -#endif /*INC_AdaStoreWalker_hpp_*/ +#endif /*INC_AdaStoreWalker_h_*/ diff --git a/languages/ada/AdaStoreWalkerTokenTypes.hpp b/languages/ada/AdaStoreWalkerTokenTypes.h index daaa4b21..be52bae2 100644 --- a/languages/ada/AdaStoreWalkerTokenTypes.hpp +++ b/languages/ada/AdaStoreWalkerTokenTypes.h @@ -1,7 +1,7 @@ -#ifndef INC_AdaStoreWalkerTokenTypes_hpp_ -#define INC_AdaStoreWalkerTokenTypes_hpp_ +#ifndef INC_AdaStoreWalkerTokenTypes_h_ +#define INC_AdaStoreWalkerTokenTypes_h_ -/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalkerTokenTypes.hpp"$ */ +/* $ANTLR 2.7.7 (20070609): "expandedada.store.g" -> "AdaStoreWalkerTokenTypes.h"$ */ #ifndef CUSTOM_API # define CUSTOM_API @@ -304,4 +304,4 @@ struct CUSTOM_API AdaStoreWalkerTokenTypes { #ifdef __cplusplus }; #endif -#endif /*INC_AdaStoreWalkerTokenTypes_hpp_*/ +#endif /*INC_AdaStoreWalkerTokenTypes_h_*/ diff --git a/languages/ada/AdaTokenTypes.hpp b/languages/ada/AdaTokenTypes.h index 918b1cfd..becbd205 100644 --- a/languages/ada/AdaTokenTypes.hpp +++ b/languages/ada/AdaTokenTypes.h @@ -1,7 +1,7 @@ -#ifndef INC_AdaTokenTypes_hpp_ -#define INC_AdaTokenTypes_hpp_ +#ifndef INC_AdaTokenTypes_h_ +#define INC_AdaTokenTypes_h_ -/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaTokenTypes.hpp"$ */ +/* $ANTLR 2.7.7 (20070609): "ada.g" -> "AdaTokenTypes.h"$ */ #ifndef CUSTOM_API # define CUSTOM_API @@ -303,4 +303,4 @@ struct CUSTOM_API AdaTokenTypes { #ifdef __cplusplus }; #endif -#endif /*INC_AdaTokenTypes_hpp_*/ +#endif /*INC_AdaTokenTypes_h_*/ diff --git a/languages/ada/AdaTreeParserSuper.cpp b/languages/ada/AdaTreeParserSuper.cpp index be5f0623..16e95182 100644 --- a/languages/ada/AdaTreeParserSuper.cpp +++ b/languages/ada/AdaTreeParserSuper.cpp @@ -1,11 +1,11 @@ /* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuper.cpp"$ */ -#include "AdaTreeParserSuper.hpp" -#include <antlr/Token.hpp> -#include <antlr/AST.hpp> -#include <antlr/NoViableAltException.hpp> -#include <antlr/MismatchedTokenException.hpp> -#include <antlr/SemanticException.hpp> -#include <antlr/BitSet.hpp> +#include "AdaTreeParserSuper.h" +#include <antlr/Token.h> +#include <antlr/AST.h> +#include <antlr/NoViableAltException.h> +#include <antlr/MismatchedTokenException.h> +#include <antlr/SemanticException.h> +#include <antlr/BitSet.h> #line 1 "ada.tree.g" #line 11 "AdaTreeParserSuper.cpp" AdaTreeParserSuper::AdaTreeParserSuper() diff --git a/languages/ada/AdaTreeParserSuper.hpp b/languages/ada/AdaTreeParserSuper.h index a4d164f0..cb35ac25 100644 --- a/languages/ada/AdaTreeParserSuper.hpp +++ b/languages/ada/AdaTreeParserSuper.h @@ -1,15 +1,15 @@ -#ifndef INC_AdaTreeParserSuper_hpp_ -#define INC_AdaTreeParserSuper_hpp_ +#ifndef INC_AdaTreeParserSuper_h_ +#define INC_AdaTreeParserSuper_h_ -#include <antlr/config.hpp> -#include "AdaTreeParserSuperTokenTypes.hpp" -/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuper.hpp"$ */ -#include <antlr/TreeParser.hpp> +#include <antlr/config.h> +#include "AdaTreeParserSuperTokenTypes.h" +/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuper.h"$ */ +#include <antlr/TreeParser.h> class CUSTOM_API AdaTreeParserSuper : public ANTLR_USE_NAMESPACE(antlr)TreeParser, public AdaTreeParserSuperTokenTypes { #line 1 "ada.tree.g" -#line 13 "AdaTreeParserSuper.hpp" +#line 13 "AdaTreeParserSuper.h" public: AdaTreeParserSuper(); static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory ); @@ -238,4 +238,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4; }; -#endif /*INC_AdaTreeParserSuper_hpp_*/ +#endif /*INC_AdaTreeParserSuper_h_*/ diff --git a/languages/ada/AdaTreeParserSuperTokenTypes.hpp b/languages/ada/AdaTreeParserSuperTokenTypes.h index 924b7415..f6f75893 100644 --- a/languages/ada/AdaTreeParserSuperTokenTypes.hpp +++ b/languages/ada/AdaTreeParserSuperTokenTypes.h @@ -1,7 +1,7 @@ -#ifndef INC_AdaTreeParserSuperTokenTypes_hpp_ -#define INC_AdaTreeParserSuperTokenTypes_hpp_ +#ifndef INC_AdaTreeParserSuperTokenTypes_h_ +#define INC_AdaTreeParserSuperTokenTypes_h_ -/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuperTokenTypes.hpp"$ */ +/* $ANTLR 2.7.7 (20070609): "ada.tree.g" -> "AdaTreeParserSuperTokenTypes.h"$ */ #ifndef CUSTOM_API # define CUSTOM_API @@ -304,4 +304,4 @@ struct CUSTOM_API AdaTreeParserSuperTokenTypes { #ifdef __cplusplus }; #endif -#endif /*INC_AdaTreeParserSuperTokenTypes_hpp_*/ +#endif /*INC_AdaTreeParserSuperTokenTypes_h_*/ diff --git a/languages/ada/Makefile.am b/languages/ada/Makefile.am index d45a2add..26fe8c2c 100644 --- a/languages/ada/Makefile.am +++ b/languages/ada/Makefile.am @@ -20,13 +20,13 @@ EXTRA_DIST = ada.g ada.tree.g ada.store.g ## The following three rules assume that you have Java installed, ## ANTLR installed, and you have the antlr jar in your CLASSPATH. -#AdaLexer.hpp AdaLexer.cpp AdaParser.hpp AdaParser.cpp: ada.g +#AdaLexer.h AdaLexer.cpp AdaParser.h AdaParser.cpp: ada.g # antlr ada.g -#AdaTreeParserSuper.hpp AdaTreeParserSuper.cpp: ada.tree.g +#AdaTreeParserSuper.h AdaTreeParserSuper.cpp: ada.tree.g # antlr ada.tree.g -#AdaStoreWalker.hpp AdaStoreWalker.cpp: ada.store.g +#AdaStoreWalker.h AdaStoreWalker.cpp: ada.store.g # antlr -glib ada.tree.g ada.store.g genparser: diff --git a/languages/ada/README.dox b/languages/ada/README.dox index e71e6d45..017b3aed 100644 --- a/languages/ada/README.dox +++ b/languages/ada/README.dox @@ -2,10 +2,10 @@ Ada Language Support The ANTLR Ada core support files are: - - ada.g -- contains AdaLexer and AdaParser, requires AdaAST.hpp and adasupport.cpp + - ada.g -- contains AdaLexer and AdaParser, requires AdaAST.h and adasupport.cpp - ada.tree.g -- contains the AdaTreeParserSuper - - AdaAST.hpp -- definition of the AST node used by ada.g - - adasupport.hpp -- general purpose utilities + - AdaAST.h -- definition of the AST node used by ada.g + - adasupport.h -- general purpose utilities - adasupport.cpp -- implementation of general purpose utilities and implementation of AdaParser class methods from ada.g These are ANTLR master files. diff --git a/languages/ada/ada.g b/languages/ada/ada.g index 5f97952b..164c2187 100644 --- a/languages/ada/ada.g +++ b/languages/ada/ada.g @@ -27,8 +27,8 @@ header "pre_include_hpp" { -#include <antlr/SemanticException.hpp> // antlr wants this -#include "AdaAST.hpp" +#include <antlr/SemanticException.h> // antlr wants this +#include "AdaAST.h" #include "preambles.h" } diff --git a/languages/ada/ada.store.g b/languages/ada/ada.store.g index 31dccf99..658bfcfa 100644 --- a/languages/ada/ada.store.g +++ b/languages/ada/ada.store.g @@ -9,8 +9,8 @@ header "pre_include_hpp" { #include <qfileinfo.h> #include <codemodel.h> -#include "AdaAST.hpp" -#include "ada_utils.hpp" +#include "AdaAST.h" +#include "ada_utils.h" } header "post_include_hpp" { diff --git a/languages/ada/ada_utils.cpp b/languages/ada/ada_utils.cpp index d7b8bbf7..e12306ea 100644 --- a/languages/ada/ada_utils.cpp +++ b/languages/ada/ada_utils.cpp @@ -11,8 +11,8 @@ #include <kdebug.h> -#include "ada_utils.hpp" -#include "adasupport.hpp" +#include "ada_utils.h" +#include "adasupport.h" TQString qtext (const RefAdaAST& n) { diff --git a/languages/ada/ada_utils.hpp b/languages/ada/ada_utils.h index 25c9fabd..ae4f9011 100644 --- a/languages/ada/ada_utils.hpp +++ b/languages/ada/ada_utils.h @@ -4,7 +4,7 @@ #define ADA_UTILS_H #include <tqstring.h> -#include "AdaAST.hpp" +#include "AdaAST.h" TQString qtext (const RefAdaAST& n); TQStringList qnamelist (const RefAdaAST& n); diff --git a/languages/ada/adasupport.cpp b/languages/ada/adasupport.cpp index 6b877b7b..69baa66d 100644 --- a/languages/ada/adasupport.cpp +++ b/languages/ada/adasupport.cpp @@ -4,10 +4,10 @@ #include <stdlib.h> #include <stack> #include <string> -#include <antlr/AST.hpp> -#include "AdaParser.hpp" -#include "AdaTokenTypes.hpp" -#include "adasupport.hpp" +#include <antlr/AST.h> +#include "AdaParser.h" +#include "AdaTokenTypes.h" +#include "adasupport.h" #define eq !strcmp diff --git a/languages/ada/adasupport.hpp b/languages/ada/adasupport.h index 9d65e0e5..f6bfddee 100644 --- a/languages/ada/adasupport.hpp +++ b/languages/ada/adasupport.h @@ -4,7 +4,7 @@ #define ADASUPPORT_H #include <string> -#include "AdaAST.hpp" +#include "AdaAST.h" std::string text (const RefAdaAST& n); int txteq (RefAdaAST n1, RefAdaAST n2); diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index e08ef9a3..1ca3abfd 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -28,10 +28,10 @@ #include "problemreporter.h" #include "backgroundparser.h" -#include "AdaLexer.hpp" -#include "AdaParser.hpp" -#include "AdaStoreWalker.hpp" -#include "AdaAST.hpp" +#include "AdaLexer.h" +#include "AdaParser.h" +#include "AdaStoreWalker.h" +#include "AdaAST.h" #include <kdevplugininfo.h> @@ -40,8 +40,8 @@ enum { KDEV_PCS_VERSION = 6 }; typedef KDevGenericFactory<AdaSupportPart> 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/ada/backgroundparser.cpp b/languages/ada/backgroundparser.cpp index 68607851..4b77abcd 100644 --- a/languages/ada/backgroundparser.cpp +++ b/languages/ada/backgroundparser.cpp @@ -11,9 +11,9 @@ #include "backgroundparser.h" #include "problemreporter.h" -#include "AdaLexer.hpp" -#include "AdaParser.hpp" -#include "AdaAST.hpp" +#include "AdaLexer.h" +#include "AdaParser.h" +#include "AdaAST.h" #include <kdebug.h> #include <tqfile.h> 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 <codemodel.h> typedef KDevGenericFactory<BashSupportPart> 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/KDevCppSupportIface.h b/languages/cpp/KDevCppSupportIface.h index cbf8b4f9..3d9363ba 100644 --- a/languages/cpp/KDevCppSupportIface.h +++ b/languages/cpp/KDevCppSupportIface.h @@ -25,4 +25,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 6a9a1fbc..d6dd5290 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -261,5 +261,3 @@ TQString AddAttributeDialog::accessID( VariableDom var ) const } #include "addattributedialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; - diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index e3070291..da75c98c 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -56,6 +56,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - - diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index 18b98e9c..793d26b4 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -258,9 +258,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -275,9 +272,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index c9593844..e4b19c18 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -416,5 +416,3 @@ TQStringList AddMethodDialog::newAccessList( const TQStringList& accessList ) co } #include "addmethoddialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; - diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h index e4cde58e..f1cfaf28 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -58,6 +58,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - - diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index 3926f966..b4af8a5e 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -314,9 +314,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -331,9 +328,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/languages/cpp/app_templates/gnome2mmapp/Makefile.am b/languages/cpp/app_templates/gnome2mmapp/Makefile.am index f86ae76c..bca35481 100644 --- a/languages/cpp/app_templates/gnome2mmapp/Makefile.am +++ b/languages/cpp/app_templates/gnome2mmapp/Makefile.am @@ -1,7 +1,7 @@ -dataFiles = acconfig.h autogen.sh gnome2mm.glade main_window.cc \ - main_window_glade.hh Makefile.am app-Makefile.am \ - configure.in gnome2mm.gladep main_window.hh \ - app.kdevelop gnome2mm.cc gnome2mmapp main_window_glade.cc\ +dataFiles = acconfig.h autogen.sh gnome2mm.glade main_window.cpp \ + main_window_glade.h Makefile.am app-Makefile.am \ + configure.in gnome2mm.gladep main_window.h \ + app.kdevelop gnome2mm.cpp gnome2mmapp main_window_glade.cpp\ src-Makefile.am config.h gnome2mmapp.png templateName = gnome2mmapp @@ -18,4 +18,4 @@ $(templateName).tar.gz: ${dataFiles} archivedir = ${appwizarddatadir} archive_DATA = $(templateName).tar.gz ${templateName}.png -CLEANFILES = *.tar.gz
\ No newline at end of file +CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cc b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cpp index 8a33b9ff..be1ab196 100644 --- a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cc +++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cpp @@ -4,7 +4,7 @@ #include <gnome--/main.h> #include <libgnome/gnome-i18n.h> -#include "main_window.hh" +#include "main_window.h" int main(int argc, char **argv) { diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.glade b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.glade index 4c0370aa..d0924693 100644 --- a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.glade +++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.glade @@ -1,4 +1,4 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<?xml version="1.0" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <glade-interface> diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.gladep b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.gladep index b7da0659..f5639907 100644 --- a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.gladep +++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.gladep @@ -1,4 +1,4 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<?xml version="1.0" standalone="no"?> <!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd"> <glade-project> diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate index 3b13385f..21dbd814 100644 --- a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate +++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate @@ -75,28 +75,28 @@ Dest=%{dest}/src/Makefile.am [FILE10] Type=install -Source=%{src}/gnome2mm.cc -Dest=%{dest}/src/%{APPNAMELC}.cc +Source=%{src}/gnome2mm.cpp +Dest=%{dest}/src/%{APPNAMELC}.cpp [FILE11] Type=install -Source=%{src}/main_window.hh -Dest=%{dest}/src/main_window.hh +Source=%{src}/main_window.h +Dest=%{dest}/src/main_window.h [FILE12] Type=install -Source=%{src}/main_window.cc -Dest=%{dest}/src/main_window.cc +Source=%{src}/main_window.cpp +Dest=%{dest}/src/main_window.cpp [FILE13] Type=install -Source=%{src}/main_window_glade.hh -Dest=%{dest}/src/main_window_glade.hh +Source=%{src}/main_window_glade.h +Dest=%{dest}/src/main_window_glade.h [FILE14] Type=install -Source=%{src}/main_window_glade.cc -Dest=%{dest}/src/main_window_glade.cc +Source=%{src}/main_window_glade.cpp +Dest=%{dest}/src/main_window_glade.cpp [MSG] Type=message diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.cc b/languages/cpp/app_templates/gnome2mmapp/main_window.cpp index 4c73911b..152a660c 100644 --- a/languages/cpp/app_templates/gnome2mmapp/main_window.cc +++ b/languages/cpp/app_templates/gnome2mmapp/main_window.cpp @@ -1,11 +1,9 @@ %{CC_TEMPLATE} -// newer (non customized) versions of this file go to main_window.cc_new - // This file is for your program, I won't touch it again! #include "config.h" -#include "main_window.hh" +#include "main_window.h" #include <gtk--/main.h> diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.hh b/languages/cpp/app_templates/gnome2mmapp/main_window.h index ae93336b..80ac8c70 100644 --- a/languages/cpp/app_templates/gnome2mmapp/main_window.hh +++ b/languages/cpp/app_templates/gnome2mmapp/main_window.h @@ -1,16 +1,14 @@ %{HH_TEMPLATE} -// newer (non customized) versions of this file go to main_window.hh_new - // you might replace // class foo : public foo_glade { ... }; // by // typedef foo_glade foo; // if you didn't make any modifications to the widget -#ifndef _MAIN_WINDOW_HH -# include "main_window_glade.hh" -# define _MAIN_WINDOW_HH +#ifndef _MAIN_WINDOW_H +# include "main_window_glade.h" +# define _MAIN_WINDOW_H class main_window : public main_window_glade { protected: diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cc b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cpp index bea6c857..577d3576 100644 --- a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cc +++ b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cpp @@ -4,11 +4,11 @@ // glade-- /home/amp8165/Projects/gnome2mm/gnome2mm.glade // for gtk 2.2.4 and gtkmm 1.2.10 // -// Please modify the corresponding derived classes in ./src/main_window.cc +// Please modify the corresponding derived classes in ./src/main_window.cpp #include "config.h" #include <libgnome/libgnome.h> -#include "main_window_glade.hh" +#include "main_window_glade.h" #include <gdk/gdkkeysyms.h> #include <gtk--/accelgroup.h> diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.hh b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.h index 97a9302f..1793dbdc 100644 --- a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.hh +++ b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.h @@ -4,10 +4,10 @@ // glade-- /home/amp8165/Projects/gnome2mm/gnome2mm.glade // for gtk 2.2.4 and gtkmm 1.2.10 // -// Please modify the corresponding derived classes in ./src/main_window.hh and./src/main_window.cc +// Please modify the corresponding derived classes in ./src/main_window.h and./src/main_window.cpp -#ifndef _MAIN_WINDOW_GLADE_HH -# define _MAIN_WINDOW_GLADE_HH +#ifndef _MAIN_WINDOW_GLADE_H +# define _MAIN_WINDOW_GLADE_H #if !defined(GLADEMM_DATA) diff --git a/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am b/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am index fe5ec32c..81df1152 100644 --- a/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am +++ b/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am @@ -1,13 +1,13 @@ bin_PROGRAMS = %{APPNAMELC} %{APPNAMELC}_SOURCES = \ - %{APPNAMELC}.cc\ - main_window_glade.cc \ - main_window.cc + %{APPNAMELC}.cpp\ + main_window_glade.cpp \ + main_window.cpp noinst_HEADERS = \ - main_window_glade.hh \ - main_window.hh + main_window_glade.h \ + main_window.h AM_CXXFLAGS = @CXXFLAGS@ @GNOMEMM_CFLAGS@ diff --git a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt index 0a78898d..f152b532 100644 --- a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt +++ b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt @@ -10,10 +10,10 @@ ################################################# set( _tarball_content - acconfig.h autogen.sh gtk2mm.glade main_window.cc - main_window_glade.hh Makefile.am app-Makefile.am - configure.in gtk2mm.gladep main_window.hh app.kdevelop - gtk2mm.cc main_window_glade.cc src-Makefile.am config.h + acconfig.h autogen.sh gtk2mm.glade main_window.cpp + main_window_glade.h Makefile.am app-Makefile.am + configure.in gtk2mm.gladep main_window.h app.kdevelop + gtk2mm.cpp main_window_glade.cpp src-Makefile.am config.h gtk2mmapp.png ) list( SORT _tarball_content ) diff --git a/languages/cpp/app_templates/gtk2mmapp/Makefile.am b/languages/cpp/app_templates/gtk2mmapp/Makefile.am index 2069ade7..16978c39 100644 --- a/languages/cpp/app_templates/gtk2mmapp/Makefile.am +++ b/languages/cpp/app_templates/gtk2mmapp/Makefile.am @@ -1,7 +1,7 @@ -dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cc \ - main_window_glade.hh Makefile.am app-Makefile.am \ - configure.in gtk2mm.gladep main_window.hh \ - app.kdevelop gtk2mm.cc main_window_glade.cc\ +dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cpp \ + main_window_glade.h Makefile.am app-Makefile.am \ + configure.in gtk2mm.gladep main_window.h \ + app.kdevelop gtk2mm.cpp main_window_glade.cpp\ src-Makefile.am config.h gtk2mmapp.png templateName = gtk2mmapp @@ -18,4 +18,4 @@ $(templateName).tar.gz: ${dataFiles} archivedir = ${appwizarddatadir} archive_DATA = $(templateName).tar.gz ${templateName}.png -CLEANFILES = *.tar.gz
\ No newline at end of file +CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp index 9845fede..30f39adf 100644 --- a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc +++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp @@ -2,7 +2,7 @@ #include <gtkmm/main.h> -#include "main_window.hh" +#include "main_window.h" int main(int argc, char **argv) { diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.glade b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.glade index ef4f1b18..144c16d4 100644 --- a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.glade +++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.glade @@ -1,4 +1,4 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<?xml version="1.0" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <glade-interface> diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.gladep b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.gladep index f09912ac..5feddec2 100644 --- a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.gladep +++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.gladep @@ -1,4 +1,4 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<?xml version="1.0" standalone="no"?> <!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd"> <glade-project> diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate index 35b51993..68b119a2 100644 --- a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate +++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate @@ -71,28 +71,28 @@ Dest=%{dest}/src/Makefile.am [FILE10] Type=install -Source=%{src}/gtk2mm.cc -Dest=%{dest}/src/%{APPNAMELC}.cc +Source=%{src}/gtk2mm.cpp +Dest=%{dest}/src/%{APPNAMELC}.cpp [FILE11] Type=install -Source=%{src}/main_window.hh -Dest=%{dest}/src/main_window.hh +Source=%{src}/main_window.h +Dest=%{dest}/src/main_window.h [FILE12] Type=install -Source=%{src}/main_window.cc -Dest=%{dest}/src/main_window.cc +Source=%{src}/main_window.cpp +Dest=%{dest}/src/main_window.cpp [FILE13] Type=install -Source=%{src}/main_window_glade.hh -Dest=%{dest}/src/main_window_glade.hh +Source=%{src}/main_window_glade.h +Dest=%{dest}/src/main_window_glade.h [FILE14] Type=install -Source=%{src}/main_window_glade.cc -Dest=%{dest}/src/main_window_glade.cc +Source=%{src}/main_window_glade.cpp +Dest=%{dest}/src/main_window_glade.cpp [MSG] Type=message diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.cc b/languages/cpp/app_templates/gtk2mmapp/main_window.cpp index ad36b327..3a7df9cf 100644 --- a/languages/cpp/app_templates/gtk2mmapp/main_window.cc +++ b/languages/cpp/app_templates/gtk2mmapp/main_window.cpp @@ -1,11 +1,9 @@ %{CC_TEMPLATE} -// newer (non customized) versions of this file go to main_window.cc_new - // This file is for your program, I won't touch it again! #include "config.h" -#include "main_window.hh" +#include "main_window.h" bool main_window::quit(GdkEventAny *ev) { return 0; diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.hh b/languages/cpp/app_templates/gtk2mmapp/main_window.h index 640e1461..85daad4b 100644 --- a/languages/cpp/app_templates/gtk2mmapp/main_window.hh +++ b/languages/cpp/app_templates/gtk2mmapp/main_window.h @@ -1,16 +1,14 @@ %{HH_TEMPLATE} -// newer (non customized) versions of this file go to main_window.hh_new - // you might replace // class foo : public foo_glade { ... }; // by // typedef foo_glade foo; // if you didn't make any modifications to the widget -#ifndef _MAIN_WINDOW_HH -# include "main_window_glade.hh" -# define _MAIN_WINDOW_HH +#ifndef _MAIN_WINDOW_H +# include "main_window_glade.h" +# define _MAIN_WINDOW_H class main_window : public main_window_glade { diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cc b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cpp index 829855a8..5bed4679 100644 --- a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cc +++ b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cpp @@ -3,7 +3,7 @@ // DO NOT EDIT THIS FILE ! It was created using glade-- // for gtk 2.8.3 and gtkmm 2.8.0 // -// Please modify the corresponding derived classes in ./src/main_window.cc +// Please modify the corresponding derived classes in ./src/main_window.cpp #if defined __GNUC__ && __GNUC__ < 3 @@ -18,7 +18,7 @@ #else //gtkmm 2.2 #define GMM_GTKMM_22_24(a,b) a #endif // -#include "main_window_glade.hh" +#include "main_window_glade.h" #include <gdk/gdkkeysyms.h> #include <gtkmm/accelgroup.h> diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.hh b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.h index 3c0cc27a..726409b4 100644 --- a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.hh +++ b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.h @@ -3,10 +3,10 @@ // DO NOT EDIT THIS FILE ! It was created using glade-- // for gtk 2.8.3 and gtkmm 2.8.0 // -// Please modify the corresponding derived classes in ./src/main_window.hh and./src/main_window.cc +// Please modify the corresponding derived classes in ./src/main_window.h and./src/main_window.cpp -#ifndef _MAIN_WINDOW_GLADE_HH -# define _MAIN_WINDOW_GLADE_HH +#ifndef _MAIN_WINDOW_GLADE_H +# define _MAIN_WINDOW_GLADE_H #if !defined(GLADEMM_DATA) diff --git a/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am b/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am index a8c856e9..e61b92f5 100644 --- a/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am +++ b/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am @@ -1,13 +1,13 @@ bin_PROGRAMS = %{APPNAMELC} %{APPNAMELC}_SOURCES = \ - %{APPNAMELC}.cc\ - main_window_glade.cc \ - main_window.cc + %{APPNAMELC}.cpp\ + main_window_glade.cpp \ + main_window.cpp noinst_HEADERS = \ - main_window_glade.hh \ - main_window.hh + main_window_glade.h \ + main_window.h AM_CXXFLAGS = @CXXFLAGS@ @GTKMM_CFLAGS@ 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/ast_utils.cpp b/languages/cpp/ast_utils.cpp index 7813e784..84f9cb1c 100644 --- a/languages/cpp/ast_utils.cpp +++ b/languages/cpp/ast_utils.cpp @@ -187,4 +187,3 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b return text.replace( TQRegExp( " :: " ), "::" ).simplifyWhiteSpace(); } -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/ast_utils.h b/languages/cpp/ast_utils.h index a960abad..54afa64a 100644 --- a/languages/cpp/ast_utils.h +++ b/languages/cpp/ast_utils.h @@ -30,5 +30,3 @@ TQString typeSpecToString( TypeSpecifierAST* typeSpec ); TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString(), bool skipPtrOp = false ); #endif // __ast_utils_h -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index 730a090f..a4ad9fed 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -547,6 +547,3 @@ void BackgroundParser::saveMemory() { m_saveMemory = true; //Delay the operation m_canParse.wakeAll(); } - - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/backgroundparser.h b/languages/cpp/backgroundparser.h index f3cd86fd..f4a63a12 100644 --- a/languages/cpp/backgroundparser.h +++ b/languages/cpp/backgroundparser.h @@ -118,5 +118,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/bithelpers.h b/languages/cpp/bithelpers.h index 3cb74420..c1aec8a8 100644 --- a/languages/cpp/bithelpers.h +++ b/languages/cpp/bithelpers.h @@ -33,5 +33,3 @@ inline Type bitInvert( Type val ) { } } #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 99a6db12..0af6faab 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -586,5 +586,3 @@ void CCConfigWidget::openPluginPaths() } #include "ccconfigwidget.moc" - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/ccconfigwidget.h b/languages/cpp/ccconfigwidget.h index a240c80f..403ce550 100644 --- a/languages/cpp/ccconfigwidget.h +++ b/languages/cpp/ccconfigwidget.h @@ -71,5 +71,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index 32b69e92..9fe117c1 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -289,9 +289,6 @@ completion-box.</string> <string>Show comment with argument hint</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> @@ -1059,9 +1056,6 @@ This option only applies to QMake projects.</string> <property name="text"> <string>Qt &3 style (#include <qwidget.h>)</string> </property> - <property name="accel"> - <string>Alt+3</string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -1076,9 +1070,6 @@ This option only applies to QMake projects.</string> <property name="text"> <string>Qt &4 style (#include <QWidget>)</string> </property> - <property name="accel"> - <string>Alt+4</string> - </property> <property name="whatsThis" stdset="0"> <string>Select this if your project is using include style as known from Qt version 4.x.</string> </property> diff --git a/languages/cpp/classgeneratorconfig.h b/languages/cpp/classgeneratorconfig.h index 29326df0..9c9cf86f 100644 --- a/languages/cpp/classgeneratorconfig.h +++ b/languages/cpp/classgeneratorconfig.h @@ -77,6 +77,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - - diff --git a/languages/cpp/codecompletionentry.h b/languages/cpp/codecompletionentry.h index de4883f9..386e39ed 100644 --- a/languages/cpp/codecompletionentry.h +++ b/languages/cpp/codecompletionentry.h @@ -54,4 +54,3 @@ public: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h index 54610e50..339c5d66 100644 --- a/languages/cpp/codeinformationrepository.h +++ b/languages/cpp/codeinformationrepository.h @@ -54,5 +54,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index 37470a49..1d9cd91e 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -702,4 +702,3 @@ TQString GccOptionsPlugin::exec( TQWidget *parent, const TQString &flags ) } #include "gccoptionsplugin.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/completiondebug.cpp b/languages/cpp/completiondebug.cpp index dc73329e..8c7df94e 100644 --- a/languages/cpp/completiondebug.cpp +++ b/languages/cpp/completiondebug.cpp @@ -52,5 +52,3 @@ template<> KDDebugState<kndbgstream>::KDDebugState() { } } - -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/completiondebug.h b/languages/cpp/completiondebug.h index 325ad193..2537e2c4 100644 --- a/languages/cpp/completiondebug.h +++ b/languages/cpp/completiondebug.h @@ -218,4 +218,3 @@ kndbgstream dbgMajor(); #endif } #endif -// kate: indent-mode csands; tab-width 2; diff --git a/languages/cpp/computerecoverypoints.h b/languages/cpp/computerecoverypoints.h index a7cfaea5..51fce194 100644 --- a/languages/cpp/computerecoverypoints.h +++ b/languages/cpp/computerecoverypoints.h @@ -187,4 +187,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index 97cc66e1..f65db442 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -94,5 +94,3 @@ void ConfigureProblemReporter::setDelayLabel( int delay ) { delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) ); } -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/cpp_tags.h b/languages/cpp/cpp_tags.h index 12a0199f..af419000 100644 --- a/languages/cpp/cpp_tags.h +++ b/languages/cpp/cpp_tags.h @@ -428,5 +428,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 2e1e67f2..b032ac72 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -4489,5 +4489,3 @@ bool CppCodeCompletion::getIncludeInfo( int line, TQString& includeFileName, TQS #include "cppcodecompletion.moc" -//kate: indent-mode csands; tab-width 2; space-indent off; - diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index 4c2f4c8b..dcdb9a79 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -323,4 +323,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/cppcodecompletionconfig.h b/languages/cpp/cppcodecompletionconfig.h index 6417c0d9..f7c8c18c 100644 --- a/languages/cpp/cppcodecompletionconfig.h +++ b/languages/cpp/cppcodecompletionconfig.h @@ -308,4 +308,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp index b84185f5..50c8b867 100644 --- a/languages/cpp/cppevaluation.cpp +++ b/languages/cpp/cppevaluation.cpp @@ -479,5 +479,3 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, return bestRet; } } - -// kate: indent-mode csands; tab-width 2; diff --git a/languages/cpp/cppevaluation.h b/languages/cpp/cppevaluation.h index 97924b0a..9843eab6 100644 --- a/languages/cpp/cppevaluation.h +++ b/languages/cpp/cppevaluation.h @@ -364,4 +364,3 @@ class ExpressionEvaluation { } #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index c8569c03..040fc759 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -39,6 +39,3 @@ protected: }; #endif -// kate: indent-mode csands; tab-width 4; - - diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index 6289da44..dda53df7 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -2217,5 +2217,3 @@ void CppNewClassDialog::headeronly_box_stateChanged(int val) } #include "cppnewclassdlg.moc" - -//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h index e7f969db..37c52ea5 100644 --- a/languages/cpp/cppnewclassdlg.h +++ b/languages/cpp/cppnewclassdlg.h @@ -289,5 +289,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/cppsplitheadersourceconfig.cpp b/languages/cpp/cppsplitheadersourceconfig.cpp index 7298354b..82e77e02 100644 --- a/languages/cpp/cppsplitheadersourceconfig.cpp +++ b/languages/cpp/cppsplitheadersourceconfig.cpp @@ -79,4 +79,3 @@ void CppSplitHeaderSourceConfig::setOrientation( const TQString &o ) } #include "cppsplitheadersourceconfig.moc" -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/cppsplitheadersourceconfig.h b/languages/cpp/cppsplitheadersourceconfig.h index 613f0d0f..c5a7eace 100644 --- a/languages/cpp/cppsplitheadersourceconfig.h +++ b/languages/cpp/cppsplitheadersourceconfig.h @@ -72,4 +72,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/cppsupport_events.h b/languages/cpp/cppsupport_events.h index b40fc0ec..94fc0143 100644 --- a/languages/cpp/cppsupport_events.h +++ b/languages/cpp/cppsupport_events.h @@ -67,5 +67,3 @@ private: #endif // __cppsupport_events_h -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp index 10ec75bc..e58639e0 100644 --- a/languages/cpp/cppsupport_utils.cpp +++ b/languages/cpp/cppsupport_utils.cpp @@ -135,5 +135,3 @@ TQString formattedClosingParenthesis(bool suppressSpace) if (not use_spaces or suppressSpace) return ")"; return " )"; } - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/cppsupport_utils.h b/languages/cpp/cppsupport_utils.h index 37331eaa..6877bbbb 100644 --- a/languages/cpp/cppsupport_utils.h +++ b/languages/cpp/cppsupport_utils.h @@ -24,5 +24,3 @@ TQString formattedOpeningParenthesis(bool suppressSpace = false); TQString formattedClosingParenthesis(bool suppressSpace = false); #endif // __cppsupport_utils_h -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp index 41335cdb..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<CppSupportPart>( data ) +: KDevGenericFactory<CppSupportPart>( pluginData ) { } @@ -35,8 +35,5 @@ TDEInstance *CppSupportFactory::createInstance() const KDevPluginInfo * CppSupportFactory::info() { - return &data; + return &pluginData; } -//kate: indent-mode csands; tab-width 4; space-indent off; - - diff --git a/languages/cpp/cppsupportfactory.h b/languages/cpp/cppsupportfactory.h index f543c4fc..db4cbd15 100644 --- a/languages/cpp/cppsupportfactory.h +++ b/languages/cpp/cppsupportfactory.h @@ -29,5 +29,3 @@ protected: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index 582fef1b..f8c05c73 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -1734,7 +1734,12 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum TQString implFile = findSourceFile(); m_backgroundParser->lock(); - TranslationUnitAST* translationUnit = *m_backgroundParser->translationUnit( m_activeFileName ); + ParsedFilePointer pTranslationUnit = m_backgroundParser->translationUnit( m_activeFileName ); + TranslationUnitAST *translationUnit = NULL; + if (pTranslationUnit) + { + translationUnit = *pTranslationUnit; + } if ( translationUnit ) { bool fail = false; @@ -3181,6 +3186,3 @@ void UIBlockTester::lockup() { } #include "cppsupportpart.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; - - diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index 7de698c0..15a272fd 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -659,5 +659,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/creategettersetterconfiguration.cpp b/languages/cpp/creategettersetterconfiguration.cpp index ace72d14..db37b540 100644 --- a/languages/cpp/creategettersetterconfiguration.cpp +++ b/languages/cpp/creategettersetterconfiguration.cpp @@ -58,5 +58,3 @@ void CreateGetterSetterConfiguration::store( ) } #include "creategettersetterconfiguration.moc" - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/creategettersetterdialog.cpp b/languages/cpp/creategettersetterdialog.cpp index e63fcf23..78b7a281 100644 --- a/languages/cpp/creategettersetterdialog.cpp +++ b/languages/cpp/creategettersetterdialog.cpp @@ -119,4 +119,3 @@ void CreateGetterSetterDialog::slotInlineChanged( ) } #include "creategettersetterdialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 9cca7ef8..893ac55b 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -353,6 +353,3 @@ void CreatePCSDialog::slotSelectionChanged( TQListViewItem * item ) { setNextPageEnabled( item != 0 ); } - -//kate: indent-mode csands; tab-width 4; space-indent off; - diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h index 02d66299..73b08620 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -56,7 +56,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - - - diff --git a/languages/cpp/debugger/debuggerconfigwidgetbase.ui b/languages/cpp/debugger/debuggerconfigwidgetbase.ui index 9d6dcbf1..b3d0ae5e 100644 --- a/languages/cpp/debugger/debuggerconfigwidgetbase.ui +++ b/languages/cpp/debugger/debuggerconfigwidgetbase.ui @@ -156,9 +156,6 @@ If you are not "dlopen"ing libs then leave this unchecked.</string> <property name="text"> <string>Enable separate terminal for application &IO</string> </property> - <property name="accel"> - <string>Alt+I</string> - </property> <property name="whatsThis" stdset="0"> <string>This allows you to enter terminal input when your application contains terminal input code (e.g. cin, fgets, etc.). @@ -173,9 +170,6 @@ Otherwise leave it unchecked.</string> <property name="text"> <string>E&nable floating toolbar</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="whatsThis" stdset="0"> <string>Use the floating toolbar. This toolbar always stays on top of all windows so that if the app covers TDevelop @@ -192,9 +186,6 @@ This toolbar is in addition to the toolbar in TDevelop.</string> <property name="text"> <string>Display static &members</string> </property> - <property name="accel"> - <string>Alt+M</string> - </property> <property name="whatsThis" stdset="0"> <string>Displaying static members makes GDB slower in producing data within TDE and TQt. diff --git a/languages/cpp/declarationinfo.h b/languages/cpp/declarationinfo.h index 8b55557e..6b63e0a7 100644 --- a/languages/cpp/declarationinfo.h +++ b/languages/cpp/declarationinfo.h @@ -69,4 +69,3 @@ struct DeclarationInfo { #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/doxydoc.cpp b/languages/cpp/doxydoc.cpp index 9b637798..0a48594b 100644 --- a/languages/cpp/doxydoc.cpp +++ b/languages/cpp/doxydoc.cpp @@ -144,5 +144,3 @@ TQString DoxyDoc::functionDescription( const TQString& tmpscope, const TQString& return TQString(); } - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/doxydoc.h b/languages/cpp/doxydoc.h index c36d6ada..7cb9639f 100644 --- a/languages/cpp/doxydoc.h +++ b/languages/cpp/doxydoc.h @@ -55,5 +55,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/expressioninfo.h b/languages/cpp/expressioninfo.h index 4b42a2f4..bfcf88d1 100644 --- a/languages/cpp/expressioninfo.h +++ b/languages/cpp/expressioninfo.h @@ -96,4 +96,3 @@ struct ExpressionInfo { #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/kdevdeepcopy.h b/languages/cpp/kdevdeepcopy.h index c29ee1e1..538b78db 100644 --- a/languages/cpp/kdevdeepcopy.h +++ b/languages/cpp/kdevdeepcopy.h @@ -10,5 +10,3 @@ inline TQString deepCopy( const TQString& s ) } #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp index 4a6c45ec..8832df13 100644 --- a/languages/cpp/kdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -202,5 +202,3 @@ bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { } } - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/kdevdriver.h b/languages/cpp/kdevdriver.h index 8af87e0c..2bbc926d 100644 --- a/languages/cpp/kdevdriver.h +++ b/languages/cpp/kdevdriver.h @@ -53,6 +53,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - - diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index 845cc382..f37301a8 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -279,5 +279,3 @@ int main( int argc, char* argv[] ) return 0; } - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp index 38a41eb8..73e39392 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp @@ -115,4 +115,3 @@ void KDevCustomImporter::processDir( const TQString path, TQStringList & files ) } #include "kdevcustomimporter.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index c8255f02..cdaf65b9 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -100,8 +100,3 @@ void SettingsDialog::validateDirectory( const TQString & dir ) } #include "settingsdialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; - - - - diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp index bede0b3e..9accb951 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp @@ -110,6 +110,3 @@ void SettingsDialog::addUrlButton_clicked( ) #include "settingsdialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; - - diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp index 62eb38fd..c208ae76 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp @@ -69,5 +69,3 @@ TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * n m_settings = new SettingsDialog( parent, name ); return m_settings; } - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index 405b7c93..f5b0e636 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -118,5 +118,3 @@ void SettingsDialog::addUrlButton_clicked( ) } #include "settingsdialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; - diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp index d3f5795b..cd830c1a 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp @@ -114,6 +114,3 @@ TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const cha m_settings = new SettingsDialog( parent, name ); return m_settings; } -//kate: indent-mode csands; tab-width 4; space-indent off; - - diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp index 5953d08e..631d50d0 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp @@ -95,7 +95,3 @@ void SettingsDialog::addUrlButton_clicked() #include "settingsdialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; - - - diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index c4143d03..49cb66f7 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -442,4 +442,3 @@ int ProblemReporter::levelToMarkType( int level ) const } #include "problemreporter.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h index 4d14a9ca..66bf9c62 100644 --- a/languages/cpp/problemreporter.h +++ b/languages/cpp/problemreporter.h @@ -155,4 +155,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp index c5c87b1c..e5ca6f3d 100644 --- a/languages/cpp/qtbuildconfig.cpp +++ b/languages/cpp/qtbuildconfig.cpp @@ -212,5 +212,3 @@ void QtBuildConfig::setDesignerIntegration( const TQString& designerIntegration m_designerIntegration = designerIntegration; } #include "qtbuildconfig.moc" - -//kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h index 118503b6..6bbd71ef 100644 --- a/languages/cpp/qtbuildconfig.h +++ b/languages/cpp/qtbuildconfig.h @@ -87,5 +87,3 @@ private: }; #endif - -// kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp index db6df895..9466feb6 100644 --- a/languages/cpp/qtdesignercppintegration.cpp +++ b/languages/cpp/qtdesignercppintegration.cpp @@ -212,7 +212,4 @@ void QtDesignerCppIntegration::processImplementationName( TQString &name ) { name.replace( ".h", ".cpp" ); } - #include "qtdesignercppintegration.moc" - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/qtdesignercppintegration.h b/languages/cpp/qtdesignercppintegration.h index d156d276..ea814ea4 100644 --- a/languages/cpp/qtdesignercppintegration.h +++ b/languages/cpp/qtdesignercppintegration.h @@ -37,5 +37,3 @@ protected: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/simplecontext.cpp b/languages/cpp/simplecontext.cpp index 225bfc84..addaaf9d 100644 --- a/languages/cpp/simplecontext.cpp +++ b/languages/cpp/simplecontext.cpp @@ -64,5 +64,3 @@ SimpleVariable SimpleContext::findVariable( const TQString& varname ) } return SimpleVariable(); } - -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/simplecontext.h b/languages/cpp/simplecontext.h index a0075554..ba41921c 100644 --- a/languages/cpp/simplecontext.h +++ b/languages/cpp/simplecontext.h @@ -168,4 +168,3 @@ class SimpleContext }; #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index da73f252..f0df868d 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -1046,6 +1046,3 @@ void SimpleTypeConfiguration::setGlobalNamespace( TypePointer globalNamespace ) SimpleType::setGlobalNamespace( globalNamespace ); } } - -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h index 1e9a0157..e7623178 100644 --- a/languages/cpp/simpletype.h +++ b/languages/cpp/simpletype.h @@ -815,5 +815,3 @@ class TypeTrace { #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h index f21be109..b7a0a4f5 100644 --- a/languages/cpp/simpletypecachebinder.h +++ b/languages/cpp/simpletypecachebinder.h @@ -345,4 +345,3 @@ class SimpleTypeCacheBinder : public Base { #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/simpletypecatalog.cpp b/languages/cpp/simpletypecatalog.cpp index f662acc5..61d0a082 100644 --- a/languages/cpp/simpletypecatalog.cpp +++ b/languages/cpp/simpletypecatalog.cpp @@ -370,6 +370,3 @@ TypePointer SimpleTypeCatalog::CatalogBuildInfo::build() { } } - -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/simpletypecatalog.h b/languages/cpp/simpletypecatalog.h index e22a3fcf..2e043724 100644 --- a/languages/cpp/simpletypecatalog.h +++ b/languages/cpp/simpletypecatalog.h @@ -115,5 +115,3 @@ protected: #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp index 0af7bdc8..0fcaa100 100644 --- a/languages/cpp/simpletypefunction.cpp +++ b/languages/cpp/simpletypefunction.cpp @@ -722,5 +722,3 @@ TypePointer SimpleTypeCatalogFunction::CatalogFunctionBuildInfo::build() { } return ret.front(); } - -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/simpletypefunction.h b/languages/cpp/simpletypefunction.h index 90b5fcab..d2169e72 100644 --- a/languages/cpp/simpletypefunction.h +++ b/languages/cpp/simpletypefunction.h @@ -338,4 +338,3 @@ public: #endif -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp index f7937db1..07804e09 100644 --- a/languages/cpp/simpletypenamespace.cpp +++ b/languages/cpp/simpletypenamespace.cpp @@ -434,5 +434,3 @@ TypePointer SimpleTypeNamespace::NamespaceBuildInfo::build() { } return m_built; } - -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/simpletypenamespace.h b/languages/cpp/simpletypenamespace.h index b465cfb6..555150a7 100644 --- a/languages/cpp/simpletypenamespace.h +++ b/languages/cpp/simpletypenamespace.h @@ -161,5 +161,3 @@ class SimpleTypeNamespace : public SimpleTypeImpl { #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/store_walker.cpp b/languages/cpp/store_walker.cpp index 8b13b808..cd05e3ce 100644 --- a/languages/cpp/store_walker.cpp +++ b/languages/cpp/store_walker.cpp @@ -1077,5 +1077,3 @@ TQStringList StoreWalker::scopeOfDeclarator( DeclaratorAST* d, const TQStringLis { return scopeOfName( d->declaratorId(), startScope ); } - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/store_walker.h b/languages/cpp/store_walker.h index 1e646d79..374607df 100644 --- a/languages/cpp/store_walker.h +++ b/languages/cpp/store_walker.h @@ -137,5 +137,3 @@ private: }; #endif // __store_walker_h -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/storeconverter.cpp b/languages/cpp/storeconverter.cpp index 6ad55925..82cd4e5e 100644 --- a/languages/cpp/storeconverter.cpp +++ b/languages/cpp/storeconverter.cpp @@ -145,5 +145,3 @@ void StoreConverter::parseArguments(FunctionDom function, CppFunction<Tag> &cppF function->addArgument(arg); } } - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/storeconverter.h b/languages/cpp/storeconverter.h index 1aa48e6b..f9203e9d 100644 --- a/languages/cpp/storeconverter.h +++ b/languages/cpp/storeconverter.h @@ -44,5 +44,3 @@ private: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/stringhelpers.cpp b/languages/cpp/stringhelpers.cpp index bc267c15..262df1e3 100644 --- a/languages/cpp/stringhelpers.cpp +++ b/languages/cpp/stringhelpers.cpp @@ -294,6 +294,3 @@ TQString stringMult( int count, TQString str ){ } } - - -// kate: indent-mode csands; tab-width 4; diff --git a/languages/cpp/stringhelpers.h b/languages/cpp/stringhelpers.h index 33e01827..7a97bdef 100644 --- a/languages/cpp/stringhelpers.h +++ b/languages/cpp/stringhelpers.h @@ -115,4 +115,3 @@ TQString stringMult( int count, TQString str ); #endif -// kate: tab-width 2; diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 0982226c..48bc3f91 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -532,5 +532,3 @@ TQString SubclassingDlg::readBaseClassName() DomUtil::openDOMFile(doc,m_formFile); return DomUtil::elementByPathExt(doc,WIDGET_CLASS_NAME).text(); } - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h index 43fd06ad..93fe9279 100644 --- a/languages/cpp/subclassingdlg.h +++ b/languages/cpp/subclassingdlg.h @@ -81,5 +81,3 @@ protected: }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/tag_creator.cpp b/languages/cpp/tag_creator.cpp index 16876219..f2a99d99 100644 --- a/languages/cpp/tag_creator.cpp +++ b/languages/cpp/tag_creator.cpp @@ -880,5 +880,3 @@ TQString TagUtils::accessToString( int id ) return TQString(); } - -//kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/tag_creator.h b/languages/cpp/tag_creator.h index 425d7135..ff95652b 100644 --- a/languages/cpp/tag_creator.h +++ b/languages/cpp/tag_creator.h @@ -127,5 +127,3 @@ private: }; #endif // __tag_creator_h -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/templates/default.cpp b/languages/cpp/templates/default.cpp index 9f3c6258..23b3f500 100644 --- a/languages/cpp/templates/default.cpp +++ b/languages/cpp/templates/default.cpp @@ -1,4 +1,3 @@ -// -*-c++-*- // // C++ Implementation: $MODULE$ // diff --git a/languages/cpp/templates/default.h b/languages/cpp/templates/default.h index aa63e1e2..4e987ea1 100644 --- a/languages/cpp/templates/default.h +++ b/languages/cpp/templates/default.h @@ -1,4 +1,3 @@ -// -*-c++-*- // // C++ Interface: $MODULE$ // diff --git a/languages/cpp/typedecoration.h b/languages/cpp/typedecoration.h index e142d837..2d9615f9 100644 --- a/languages/cpp/typedecoration.h +++ b/languages/cpp/typedecoration.h @@ -115,5 +115,3 @@ class TypeDecoration { }; #endif -// kate: indent-mode csands; tab-width 4; - diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h index 77af4e00..592863c4 100644 --- a/languages/cpp/typedesc.h +++ b/languages/cpp/typedesc.h @@ -400,4 +400,3 @@ class TypeDescShared : public TypeDesc, public TDEShared { extern TypeDesc operator + ( const TypeDesc& lhs, const TypeDesc& rhs ); #endif -// kate: indent-mode csands; tab-width 4; 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<CSharpSupportPart> 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<FortranSupportPart> 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/JavaAST.hpp b/languages/java/JavaAST.h index 7108fca1..4d89452e 100644 --- a/languages/java/JavaAST.hpp +++ b/languages/java/JavaAST.h @@ -1,8 +1,8 @@ #ifndef JAVAAST_HPP #define JAVAAST_HPP -#include <antlr/CommonAST.hpp> -#include <antlr/ASTFactory.hpp> +#include <antlr/CommonAST.h> +#include <antlr/ASTFactory.h> class JavaAST; typedef ANTLR_USE_NAMESPACE(antlr)ASTRefCount<JavaAST> RefJavaAST; diff --git a/languages/java/JavaLexer.cpp b/languages/java/JavaLexer.cpp index 623e816f..4230b156 100644 --- a/languages/java/JavaLexer.cpp +++ b/languages/java/JavaLexer.cpp @@ -1,12 +1,12 @@ /* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaLexer.cpp"$ */ -#include "JavaLexer.hpp" -#include <antlr/CharBuffer.hpp> -#include <antlr/TokenStreamException.hpp> -#include <antlr/TokenStreamIOException.hpp> -#include <antlr/TokenStreamRecognitionException.hpp> -#include <antlr/CharStreamException.hpp> -#include <antlr/CharStreamIOException.hpp> -#include <antlr/NoViableAltForCharException.hpp> +#include "JavaLexer.h" +#include <antlr/CharBuffer.h> +#include <antlr/TokenStreamException.h> +#include <antlr/TokenStreamIOException.h> +#include <antlr/TokenStreamRecognitionException.h> +#include <antlr/CharStreamException.h> +#include <antlr/CharStreamIOException.h> +#include <antlr/NoViableAltForCharException.h> #line 1041 "java.g" diff --git a/languages/java/JavaLexer.hpp b/languages/java/JavaLexer.h index 9d185686..e5b6fb1d 100644 --- a/languages/java/JavaLexer.hpp +++ b/languages/java/JavaLexer.h @@ -1,10 +1,10 @@ -#ifndef INC_JavaLexer_hpp_ -#define INC_JavaLexer_hpp_ +#ifndef INC_JavaLexer_h_ +#define INC_JavaLexer_h_ #line 2 "java.g" #include "driver.h" - #include "JavaAST.hpp" + #include "JavaAST.h" #include <tqlistview.h> #include <kdebug.h> @@ -15,14 +15,14 @@ RefJavaAST(ast)->setColumn( t->getColumn() ); \ } -#line 19 "JavaLexer.hpp" -#include <antlr/config.hpp> -/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaLexer.hpp"$ */ -#include <antlr/CommonToken.hpp> -#include <antlr/InputBuffer.hpp> -#include <antlr/BitSet.hpp> -#include "JavaTokenTypes.hpp" -#include <antlr/CharScanner.hpp> +#line 19 "JavaLexer.h" +#include <antlr/config.h> +/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaLexer.h"$ */ +#include <antlr/CommonToken.h> +#include <antlr/InputBuffer.h> +#include <antlr/BitSet.h> +#include "JavaTokenTypes.h" +#include <antlr/CharScanner.h> class CUSTOM_API JavaLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public JavaTokenTypes { #line 1058 "java.g" @@ -45,7 +45,7 @@ public: virtual void reportWarning( const ANTLR_USE_NAMESPACE(std)string& warnMessage ){ m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(warnMessage.c_str()), getLine(), getColumn()) ); } -#line 30 "JavaLexer.hpp" +#line 30 "JavaLexer.h" private: void initLiterals(); public: @@ -129,4 +129,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4; }; -#endif /*INC_JavaLexer_hpp_*/ +#endif /*INC_JavaLexer_h_*/ diff --git a/languages/java/JavaRecognizer.cpp b/languages/java/JavaRecognizer.cpp index 1021c6a0..7d010b49 100644 --- a/languages/java/JavaRecognizer.cpp +++ b/languages/java/JavaRecognizer.cpp @@ -1,8 +1,8 @@ /* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaRecognizer.cpp"$ */ -#include "JavaRecognizer.hpp" -#include <antlr/NoViableAltException.hpp> -#include <antlr/SemanticException.hpp> -#include <antlr/ASTFactory.hpp> +#include "JavaRecognizer.h" +#include <antlr/NoViableAltException.h> +#include <antlr/SemanticException.h> +#include <antlr/ASTFactory.h> #line 1 "java.g" #line 8 "JavaRecognizer.cpp" JavaRecognizer::JavaRecognizer(ANTLR_USE_NAMESPACE(antlr)TokenBuffer& tokenBuf, int k) diff --git a/languages/java/JavaRecognizer.hpp b/languages/java/JavaRecognizer.h index fab59972..32311a3d 100644 --- a/languages/java/JavaRecognizer.hpp +++ b/languages/java/JavaRecognizer.h @@ -1,10 +1,10 @@ -#ifndef INC_JavaRecognizer_hpp_ -#define INC_JavaRecognizer_hpp_ +#ifndef INC_JavaRecognizer_h_ +#define INC_JavaRecognizer_h_ #line 2 "java.g" #include "driver.h" - #include "JavaAST.hpp" + #include "JavaAST.h" #include <tqlistview.h> #include <kdebug.h> @@ -15,13 +15,13 @@ RefJavaAST(ast)->setColumn( t->getColumn() ); \ } -#line 19 "JavaRecognizer.hpp" -#include <antlr/config.hpp> -/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaRecognizer.hpp"$ */ -#include <antlr/TokenStream.hpp> -#include <antlr/TokenBuffer.hpp> -#include "JavaTokenTypes.hpp" -#include <antlr/LLkParser.hpp> +#line 19 "JavaRecognizer.h" +#include <antlr/config.h> +/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaRecognizer.h"$ */ +#include <antlr/TokenStream.h> +#include <antlr/TokenBuffer.h> +#include "JavaTokenTypes.h" +#include <antlr/LLkParser.h> /** Java 1.3 Recognizer * @@ -157,7 +157,7 @@ public: void reportMessage( const ANTLR_USE_NAMESPACE(std)string& message ){ m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(message.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); } -#line 142 "JavaRecognizer.hpp" +#line 142 "JavaRecognizer.h" public: void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory ); protected: @@ -420,4 +420,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_66; }; -#endif /*INC_JavaRecognizer_hpp_*/ +#endif /*INC_JavaRecognizer_h_*/ diff --git a/languages/java/JavaStoreWalker.cpp b/languages/java/JavaStoreWalker.cpp index 1bdb9522..763f95e7 100644 --- a/languages/java/JavaStoreWalker.cpp +++ b/languages/java/JavaStoreWalker.cpp @@ -1,11 +1,11 @@ /* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalker.cpp"$ */ -#include "JavaStoreWalker.hpp" -#include <antlr/Token.hpp> -#include <antlr/AST.hpp> -#include <antlr/NoViableAltException.hpp> -#include <antlr/MismatchedTokenException.hpp> -#include <antlr/SemanticException.hpp> -#include <antlr/BitSet.hpp> +#include "JavaStoreWalker.h" +#include <antlr/Token.h> +#include <antlr/AST.h> +#include <antlr/NoViableAltException.h> +#include <antlr/MismatchedTokenException.h> +#include <antlr/SemanticException.h> +#include <antlr/BitSet.h> #line 1 "java.store.g" #line 11 "JavaStoreWalker.cpp" JavaStoreWalker::JavaStoreWalker() diff --git a/languages/java/JavaStoreWalker.hpp b/languages/java/JavaStoreWalker.h index 676163ad..244c0978 100644 --- a/languages/java/JavaStoreWalker.hpp +++ b/languages/java/JavaStoreWalker.h @@ -1,21 +1,21 @@ -#ifndef INC_JavaStoreWalker_hpp_ -#define INC_JavaStoreWalker_hpp_ +#ifndef INC_JavaStoreWalker_h_ +#define INC_JavaStoreWalker_h_ #line 3 "java.store.g" #include <codemodel.h> - #include "JavaAST.hpp" + #include "JavaAST.h" #include <tqstring.h> #include <tqstringlist.h> #include <tqvaluestack.h> #include <tqfileinfo.h> -#line 15 "JavaStoreWalker.hpp" -#include <antlr/config.hpp> -#include "JavaStoreWalkerTokenTypes.hpp" -/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalker.hpp"$ */ -#include <antlr/TreeParser.hpp> +#line 15 "JavaStoreWalker.h" +#include <antlr/config.h> +#include "JavaStoreWalkerTokenTypes.h" +/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalker.h"$ */ +#include <antlr/TreeParser.h> #line 13 "java.store.g" @@ -23,7 +23,7 @@ #include <kdebug.h> -#line 27 "JavaStoreWalker.hpp" +#line 27 "JavaStoreWalker.h" /** Java 1.2 AST Recognizer Grammar * * Author: @@ -70,7 +70,7 @@ public: initializeASTFactory (ast_factory); setASTFactory (&ast_factory); } -#line 44 "JavaStoreWalker.hpp" +#line 44 "JavaStoreWalker.h" public: JavaStoreWalker(); static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory ); @@ -161,4 +161,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_1; }; -#endif /*INC_JavaStoreWalker_hpp_*/ +#endif /*INC_JavaStoreWalker_h_*/ diff --git a/languages/java/JavaStoreWalkerTokenTypes.hpp b/languages/java/JavaStoreWalkerTokenTypes.h index 44322944..d8a07893 100644 --- a/languages/java/JavaStoreWalkerTokenTypes.hpp +++ b/languages/java/JavaStoreWalkerTokenTypes.h @@ -1,7 +1,7 @@ -#ifndef INC_JavaStoreWalkerTokenTypes_hpp_ -#define INC_JavaStoreWalkerTokenTypes_hpp_ +#ifndef INC_JavaStoreWalkerTokenTypes_h_ +#define INC_JavaStoreWalkerTokenTypes_h_ -/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalkerTokenTypes.hpp"$ */ +/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalkerTokenTypes.h"$ */ #ifndef CUSTOM_API # define CUSTOM_API @@ -166,4 +166,4 @@ struct CUSTOM_API JavaStoreWalkerTokenTypes { #ifdef __cplusplus }; #endif -#endif /*INC_JavaStoreWalkerTokenTypes_hpp_*/ +#endif /*INC_JavaStoreWalkerTokenTypes_h_*/ diff --git a/languages/java/JavaTokenTypes.hpp b/languages/java/JavaTokenTypes.h index e36fa54c..8689c5ef 100644 --- a/languages/java/JavaTokenTypes.hpp +++ b/languages/java/JavaTokenTypes.h @@ -1,7 +1,7 @@ -#ifndef INC_JavaTokenTypes_hpp_ -#define INC_JavaTokenTypes_hpp_ +#ifndef INC_JavaTokenTypes_h_ +#define INC_JavaTokenTypes_h_ -/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaTokenTypes.hpp"$ */ +/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaTokenTypes.h"$ */ #ifndef CUSTOM_API # define CUSTOM_API @@ -165,4 +165,4 @@ struct CUSTOM_API JavaTokenTypes { #ifdef __cplusplus }; #endif -#endif /*INC_JavaTokenTypes_hpp_*/ +#endif /*INC_JavaTokenTypes_h_*/ diff --git a/languages/java/Makefile.am b/languages/java/Makefile.am index a1a1e812..f4a05f62 100644 --- a/languages/java/Makefile.am +++ b/languages/java/Makefile.am @@ -22,10 +22,10 @@ JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdri EXTRA_DIST = java.g java.tree.g java.store.g -#JavaLexer.hpp JavaLexer.cpp JavaRecognizer.hpp JavaRecognizer.cpp: # java.g +#JavaLexer.h JavaLexer.cpp JavaRecognizer.h JavaRecognizer.cpp: # java.g # antlr java.g -#JavaStoreWalker.hpp JavaStoreWalker.cpp: # java.store.g +#JavaStoreWalker.h JavaStoreWalker.cpp: # java.store.g # antlr java.store.g METASOURCES = AUTO diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h index fee2bc78..4823cf43 100644 --- a/languages/java/backgroundparser.h +++ b/languages/java/backgroundparser.h @@ -13,7 +13,7 @@ #define BACKGROUNDPARSER_H #include "driver.h" -#include "JavaAST.hpp" +#include "JavaAST.h" #include <tqthread.h> #include <tqwaitcondition.h> diff --git a/languages/java/driver.cpp b/languages/java/driver.cpp index c22bc9ce..3fbcd07b 100644 --- a/languages/java/driver.cpp +++ b/languages/java/driver.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include "JavaAST.hpp" -#include "JavaLexer.hpp" -#include "JavaRecognizer.hpp" +#include "JavaAST.h" +#include "JavaLexer.h" +#include "JavaRecognizer.h" #include <kdebug.h> #include <stdlib.h> diff --git a/languages/java/driver.h b/languages/java/driver.h index def7e400..3575ccfb 100644 --- a/languages/java/driver.h +++ b/languages/java/driver.h @@ -20,7 +20,7 @@ #ifndef DRIVER_H #define DRIVER_H -#include "JavaAST.hpp" +#include "JavaAST.h" #include <tqpair.h> #include <tqvaluestack.h> diff --git a/languages/java/java.g b/languages/java/java.g index 1f825ec5..4228a573 100644 --- a/languages/java/java.g +++ b/languages/java/java.g @@ -1,7 +1,7 @@ header "pre_include_hpp" { #include "driver.h" - #include "JavaAST.hpp" + #include "JavaAST.h" #include <qlistview.h> #include <kdebug.h> diff --git a/languages/java/java.store.g b/languages/java/java.store.g index b69b7323..cc545c64 100644 --- a/languages/java/java.store.g +++ b/languages/java/java.store.g @@ -2,7 +2,7 @@ header "pre_include_hpp" { #include <codemodel.h> - #include "JavaAST.hpp" + #include "JavaAST.h" #include <qstring.h> #include <qstringlist.h> 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 <kdevplugininfo.h> #include "javasupportfactory.h" -static const KDevPluginInfo data("kdevjavasupport"); +static const KDevPluginInfo pluginData("kdevjavasupport"); K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory ) JavaSupportFactory::JavaSupportFactory() - : KDevGenericFactory<JavaSupportPart>( data ) + : KDevGenericFactory<JavaSupportPart>( pluginData ) { } @@ -34,6 +34,6 @@ TDEInstance *JavaSupportFactory::createInstance() const KDevPluginInfo *JavaSupportFactory::info() { - return &data; + return &pluginData; } diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index f9bbbd88..50571ba6 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -23,8 +23,8 @@ #include "kdevdriver.h" #include "javasupport_utils.h" -#include "JavaStoreWalker.hpp" -#include "JavaAST.hpp" +#include "JavaStoreWalker.h" +#include "JavaAST.h" #include <tqheader.h> #include <tqdir.h> diff --git a/languages/java/kdevdriver.cpp b/languages/java/kdevdriver.cpp index d19a20c3..d3cffb68 100644 --- a/languages/java/kdevdriver.cpp +++ b/languages/java/kdevdriver.cpp @@ -1,6 +1,6 @@ #include "kdevdriver.h" -#include "JavaLexer.hpp" +#include "JavaLexer.h" #include <unistd.h> #include <tqfileinfo.h> 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<kjsSupportPart> 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/Makefile.am b/languages/pascal/Makefile.am index 9d168734..5d4b3513 100644 --- a/languages/pascal/Makefile.am +++ b/languages/pascal/Makefile.am @@ -23,10 +23,10 @@ genparser: antlr pascal.g && antlr pascal.tree.g ## The following rules assume that you have Java and ANTLR installed, -#PascalLexer.hpp PascalLexer.cpp PascalParser.hpp PascalParser.cpp: pascal.g +#PascalLexer.h PascalLexer.cpp PascalParser.h PascalParser.cpp: pascal.g # antlr pascal.g -#PascalStoreWalker.hpp PascalStoreWalker.cpp: pascal.tree.g +#PascalStoreWalker.h PascalStoreWalker.cpp: pascal.tree.g # antlr pascal.tree.g templatedir = ${kde_datadir}/kdevabbrev/templates diff --git a/languages/pascal/PascalAST.hpp b/languages/pascal/PascalAST.h index 3df4ea50..1e3df014 100644 --- a/languages/pascal/PascalAST.hpp +++ b/languages/pascal/PascalAST.h @@ -1,7 +1,7 @@ #ifndef PASCALAST_HPP #define PASCALAST_HPP -#include <antlr/CommonAST.hpp> +#include <antlr/CommonAST.h> class PascalAST; typedef antlr::ASTRefCount<PascalAST> RefPascalAST; diff --git a/languages/pascal/PascalLexer.cpp b/languages/pascal/PascalLexer.cpp index 28f532f8..c140ee51 100644 --- a/languages/pascal/PascalLexer.cpp +++ b/languages/pascal/PascalLexer.cpp @@ -1,12 +1,12 @@ /* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalLexer.cpp"$ */ -#include "PascalLexer.hpp" -#include <antlr/CharBuffer.hpp> -#include <antlr/TokenStreamException.hpp> -#include <antlr/TokenStreamIOException.hpp> -#include <antlr/TokenStreamRecognitionException.hpp> -#include <antlr/CharStreamException.hpp> -#include <antlr/CharStreamIOException.hpp> -#include <antlr/NoViableAltForCharException.hpp> +#include "PascalLexer.h" +#include <antlr/CharBuffer.h> +#include <antlr/TokenStreamException.h> +#include <antlr/TokenStreamIOException.h> +#include <antlr/TokenStreamRecognitionException.h> +#include <antlr/CharStreamException.h> +#include <antlr/CharStreamIOException.h> +#include <antlr/NoViableAltForCharException.h> #line 1 "pascal.g" #line 13 "PascalLexer.cpp" diff --git a/languages/pascal/PascalLexer.hpp b/languages/pascal/PascalLexer.h index 99a14959..e2043c2f 100644 --- a/languages/pascal/PascalLexer.hpp +++ b/languages/pascal/PascalLexer.h @@ -1,10 +1,10 @@ -#ifndef INC_PascalLexer_hpp_ -#define INC_PascalLexer_hpp_ +#ifndef INC_PascalLexer_h_ +#define INC_PascalLexer_h_ #line 29 "pascal.g" #include "problemreporter.h" - #include "PascalAST.hpp" + #include "PascalAST.h" #include <tqlistview.h> #include <kdebug.h> @@ -15,14 +15,14 @@ RefPascalAST(ast)->setColumn( t->getColumn() ); \ } -#line 19 "PascalLexer.hpp" -#include <antlr/config.hpp> -/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalLexer.hpp"$ */ -#include <antlr/CommonToken.hpp> -#include <antlr/InputBuffer.hpp> -#include <antlr/BitSet.hpp> -#include "PascalTokenTypes.hpp" -#include <antlr/CharScanner.hpp> +#line 19 "PascalLexer.h" +#include <antlr/config.h> +/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalLexer.h"$ */ +#include <antlr/CommonToken.h> +#include <antlr/InputBuffer.h> +#include <antlr/BitSet.h> +#include "PascalTokenTypes.h" +#include <antlr/CharScanner.h> class CUSTOM_API PascalLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public PascalTokenTypes { #line 1067 "pascal.g" @@ -56,7 +56,7 @@ public: getFilename().c_str(), getLine(), getColumn() ); } -#line 30 "PascalLexer.hpp" +#line 30 "PascalLexer.h" private: void initLiterals(); public: @@ -118,4 +118,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_3; }; -#endif /*INC_PascalLexer_hpp_*/ +#endif /*INC_PascalLexer_h_*/ diff --git a/languages/pascal/PascalParser.cpp b/languages/pascal/PascalParser.cpp index 51d620ff..e45cdb4e 100644 --- a/languages/pascal/PascalParser.cpp +++ b/languages/pascal/PascalParser.cpp @@ -1,8 +1,8 @@ /* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalParser.cpp"$ */ -#include "PascalParser.hpp" -#include <antlr/NoViableAltException.hpp> -#include <antlr/SemanticException.hpp> -#include <antlr/ASTFactory.hpp> +#include "PascalParser.h" +#include <antlr/NoViableAltException.h> +#include <antlr/SemanticException.h> +#include <antlr/ASTFactory.h> #line 1 "pascal.g" #line 8 "PascalParser.cpp" PascalParser::PascalParser(ANTLR_USE_NAMESPACE(antlr)TokenBuffer& tokenBuf, int k) diff --git a/languages/pascal/PascalParser.hpp b/languages/pascal/PascalParser.h index dfd4e5f2..19cbc397 100644 --- a/languages/pascal/PascalParser.hpp +++ b/languages/pascal/PascalParser.h @@ -1,10 +1,10 @@ -#ifndef INC_PascalParser_hpp_ -#define INC_PascalParser_hpp_ +#ifndef INC_PascalParser_h_ +#define INC_PascalParser_h_ #line 29 "pascal.g" #include "problemreporter.h" - #include "PascalAST.hpp" + #include "PascalAST.h" #include <tqlistview.h> #include <kdebug.h> @@ -15,13 +15,13 @@ RefPascalAST(ast)->setColumn( t->getColumn() ); \ } -#line 19 "PascalParser.hpp" -#include <antlr/config.hpp> -/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalParser.hpp"$ */ -#include <antlr/TokenStream.hpp> -#include <antlr/TokenBuffer.hpp> -#include "PascalTokenTypes.hpp" -#include <antlr/LLkParser.hpp> +#line 19 "PascalParser.h" +#include <antlr/config.h> +/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalParser.h"$ */ +#include <antlr/TokenStream.h> +#include <antlr/TokenBuffer.h> +#include "PascalTokenTypes.h" +#include <antlr/LLkParser.h> class CUSTOM_API PascalParser : public ANTLR_USE_NAMESPACE(antlr)LLkParser, public PascalTokenTypes { @@ -58,7 +58,7 @@ public: LT(1)->getLine(), LT(1)->getColumn() ); } -#line 30 "PascalParser.hpp" +#line 30 "PascalParser.h" public: void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory ); protected: @@ -419,4 +419,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_76; }; -#endif /*INC_PascalParser_hpp_*/ +#endif /*INC_PascalParser_h_*/ diff --git a/languages/pascal/PascalStoreWalker.cpp b/languages/pascal/PascalStoreWalker.cpp index 96c69fe4..b56897df 100644 --- a/languages/pascal/PascalStoreWalker.cpp +++ b/languages/pascal/PascalStoreWalker.cpp @@ -1,11 +1,11 @@ /* $ANTLR 2.7.7 (20061129): "pascal.tree.g" -> "PascalStoreWalker.cpp"$ */ -#include "PascalStoreWalker.hpp" -#include <antlr/Token.hpp> -#include <antlr/AST.hpp> -#include <antlr/NoViableAltException.hpp> -#include <antlr/MismatchedTokenException.hpp> -#include <antlr/SemanticException.hpp> -#include <antlr/BitSet.hpp> +#include "PascalStoreWalker.h" +#include <antlr/Token.h> +#include <antlr/AST.h> +#include <antlr/NoViableAltException.h> +#include <antlr/MismatchedTokenException.h> +#include <antlr/SemanticException.h> +#include <antlr/BitSet.h> #line 1 "pascal.tree.g" #line 11 "PascalStoreWalker.cpp" PascalStoreWalker::PascalStoreWalker() diff --git a/languages/pascal/PascalStoreWalker.hpp b/languages/pascal/PascalStoreWalker.h index ada7c020..ceece541 100644 --- a/languages/pascal/PascalStoreWalker.hpp +++ b/languages/pascal/PascalStoreWalker.h @@ -1,27 +1,27 @@ -#ifndef INC_PascalStoreWalker_hpp_ -#define INC_PascalStoreWalker_hpp_ +#ifndef INC_PascalStoreWalker_h_ +#define INC_PascalStoreWalker_h_ #line 20 "pascal.tree.g" #include <codemodel.h> - #include "PascalAST.hpp" + #include "PascalAST.h" #include <tqstring.h> #include <tqstringlist.h> #include <tqfileinfo.h> -#line 14 "PascalStoreWalker.hpp" -#include <antlr/config.hpp> -#include "PascalStoreWalkerTokenTypes.hpp" -/* $ANTLR 2.7.7 (20061129): "pascal.tree.g" -> "PascalStoreWalker.hpp"$ */ -#include <antlr/TreeParser.hpp> +#line 14 "PascalStoreWalker.h" +#include <antlr/config.h> +#include "PascalStoreWalkerTokenTypes.h" +/* $ANTLR 2.7.7 (20061129): "pascal.tree.g" -> "PascalStoreWalker.h"$ */ +#include <antlr/TreeParser.h> #line 29 "pascal.tree.g" #include <codemodel.h> #include <kdebug.h> -#line 25 "PascalStoreWalker.hpp" +#line 25 "PascalStoreWalker.h" class CUSTOM_API PascalStoreWalker : public ANTLR_USE_NAMESPACE(antlr)TreeParser, public PascalStoreWalkerTokenTypes { #line 47 "pascal.tree.g" @@ -48,7 +48,7 @@ public: } void wipeout() { m_model->wipeout(); } -#line 29 "PascalStoreWalker.hpp" +#line 29 "PascalStoreWalker.h" public: PascalStoreWalker(); static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory ); @@ -169,4 +169,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_6; }; -#endif /*INC_PascalStoreWalker_hpp_*/ +#endif /*INC_PascalStoreWalker_h_*/ diff --git a/languages/pascal/PascalStoreWalkerTokenTypes.hpp b/languages/pascal/PascalStoreWalkerTokenTypes.h index cd9e0c81..4631429c 100644 --- a/languages/pascal/PascalStoreWalkerTokenTypes.hpp +++ b/languages/pascal/PascalStoreWalkerTokenTypes.h @@ -1,7 +1,7 @@ -#ifndef INC_PascalStoreWalkerTokenTypes_hpp_ -#define INC_PascalStoreWalkerTokenTypes_hpp_ +#ifndef INC_PascalStoreWalkerTokenTypes_h_ +#define INC_PascalStoreWalkerTokenTypes_h_ -/* $ANTLR 2.7.7 (20061129): "pascal.tree.g" -> "PascalStoreWalkerTokenTypes.hpp"$ */ +/* $ANTLR 2.7.7 (20061129): "pascal.tree.g" -> "PascalStoreWalkerTokenTypes.h"$ */ #ifndef CUSTOM_API # define CUSTOM_API @@ -203,4 +203,4 @@ struct CUSTOM_API PascalStoreWalkerTokenTypes { #ifdef __cplusplus }; #endif -#endif /*INC_PascalStoreWalkerTokenTypes_hpp_*/ +#endif /*INC_PascalStoreWalkerTokenTypes_h_*/ diff --git a/languages/pascal/PascalTokenTypes.hpp b/languages/pascal/PascalTokenTypes.h index 007269b0..42e97d53 100644 --- a/languages/pascal/PascalTokenTypes.hpp +++ b/languages/pascal/PascalTokenTypes.h @@ -1,10 +1,10 @@ -#ifndef INC_PascalTokenTypes_hpp_ -#define INC_PascalTokenTypes_hpp_ +#ifndef INC_PascalTokenTypes_h_ +#define INC_PascalTokenTypes_h_ #undef TRUE #undef FALSE -/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalTokenTypes.hpp"$ */ +/* $ANTLR 2.7.7 (20061129): "pascal.g" -> "PascalTokenTypes.h"$ */ #ifndef CUSTOM_API # define CUSTOM_API @@ -206,4 +206,4 @@ struct CUSTOM_API PascalTokenTypes { #ifdef __cplusplus }; #endif -#endif /*INC_PascalTokenTypes_hpp_*/ +#endif /*INC_PascalTokenTypes_h_*/ diff --git a/languages/pascal/backgroundparser.cpp b/languages/pascal/backgroundparser.cpp index ff202374..df9c85dc 100644 --- a/languages/pascal/backgroundparser.cpp +++ b/languages/pascal/backgroundparser.cpp @@ -13,12 +13,12 @@ #include "backgroundparser.h" #include "problemreporter.h" -#include "PascalLexer.hpp" -#include "PascalParser.hpp" -#include "PascalAST.hpp" +#include "PascalLexer.h" +#include "PascalParser.h" +#include "PascalAST.h" #include <kdebug.h> #include <tqfile.h> -#include <antlr/ASTFactory.hpp> +#include <antlr/ASTFactory.h> BackgroundParser::BackgroundParser( ProblemReporter* reporter, const TQString& source, diff --git a/languages/pascal/pascal.g b/languages/pascal/pascal.g index fde5dcb8..59407423 100644 --- a/languages/pascal/pascal.g +++ b/languages/pascal/pascal.g @@ -28,7 +28,7 @@ header "pre_include_hpp" { #include "problemreporter.h" - #include "PascalAST.hpp" + #include "PascalAST.h" #include <qlistview.h> #include <kdebug.h> diff --git a/languages/pascal/pascal.tree.g b/languages/pascal/pascal.tree.g index c597afb8..d90503c4 100644 --- a/languages/pascal/pascal.tree.g +++ b/languages/pascal/pascal.tree.g @@ -19,7 +19,7 @@ header "pre_include_hpp" { #include <codemodel.h> - #include "PascalAST.hpp" + #include "PascalAST.h" #include <qstring.h> #include <qstringlist.h> diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 69cbebf8..90532c22 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -20,7 +20,7 @@ #include <tdeapplication.h> #include <kstatusbar.h> -#include <antlr/ASTFactory.hpp> +#include <antlr/ASTFactory.h> #include "catalog.h" #include <kdevcore.h> @@ -31,9 +31,9 @@ #include "pascalsupport_part.h" #include "problemreporter.h" -#include "PascalLexer.hpp" -#include "PascalParser.hpp" -#include "PascalStoreWalker.hpp" +#include "PascalLexer.h" +#include "PascalParser.h" +#include "PascalStoreWalker.h" struct PascalSupportPartData{ ProblemReporter* problemReporter; @@ -44,11 +44,11 @@ struct PascalSupportPartData{ }; typedef KDevGenericFactory<PascalSupportPart> 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<PerlSupportPart> 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/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui index 02228756..09124bf8 100644 --- a/languages/php/phpconfigwidgetbase.ui +++ b/languages/php/phpconfigwidgetbase.ui @@ -52,9 +52,6 @@ <property name="text"> <string>Use current file in editor</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> 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/app_templates/pyqt/templates-ui-mainwin b/languages/python/app_templates/pyqt/templates-ui-mainwin index fd24b2f5..d8eff427 100644 --- a/languages/python/app_templates/pyqt/templates-ui-mainwin +++ b/languages/python/app_templates/pyqt/templates-ui-mainwin @@ -111,9 +111,6 @@ <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -142,9 +139,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -258,9 +252,6 @@ <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -272,9 +263,6 @@ <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -286,9 +274,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 092f40b9..4f302c5d 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -39,11 +39,11 @@ #include "pythonimplementationwidget.h" typedef KDevGenericFactory<PythonSupportPart> 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 0b4627b9..470e981d 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -38,11 +38,11 @@ #include <codemodel_utils.h> typedef KDevGenericFactory<RubySupportPart> 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<SQLSupportPart> 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/antlr/README b/lib/antlr/README index 6ca0913b..1f6d902d 100644 --- a/lib/antlr/README +++ b/lib/antlr/README @@ -64,7 +64,7 @@ and compile with an option to define away the word 'std', such as CC .... -Dstd= .... -Also in the antlr subdirectory there's a file config.hpp. Tweak this one to +Also in the antlr subdirectory there's a file config.h. Tweak this one to enable/disable the different bells and whistles used in the rest of the code. Don't forget to submit those changes back to us (along with compiler info) so we can incorporate them in our next release! diff --git a/lib/antlr/TODO b/lib/antlr/TODO index 51d104c3..0b97e6e5 100644 --- a/lib/antlr/TODO +++ b/lib/antlr/TODO @@ -10,7 +10,7 @@ * On Thu, Sep 21, 2000 at 12:33:48AM -0700, John Lambert <JohnL@jBASE.com> wrote: > 1) The literal EOF is not defined and causes the define of EOF_CHAR in - > CharScanner.hpp to fail. + > CharScanner.h to fail. ANTLR with STL Port. Changing the EOF define to char_traits<char>::eof() breaks things for gcc-2.95.2. Fix this in next release portably. diff --git a/lib/antlr/antlr/ANTLRException.hpp b/lib/antlr/antlr/ANTLRException.h index 426595a2..b67f5771 100644 --- a/lib/antlr/antlr/ANTLRException.hpp +++ b/lib/antlr/antlr/ANTLRException.h @@ -1,5 +1,5 @@ -#ifndef INC_ANTLRException_hpp__ -#define INC_ANTLRException_hpp__ +#ifndef INC_ANTLRException_h__ +#define INC_ANTLRException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,7 +8,7 @@ * $Id$ */ -#include <antlr/config.hpp> +#include <antlr/config.h> #include <string> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE @@ -56,4 +56,4 @@ private: } #endif -#endif //INC_ANTLRException_hpp__ +#endif //INC_ANTLRException_h__ diff --git a/lib/antlr/antlr/ANTLRUtil.hpp b/lib/antlr/antlr/ANTLRUtil.h index 4732588c..33f37792 100644 --- a/lib/antlr/antlr/ANTLRUtil.hpp +++ b/lib/antlr/antlr/ANTLRUtil.h @@ -1,5 +1,5 @@ -#ifndef INC_ANTLRUtil_hpp__ -#define INC_ANTLRUtil_hpp__ +#ifndef INC_ANTLRUtil_h__ +#define INC_ANTLRUtil_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,7 +8,7 @@ * $Id$ */ -#include <antlr/config.hpp> +#include <antlr/config.h> #include <iostream> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE diff --git a/lib/antlr/antlr/AST.hpp b/lib/antlr/antlr/AST.h index b01a60a9..49d11b76 100644 --- a/lib/antlr/antlr/AST.hpp +++ b/lib/antlr/antlr/AST.h @@ -1,5 +1,5 @@ -#ifndef INC_AST_hpp__ -#define INC_AST_hpp__ +#ifndef INC_AST_h__ +#define INC_AST_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,9 +8,9 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/ASTRefCount.hpp> -#include <antlr/Token.hpp> +#include <antlr/config.h> +#include <antlr/ASTRefCount.h> +#include <antlr/Token.h> #include <vector> #include <string> @@ -163,4 +163,4 @@ inline bool operator<( RefAST l, RefAST r ) } #endif -#endif //INC_AST_hpp__ +#endif //INC_AST_h__ diff --git a/lib/antlr/antlr/ASTArray.hpp b/lib/antlr/antlr/ASTArray.h index 2d224d32..134fc1fb 100644 --- a/lib/antlr/antlr/ASTArray.hpp +++ b/lib/antlr/antlr/ASTArray.h @@ -1,5 +1,5 @@ -#ifndef INC_ASTArray_hpp__ -#define INC_ASTArray_hpp__ +#ifndef INC_ASTArray_h__ +#define INC_ASTArray_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/AST.hpp> +#include <antlr/config.h> +#include <antlr/AST.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -42,4 +42,4 @@ public: } #endif -#endif //INC_ASTArray_hpp__ +#endif //INC_ASTArray_h__ diff --git a/lib/antlr/antlr/ASTFactory.hpp b/lib/antlr/antlr/ASTFactory.h index 968ab6c5..04d626d9 100644 --- a/lib/antlr/antlr/ASTFactory.hpp +++ b/lib/antlr/antlr/ASTFactory.h @@ -1,5 +1,5 @@ -#ifndef INC_ASTFactory_hpp__ -#define INC_ASTFactory_hpp__ +#ifndef INC_ASTFactory_h__ +#define INC_ASTFactory_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,10 +8,10 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/AST.hpp> -#include <antlr/ASTArray.hpp> -#include <antlr/ASTPair.hpp> +#include <antlr/config.h> +#include <antlr/AST.h> +#include <antlr/ASTArray.h> +#include <antlr/ASTPair.h> #include <istream> #include <utility> @@ -162,4 +162,4 @@ private: } #endif -#endif //INC_ASTFactory_hpp__ +#endif //INC_ASTFactory_h__ diff --git a/lib/antlr/antlr/ASTNULLType.hpp b/lib/antlr/antlr/ASTNULLType.h index 867f5e5b..70d34cca 100644 --- a/lib/antlr/antlr/ASTNULLType.hpp +++ b/lib/antlr/antlr/ASTNULLType.h @@ -1,5 +1,5 @@ -#ifndef INC_ASTNULLType_hpp__ -#define INC_ASTNULLType_hpp__ +#ifndef INC_ASTNULLType_h__ +#define INC_ASTNULLType_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/AST.hpp> +#include <antlr/config.h> +#include <antlr/AST.h> #include <iostream> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE @@ -61,4 +61,4 @@ public: } #endif -#endif //INC_ASTNULLType_hpp__ +#endif //INC_ASTNULLType_h__ diff --git a/lib/antlr/antlr/ASTPair.hpp b/lib/antlr/antlr/ASTPair.h index d6237902..a3f52959 100644 --- a/lib/antlr/antlr/ASTPair.hpp +++ b/lib/antlr/antlr/ASTPair.h @@ -1,5 +1,5 @@ -#ifndef INC_ASTPair_hpp__ -#define INC_ASTPair_hpp__ +#ifndef INC_ASTPair_h__ +#define INC_ASTPair_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/AST.hpp> +#include <antlr/config.h> +#include <antlr/AST.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -54,4 +54,4 @@ public: } #endif -#endif //INC_ASTPair_hpp__ +#endif //INC_ASTPair_h__ diff --git a/lib/antlr/antlr/ASTRefCount.hpp b/lib/antlr/antlr/ASTRefCount.h index f5ef4422..889ecc9d 100644 --- a/lib/antlr/antlr/ASTRefCount.hpp +++ b/lib/antlr/antlr/ASTRefCount.h @@ -1,5 +1,5 @@ -#ifndef INC_ASTRefCount_hpp__ -# define INC_ASTRefCount_hpp__ +#ifndef INC_ASTRefCount_h__ +# define INC_ASTRefCount_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,7 +8,7 @@ * $Id$ */ -# include <antlr/config.hpp> +# include <antlr/config.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -95,4 +95,4 @@ typedef ASTRefCount<AST> RefAST; } #endif -#endif //INC_ASTRefCount_hpp__ +#endif //INC_ASTRefCount_h__ diff --git a/lib/antlr/antlr/BaseAST.hpp b/lib/antlr/antlr/BaseAST.h index 1bfc4e56..bb797f24 100644 --- a/lib/antlr/antlr/BaseAST.hpp +++ b/lib/antlr/antlr/BaseAST.h @@ -1,5 +1,5 @@ -#ifndef INC_BaseAST_hpp__ -#define INC_BaseAST_hpp__ +#ifndef INC_BaseAST_h__ +#define INC_BaseAST_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/AST.hpp> +#include <antlr/config.h> +#include <antlr/AST.h> #include <iostream> @@ -190,4 +190,4 @@ inline bool BaseAST::equals(RefAST t) const } #endif -#endif //INC_BaseAST_hpp__ +#endif //INC_BaseAST_h__ diff --git a/lib/antlr/antlr/BitSet.hpp b/lib/antlr/antlr/BitSet.h index f7619232..696a91a0 100644 --- a/lib/antlr/antlr/BitSet.hpp +++ b/lib/antlr/antlr/BitSet.h @@ -1,5 +1,5 @@ -#ifndef INC_BitSet_hpp__ -#define INC_BitSet_hpp__ +#ifndef INC_BitSet_h__ +#define INC_BitSet_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,7 +8,7 @@ * $Id$ */ -#include <antlr/config.hpp> +#include <antlr/config.h> #include <vector> #include <stdexcept> @@ -57,4 +57,4 @@ public: } #endif -#endif //INC_BitSet_hpp__ +#endif //INC_BitSet_h__ diff --git a/lib/antlr/antlr/CharBuffer.hpp b/lib/antlr/antlr/CharBuffer.h index fe2b1bc5..647fe466 100644 --- a/lib/antlr/antlr/CharBuffer.hpp +++ b/lib/antlr/antlr/CharBuffer.h @@ -1,5 +1,5 @@ -#ifndef INC_CharBuffer_hpp__ -#define INC_CharBuffer_hpp__ +#ifndef INC_CharBuffer_h__ +#define INC_CharBuffer_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,11 +8,11 @@ * $Id$ */ -#include <antlr/config.hpp> +#include <antlr/config.h> #include <istream> -#include <antlr/InputBuffer.hpp> +#include <antlr/InputBuffer.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -53,4 +53,4 @@ private: } #endif -#endif //INC_CharBuffer_hpp__ +#endif //INC_CharBuffer_h__ diff --git a/lib/antlr/antlr/CharInputBuffer.hpp b/lib/antlr/antlr/CharInputBuffer.h index 543972a3..8d4b3369 100644 --- a/lib/antlr/antlr/CharInputBuffer.hpp +++ b/lib/antlr/antlr/CharInputBuffer.h @@ -1,5 +1,5 @@ -#ifndef INC_CharInputBuffer_hpp__ -# define INC_CharInputBuffer_hpp__ +#ifndef INC_CharInputBuffer_h__ +# define INC_CharInputBuffer_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -# include <antlr/config.hpp> -# include <antlr/InputBuffer.hpp> +# include <antlr/config.h> +# include <antlr/InputBuffer.h> # ifdef HAS_NOT_CCTYPE_H # include <ctype.h> @@ -21,12 +21,12 @@ namespace antlr { #endif -/** CharInputBuffer.hpp provides an InputBuffer for plain character arrays (buffers). +/** CharInputBuffer.h provides an InputBuffer for plain character arrays (buffers). */ class CharInputBuffer : public InputBuffer { public: - /** Construct a CharInputBuffer.hpp object with a char* buffer of 'size' + /** Construct a CharInputBuffer.h object with a char* buffer of 'size' * if 'owner' is true, then the buffer will be delete[]-ed on destruction. * @note it is assumed the buffer was allocated with new[]! */ diff --git a/lib/antlr/antlr/CharScanner.hpp b/lib/antlr/antlr/CharScanner.h index f7e58520..9ad6fc7b 100644 --- a/lib/antlr/antlr/CharScanner.hpp +++ b/lib/antlr/antlr/CharScanner.h @@ -1,5 +1,5 @@ -#ifndef INC_CharScanner_hpp__ -#define INC_CharScanner_hpp__ +#ifndef INC_CharScanner_h__ +#define INC_CharScanner_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,7 +8,7 @@ * $Id$ */ -#include <antlr/config.hpp> +#include <antlr/config.h> #include <map> @@ -26,13 +26,13 @@ # include <stdio.h> #endif -#include <antlr/TokenStream.hpp> -#include <antlr/RecognitionException.hpp> -#include <antlr/SemanticException.hpp> -#include <antlr/MismatchedCharException.hpp> -#include <antlr/InputBuffer.hpp> -#include <antlr/BitSet.hpp> -#include <antlr/LexerSharedInputState.hpp> +#include <antlr/TokenStream.h> +#include <antlr/RecognitionException.h> +#include <antlr/SemanticException.h> +#include <antlr/MismatchedCharException.h> +#include <antlr/InputBuffer.h> +#include <antlr/BitSet.h> +#include <antlr/LexerSharedInputState.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -573,4 +573,4 @@ inline bool CharScannerLiteralsLess::operator() (const ANTLR_USE_NAMESPACE(std)s } #endif -#endif //INC_CharScanner_hpp__ +#endif //INC_CharScanner_h__ diff --git a/lib/antlr/antlr/CharStreamException.hpp b/lib/antlr/antlr/CharStreamException.h index a49e3bbb..291593f2 100644 --- a/lib/antlr/antlr/CharStreamException.hpp +++ b/lib/antlr/antlr/CharStreamException.h @@ -1,5 +1,5 @@ -#ifndef INC_CharStreamException_hpp__ -#define INC_CharStreamException_hpp__ +#ifndef INC_CharStreamException_h__ +#define INC_CharStreamException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/ANTLRException.hpp> +#include <antlr/config.h> +#include <antlr/ANTLRException.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -26,4 +26,4 @@ public: } #endif -#endif //INC_CharStreamException_hpp__ +#endif //INC_CharStreamException_h__ diff --git a/lib/antlr/antlr/CharStreamIOException.hpp b/lib/antlr/antlr/CharStreamIOException.h index e3e3111e..011aaf1f 100644 --- a/lib/antlr/antlr/CharStreamIOException.hpp +++ b/lib/antlr/antlr/CharStreamIOException.h @@ -1,5 +1,5 @@ -#ifndef INC_CharStreamIOException_hpp__ -#define INC_CharStreamIOException_hpp__ +#ifndef INC_CharStreamIOException_h__ +#define INC_CharStreamIOException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/CharStreamException.hpp> +#include <antlr/config.h> +#include <antlr/CharStreamException.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -28,4 +28,4 @@ public: } #endif -#endif //INC_CharStreamIOException_hpp__ +#endif //INC_CharStreamIOException_h__ diff --git a/lib/antlr/antlr/CircularQueue.hpp b/lib/antlr/antlr/CircularQueue.h index 506b4f56..89c593a1 100644 --- a/lib/antlr/antlr/CircularQueue.hpp +++ b/lib/antlr/antlr/CircularQueue.h @@ -1,5 +1,5 @@ -#ifndef INC_CircularQueue_hpp__ -#define INC_CircularQueue_hpp__ +#ifndef INC_CircularQueue_h__ +#define INC_CircularQueue_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/Token.hpp> +#include <antlr/config.h> +#include <antlr/Token.h> #include <vector> #include <cassert> @@ -97,4 +97,4 @@ private: } #endif -#endif //INC_CircularQueue_hpp__ +#endif //INC_CircularQueue_h__ diff --git a/lib/antlr/antlr/CommonAST.hpp b/lib/antlr/antlr/CommonAST.h index 091d7b6e..a89f5f01 100644 --- a/lib/antlr/antlr/CommonAST.hpp +++ b/lib/antlr/antlr/CommonAST.h @@ -1,5 +1,5 @@ -#ifndef INC_CommonAST_hpp__ -#define INC_CommonAST_hpp__ +#ifndef INC_CommonAST_h__ +#define INC_CommonAST_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/BaseAST.hpp> +#include <antlr/config.h> +#include <antlr/BaseAST.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -107,4 +107,4 @@ typedef ASTRefCount<CommonAST> RefCommonAST; } #endif -#endif //INC_CommonAST_hpp__ +#endif //INC_CommonAST_h__ diff --git a/lib/antlr/antlr/CommonASTWithHiddenTokens.hpp b/lib/antlr/antlr/CommonASTWithHiddenTokens.h index cac7c83e..01772835 100644 --- a/lib/antlr/antlr/CommonASTWithHiddenTokens.hpp +++ b/lib/antlr/antlr/CommonASTWithHiddenTokens.h @@ -1,5 +1,5 @@ -#ifndef INC_CommonASTWithHiddenTokens_hpp__ -#define INC_CommonASTWithHiddenTokens_hpp__ +#ifndef INC_CommonASTWithHiddenTokens_h__ +#define INC_CommonASTWithHiddenTokens_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/CommonAST.hpp> +#include <antlr/config.h> +#include <antlr/CommonAST.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -57,4 +57,4 @@ typedef ASTRefCount<CommonASTWithHiddenTokens> RefCommonASTWithHiddenTokens; } #endif -#endif //INC_CommonASTWithHiddenTokens_hpp__ +#endif //INC_CommonASTWithHiddenTokens_h__ diff --git a/lib/antlr/antlr/CommonHiddenStreamToken.hpp b/lib/antlr/antlr/CommonHiddenStreamToken.h index f3b78c44..8f0e2e38 100644 --- a/lib/antlr/antlr/CommonHiddenStreamToken.hpp +++ b/lib/antlr/antlr/CommonHiddenStreamToken.h @@ -1,5 +1,5 @@ -#ifndef INC_CommonHiddenStreamToken_hpp__ -#define INC_CommonHiddenStreamToken_hpp__ +#ifndef INC_CommonHiddenStreamToken_h__ +#define INC_CommonHiddenStreamToken_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/CommonToken.hpp> +#include <antlr/config.h> +#include <antlr/CommonToken.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -38,4 +38,4 @@ public: } #endif -#endif //INC_CommonHiddenStreamToken_hpp__ +#endif //INC_CommonHiddenStreamToken_h__ diff --git a/lib/antlr/antlr/CommonToken.hpp b/lib/antlr/antlr/CommonToken.h index 51d17b42..6f8d4973 100644 --- a/lib/antlr/antlr/CommonToken.hpp +++ b/lib/antlr/antlr/CommonToken.h @@ -1,5 +1,5 @@ -#ifndef INC_CommonToken_hpp__ -#define INC_CommonToken_hpp__ +#ifndef INC_CommonToken_h__ +#define INC_CommonToken_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/Token.hpp> +#include <antlr/config.h> +#include <antlr/Token.h> #include <string> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE @@ -80,4 +80,4 @@ private: } #endif -#endif //INC_CommonToken_hpp__ +#endif //INC_CommonToken_h__ diff --git a/lib/antlr/antlr/IOException.hpp b/lib/antlr/antlr/IOException.h index 22566ecc..b616adf8 100644 --- a/lib/antlr/antlr/IOException.hpp +++ b/lib/antlr/antlr/IOException.h @@ -1,5 +1,5 @@ -#ifndef INC_IOException_hpp__ -#define INC_IOException_hpp__ +#ifndef INC_IOException_h__ +#define INC_IOException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/ANTLRException.hpp> +#include <antlr/config.h> +#include <antlr/ANTLRException.h> #include <exception> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE @@ -42,4 +42,4 @@ public: } #endif -#endif //INC_IOException_hpp__ +#endif //INC_IOException_h__ diff --git a/lib/antlr/antlr/InputBuffer.hpp b/lib/antlr/antlr/InputBuffer.h index b979ef8c..f71f73e8 100644 --- a/lib/antlr/antlr/InputBuffer.hpp +++ b/lib/antlr/antlr/InputBuffer.h @@ -1,5 +1,5 @@ -#ifndef INC_InputBuffer_hpp__ -#define INC_InputBuffer_hpp__ +#ifndef INC_InputBuffer_h__ +#define INC_InputBuffer_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/CircularQueue.hpp> +#include <antlr/config.h> +#include <antlr/CircularQueue.h> #include <string> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE @@ -143,4 +143,4 @@ inline void InputBuffer::syncConsume() { } #endif -#endif //INC_InputBuffer_hpp__ +#endif //INC_InputBuffer_h__ diff --git a/lib/antlr/antlr/LLkParser.hpp b/lib/antlr/antlr/LLkParser.h index 32acd3dd..d9d2d9fd 100644 --- a/lib/antlr/antlr/LLkParser.hpp +++ b/lib/antlr/antlr/LLkParser.h @@ -1,5 +1,5 @@ -#ifndef INC_LLkParser_hpp__ -#define INC_LLkParser_hpp__ +#ifndef INC_LLkParser_h__ +#define INC_LLkParser_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/Parser.hpp> +#include <antlr/config.h> +#include <antlr/Parser.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -64,4 +64,4 @@ public: } #endif -#endif //INC_LLkParser_hpp__ +#endif //INC_LLkParser_h__ diff --git a/lib/antlr/antlr/LexerSharedInputState.hpp b/lib/antlr/antlr/LexerSharedInputState.h index 2571bda3..3f5c26e5 100644 --- a/lib/antlr/antlr/LexerSharedInputState.hpp +++ b/lib/antlr/antlr/LexerSharedInputState.h @@ -1,5 +1,5 @@ -#ifndef INC_LexerSharedInputState_hpp__ -#define INC_LexerSharedInputState_hpp__ +#ifndef INC_LexerSharedInputState_h__ +#define INC_LexerSharedInputState_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,10 +8,10 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/InputBuffer.hpp> -#include <antlr/RefCount.hpp> -#include <antlr/CharBuffer.hpp> +#include <antlr/config.h> +#include <antlr/InputBuffer.h> +#include <antlr/RefCount.h> +#include <antlr/CharBuffer.h> #include <string> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE @@ -153,4 +153,4 @@ typedef RefCount<LexerInputState> LexerSharedInputState; } #endif -#endif //INC_LexerSharedInputState_hpp__ +#endif //INC_LexerSharedInputState_h__ diff --git a/lib/antlr/antlr/Makefile.am b/lib/antlr/antlr/Makefile.am index 717c43c0..b866634c 100644 --- a/lib/antlr/antlr/Makefile.am +++ b/lib/antlr/antlr/Makefile.am @@ -1,2 +1,2 @@ -noinst_HEADERS = ANTLRException.hpp ANTLRUtil.hpp AST.hpp ASTArray.hpp ASTFactory.hpp ASTNULLType.hpp ASTPair.hpp ASTRefCount.hpp BaseAST.hpp BitSet.hpp CharBuffer.hpp CharInputBuffer.hpp CharScanner.hpp CharStreamException.hpp CharStreamIOException.hpp CircularQueue.hpp CommonAST.hpp CommonASTWithHiddenTokens.hpp CommonHiddenStreamToken.hpp CommonToken.hpp InputBuffer.hpp IOException.hpp LLkParser.hpp LexerSharedInputState.hpp MismatchedCharException.hpp MismatchedTokenException.hpp NoViableAltException.hpp NoViableAltForCharException.hpp Parser.hpp ParserSharedInputState.hpp RecognitionException.hpp RefCount.hpp SemanticException.hpp String.hpp Token.hpp TokenBuffer.hpp TokenStream.hpp TokenStreamBasicFilter.hpp TokenStreamException.hpp TokenStreamHiddenTokenFilter.hpp TokenStreamIOException.hpp TokenStreamRecognitionException.hpp TokenStreamRetryException.hpp TokenStreamSelector.hpp TreeParser.hpp TreeParserSharedInputState.hpp config.hpp +noinst_HEADERS = ANTLRException.h ANTLRUtil.h AST.h ASTArray.h ASTFactory.h ASTNULLType.h ASTPair.h ASTRefCount.h BaseAST.h BitSet.h CharBuffer.h CharInputBuffer.h CharScanner.h CharStreamException.h CharStreamIOException.h CircularQueue.h CommonAST.h CommonASTWithHiddenTokens.h CommonHiddenStreamToken.h CommonToken.h InputBuffer.h IOException.h LLkParser.h LexerSharedInputState.h MismatchedCharException.h MismatchedTokenException.h NoViableAltException.h NoViableAltForCharException.h Parser.h ParserSharedInputState.h RecognitionException.h RefCount.h SemanticException.h String.h Token.h TokenBuffer.h TokenStream.h TokenStreamBasicFilter.h TokenStreamException.h TokenStreamHiddenTokenFilter.h TokenStreamIOException.h TokenStreamRecognitionException.h TokenStreamRetryException.h TokenStreamSelector.h TreeParser.h TreeParserSharedInputState.h config.h diff --git a/lib/antlr/antlr/MismatchedCharException.hpp b/lib/antlr/antlr/MismatchedCharException.h index cc77f9e4..2f0b9be4 100644 --- a/lib/antlr/antlr/MismatchedCharException.hpp +++ b/lib/antlr/antlr/MismatchedCharException.h @@ -1,5 +1,5 @@ -#ifndef INC_MismatchedCharException_hpp__ -#define INC_MismatchedCharException_hpp__ +#ifndef INC_MismatchedCharException_h__ +#define INC_MismatchedCharException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,9 +8,9 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/RecognitionException.hpp> -#include <antlr/BitSet.hpp> +#include <antlr/config.h> +#include <antlr/RecognitionException.h> +#include <antlr/BitSet.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -99,4 +99,4 @@ public: } #endif -#endif //INC_MismatchedCharException_hpp__ +#endif //INC_MismatchedCharException_h__ diff --git a/lib/antlr/antlr/MismatchedTokenException.hpp b/lib/antlr/antlr/MismatchedTokenException.h index 47fb44e6..af3bdb8c 100644 --- a/lib/antlr/antlr/MismatchedTokenException.hpp +++ b/lib/antlr/antlr/MismatchedTokenException.h @@ -1,5 +1,5 @@ -#ifndef INC_MismatchedTokenException_hpp__ -#define INC_MismatchedTokenException_hpp__ +#ifndef INC_MismatchedTokenException_h__ +#define INC_MismatchedTokenException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,11 +8,11 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/RecognitionException.hpp> -#include <antlr/BitSet.hpp> -#include <antlr/Token.hpp> -#include <antlr/AST.hpp> +#include <antlr/config.h> +#include <antlr/RecognitionException.h> +#include <antlr/BitSet.h> +#include <antlr/Token.h> +#include <antlr/AST.h> #include <vector> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE @@ -141,4 +141,4 @@ private: } #endif -#endif //INC_MismatchedTokenException_hpp__ +#endif //INC_MismatchedTokenException_h__ diff --git a/lib/antlr/antlr/NoViableAltException.hpp b/lib/antlr/antlr/NoViableAltException.h index 22236c90..492c7b06 100644 --- a/lib/antlr/antlr/NoViableAltException.hpp +++ b/lib/antlr/antlr/NoViableAltException.h @@ -1,5 +1,5 @@ -#ifndef INC_NoViableAltException_hpp__ -#define INC_NoViableAltException_hpp__ +#ifndef INC_NoViableAltException_h__ +#define INC_NoViableAltException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,10 +8,10 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/RecognitionException.hpp> -#include <antlr/Token.hpp> -#include <antlr/AST.hpp> +#include <antlr/config.h> +#include <antlr/RecognitionException.h> +#include <antlr/Token.h> +#include <antlr/AST.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -37,4 +37,4 @@ public: } #endif -#endif //INC_NoViableAltException_hpp__ +#endif //INC_NoViableAltException_h__ diff --git a/lib/antlr/antlr/NoViableAltForCharException.hpp b/lib/antlr/antlr/NoViableAltForCharException.h index 0b16a0ea..9c592544 100644 --- a/lib/antlr/antlr/NoViableAltForCharException.hpp +++ b/lib/antlr/antlr/NoViableAltForCharException.h @@ -1,5 +1,5 @@ -#ifndef INC_NoViableAltForCharException_hpp__ -# define INC_NoViableAltForCharException_hpp__ +#ifndef INC_NoViableAltForCharException_h__ +# define INC_NoViableAltForCharException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,9 +8,9 @@ * $Id$ */ -# include <antlr/config.hpp> -# include <antlr/RecognitionException.hpp> -# include <antlr/CharScanner.hpp> +# include <antlr/config.h> +# include <antlr/RecognitionException.h> +# include <antlr/CharScanner.h> # ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr @@ -38,4 +38,4 @@ protected: } # endif -#endif //INC_NoViableAltForCharException_hpp__ +#endif //INC_NoViableAltForCharException_h__ diff --git a/lib/antlr/antlr/Parser.hpp b/lib/antlr/antlr/Parser.h index f74be2a8..4c53c433 100644 --- a/lib/antlr/antlr/Parser.hpp +++ b/lib/antlr/antlr/Parser.h @@ -1,5 +1,5 @@ -#ifndef INC_Parser_hpp__ -#define INC_Parser_hpp__ +#ifndef INC_Parser_h__ +#define INC_Parser_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,17 +8,17 @@ * $Id$ */ -#include <antlr/config.hpp> +#include <antlr/config.h> #include <iostream> #include <exception> -#include <antlr/BitSet.hpp> -#include <antlr/TokenBuffer.hpp> -#include <antlr/RecognitionException.hpp> -#include <antlr/MismatchedTokenException.hpp> -#include <antlr/ASTFactory.hpp> -#include <antlr/ParserSharedInputState.hpp> +#include <antlr/BitSet.h> +#include <antlr/TokenBuffer.h> +#include <antlr/RecognitionException.h> +#include <antlr/MismatchedTokenException.h> +#include <antlr/ASTFactory.h> +#include <antlr/ParserSharedInputState.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -316,4 +316,4 @@ private: } #endif -#endif //INC_Parser_hpp__ +#endif //INC_Parser_h__ diff --git a/lib/antlr/antlr/ParserSharedInputState.hpp b/lib/antlr/antlr/ParserSharedInputState.h index b011bc15..1c0a8152 100644 --- a/lib/antlr/antlr/ParserSharedInputState.hpp +++ b/lib/antlr/antlr/ParserSharedInputState.h @@ -1,5 +1,5 @@ -#ifndef INC_ParserSharedInputState_hpp__ -#define INC_ParserSharedInputState_hpp__ +#ifndef INC_ParserSharedInputState_h__ +#define INC_ParserSharedInputState_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,9 +8,9 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/TokenBuffer.hpp> -#include <antlr/RefCount.hpp> +#include <antlr/config.h> +#include <antlr/TokenBuffer.h> +#include <antlr/RefCount.h> #include <string> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE @@ -89,4 +89,4 @@ typedef RefCount<ParserInputState> ParserSharedInputState; } #endif -#endif //INC_ParserSharedInputState_hpp__ +#endif //INC_ParserSharedInputState_h__ diff --git a/lib/antlr/antlr/RecognitionException.hpp b/lib/antlr/antlr/RecognitionException.h index e61bc620..3d7604ee 100644 --- a/lib/antlr/antlr/RecognitionException.hpp +++ b/lib/antlr/antlr/RecognitionException.h @@ -1,5 +1,5 @@ -#ifndef INC_RecognitionException_hpp__ -# define INC_RecognitionException_hpp__ +#ifndef INC_RecognitionException_h__ +# define INC_RecognitionException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -# include <antlr/config.hpp> -# include <antlr/ANTLRException.hpp> +# include <antlr/config.h> +# include <antlr/ANTLRException.h> # ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr @@ -63,4 +63,4 @@ namespace antlr } # endif -#endif //INC_RecognitionException_hpp__ +#endif //INC_RecognitionException_h__ diff --git a/lib/antlr/antlr/RefCount.hpp b/lib/antlr/antlr/RefCount.h index 8546a049..93df952e 100644 --- a/lib/antlr/antlr/RefCount.hpp +++ b/lib/antlr/antlr/RefCount.h @@ -1,5 +1,5 @@ -#ifndef INC_RefCount_hpp__ -#define INC_RefCount_hpp__ +#ifndef INC_RefCount_h__ +#define INC_RefCount_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com * Software rights: http://www.antlr.org/license.html @@ -7,7 +7,7 @@ * $Id$ */ -#include <antlr/config.hpp> +#include <antlr/config.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -77,4 +77,4 @@ public: } #endif -#endif //INC_RefCount_hpp__ +#endif //INC_RefCount_h__ diff --git a/lib/antlr/antlr/SemanticException.hpp b/lib/antlr/antlr/SemanticException.h index dc68d5a9..05c5c5fe 100644 --- a/lib/antlr/antlr/SemanticException.hpp +++ b/lib/antlr/antlr/SemanticException.h @@ -1,5 +1,5 @@ -#ifndef INC_SemanticException_hpp__ -#define INC_SemanticException_hpp__ +#ifndef INC_SemanticException_h__ +#define INC_SemanticException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/RecognitionException.hpp> +#include <antlr/config.h> +#include <antlr/RecognitionException.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -37,4 +37,4 @@ public: } #endif -#endif //INC_SemanticException_hpp__ +#endif //INC_SemanticException_h__ diff --git a/lib/antlr/antlr/String.hpp b/lib/antlr/antlr/String.h index 7e6dde5a..7e406c1a 100644 --- a/lib/antlr/antlr/String.hpp +++ b/lib/antlr/antlr/String.h @@ -1,5 +1,5 @@ -#ifndef INC_String_hpp__ -#define INC_String_hpp__ +#ifndef INC_String_h__ +#define INC_String_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,7 +8,7 @@ * $Id$ */ -#include <antlr/config.hpp> +#include <antlr/config.h> #include <string> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE @@ -24,4 +24,4 @@ ANTLR_API ANTLR_USE_NAMESPACE(std)string charName( int ch ); } #endif -#endif //INC_String_hpp__ +#endif //INC_String_h__ diff --git a/lib/antlr/antlr/Token.hpp b/lib/antlr/antlr/Token.h index cd56fc3c..88f747ba 100644 --- a/lib/antlr/antlr/Token.hpp +++ b/lib/antlr/antlr/Token.h @@ -1,5 +1,5 @@ -#ifndef INC_Token_hpp__ -#define INC_Token_hpp__ +#ifndef INC_Token_h__ +#define INC_Token_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/TokenRefCount.hpp> +#include <antlr/config.h> +#include <antlr/TokenRefCount.h> #include <string> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE @@ -105,4 +105,4 @@ inline bool operator<( RefToken l, RefToken r ) } #endif -#endif //INC_Token_hpp__ +#endif //INC_Token_h__ diff --git a/lib/antlr/antlr/TokenBuffer.hpp b/lib/antlr/antlr/TokenBuffer.h index 3077eead..5832ef6e 100644 --- a/lib/antlr/antlr/TokenBuffer.hpp +++ b/lib/antlr/antlr/TokenBuffer.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenBuffer_hpp__ -#define INC_TokenBuffer_hpp__ +#ifndef INC_TokenBuffer_h__ +#define INC_TokenBuffer_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,9 +8,9 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/TokenStream.hpp> -#include <antlr/CircularQueue.hpp> +#include <antlr/config.h> +#include <antlr/TokenStream.h> +#include <antlr/CircularQueue.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -118,4 +118,4 @@ inline void TokenBuffer::syncConsume() } #endif -#endif //INC_TokenBuffer_hpp__ +#endif //INC_TokenBuffer_h__ diff --git a/lib/antlr/antlr/TokenRefCount.hpp b/lib/antlr/antlr/TokenRefCount.h index 9ccbb98c..6b2042b7 100644 --- a/lib/antlr/antlr/TokenRefCount.hpp +++ b/lib/antlr/antlr/TokenRefCount.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenRefCount_hpp__ -# define INC_TokenRefCount_hpp__ +#ifndef INC_TokenRefCount_h__ +# define INC_TokenRefCount_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,7 +8,7 @@ * $Id:$ */ -# include <antlr/config.hpp> +# include <antlr/config.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -95,4 +95,4 @@ typedef TokenRefCount<Token> RefToken; } #endif -#endif //INC_TokenRefCount_hpp__ +#endif //INC_TokenRefCount_h__ diff --git a/lib/antlr/antlr/TokenStream.hpp b/lib/antlr/antlr/TokenStream.h index dbf83a8c..d7fc688b 100644 --- a/lib/antlr/antlr/TokenStream.hpp +++ b/lib/antlr/antlr/TokenStream.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenStream_hpp__ -#define INC_TokenStream_hpp__ +#ifndef INC_TokenStream_h__ +#define INC_TokenStream_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/Token.hpp> +#include <antlr/config.h> +#include <antlr/Token.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -31,4 +31,4 @@ public: } #endif -#endif //INC_TokenStream_hpp__ +#endif //INC_TokenStream_h__ diff --git a/lib/antlr/antlr/TokenStreamBasicFilter.hpp b/lib/antlr/antlr/TokenStreamBasicFilter.h index bcdb131c..51862169 100644 --- a/lib/antlr/antlr/TokenStreamBasicFilter.hpp +++ b/lib/antlr/antlr/TokenStreamBasicFilter.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenStreamBasicFilter_hpp__ -#define INC_TokenStreamBasicFilter_hpp__ +#ifndef INC_TokenStreamBasicFilter_h__ +#define INC_TokenStreamBasicFilter_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,9 +8,9 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/BitSet.hpp> -#include <antlr/TokenStream.hpp> +#include <antlr/config.h> +#include <antlr/BitSet.h> +#include <antlr/TokenStream.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -43,4 +43,4 @@ public: } #endif -#endif //INC_TokenStreamBasicFilter_hpp__ +#endif //INC_TokenStreamBasicFilter_h__ diff --git a/lib/antlr/antlr/TokenStreamException.hpp b/lib/antlr/antlr/TokenStreamException.h index dbddb442..7bffddca 100644 --- a/lib/antlr/antlr/TokenStreamException.hpp +++ b/lib/antlr/antlr/TokenStreamException.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenStreamException_hpp__ -#define INC_TokenStreamException_hpp__ +#ifndef INC_TokenStreamException_h__ +#define INC_TokenStreamException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/ANTLRException.hpp> +#include <antlr/config.h> +#include <antlr/ANTLRException.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -38,4 +38,4 @@ public: } #endif -#endif //INC_TokenStreamException_hpp__ +#endif //INC_TokenStreamException_h__ diff --git a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.h index ed007a7a..2597ce58 100644 --- a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp +++ b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenStreamHiddenTokenFilter_hpp__ -#define INC_TokenStreamHiddenTokenFilter_hpp__ +#ifndef INC_TokenStreamHiddenTokenFilter_h__ +#define INC_TokenStreamHiddenTokenFilter_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/TokenStreamBasicFilter.hpp> +#include <antlr/config.h> +#include <antlr/TokenStreamBasicFilter.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -92,4 +92,4 @@ public: } #endif -#endif //INC_TokenStreamHiddenTokenFilter_hpp__ +#endif //INC_TokenStreamHiddenTokenFilter_h__ diff --git a/lib/antlr/antlr/TokenStreamIOException.hpp b/lib/antlr/antlr/TokenStreamIOException.h index fff72ced..db2d8677 100644 --- a/lib/antlr/antlr/TokenStreamIOException.hpp +++ b/lib/antlr/antlr/TokenStreamIOException.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenStreamIOException_hpp__ -#define INC_TokenStreamIOException_hpp__ +#ifndef INC_TokenStreamIOException_h__ +#define INC_TokenStreamIOException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/TokenStreamException.hpp> +#include <antlr/config.h> +#include <antlr/TokenStreamException.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -37,4 +37,4 @@ private: } #endif -#endif //INC_TokenStreamIOException_hpp__ +#endif //INC_TokenStreamIOException_h__ diff --git a/lib/antlr/antlr/TokenStreamRecognitionException.hpp b/lib/antlr/antlr/TokenStreamRecognitionException.h index 687d7814..2c4b9548 100644 --- a/lib/antlr/antlr/TokenStreamRecognitionException.hpp +++ b/lib/antlr/antlr/TokenStreamRecognitionException.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenStreamRecognitionException_hpp__ -#define INC_TokenStreamRecognitionException_hpp__ +#ifndef INC_TokenStreamRecognitionException_h__ +#define INC_TokenStreamRecognitionException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/TokenStreamException.hpp> +#include <antlr/config.h> +#include <antlr/TokenStreamException.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -54,4 +54,4 @@ private: } #endif -#endif //INC_TokenStreamRecognitionException_hpp__ +#endif //INC_TokenStreamRecognitionException_h__ diff --git a/lib/antlr/antlr/TokenStreamRetryException.hpp b/lib/antlr/antlr/TokenStreamRetryException.h index 5af21cde..bb3dcf2d 100644 --- a/lib/antlr/antlr/TokenStreamRetryException.hpp +++ b/lib/antlr/antlr/TokenStreamRetryException.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenStreamRetryException_hpp__ -#define INC_TokenStreamRetryException_hpp__ +#ifndef INC_TokenStreamRetryException_h__ +#define INC_TokenStreamRetryException_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/TokenStreamException.hpp> +#include <antlr/config.h> +#include <antlr/TokenStreamException.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -25,4 +25,4 @@ public: } #endif -#endif //INC_TokenStreamRetryException_hpp__ +#endif //INC_TokenStreamRetryException_h__ diff --git a/lib/antlr/antlr/TokenStreamRewriteEngine.hpp b/lib/antlr/antlr/TokenStreamRewriteEngine.h index 9fab08c2..20f3e8f4 100644 --- a/lib/antlr/antlr/TokenStreamRewriteEngine.hpp +++ b/lib/antlr/antlr/TokenStreamRewriteEngine.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenStreamRewriteEngine_hpp__ -#define INC_TokenStreamRewriteEngine_hpp__ +#ifndef INC_TokenStreamRewriteEngine_h__ +#define INC_TokenStreamRewriteEngine_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -16,11 +16,11 @@ #include <cassert> #include <algorithm> -#include <antlr/config.hpp> +#include <antlr/config.h> -#include <antlr/TokenStream.hpp> -#include <antlr/TokenWithIndex.hpp> -#include <antlr/BitSet.hpp> +#include <antlr/TokenStream.h> +#include <antlr/TokenWithIndex.h> +#include <antlr/BitSet.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/antlr/TokenStreamSelector.hpp b/lib/antlr/antlr/TokenStreamSelector.h index 1dab8797..2ed91d72 100644 --- a/lib/antlr/antlr/TokenStreamSelector.hpp +++ b/lib/antlr/antlr/TokenStreamSelector.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenStreamSelector_hpp__ -#define INC_TokenStreamSelector_hpp__ +#ifndef INC_TokenStreamSelector_h__ +#define INC_TokenStreamSelector_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/TokenStream.hpp> +#include <antlr/config.h> +#include <antlr/TokenStream.h> #include <map> #include <stack> @@ -84,4 +84,4 @@ public: } #endif -#endif //INC_TokenStreamSelector_hpp__ +#endif //INC_TokenStreamSelector_h__ diff --git a/lib/antlr/antlr/TokenWithIndex.hpp b/lib/antlr/antlr/TokenWithIndex.h index e4a3e37e..d7511996 100644 --- a/lib/antlr/antlr/TokenWithIndex.hpp +++ b/lib/antlr/antlr/TokenWithIndex.h @@ -1,5 +1,5 @@ -#ifndef INC_TokenWithIndex_hpp__ -#define INC_TokenWithIndex_hpp__ +#ifndef INC_TokenWithIndex_h__ +#define INC_TokenWithIndex_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,9 +8,9 @@ * $Id:$ */ -#include <antlr/config.hpp> -#include <antlr/CommonToken.hpp> -#include <antlr/String.hpp> +#include <antlr/config.h> +#include <antlr/CommonToken.h> +#include <antlr/String.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -81,4 +81,4 @@ typedef TokenRefCount<TokenWithIndex> RefTokenWithIndex; } #endif -#endif //INC_CommonToken_hpp__ +#endif //INC_CommonToken_h__ diff --git a/lib/antlr/antlr/TreeParser.hpp b/lib/antlr/antlr/TreeParser.h index aeee3f9d..ab293d49 100644 --- a/lib/antlr/antlr/TreeParser.hpp +++ b/lib/antlr/antlr/TreeParser.h @@ -1,5 +1,5 @@ -#ifndef INC_TreeParser_hpp__ -#define INC_TreeParser_hpp__ +#ifndef INC_TreeParser_h__ +#define INC_TreeParser_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,13 +8,13 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/AST.hpp> -#include <antlr/ASTFactory.hpp> -#include <antlr/BitSet.hpp> -#include <antlr/RecognitionException.hpp> -#include <antlr/MismatchedTokenException.hpp> -#include <antlr/TreeParserSharedInputState.hpp> +#include <antlr/config.h> +#include <antlr/AST.h> +#include <antlr/ASTFactory.h> +#include <antlr/BitSet.h> +#include <antlr/RecognitionException.h> +#include <antlr/MismatchedTokenException.h> +#include <antlr/TreeParserSharedInputState.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -152,4 +152,4 @@ private: } #endif -#endif //INC_TreeParser_hpp__ +#endif //INC_TreeParser_h__ diff --git a/lib/antlr/antlr/TreeParserSharedInputState.hpp b/lib/antlr/antlr/TreeParserSharedInputState.h index 76ec6840..3eb95641 100644 --- a/lib/antlr/antlr/TreeParserSharedInputState.hpp +++ b/lib/antlr/antlr/TreeParserSharedInputState.h @@ -1,5 +1,5 @@ -#ifndef INC_TreeParserSharedInputState_hpp__ -#define INC_TreeParserSharedInputState_hpp__ +#ifndef INC_TreeParserSharedInputState_h__ +#define INC_TreeParserSharedInputState_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -8,8 +8,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/RefCount.hpp> +#include <antlr/config.h> +#include <antlr/RefCount.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { @@ -42,4 +42,4 @@ typedef RefCount<TreeParserInputState> TreeParserSharedInputState; } #endif -#endif //INC_TreeParserSharedInputState_hpp__ +#endif //INC_TreeParserSharedInputState_h__ diff --git a/lib/antlr/antlr/config.hpp b/lib/antlr/antlr/config.h index db8fb28a..4d3456ec 100644 --- a/lib/antlr/antlr/config.hpp +++ b/lib/antlr/antlr/config.h @@ -1,5 +1,5 @@ -#ifndef INC_config_hpp__ -#define INC_config_hpp__ +#ifndef INC_config_h__ +#define INC_config_h__ /* ANTLR Translator Generator * Project led by Terence Parr at http://www.jGuru.com @@ -287,4 +287,4 @@ # define ANTLR_END_NAMESPACE #endif -#endif //INC_config_hpp__ +#endif //INC_config_h__ diff --git a/lib/antlr/src/ANTLRUtil.cpp b/lib/antlr/src/ANTLRUtil.cpp index 30e7ba21..5df8db6d 100644 --- a/lib/antlr/src/ANTLRUtil.cpp +++ b/lib/antlr/src/ANTLRUtil.cpp @@ -5,8 +5,8 @@ * $Id$ */ -#include <antlr/config.hpp> -#include <antlr/IOException.hpp> +#include <antlr/config.h> +#include <antlr/IOException.h> #include <iostream> #include <cctype> diff --git a/lib/antlr/src/ASTFactory.cpp b/lib/antlr/src/ASTFactory.cpp index 98ce6b7a..55f1ce19 100644 --- a/lib/antlr/src/ASTFactory.cpp +++ b/lib/antlr/src/ASTFactory.cpp @@ -5,11 +5,11 @@ * $Id$ */ -#include "antlr/CommonAST.hpp" -#include "antlr/ANTLRException.hpp" -#include "antlr/IOException.hpp" -#include "antlr/ASTFactory.hpp" -#include "antlr/ANTLRUtil.hpp" +#include "antlr/CommonAST.h" +#include "antlr/ANTLRException.h" +#include "antlr/IOException.h" +#include "antlr/ASTFactory.h" +#include "antlr/ANTLRUtil.h" #include <iostream> #include <istream> diff --git a/lib/antlr/src/ASTNULLType.cpp b/lib/antlr/src/ASTNULLType.cpp index 7dd62724..cc3d839d 100644 --- a/lib/antlr/src/ASTNULLType.cpp +++ b/lib/antlr/src/ASTNULLType.cpp @@ -5,9 +5,9 @@ * $Id$ */ -#include "antlr/config.hpp" -#include "antlr/AST.hpp" -#include "antlr/ASTNULLType.hpp" +#include "antlr/config.h" +#include "antlr/AST.h" +#include "antlr/ASTNULLType.h" #include <iostream> diff --git a/lib/antlr/src/ASTRefCount.cpp b/lib/antlr/src/ASTRefCount.cpp index 0ca54df0..13294fb8 100644 --- a/lib/antlr/src/ASTRefCount.cpp +++ b/lib/antlr/src/ASTRefCount.cpp @@ -4,8 +4,8 @@ * * $Id$ */ -#include "antlr/ASTRefCount.hpp" -#include "antlr/AST.hpp" +#include "antlr/ASTRefCount.h" +#include "antlr/AST.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/BaseAST.cpp b/lib/antlr/src/BaseAST.cpp index f10f1e16..b5d1814f 100644 --- a/lib/antlr/src/BaseAST.cpp +++ b/lib/antlr/src/BaseAST.cpp @@ -5,12 +5,12 @@ * $Id$ */ -#include "antlr/config.hpp" +#include "antlr/config.h" #include <iostream> -#include "antlr/AST.hpp" -#include "antlr/BaseAST.hpp" +#include "antlr/AST.h" +#include "antlr/BaseAST.h" ANTLR_USING_NAMESPACE(std) #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE diff --git a/lib/antlr/src/BitSet.cpp b/lib/antlr/src/BitSet.cpp index 2a32404a..c04b96c5 100644 --- a/lib/antlr/src/BitSet.cpp +++ b/lib/antlr/src/BitSet.cpp @@ -4,7 +4,7 @@ * * $Id$ */ -#include "antlr/BitSet.hpp" +#include "antlr/BitSet.h" #include <string> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE diff --git a/lib/antlr/src/CharBuffer.cpp b/lib/antlr/src/CharBuffer.cpp index a0e11eae..b5895e9f 100644 --- a/lib/antlr/src/CharBuffer.cpp +++ b/lib/antlr/src/CharBuffer.cpp @@ -5,7 +5,7 @@ * $Id$ */ -#include "antlr/CharBuffer.hpp" +#include "antlr/CharBuffer.h" #include <iostream> //#include <ios> diff --git a/lib/antlr/src/CharScanner.cpp b/lib/antlr/src/CharScanner.cpp index d5b1f753..63545468 100644 --- a/lib/antlr/src/CharScanner.cpp +++ b/lib/antlr/src/CharScanner.cpp @@ -7,8 +7,8 @@ #include <iostream> -#include "antlr/CharScanner.hpp" -#include "antlr/CommonToken.hpp" +#include "antlr/CharScanner.h" +#include "antlr/CommonToken.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/CommonAST.cpp b/lib/antlr/src/CommonAST.cpp index e132c0aa..a44e222f 100644 --- a/lib/antlr/src/CommonAST.cpp +++ b/lib/antlr/src/CommonAST.cpp @@ -4,13 +4,13 @@ * * $Id$ */ -#include "antlr/config.hpp" +#include "antlr/config.h" #include <cstdlib> #include <iostream> -#include "antlr/CommonAST.hpp" -#include "antlr/ANTLRUtil.hpp" +#include "antlr/CommonAST.h" +#include "antlr/ANTLRUtil.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/CommonASTWithHiddenTokens.cpp b/lib/antlr/src/CommonASTWithHiddenTokens.cpp index b0e1a3dd..21a6be61 100644 --- a/lib/antlr/src/CommonASTWithHiddenTokens.cpp +++ b/lib/antlr/src/CommonASTWithHiddenTokens.cpp @@ -4,12 +4,12 @@ * * $Id$ */ -#include "antlr/config.hpp" -#include "antlr/AST.hpp" -#include "antlr/BaseAST.hpp" -#include "antlr/CommonAST.hpp" -#include "antlr/CommonASTWithHiddenTokens.hpp" -#include "antlr/CommonHiddenStreamToken.hpp" +#include "antlr/config.h" +#include "antlr/AST.h" +#include "antlr/BaseAST.h" +#include "antlr/CommonAST.h" +#include "antlr/CommonASTWithHiddenTokens.h" +#include "antlr/CommonHiddenStreamToken.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/CommonHiddenStreamToken.cpp b/lib/antlr/src/CommonHiddenStreamToken.cpp index 9396a43b..3ccb69bc 100644 --- a/lib/antlr/src/CommonHiddenStreamToken.cpp +++ b/lib/antlr/src/CommonHiddenStreamToken.cpp @@ -4,7 +4,7 @@ * * $Id$ */ -#include "antlr/CommonHiddenStreamToken.hpp" +#include "antlr/CommonHiddenStreamToken.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/CommonToken.cpp b/lib/antlr/src/CommonToken.cpp index a223b239..db5f4716 100644 --- a/lib/antlr/src/CommonToken.cpp +++ b/lib/antlr/src/CommonToken.cpp @@ -5,8 +5,8 @@ * $Id$ */ -#include "antlr/CommonToken.hpp" -#include "antlr/String.hpp" +#include "antlr/CommonToken.h" +#include "antlr/String.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/InputBuffer.cpp b/lib/antlr/src/InputBuffer.cpp index c9eced7d..a65755d7 100644 --- a/lib/antlr/src/InputBuffer.cpp +++ b/lib/antlr/src/InputBuffer.cpp @@ -5,8 +5,8 @@ * $Id$ */ -#include "antlr/config.hpp" -#include "antlr/InputBuffer.hpp" +#include "antlr/config.h" +#include "antlr/InputBuffer.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/LLkParser.cpp b/lib/antlr/src/LLkParser.cpp index ab0d672a..c45447f5 100644 --- a/lib/antlr/src/LLkParser.cpp +++ b/lib/antlr/src/LLkParser.cpp @@ -5,7 +5,7 @@ * $Id$ */ -#include "antlr/LLkParser.hpp" +#include "antlr/LLkParser.h" #include <iostream> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE diff --git a/lib/antlr/src/MismatchedCharException.cpp b/lib/antlr/src/MismatchedCharException.cpp index e73dbf36..019743b0 100644 --- a/lib/antlr/src/MismatchedCharException.cpp +++ b/lib/antlr/src/MismatchedCharException.cpp @@ -5,9 +5,9 @@ * $Id$ */ -#include "antlr/CharScanner.hpp" -#include "antlr/MismatchedCharException.hpp" -#include "antlr/String.hpp" +#include "antlr/CharScanner.h" +#include "antlr/MismatchedCharException.h" +#include "antlr/String.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/MismatchedTokenException.cpp b/lib/antlr/src/MismatchedTokenException.cpp index 7fc349f7..52ceeec4 100644 --- a/lib/antlr/src/MismatchedTokenException.cpp +++ b/lib/antlr/src/MismatchedTokenException.cpp @@ -5,8 +5,8 @@ * $Id$ */ -#include "antlr/MismatchedTokenException.hpp" -#include "antlr/String.hpp" +#include "antlr/MismatchedTokenException.h" +#include "antlr/String.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/NoViableAltException.cpp b/lib/antlr/src/NoViableAltException.cpp index 94da2cc4..67406df7 100644 --- a/lib/antlr/src/NoViableAltException.cpp +++ b/lib/antlr/src/NoViableAltException.cpp @@ -5,8 +5,8 @@ * $Id$ */ -#include "antlr/NoViableAltException.hpp" -#include "antlr/String.hpp" +#include "antlr/NoViableAltException.h" +#include "antlr/String.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/NoViableAltForCharException.cpp b/lib/antlr/src/NoViableAltForCharException.cpp index 10d9447a..cee6afd9 100644 --- a/lib/antlr/src/NoViableAltForCharException.cpp +++ b/lib/antlr/src/NoViableAltForCharException.cpp @@ -5,8 +5,8 @@ * $Id$ */ -#include "antlr/NoViableAltForCharException.hpp" -#include "antlr/String.hpp" +#include "antlr/NoViableAltForCharException.h" +#include "antlr/String.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/Parser.cpp b/lib/antlr/src/Parser.cpp index 640da7b6..83b7aaa3 100644 --- a/lib/antlr/src/Parser.cpp +++ b/lib/antlr/src/Parser.cpp @@ -5,7 +5,7 @@ * $Id$ */ -#include "antlr/Parser.hpp" +#include "antlr/Parser.h" #include <iostream> diff --git a/lib/antlr/src/RecognitionException.cpp b/lib/antlr/src/RecognitionException.cpp index 9c185ccc..54d3df71 100644 --- a/lib/antlr/src/RecognitionException.cpp +++ b/lib/antlr/src/RecognitionException.cpp @@ -5,8 +5,8 @@ * $Id$ */ -#include "antlr/RecognitionException.hpp" -#include "antlr/String.hpp" +#include "antlr/RecognitionException.h" +#include "antlr/String.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/String.cpp b/lib/antlr/src/String.cpp index ae70f479..6d8b43cf 100644 --- a/lib/antlr/src/String.cpp +++ b/lib/antlr/src/String.cpp @@ -5,7 +5,7 @@ * $Id$ */ -#include "antlr/String.hpp" +#include "antlr/String.h" #include <cctype> diff --git a/lib/antlr/src/Token.cpp b/lib/antlr/src/Token.cpp index f8181634..44c1fcbe 100644 --- a/lib/antlr/src/Token.cpp +++ b/lib/antlr/src/Token.cpp @@ -5,8 +5,8 @@ * $Id$ */ -#include "antlr/Token.hpp" -#include "antlr/String.hpp" +#include "antlr/Token.h" +#include "antlr/String.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/TokenBuffer.cpp b/lib/antlr/src/TokenBuffer.cpp index ed69d6e0..d329aa58 100644 --- a/lib/antlr/src/TokenBuffer.cpp +++ b/lib/antlr/src/TokenBuffer.cpp @@ -5,7 +5,7 @@ * $Id$ */ -#include "antlr/TokenBuffer.hpp" +#include "antlr/TokenBuffer.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/TokenRefCount.cpp b/lib/antlr/src/TokenRefCount.cpp index 0afb0f84..4493c0d7 100644 --- a/lib/antlr/src/TokenRefCount.cpp +++ b/lib/antlr/src/TokenRefCount.cpp @@ -4,8 +4,8 @@ * * $Id:$ */ -#include "antlr/TokenRefCount.hpp" -#include "antlr/Token.hpp" +#include "antlr/TokenRefCount.h" +#include "antlr/Token.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/TokenStreamBasicFilter.cpp b/lib/antlr/src/TokenStreamBasicFilter.cpp index 982e8645..479ba76a 100644 --- a/lib/antlr/src/TokenStreamBasicFilter.cpp +++ b/lib/antlr/src/TokenStreamBasicFilter.cpp @@ -4,7 +4,7 @@ * * $Id$ */ -#include "antlr/TokenStreamBasicFilter.hpp" +#include "antlr/TokenStreamBasicFilter.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp index 431df0c3..f55c9fc5 100644 --- a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp +++ b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp @@ -4,8 +4,8 @@ * * $Id$ */ -#include "antlr/TokenStreamHiddenTokenFilter.hpp" -#include "antlr/CommonHiddenStreamToken.hpp" +#include "antlr/TokenStreamHiddenTokenFilter.h" +#include "antlr/CommonHiddenStreamToken.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/TokenStreamRewriteEngine.cpp b/lib/antlr/src/TokenStreamRewriteEngine.cpp index 2f171eb6..8b0e8f3f 100644 --- a/lib/antlr/src/TokenStreamRewriteEngine.cpp +++ b/lib/antlr/src/TokenStreamRewriteEngine.cpp @@ -1,4 +1,4 @@ -#include <antlr/config.hpp> +#include <antlr/config.h> #include <string> #include <list> @@ -10,10 +10,10 @@ #include <sstream> #include <cassert> -#include <antlr/TokenStream.hpp> -#include <antlr/TokenWithIndex.hpp> -#include <antlr/BitSet.hpp> -#include <antlr/TokenStreamRewriteEngine.hpp> +#include <antlr/TokenStream.h> +#include <antlr/TokenWithIndex.h> +#include <antlr/BitSet.h> +#include <antlr/TokenStreamRewriteEngine.h> #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/TokenStreamSelector.cpp b/lib/antlr/src/TokenStreamSelector.cpp index 602e50dc..26d697bc 100644 --- a/lib/antlr/src/TokenStreamSelector.cpp +++ b/lib/antlr/src/TokenStreamSelector.cpp @@ -4,8 +4,8 @@ * * $Id$ */ -#include "antlr/TokenStreamSelector.hpp" -#include "antlr/TokenStreamRetryException.hpp" +#include "antlr/TokenStreamSelector.h" +#include "antlr/TokenStreamRetryException.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { diff --git a/lib/antlr/src/TreeParser.cpp b/lib/antlr/src/TreeParser.cpp index 6b3f2ca1..dd48b37f 100644 --- a/lib/antlr/src/TreeParser.cpp +++ b/lib/antlr/src/TreeParser.cpp @@ -5,8 +5,8 @@ * $Id$ */ -#include "antlr/TreeParser.hpp" -#include "antlr/ASTNULLType.hpp" +#include "antlr/TreeParser.h" +#include "antlr/ASTNULLType.h" #ifdef ANTLR_CXX_SUPPORTS_NAMESPACE namespace antlr { 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<DummyPlugin> 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 <kdevplugininfo.h> -static const KDevPluginInfo data("KDevDummyPlugin"); +static const KDevPluginInfo pluginData("KDevDummyPlugin"); typedef KDevGenericFactory<DummyPlugin> 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/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp index bea1c79a..0047a3db 100644 --- a/lib/util/configwidgetproxy.cpp +++ b/lib/util/configwidgetproxy.cpp @@ -101,5 +101,3 @@ void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page ) } #include "configwidgetproxy.moc" - -// kate: space-indent off; indent-width 4; replace-tabs off; tab-width 4; diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index 7881f830..ffbbca15 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -126,5 +126,3 @@ private: }; #endif - -// kate: space-indent off; indent-width 4; replace-tabs off; tab-width 4; diff --git a/lib/util/kdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp index 198e9a42..34893c73 100644 --- a/lib/util/kdeveditorutil.cpp +++ b/lib/util/kdeveditorutil.cpp @@ -83,7 +83,3 @@ TQString KDevEditorUtil::currentSelection( KTextEditor::Document * doc ) KTextEditor::SelectionInterface * selectIface = dynamic_cast<KTextEditor::SelectionInterface*>( doc ); return selectIface ? selectIface->selection() : TQString(); } - - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs on; - diff --git a/lib/util/kdeveditorutil.h b/lib/util/kdeveditorutil.h index 79a64fe1..0c117621 100644 --- a/lib/util/kdeveditorutil.h +++ b/lib/util/kdeveditorutil.h @@ -62,6 +62,3 @@ public: }; #endif - - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs on; diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index b9220250..51d310bf 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -121,5 +121,3 @@ void KDevShellWidget::setAutoReactivateOnCloseDelayed( ) #include "kdevshellwidget.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h index 6bb6a8d7..9ba21e2e 100644 --- a/lib/util/kdevshellwidget.h +++ b/lib/util/kdevshellwidget.h @@ -97,5 +97,3 @@ private: }; #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/lib/widgets/processlinemaker.h b/lib/widgets/processlinemaker.h index 19f714fa..7126b322 100644 --- a/lib/widgets/processlinemaker.h +++ b/lib/widgets/processlinemaker.h @@ -64,5 +64,3 @@ private: }; #endif - -//kate: replace-tabs off; indent-spaces off; diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index e87cee2d..86373504 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -1370,5 +1370,3 @@ bool AppWizardDialog::checkAndHideItems(TQListViewItem *item) } #include "appwizarddlg.moc" - -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h index 392cd1b6..bae75531 100644 --- a/parts/appwizard/appwizarddlg.h +++ b/parts/appwizard/appwizarddlg.h @@ -206,5 +206,3 @@ public slots: }; #endif - -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index c83fc89c..e1a9dbad 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -94,5 +94,3 @@ void AppWizardPart::openFilesAfterGeneration() } #include "appwizardpart.moc" - -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin -Subproject 20b5a47aa3db7c7a75c6574be638f3d07a26cfe +Subproject a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3 diff --git a/parts/appwizard/common/gnome/macros/ChangeLog b/parts/appwizard/common/gnome/macros/ChangeLog index 1cd754ed..98964051 100644 --- a/parts/appwizard/common/gnome/macros/ChangeLog +++ b/parts/appwizard/common/gnome/macros/ChangeLog @@ -853,7 +853,3 @@ Sat Feb 14 01:09:37 1998 Tom Tromey <tromey@cygnus.com> * aclocal-include.m4: New file. Defines AM_ACLOCAL_INCLUDE macro to provide extra search directories to `aclocal'. - -*Local Variables: -*backup-inhibited: t -*End: diff --git a/parts/appwizard/common/gnome2/macros/gnome-deprecated-macros.m4 b/parts/appwizard/common/gnome2/macros/gnome-deprecated-macros.m4 index b27ba528..eec406ef 100644 --- a/parts/appwizard/common/gnome2/macros/gnome-deprecated-macros.m4 +++ b/parts/appwizard/common/gnome2/macros/gnome-deprecated-macros.m4 @@ -1,5 +1,3 @@ --*- mode: autoconf -*- - # GNOME_AUTOGEN_OBSOLETE # this marker is checked for in the aclocal.m4 file to check for bad macros ... diff --git a/parts/appwizard/common/incadmin/config.guess b/parts/appwizard/common/incadmin/config.guess index d622a44e..aed5d7a0 100755 --- a/parts/appwizard/common/incadmin/config.guess +++ b/parts/appwizard/common/incadmin/config.guess @@ -1521,10 +1521,3 @@ UNAME_VERSION = ${UNAME_VERSION} EOF exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/parts/appwizard/common/incadmin/config.sub b/parts/appwizard/common/incadmin/config.sub index c894da45..bc16da11 100755 --- a/parts/appwizard/common/incadmin/config.sub +++ b/parts/appwizard/common/incadmin/config.sub @@ -1764,10 +1764,3 @@ esac echo $basic_machine$os exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index f5fb19b4..3f35292a 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -8404,10 +8404,3 @@ build_old_libs=yes # ### BEGIN LIBTOOL TAG CONFIG: disable-static build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 - diff --git a/parts/appwizard/common/incadmin/mkinstalldirs b/parts/appwizard/common/incadmin/mkinstalldirs index d2d5f21b..8d9c7d3b 100755 --- a/parts/appwizard/common/incadmin/mkinstalldirs +++ b/parts/appwizard/common/incadmin/mkinstalldirs @@ -103,9 +103,4 @@ do done exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# End: # mkinstalldirs ends here diff --git a/parts/appwizard/common/tde-index.docbook b/parts/appwizard/common/tde-index.docbook index f1d2a825..bb1a0bc3 100644 --- a/parts/appwizard/common/tde-index.docbook +++ b/parts/appwizard/common/tde-index.docbook @@ -540,16 +540,3 @@ dicer-toaster daemon first, or &%{APPNAMELC}; won't work !</para> &documentation.index; </book> - -<!-- -Local Variables: -mode: sgml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -vim:tabstop=2:shiftwidth=2:expandtab ---> - diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 16d590ab..0797b6b3 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<AStylePart> 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_config.cpp b/parts/bookmarks/bookmarks_config.cpp index c5ef7191..36cc05a5 100644 --- a/parts/bookmarks/bookmarks_config.cpp +++ b/parts/bookmarks/bookmarks_config.cpp @@ -134,5 +134,3 @@ void BookmarksConfig::setToken( TQString const & token ) { _token = token; } - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/bookmarks/bookmarks_config.h b/parts/bookmarks/bookmarks_config.h index 38a3f0e9..6721bd7d 100644 --- a/parts/bookmarks/bookmarks_config.h +++ b/parts/bookmarks/bookmarks_config.h @@ -49,5 +49,3 @@ private: }; #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index f7ac78cb..04fee8d7 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -41,11 +41,11 @@ #define BOOKMARKSETTINGSPAGE 1 typedef KDevGenericFactory<BookmarksPart> 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()); @@ -564,5 +564,3 @@ BookmarksConfig * BookmarksPart::config( ) } #include "bookmarks_part.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h index f51603d7..ae74bf63 100644 --- a/parts/bookmarks/bookmarks_part.h +++ b/parts/bookmarks/bookmarks_part.h @@ -106,5 +106,3 @@ private: #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/bookmarks/bookmarks_settings.cpp b/parts/bookmarks/bookmarks_settings.cpp index 58369d92..56a64b5a 100644 --- a/parts/bookmarks/bookmarks_settings.cpp +++ b/parts/bookmarks/bookmarks_settings.cpp @@ -62,5 +62,3 @@ void BookmarkSettings::slotAccept() #include "bookmarks_settings.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index 39dad5e3..ac14328b 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -332,5 +332,3 @@ void BookmarksWidget::expandAll( ) #include "bookmarks_widget.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h index 57180574..79df9593 100644 --- a/parts/bookmarks/bookmarks_widget.h +++ b/parts/bookmarks/bookmarks_widget.h @@ -69,5 +69,3 @@ private: #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; 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<ClassViewPart> 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_createtagfile.cpp b/parts/ctags2/ctags2_createtagfile.cpp index e066a136..e82ad9ce 100644 --- a/parts/ctags2/ctags2_createtagfile.cpp +++ b/parts/ctags2/ctags2_createtagfile.cpp @@ -51,5 +51,3 @@ TQString CreateTagFile::directory( ) } #include "ctags2_createtagfile.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 324ded8a..1333ac54 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -55,11 +55,11 @@ namespace ctags } typedef KDevGenericFactory<CTags2Part> 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"); @@ -367,5 +367,3 @@ void CTags2Part::slotGoToNext( ) } #include "ctags2_part.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h index 93af5f7f..5de52c37 100644 --- a/parts/ctags2/ctags2_part.h +++ b/parts/ctags2/ctags2_part.h @@ -66,5 +66,3 @@ private: #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/ctags2/ctags2_selecttagfile.cpp b/parts/ctags2/ctags2_selecttagfile.cpp index c1a8d617..21f60af4 100644 --- a/parts/ctags2/ctags2_selecttagfile.cpp +++ b/parts/ctags2/ctags2_selecttagfile.cpp @@ -44,5 +44,3 @@ TQString SelectTagFile::tagsfilePath( ) } #include "ctags2_selecttagfile.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/ctags2/ctags2_selecttagfile.h b/parts/ctags2/ctags2_selecttagfile.h index 05ea1b31..046e72c3 100644 --- a/parts/ctags2/ctags2_selecttagfile.h +++ b/parts/ctags2/ctags2_selecttagfile.h @@ -30,5 +30,3 @@ public slots: #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index b45a41be..96837e98 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -169,5 +169,3 @@ void CTags2SettingsWidget::removeTagFile() #include "ctags2_settingswidget.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp index bd1b138d..b9b54d97 100644 --- a/parts/ctags2/ctags2_widget.cpp +++ b/parts/ctags2/ctags2_widget.cpp @@ -194,6 +194,3 @@ void CTags2Widget::goToNext( ) } #include "ctags2_widget.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; - diff --git a/parts/ctags2/ctags2_widget.h b/parts/ctags2/ctags2_widget.h index e6564509..d67ec415 100644 --- a/parts/ctags2/ctags2_widget.h +++ b/parts/ctags2/ctags2_widget.h @@ -53,5 +53,3 @@ private: }; #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/ctags2/readtags.c b/parts/ctags2/readtags.c index 38014d3f..eb78a51e 100644 --- a/parts/ctags2/readtags.c +++ b/parts/ctags2/readtags.c @@ -956,5 +956,3 @@ extern int main (int argc, char **argv) } #endif - -/* vi:set tabstop=8 shiftwidth=4: */ diff --git a/parts/ctags2/readtags.h b/parts/ctags2/readtags.h index 4d4228fc..3bf62761 100644 --- a/parts/ctags2/readtags.h +++ b/parts/ctags2/readtags.h @@ -247,5 +247,3 @@ extern tagResult tagsClose (tagFile *const file); #endif #endif - -/* vi:set tabstop=8 shiftwidth=4: */ diff --git a/parts/ctags2/tags.cpp b/parts/ctags2/tags.cpp index 19993823..d17cf674 100644 --- a/parts/ctags2/tags.cpp +++ b/parts/ctags2/tags.cpp @@ -165,7 +165,3 @@ Tags::TagList Tags::getExactMatches( const TQString & tag ) { return getMatches( tag, false ); } - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; - - diff --git a/parts/ctags2/tags.h b/parts/ctags2/tags.h index 22b7e7ea..c9c7e6f3 100644 --- a/parts/ctags2/tags.h +++ b/parts/ctags2/tags.h @@ -70,5 +70,3 @@ private: }; #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; 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<DiffPart> 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 <kdialogbase.h> typedef KDevGenericFactory<DistpartPart> 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/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui index b524720f..b88906eb 100644 --- a/parts/documentation/addcatalogdlgbase.ui +++ b/parts/documentation/addcatalogdlgbase.ui @@ -135,9 +135,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -152,9 +149,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> 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<DocumentationPart> 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/documentation/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui index 875f4546..013c0080 100644 --- a/parts/documentation/editbookmarkdlg.ui +++ b/parts/documentation/editbookmarkdlg.ui @@ -89,9 +89,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -106,9 +103,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui index 4355d579..7315092b 100644 --- a/parts/documentation/editcatalogdlgbase.ui +++ b/parts/documentation/editcatalogdlgbase.ui @@ -63,9 +63,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -80,9 +77,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui index 5d85bdf1..3dd843f6 100644 --- a/parts/documentation/find_documentation_optionsbase.ui +++ b/parts/documentation/find_documentation_optionsbase.ui @@ -147,9 +147,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -164,9 +161,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui index f57b2c10..fe558f89 100644 --- a/parts/documentation/selecttopicbase.ui +++ b/parts/documentation/selecttopicbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> 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<DoxygenPart> 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/file-templates/ui-confdialog b/parts/filecreate/file-templates/ui-confdialog index b61af20d..ff2dd7f4 100644 --- a/parts/filecreate/file-templates/ui-confdialog +++ b/parts/filecreate/file-templates/ui-confdialog @@ -119,9 +119,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -136,9 +133,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/filecreate/file-templates/ui-dialogb b/parts/filecreate/file-templates/ui-dialogb index e02e5ea6..c29cbd15 100644 --- a/parts/filecreate/file-templates/ui-dialogb +++ b/parts/filecreate/file-templates/ui-dialogb @@ -78,9 +78,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -95,9 +92,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/filecreate/file-templates/ui-dialogr b/parts/filecreate/file-templates/ui-dialogr index f5d5ffad..884f8c22 100644 --- a/parts/filecreate/file-templates/ui-dialogr +++ b/parts/filecreate/file-templates/ui-dialogr @@ -47,9 +47,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -64,9 +61,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/filecreate/file-templates/ui-mainwin b/parts/filecreate/file-templates/ui-mainwin index fd24b2f5..d8eff427 100644 --- a/parts/filecreate/file-templates/ui-mainwin +++ b/parts/filecreate/file-templates/ui-mainwin @@ -111,9 +111,6 @@ <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -142,9 +139,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -258,9 +252,6 @@ <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -272,9 +263,6 @@ <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -286,9 +274,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> diff --git a/parts/filecreate/file-templates/ui-tabdialog b/parts/filecreate/file-templates/ui-tabdialog index 56ac7bd7..4be4f92e 100644 --- a/parts/filecreate/file-templates/ui-tabdialog +++ b/parts/filecreate/file-templates/ui-tabdialog @@ -101,9 +101,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -118,9 +115,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 40c8e2c0..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<FileCreatePart> 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"); @@ -585,5 +585,3 @@ void FileCreatePart::slotGlobalInitialize( ) } #include "filecreate_part.moc" - -// kate: indent-width 2; replace-tabs on; tab-width 4; space-indent on; diff --git a/parts/filelist/filelist_item.cpp b/parts/filelist/filelist_item.cpp index 2d48a043..567f672f 100644 --- a/parts/filelist/filelist_item.cpp +++ b/parts/filelist/filelist_item.cpp @@ -100,5 +100,3 @@ int FileListItem::compare( TQListViewItem * i, int col, bool ascending ) const else return info1.extension().compare( info2.extension() ); } - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/filelist/filelist_item.h b/parts/filelist/filelist_item.h index 6b88b09e..adb8577a 100644 --- a/parts/filelist/filelist_item.h +++ b/parts/filelist/filelist_item.h @@ -49,5 +49,3 @@ private: #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 2e415dcd..49141dc0 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -296,5 +296,3 @@ void FileListWidget::restoreSelections(const TQStringList & list) } #include "filelist_widget.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h index b582a309..ace8ed0b 100644 --- a/parts/filelist/filelist_widget.h +++ b/parts/filelist/filelist_widget.h @@ -69,5 +69,3 @@ private: #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/parts/filelist/projectviewconfigbase.ui b/parts/filelist/projectviewconfigbase.ui index 7e362f85..564a92d0 100644 --- a/parts/filelist/projectviewconfigbase.ui +++ b/parts/filelist/projectviewconfigbase.ui @@ -26,9 +26,6 @@ <property name="text"> <string>Display toolbar in toolview (note: change needs a restart)</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Uncheck this if you want the toolbar together with all other toolbars. You can disable it then</string> </property> @@ -43,9 +40,6 @@ <property name="text"> <string>Only save project files in a session</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Check this if you want to ignore files that are not part of the project</string> </property> @@ -60,9 +54,6 @@ <property name="text"> <string>Close all open files before opening a session</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Check this if you want the currently open files closed before opening a session</string> </property> 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<FileSelectorPart> 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<FileGroupsPart> 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<FileViewPart> 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<FullScreenPart> 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/filterdlg.ui b/parts/outputviews/filterdlg.ui index eae824f3..07a8d1f5 100644 --- a/parts/outputviews/filterdlg.ui +++ b/parts/outputviews/filterdlg.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> 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<PartExplorerPlugin> 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<QuickOpenPart> 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/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index 1fb873fc..64a2ff0f 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -87,9 +87,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -104,9 +101,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp index 291cfa73..dc90a20c 100644 --- a/parts/quickopen/quickopendialog.cpp +++ b/parts/quickopen/quickopendialog.cpp @@ -151,5 +151,3 @@ void QuickOpenDialog::itemSelectionChanged() { } #include "quickopendialog.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; show-tabs on; 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<RegexpTestPart> 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<scriptingPart> 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<SnippetPart> 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/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui index 9d1d0c9d..9d816561 100644 --- a/parts/snippet/snippetsettingsbase.ui +++ b/parts/snippet/snippetsettingsbase.ui @@ -92,9 +92,6 @@ <property name="text"> <string>Single dialog for each variable within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -109,9 +106,6 @@ <property name="text"> <string>One dialog for all variables within a snippet</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>false</bool> </property> @@ -207,9 +201,6 @@ <property name="text"> <string>The group's language is supported by the project</string> </property> - <property name="accel"> - <string></string> - </property> <property name="checked"> <bool>false</bool> </property> 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<TextToolsPart> 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/Makefile.am b/parts/tipofday/Makefile.am index 4ec54292..9b39f67a 100644 --- a/parts/tipofday/Makefile.am +++ b/parts/tipofday/Makefile.am @@ -19,6 +19,6 @@ rc_DATA = kdevpart_tipofday.rc rcdir = $(kde_datadir)/kdevtipofday messages: rc.cpp - $(PREPARETIPS) > tips.cc - $(XGETTEXT) *.cpp *.h tips.cc -o $(podir)/kdevtipofday.pot - rm -f tips.cc + $(PREPARETIPS) > tips.cpp + $(XGETTEXT) *.cpp *.h tips.cpp -o $(podir)/kdevtipofday.pot + rm -f tips.cpp 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<TipOfDayPart> 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<int, TQString> 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<UIChooserPart> 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_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp index d32a74e4..23d45735 100644 --- a/parts/valgrind/valgrind_dialog.cpp +++ b/parts/valgrind/valgrind_dialog.cpp @@ -201,6 +201,3 @@ bool ValgrindDialog::isNewValgrindVersion( ) const return proc->exitStatus(); return true; } - -// kate: space-indent on; indent-width 2; tab-width 2; show-tabs on; - 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<ValgrindPart> 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<VCSManagerPart> 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/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 619b3ab3..c0c63e2e 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -448,4 +448,3 @@ void MainWindowShare::slotActivePartChanged( KParts::Part * part ) } #include "mainwindowshare.moc" -//kate: space-indent on; indent-width 4; diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 05a4d26f..33110d01 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -299,5 +299,3 @@ void MultiBuffer::updateUrlForPart(KParts::Part *part, KURL url) } #include "multibuffer.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/src/multibuffer.h b/src/multibuffer.h index c60e779e..b0a024f1 100644 --- a/src/multibuffer.h +++ b/src/multibuffer.h @@ -86,5 +86,3 @@ private: }; #endif - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index 3517ab6c..d42c0d5f 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -305,5 +305,3 @@ void DMainWindow::widgetDestroyed() } #include "dmainwindow.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index 2f896b51..a626a0dd 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -177,5 +177,3 @@ TQStringList PluginSelectDialog::unselectedPluginNames( ) #include "pluginselectdialog.moc" - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/src/pluginselectdialog.h b/src/pluginselectdialog.h index d27f2940..aa85937c 100644 --- a/src/pluginselectdialog.h +++ b/src/pluginselectdialog.h @@ -39,5 +39,3 @@ protected slots: }; #endif - -// kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/src/settingswidget.ui b/src/settingswidget.ui index f43efe86..15b00c75 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -439,9 +439,6 @@ <property name="text"> <string>Directory &navigation messages</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="toolTip" stdset="0"> <string>Check this if you want to know what directory make is in</string> </property> diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 1108a299..6d74fb5d 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -1023,5 +1023,3 @@ void SimpleMainWindow::slotProgrammingHandbook() } #include "simplemainwindow.moc" - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h index cc7d86f4..ede22520 100644 --- a/src/simplemainwindow.h +++ b/src/simplemainwindow.h @@ -136,7 +136,4 @@ private: KURL::List m_splitURLs; }; - -// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on - #endif diff --git a/src/tdeconf_update/Makefile.am b/src/tdeconf_update/Makefile.am index f806baa2..f0019e44 100644 --- a/src/tdeconf_update/Makefile.am +++ b/src/tdeconf_update/Makefile.am @@ -13,6 +13,3 @@ tdeconfdir = $(libdir)/tdeconf_update_bin kdev_gen_settings_tdeconf_update_SOURCES = kdev-gen-settings-tdeconf_update.cpp kdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kdev_gen_settings_tdeconf_update_LDADD = $(LIB_QT) - -# vim: set noet: - diff --git a/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp index 63e4a834..b920e7ab 100644 --- a/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp +++ b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp @@ -108,6 +108,3 @@ int main() return 0; } - -// vim: set noet ts=4 sts=4 sw=4: - diff --git a/translations/desktop_files/tdevelop-desktops/tdevelop-desktops.pot b/translations/desktop_files/tdevelop-desktops/tdevelop-desktops.pot index 7829bb97..bf8fb9cc 100644 --- a/translations/desktop_files/tdevelop-desktops/tdevelop-desktops.pot +++ b/translations/desktop_files/tdevelop-desktops/tdevelop-desktops.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-27 23:02+0200\n" +"POT-Creation-Date: 2021-07-07 22:25+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -161,8 +161,7 @@ msgstr "" #. Name #. GenericName -#: kdevassistant.desktop:2 -#: src/profiles/KDevAssistant/profile.config:9 +#: kdevassistant.desktop:2 src/profiles/KDevAssistant/profile.config:9 msgid "TDevelop Assistant" msgstr "" @@ -446,8 +445,7 @@ msgstr "" #. GenericName #. Comment -#: languages/cpp/kdevcsupport.desktop:4 -#: languages/cpp/kdevcsupport.desktop:6 +#: languages/cpp/kdevcsupport.desktop:4 languages/cpp/kdevcsupport.desktop:6 msgid "C Support" msgstr "" @@ -860,8 +858,7 @@ msgstr "" #. GenericName #. Comment -#: parts/diff/kdevdiff.desktop:4 -#: parts/diff/kdevdiff.desktop:6 +#: parts/diff/kdevdiff.desktop:4 parts/diff/kdevdiff.desktop:6 msgid "Difference Viewer" msgstr "" @@ -1291,8 +1288,7 @@ msgstr "" #. Name #. GenericName -#: parts/snippet/kdevsnippet.desktop:2 -#: parts/snippet/kdevsnippet.desktop:4 +#: parts/snippet/kdevsnippet.desktop:2 parts/snippet/kdevsnippet.desktop:4 msgid "Code Snippets" msgstr "" @@ -1323,8 +1319,7 @@ msgstr "" #. GenericName #. Comment -#: parts/tipofday/kdevtipofday.desktop:4 -#: parts/tipofday/kdevtipofday.desktop:6 +#: parts/tipofday/kdevtipofday.desktop:4 parts/tipofday/kdevtipofday.desktop:6 msgid "Tip of the Day" msgstr "" @@ -1582,8 +1577,7 @@ msgstr "" #. Name #. GenericName -#: tde-development-tdevelop.directory:2 -#: src/profiles/profile.config:3 +#: tde-development-tdevelop.directory:2 src/profiles/profile.config:3 msgid "TDevelop" msgstr "" @@ -3494,8 +3488,7 @@ msgid "GNOME C Application (Automake based)" msgstr "" #. Comment -#: parts/appwizard/imports/java:3 -#: parts/appwizard/imports/java-auto:3 +#: parts/appwizard/imports/java:3 parts/appwizard/imports/java-auto:3 msgid "Java Application (Automake based)" msgstr "" diff --git a/translations/desktop_files/tdevelop-eventsrc/it.po b/translations/desktop_files/tdevelop-eventsrc/it.po index 7ac2ce53..fed8da4d 100644 --- a/translations/desktop_files/tdevelop-eventsrc/it.po +++ b/translations/desktop_files/tdevelop-eventsrc/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-22 04:04+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-11-10 04:59+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdevelop/tdevelop-events/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Comment #: src/eventsrc:3 msgid "KDevelop" -msgstr "" +msgstr "TDevelop" #. Name #: src/eventsrc:6 diff --git a/translations/desktop_files/tdevelop-eventsrc/pt.po b/translations/desktop_files/tdevelop-eventsrc/pt.po index 4cb31005..6b53afba 100644 --- a/translations/desktop_files/tdevelop-eventsrc/pt.po +++ b/translations/desktop_files/tdevelop-eventsrc/pt.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-22 04:04+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2020-12-09 16:00+0000\n" +"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n" +"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdevelop/tdevelop-events/pt/>\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.3.2\n" #. Comment #: src/eventsrc:3 msgid "KDevelop" -msgstr "" +msgstr "KDevelop" #. Name #: src/eventsrc:6 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<ClearcasePart> 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/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui index 12844638..667176f2 100644 --- a/vcs/cvsservice/commitdialogbase.ui +++ b/vcs/cvsservice/commitdialogbase.ui @@ -132,9 +132,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp index bf478f7c..79f83deb 100644 --- a/vcs/cvsservice/cvsentry.cpp +++ b/vcs/cvsservice/cvsentry.cpp @@ -183,5 +183,3 @@ VCSFileInfo CVSEntry::toVCSFileInfo() const return VCSFileInfo( fileName(), revision(), revision(), fileState ); } - -//kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index cbfc726f..8eb77b71 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -311,4 +311,3 @@ void CVSFileInfoProvider::printOutFileInfoMap( const VCSFileInfoMap &map ) } #include "cvsfileinfoprovider.moc" -// kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h index 8bc3a6fe..4cc9f4f2 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.h +++ b/vcs/cvsservice/cvsfileinfoprovider.h @@ -77,4 +77,3 @@ private: }; #endif -//kate: space-indent on; indent-width 4; 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<CvsServicePart> 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/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui index 97bbd918..06c9b11c 100644 --- a/vcs/cvsservice/diffdialogbase.ui +++ b/vcs/cvsservice/diffdialogbase.ui @@ -201,9 +201,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -218,9 +215,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/editorsdialogbase.ui b/vcs/cvsservice/editorsdialogbase.ui index 37af7c1b..7e1fa65f 100644 --- a/vcs/cvsservice/editorsdialogbase.ui +++ b/vcs/cvsservice/editorsdialogbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui index 92687fb8..1132e928 100644 --- a/vcs/cvsservice/releaseinputdialogbase.ui +++ b/vcs/cvsservice/releaseinputdialogbase.ui @@ -188,9 +188,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -205,9 +202,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui index dc12e6bc..e5e52848 100644 --- a/vcs/cvsservice/tagdialogbase.ui +++ b/vcs/cvsservice/tagdialogbase.ui @@ -113,9 +113,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -130,9 +127,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> 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<PerforcePart> 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/commitdlg.cpp b/vcs/subversion/commitdlg.cpp index cd6fedab..b342da09 100644 --- a/vcs/subversion/commitdlg.cpp +++ b/vcs/subversion/commitdlg.cpp @@ -43,5 +43,3 @@ bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev ) } #include "commitdlg.moc" - -//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle; diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h index 2f9d5a85..4636c198 100644 --- a/vcs/subversion/commitdlg.h +++ b/vcs/subversion/commitdlg.h @@ -34,5 +34,3 @@ protected: }; #endif - -//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle; 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<subversionPart> 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; diff --git a/vcs/subversion/subversiondiff.ui b/vcs/subversion/subversiondiff.ui index a624e6bb..5d92a4bb 100644 --- a/vcs/subversion/subversiondiff.ui +++ b/vcs/subversion/subversiondiff.ui @@ -74,9 +74,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui index 75937324..465f171b 100644 --- a/vcs/subversion/svn_commitdlgbase.ui +++ b/vcs/subversion/svn_commitdlgbase.ui @@ -70,9 +70,6 @@ <property name="text"> <string>Keep Locks</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> @@ -107,9 +104,6 @@ <property name="text"> <string>Recursive</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> diff --git a/vcs/subversion/svn_logviewoptiondlgbase.ui b/vcs/subversion/svn_logviewoptiondlgbase.ui index 25ed4987..45b34a95 100644 --- a/vcs/subversion/svn_logviewoptiondlgbase.ui +++ b/vcs/subversion/svn_logviewoptiondlgbase.ui @@ -34,9 +34,6 @@ <property name="text"> <string>Do not show logs before branching point</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> diff --git a/vcs/subversion/svnssltrustpromptbase.ui b/vcs/subversion/svnssltrustpromptbase.ui index fc72c0d5..26e70c41 100644 --- a/vcs/subversion/svnssltrustpromptbase.ui +++ b/vcs/subversion/svnssltrustpromptbase.ui @@ -26,9 +26,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQListView" row="1" column="0" rowspan="1" colspan="3"> <column> @@ -64,9 +61,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQPushButton" row="2" column="1"> <property name="name"> @@ -75,9 +69,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> |