diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ project(KDevPlatform) # we need some parts of the ECM CMake helpers -find_package (ECM 0.0.9 REQUIRED NO_MODULE) +find_package (ECM "5.14.0" REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${KDevPlatform_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) include(KDECompilerSettings NO_POLICY_SCOPE) @@ -29,6 +29,7 @@ include(ECMMarkNonGuiExecutable) include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) +include(ECMQtDeclareLoggingCategory) include(GenerateExportHeader) include(FeatureSummary) include(WriteBasicConfigVersionFile) diff --git a/debugger/CMakeLists.txt b/debugger/CMakeLists.txt --- a/debugger/CMakeLists.txt +++ b/debugger/CMakeLists.txt @@ -9,7 +9,6 @@ util/treemodel.cpp util/treeview.cpp util/pathmappings.cpp - util/debug.cpp breakpoint/breakpoint.cpp breakpoint/breakpointmodel.cpp breakpoint/breakpointwidget.cpp @@ -21,6 +20,11 @@ framestack/framestackmodel.cpp framestack/framestackwidget.cpp ) +ecm_qt_declare_logging_category(KDevPlatformDebugger_LIB_SRCS + HEADER util/debug.h + IDENTIFIER DEBUGGER + CATEGORY_NAME "kdevplatform.debugger" +) kdevplatform_add_library(KDevPlatformDebugger SOURCES ${KDevPlatformDebugger_LIB_SRCS}) target_link_libraries(KDevPlatformDebugger LINK_PUBLIC diff --git a/debugger/util/debug.h b/debugger/util/debug.h deleted file mode 100644 --- a/debugger/util/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_DEBUGGER_DEBUG_H -#define KDEVPLATFORM_DEBUGGER_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(DEBUGGER) - -#endif diff --git a/debugger/util/debug.cpp b/debugger/util/debug.cpp deleted file mode 100644 --- a/debugger/util/debug.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "debug.h" - -Q_LOGGING_CATEGORY(DEBUGGER, "kdevplatform.debugger") diff --git a/debugger/util/pathmappings.cpp b/debugger/util/pathmappings.cpp --- a/debugger/util/pathmappings.cpp +++ b/debugger/util/pathmappings.cpp @@ -20,7 +20,8 @@ */ #include "pathmappings.h" -#include "debug.h" + +#include #include #include diff --git a/debugger/util/treeitem.cpp b/debugger/util/treeitem.cpp --- a/debugger/util/treeitem.cpp +++ b/debugger/util/treeitem.cpp @@ -23,7 +23,7 @@ #include -#include "debug.h" +#include #include "treemodel.h" using namespace KDevelop; diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -21,6 +21,12 @@ documentationview.cpp ) +ecm_qt_declare_logging_category(KDevPlatformDocumentation_LIB_SRCS + HEADER debug.h + IDENTIFIER DOCUMENTATION + CATEGORY_NAME "kdevplatform.documentation" +) + ki18n_wrap_ui(KDevPlatformDocumentation_LIB_SRCS documentationfindwidget.ui) kdevplatform_add_library(KDevPlatformDocumentation SOURCES ${KDevPlatformDocumentation_LIB_SRCS}) diff --git a/documentation/debug.h b/documentation/debug.h deleted file mode 100644 --- a/documentation/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_DOCUMENTATION_DEBUG_H -#define KDEVPLATFORM_DOCUMENTATION_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(DOCUMENTATION) - -#endif diff --git a/documentation/documentationview.cpp b/documentation/documentationview.cpp --- a/documentation/documentationview.cpp +++ b/documentation/documentationview.cpp @@ -39,9 +39,6 @@ #include "documentationfindwidget.h" #include "debug.h" -Q_LOGGING_CATEGORY(DOCUMENTATION, "kdevplatform.documentation") - - using namespace KDevelop; DocumentationView::DocumentationView(QWidget* parent, ProvidersModel* model) diff --git a/language/CMakeLists.txt b/language/CMakeLists.txt --- a/language/CMakeLists.txt +++ b/language/CMakeLists.txt @@ -139,7 +139,6 @@ util/setrepository.cpp util/includeitem.cpp util/navigationtooltip.cpp - util/debug.cpp highlighting/colorcache.cpp highlighting/configurablecolors.cpp @@ -169,6 +168,12 @@ list(APPEND KDevPlatformLanguage_LIB_SRCS ${grantlee_LIB_SRCS}) endif() +ecm_qt_declare_logging_category(KDevPlatformLanguage_LIB_SRCS + HEADER util/debug.h + IDENTIFIER LANGUAGE + CATEGORY_NAME "kdevplatform.language" +) + ki18n_wrap_ui(KDevPlatformLanguage_LIB_SRCS codegen/basicrefactoring.ui codegen/progressdialogs/refactoringdialog.ui) diff --git a/language/util/debug.h b/language/util/debug.h deleted file mode 100644 --- a/language/util/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_LANGUAGE_DEBUG_H -#define KDEVPLATFORM_LANGUAGE_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(LANGUAGE) - -#endif diff --git a/language/util/debug.cpp b/language/util/debug.cpp deleted file mode 100644 --- a/language/util/debug.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "debug.h" - -Q_LOGGING_CATEGORY(LANGUAGE, "kdevplatform.language") diff --git a/outputview/CMakeLists.txt b/outputview/CMakeLists.txt --- a/outputview/CMakeLists.txt +++ b/outputview/CMakeLists.txt @@ -12,6 +12,11 @@ outputjob.cpp outputexecutejob.cpp ) +ecm_qt_declare_logging_category(outputviewinterfaces_LIB_SRCS + HEADER debug.h + IDENTIFIER OUTPUTVIEW + CATEGORY_NAME "kdevplatform.outputview" +) kdevplatform_add_library(KDevPlatformOutputView SOURCES ${outputviewinterfaces_LIB_SRCS}) target_link_libraries(KDevPlatformOutputView PRIVATE Qt5::Core diff --git a/outputview/debug.h b/outputview/debug.h deleted file mode 100644 --- a/outputview/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_OUTPUTVIEW_DEBUG_H -#define KDEVPLATFORM_OUTPUTVIEW_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(OUTPUTVIEW) - -#endif diff --git a/outputview/ioutputview.cpp b/outputview/ioutputview.cpp --- a/outputview/ioutputview.cpp +++ b/outputview/ioutputview.cpp @@ -21,8 +21,6 @@ #include "ioutputview.h" #include "debug.h" -Q_LOGGING_CATEGORY(OUTPUTVIEW, "kdevplatform.outputview") - namespace KDevelop { diff --git a/plugins/appwizard/CMakeLists.txt b/plugins/appwizard/CMakeLists.txt --- a/plugins/appwizard/CMakeLists.txt +++ b/plugins/appwizard/CMakeLists.txt @@ -16,6 +16,12 @@ projectvcspage.ui ) +ecm_qt_declare_logging_category(kdevappwizard_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_APPWIZARD + CATEGORY_NAME "kdevplatform.plugins.appwizard" +) + ki18n_wrap_ui(kdevappwizard_PART_SRCS ${kdevappwizard_PART_UI}) qt5_add_resources(kdevappwizard_PART_SRCS kdevappwizard.qrc) diff --git a/plugins/appwizard/appwizardplugin.cpp b/plugins/appwizard/appwizardplugin.cpp --- a/plugins/appwizard/appwizardplugin.cpp +++ b/plugins/appwizard/appwizardplugin.cpp @@ -59,7 +59,6 @@ using namespace KDevelop; -Q_LOGGING_CATEGORY(PLUGIN_APPWIZARD, "kdevplatform.plugins.appwizard") K_PLUGIN_FACTORY_WITH_JSON(AppWizardFactory, "kdevappwizard.json", registerPlugin();) AppWizardPlugin::AppWizardPlugin(QObject *parent, const QVariantList &) diff --git a/plugins/appwizard/debug.h b/plugins/appwizard/debug.h deleted file mode 100644 --- a/plugins/appwizard/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_APPWIZARD_DEBUG_H -#define KDEVPLATFORM_APPWIZARD_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_APPWIZARD) - -#endif diff --git a/plugins/classbrowser/CMakeLists.txt b/plugins/classbrowser/CMakeLists.txt --- a/plugins/classbrowser/CMakeLists.txt +++ b/plugins/classbrowser/CMakeLists.txt @@ -14,6 +14,11 @@ classwidget.cpp classtree.cpp ) +ecm_qt_declare_logging_category(kdevclassbrowser_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_CLASSBROWSER + CATEGORY_NAME "kdevplatform.plugins.classbrowser" +) qt5_add_resources(kdevclassbrowser_PART_SRCS kdevclassbrowser.qrc) kdevplatform_add_plugin(kdevclassbrowser JSON kdevclassbrowser.json SOURCES ${kdevclassbrowser_PART_SRCS}) target_link_libraries(kdevclassbrowser KF5::TextEditor KDev::Util KDev::Language KDev::Interfaces) diff --git a/plugins/classbrowser/classbrowserplugin.cpp b/plugins/classbrowser/classbrowserplugin.cpp --- a/plugins/classbrowser/classbrowserplugin.cpp +++ b/plugins/classbrowser/classbrowserplugin.cpp @@ -48,7 +48,6 @@ #include #include -Q_LOGGING_CATEGORY(PLUGIN_CLASSBROWSER, "kdevplatform.plugins.classbrowser") K_PLUGIN_FACTORY_WITH_JSON(KDevClassBrowserFactory, "kdevclassbrowser.json", registerPlugin(); ) using namespace KDevelop; diff --git a/plugins/classbrowser/debug.h b/plugins/classbrowser/debug.h deleted file mode 100644 --- a/plugins/classbrowser/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_CLASSBROWSER_DEBUG_H -#define KDEVPLATFORM_CLASSBROWSER_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_CLASSBROWSER) - -#endif diff --git a/plugins/codeutils/CMakeLists.txt b/plugins/codeutils/CMakeLists.txt --- a/plugins/codeutils/CMakeLists.txt +++ b/plugins/codeutils/CMakeLists.txt @@ -7,6 +7,11 @@ codeutilsplugin.cpp ) +ecm_qt_declare_logging_category(kdevcodeutils_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_CODEUTILS + CATEGORY_NAME "kdevplatform.plugins.codeutils" +) qt5_add_resources(kdevcodeutils_PART_SRCS kdevcodeutils.qrc) kdevplatform_add_plugin(kdevcodeutils JSON kdevcodeutils.json SOURCES ${kdevcodeutils_PART_SRCS}) diff --git a/plugins/codeutils/codeutilsplugin.h b/plugins/codeutils/codeutilsplugin.h --- a/plugins/codeutils/codeutilsplugin.h +++ b/plugins/codeutils/codeutilsplugin.h @@ -24,8 +24,6 @@ #include #include -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_CODEUTILS) class CodeUtilsPlugin : public KDevelop::IPlugin { diff --git a/plugins/codeutils/codeutilsplugin.cpp b/plugins/codeutils/codeutilsplugin.cpp --- a/plugins/codeutils/codeutilsplugin.cpp +++ b/plugins/codeutils/codeutilsplugin.cpp @@ -45,8 +45,7 @@ #include #include #include - -Q_LOGGING_CATEGORY(PLUGIN_CODEUTILS, "kdevplatform.plugins.codeutils") +#include using namespace KDevelop; diff --git a/plugins/contextbrowser/CMakeLists.txt b/plugins/contextbrowser/CMakeLists.txt --- a/plugins/contextbrowser/CMakeLists.txt +++ b/plugins/contextbrowser/CMakeLists.txt @@ -8,6 +8,11 @@ browsemanager.cpp ) +ecm_qt_declare_logging_category(kdevcontextbrowser_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_CONTEXTBROWSER + CATEGORY_NAME "kdevplatform.plugins.contextbrowser" +) qt5_add_resources(kdevcontextbrowser_PART_SRCS kdevcontextbrowser.qrc) kdevplatform_add_plugin(kdevcontextbrowser JSON kdevcontextbrowser.json SOURCES ${kdevcontextbrowser_PART_SRCS}) diff --git a/plugins/contextbrowser/contextbrowser.cpp b/plugins/contextbrowser/contextbrowser.cpp --- a/plugins/contextbrowser/contextbrowser.cpp +++ b/plugins/contextbrowser/contextbrowser.cpp @@ -81,8 +81,6 @@ #include -Q_LOGGING_CATEGORY(PLUGIN_CONTEXTBROWSER, "kdevplatform.plugins.contextbrowser") - using KTextEditor::Attribute; using KTextEditor::View; diff --git a/plugins/contextbrowser/debug.h b/plugins/contextbrowser/debug.h deleted file mode 100644 --- a/plugins/contextbrowser/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_CONTEXTBROWSER_DEBUG_H -#define KDEVPLATFORM_CONTEXTBROWSER_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_CONTEXTBROWSER) - -#endif diff --git a/plugins/cvs/CMakeLists.txt b/plugins/cvs/CMakeLists.txt --- a/plugins/cvs/CMakeLists.txt +++ b/plugins/cvs/CMakeLists.txt @@ -1,9 +1,13 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevcvs\") -add_subdirectory(tests) - ########### next target ############### +ecm_qt_declare_logging_category(kdevcvs_LOG_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_CVS + CATEGORY_NAME "kdevplatform.plugins.cvs" +) + set(kdevcvs_PART_SRCS cvsplugin.cpp cvsmainview.cpp @@ -19,6 +23,7 @@ cvslogjob.cpp cvsdiffjob.cpp cvsstatusjob.cpp + ${kdevcvs_LOG_PART_SRCS} ) set(kdevcvs_PART_UI @@ -44,3 +49,5 @@ KDev::Project KDev::Language ) + +add_subdirectory(tests) diff --git a/plugins/cvs/cvsplugin.cpp b/plugins/cvs/cvsplugin.cpp --- a/plugins/cvs/cvsplugin.cpp +++ b/plugins/cvs/cvsplugin.cpp @@ -49,7 +49,6 @@ #include #include -Q_LOGGING_CATEGORY(PLUGIN_CVS, "kdevplatform.plugins.cvs") K_PLUGIN_FACTORY(KDevCvsFactory, registerPlugin();) // K_EXPORT_PLUGIN(KDevCvsFactory(KAboutData("kdevcvs", "kdevcvs", ki18n("CVS"), "0.1", ki18n("Support for CVS version control system"), KAboutData::License_GPL))) diff --git a/plugins/cvs/cvsproxy.cpp b/plugins/cvs/cvsproxy.cpp --- a/plugins/cvs/cvsproxy.cpp +++ b/plugins/cvs/cvsproxy.cpp @@ -24,7 +24,7 @@ #include "cvslogjob.h" #include "cvsstatusjob.h" #include "cvsdiffjob.h" -#include "debug.h" +#include #include diff --git a/plugins/cvs/debug.h b/plugins/cvs/debug.h deleted file mode 100644 --- a/plugins/cvs/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_CVS_DEBUG_H -#define KDEVPLATFORM_CVS_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_CVS) - -#endif diff --git a/plugins/cvs/tests/CMakeLists.txt b/plugins/cvs/tests/CMakeLists.txt --- a/plugins/cvs/tests/CMakeLists.txt +++ b/plugins/cvs/tests/CMakeLists.txt @@ -17,7 +17,8 @@ if (CVS) include_directories( - ${KDevPlatform_SOURCE_DIR}/plugins/cvs + .. + ${CMAKE_CURRENT_BINARY_DIR}/.. ) set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) set(test_cvs_SRCS test_cvs.cpp @@ -27,6 +28,7 @@ ../cvslogjob.cpp ../cvsstatusjob.cpp ../cvsdiffjob.cpp + ${kdevcvs_LOG_PART_SRCS} ) ecm_add_test(${test_cvs_SRCS} TEST_NAME test_cvs diff --git a/plugins/cvs/tests/test_cvs.cpp b/plugins/cvs/tests/test_cvs.cpp --- a/plugins/cvs/tests/test_cvs.cpp +++ b/plugins/cvs/tests/test_cvs.cpp @@ -28,9 +28,6 @@ #define CVS_TESTFILE_NAME "testfile" #define CVS_CHECKOUT CVSTEST_BASEDIR "working/" -// we need to add this since it is declared in cvsplugin.cpp which we don't compile here -Q_LOGGING_CATEGORY(PLUGIN_CVS, "kdevplatform.plugins.cvs") - void TestCvs::initTestCase() { KDevelop::AutoTestShell::init(); diff --git a/plugins/documentswitcher/CMakeLists.txt b/plugins/documentswitcher/CMakeLists.txt --- a/plugins/documentswitcher/CMakeLists.txt +++ b/plugins/documentswitcher/CMakeLists.txt @@ -8,6 +8,12 @@ documentswitchertreeview.cpp ) +ecm_qt_declare_logging_category(kdevdocumentswitcher_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_DOCUMENTSWITCHER + CATEGORY_NAME "kdevplatform.plugins.documentswitcher" +) + qt5_add_resources(kdevdocumentswitcher_PART_SRCS kdevdocumentswitcher.qrc) kdevplatform_add_plugin(kdevdocumentswitcher JSON kdevdocumentswitcher.json SOURCES ${kdevdocumentswitcher_PART_SRCS}) diff --git a/plugins/documentswitcher/documentswitcherplugin.h b/plugins/documentswitcher/documentswitcherplugin.h --- a/plugins/documentswitcher/documentswitcherplugin.h +++ b/plugins/documentswitcher/documentswitcherplugin.h @@ -21,8 +21,6 @@ #include #include -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_DOCUMENTSWITCHER) class QStandardItemModel; namespace Sublime diff --git a/plugins/documentswitcher/documentswitcherplugin.cpp b/plugins/documentswitcher/documentswitcherplugin.cpp --- a/plugins/documentswitcher/documentswitcherplugin.cpp +++ b/plugins/documentswitcher/documentswitcherplugin.cpp @@ -39,13 +39,13 @@ #include #include "documentswitchertreeview.h" +#include "debug.h" #include #include #include #include -Q_LOGGING_CATEGORY(PLUGIN_DOCUMENTSWITCHER, "kdevplatform.plugins.documentswitcher") K_PLUGIN_FACTORY_WITH_JSON(DocumentSwitcherFactory, "kdevdocumentswitcher.json", registerPlugin();) //TODO: Show frame around view's widget while walking through diff --git a/plugins/execute/CMakeLists.txt b/plugins/execute/CMakeLists.txt --- a/plugins/execute/CMakeLists.txt +++ b/plugins/execute/CMakeLists.txt @@ -9,6 +9,12 @@ nativeappjob.cpp ) +ecm_qt_declare_logging_category(kdevexecute_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_EXECUTE + CATEGORY_NAME "kdevplatform.plugins.execute" +) + ki18n_wrap_ui( kdevexecute_PART_SRCS nativeappconfig.ui) kdevplatform_add_plugin(kdevexecute JSON kdevexecute.json SOURCES ${kdevexecute_PART_SRCS}) diff --git a/plugins/execute/debug.h b/plugins/execute/debug.h deleted file mode 100644 --- a/plugins/execute/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_EXECUTE_DEBUG_H -#define KDEVPLATFORM_EXECUTE_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_EXECUTE) - -#endif diff --git a/plugins/execute/executeplugin.cpp b/plugins/execute/executeplugin.cpp --- a/plugins/execute/executeplugin.cpp +++ b/plugins/execute/executeplugin.cpp @@ -59,7 +59,6 @@ using namespace KDevelop; -Q_LOGGING_CATEGORY(PLUGIN_EXECUTE, "kdevplatform.plugins.execute") K_PLUGIN_FACTORY_WITH_JSON(KDevExecuteFactory, "kdevexecute.json", registerPlugin();) ExecutePlugin::ExecutePlugin(QObject *parent, const QVariantList&) diff --git a/plugins/executescript/CMakeLists.txt b/plugins/executescript/CMakeLists.txt --- a/plugins/executescript/CMakeLists.txt +++ b/plugins/executescript/CMakeLists.txt @@ -5,6 +5,11 @@ scriptappconfig.cpp scriptappjob.cpp ) +ecm_qt_declare_logging_category(kdevexecutescript_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_EXECUTESCRIPT + CATEGORY_NAME "kdevplatform.plugins.executescript" +) ki18n_wrap_ui(kdevexecutescript_PART_SRCS scriptappconfig.ui ) diff --git a/plugins/executescript/debug.h b/plugins/executescript/debug.h deleted file mode 100644 --- a/plugins/executescript/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_EXECUTESCRIPT_DEBUG_H -#define KDEVPLATFORM_EXECUTESCRIPT_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_EXECUTESCRIPT) - -#endif diff --git a/plugins/executescript/executescriptplugin.cpp b/plugins/executescript/executescriptplugin.cpp --- a/plugins/executescript/executescriptplugin.cpp +++ b/plugins/executescript/executescriptplugin.cpp @@ -53,7 +53,6 @@ using namespace KDevelop; -Q_LOGGING_CATEGORY(PLUGIN_EXECUTESCRIPT, "kdevplatform.plugins.executescript") K_PLUGIN_FACTORY_WITH_JSON(KDevExecuteFactory, "kdevexecutescript.json", registerPlugin();) ExecuteScriptPlugin::ExecuteScriptPlugin(QObject *parent, const QVariantList&) diff --git a/plugins/externalscript/CMakeLists.txt b/plugins/externalscript/CMakeLists.txt --- a/plugins/externalscript/CMakeLists.txt +++ b/plugins/externalscript/CMakeLists.txt @@ -7,7 +7,12 @@ externalscriptitem.cpp externalscriptjob.cpp editexternalscript.cpp - externalscriptdebug.cpp +) + +ecm_qt_declare_logging_category(kdevexternalscript_PART_SRCS + HEADER externalscriptdebug.h + IDENTIFIER PLUGIN_EXTERNALSCRIPT + CATEGORY_NAME "kdevplatform.plugins.externalscript" ) set(kdevexternalscript_PART_UI diff --git a/plugins/externalscript/externalscriptdebug.h b/plugins/externalscript/externalscriptdebug.h deleted file mode 100644 --- a/plugins/externalscript/externalscriptdebug.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - This plugin is part of KDevelop. - - Copyright (C) 2011 Milian Wolff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -#ifndef KDEVPLATFORM_PLUGIN_EXTERNALSCRIPTDEBUG_H -#define KDEVPLATFORM_PLUGIN_EXTERNALSCRIPTDEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_EXTERNALSCRIPT) - -#endif // KDEVPLATFORM_PLUGIN_EXTERNALSCRIPTDEBUG_H diff --git a/plugins/externalscript/externalscriptdebug.cpp b/plugins/externalscript/externalscriptdebug.cpp deleted file mode 100644 --- a/plugins/externalscript/externalscriptdebug.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - This plugin is part of KDevelop. - - Copyright (C) 2011 Milian Wolff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -#include "externalscriptdebug.h" - -Q_LOGGING_CATEGORY(PLUGIN_EXTERNALSCRIPT, "kdevplatform.plugins.externalscript") diff --git a/plugins/filemanager/CMakeLists.txt b/plugins/filemanager/CMakeLists.txt --- a/plugins/filemanager/CMakeLists.txt +++ b/plugins/filemanager/CMakeLists.txt @@ -5,6 +5,11 @@ filemanager.cpp bookmarkhandler.cpp ) +ecm_qt_declare_logging_category(kdevfilemanager_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_FILEMANAGER + CATEGORY_NAME "kdevplatform.plugins.filemanager" +) qt5_add_resources(kdevfilemanager_PART_SRCS kdevfilemanager.qrc) kdevplatform_add_plugin(kdevfilemanager JSON kdevfilemanager.json SOURCES ${kdevfilemanager_PART_SRCS}) target_link_libraries(kdevfilemanager KF5::Bookmarks KF5::KIOCore KF5::KIOFileWidgets KF5::KIOWidgets KF5::TextEditor KDev::Interfaces) diff --git a/plugins/filemanager/debug.h b/plugins/filemanager/debug.h deleted file mode 100644 --- a/plugins/filemanager/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_FILEMANAGER_DEBUG_H -#define KDEVPLATFORM_FILEMANAGER_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_FILEMANAGER) - -#endif diff --git a/plugins/filemanager/filemanager.cpp b/plugins/filemanager/filemanager.cpp --- a/plugins/filemanager/filemanager.cpp +++ b/plugins/filemanager/filemanager.cpp @@ -50,8 +50,6 @@ #include "bookmarkhandler.h" #include "debug.h" -Q_LOGGING_CATEGORY(PLUGIN_FILEMANAGER, "kdevplatform.plugins.filemanager") - FileManager::FileManager(KDevFileManagerPlugin *plugin, QWidget* parent) : QWidget(parent), m_plugin(plugin) { diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt --- a/plugins/filetemplates/CMakeLists.txt +++ b/plugins/filetemplates/CMakeLists.txt @@ -15,7 +15,12 @@ templateoptionspage.cpp templateselectionpage.cpp testcasespage.cpp - debug.cpp +) + +ecm_qt_declare_logging_category(kdevfiletemplates_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_FILETEMPLATES + CATEGORY_NAME "kdevplatform.plugins.filetemplates" ) ki18n_wrap_ui(kdevfiletemplates_PART_SRCS diff --git a/plugins/filetemplates/debug.h b/plugins/filetemplates/debug.h deleted file mode 100644 --- a/plugins/filetemplates/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_FILETEMPLATES_DEBUG_H -#define KDEVPLATFORM_FILETEMPLATES_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_FILETEMPLATES) - -#endif diff --git a/plugins/filetemplates/debug.cpp b/plugins/filetemplates/debug.cpp deleted file mode 100644 --- a/plugins/filetemplates/debug.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "debug.h" - -Q_LOGGING_CATEGORY(PLUGIN_FILETEMPLATES, "kdevplatform.plugins.filetemplates") diff --git a/plugins/git/CMakeLists.txt b/plugins/git/CMakeLists.txt --- a/plugins/git/CMakeLists.txt +++ b/plugins/git/CMakeLists.txt @@ -1,8 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevgit\") -add_subdirectory(tests) -add_subdirectory(icons) - +ecm_qt_declare_logging_category(kdevgit_LOG_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_GIT + CATEGORY_NAME "kdevplatform.plugins.git" +) set(kdevgit_PART_SRCS stashmanagerdialog.cpp stashpatchsource.cpp @@ -13,6 +15,7 @@ gitjob.cpp gitplugincheckinrepositoryjob.cpp gitnameemaildialog.cpp + ${kdevgit_LOG_PART_SRCS} ) ki18n_wrap_ui(kdevgit_PART_SRCS stashmanagerdialog.ui) ki18n_wrap_ui(kdevgit_PART_SRCS gitnameemaildialog.ui) @@ -24,3 +27,6 @@ KDev::Project KF5::SonnetUi ) + +add_subdirectory(tests) +add_subdirectory(icons) diff --git a/plugins/git/debug.h b/plugins/git/debug.h deleted file mode 100644 --- a/plugins/git/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_GIT_DEBUG_H -#define KDEVPLATFORM_GIT_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_GIT) - -#endif diff --git a/plugins/git/gitplugin.cpp b/plugins/git/gitplugin.cpp --- a/plugins/git/gitplugin.cpp +++ b/plugins/git/gitplugin.cpp @@ -60,8 +60,6 @@ #include "gitnameemaildialog.h" #include "debug.h" -Q_LOGGING_CATEGORY(PLUGIN_GIT, "kdevplatform.plugins.git") - using namespace KDevelop; QVariant runSynchronously(KDevelop::VcsJob* job) diff --git a/plugins/git/tests/CMakeLists.txt b/plugins/git/tests/CMakeLists.txt --- a/plugins/git/tests/CMakeLists.txt +++ b/plugins/git/tests/CMakeLists.txt @@ -3,7 +3,10 @@ find_program(GIT_FOUND NAMES git) if (GIT_FOUND) - + include_directories( + .. + ${CMAKE_CURRENT_BINARY_DIR}/.. + ) set(gittest_SRCS test_git.cpp ../gitplugin.cpp @@ -14,6 +17,7 @@ ../gitmessagehighlighter.cpp ../gitplugincheckinrepositoryjob.cpp ../gitnameemaildialog.cpp + ${kdevgit_LOG_PART_SRCS} ) ki18n_wrap_ui(gittest_SRCS ../stashmanagerdialog.ui) ki18n_wrap_ui(gittest_SRCS ../gitnameemaildialog.ui) diff --git a/plugins/grepview/CMakeLists.txt b/plugins/grepview/CMakeLists.txt --- a/plugins/grepview/CMakeLists.txt +++ b/plugins/grepview/CMakeLists.txt @@ -3,6 +3,12 @@ ########### next target ############### +ecm_qt_declare_logging_category(kdevgrepview_LOG_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_GREPVIEW + CATEGORY_NAME "kdevplatform.plugins.grepview" +) + set(kdevgrepview_PART_SRCS grepviewplugin.cpp grepviewpluginmetadata.cpp @@ -13,6 +19,7 @@ grepfindthread.cpp grepoutputview.cpp greputil.cpp + ${kdevgrepview_LOG_PART_SRCS} ) set(kdevgrepview_PART_UI diff --git a/plugins/grepview/debug.h b/plugins/grepview/debug.h deleted file mode 100644 --- a/plugins/grepview/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_GREPVIEW_DEBUG_H -#define KDEVPLATFORM_GREPVIEW_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_GREPVIEW) - -#endif diff --git a/plugins/grepview/grepviewplugin.cpp b/plugins/grepview/grepviewplugin.cpp --- a/plugins/grepview/grepviewplugin.cpp +++ b/plugins/grepview/grepviewplugin.cpp @@ -40,8 +40,6 @@ #include #include -Q_LOGGING_CATEGORY(PLUGIN_GREPVIEW, "kdevplatform.plugins.grepview") - static QString patternFromSelection(const KDevelop::IDocument* doc) { if (!doc) diff --git a/plugins/grepview/tests/CMakeLists.txt b/plugins/grepview/tests/CMakeLists.txt --- a/plugins/grepview/tests/CMakeLists.txt +++ b/plugins/grepview/tests/CMakeLists.txt @@ -1,3 +1,7 @@ +include_directories( + .. + ${CMAKE_CURRENT_BINARY_DIR}/.. +) set(findReplaceTest_SRCS test_findreplace.cpp ../grepviewplugin.cpp @@ -8,6 +12,7 @@ ../grepfindthread.cpp ../grepoutputview.cpp ../greputil.cpp + ${kdevgrepview_LOG_PART_SRCS} ) set(kdevgrepview_PART_UI ../grepwidget.ui diff --git a/plugins/konsole/CMakeLists.txt b/plugins/konsole/CMakeLists.txt --- a/plugins/konsole/CMakeLists.txt +++ b/plugins/konsole/CMakeLists.txt @@ -6,5 +6,10 @@ kdevkonsoleview.cpp ) +ecm_qt_declare_logging_category(kdevkonsoleview_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_KONSOLE + CATEGORY_NAME "kdevplatform.plugins.konsole" +) kdevplatform_add_plugin(kdevkonsoleview JSON kdevkonsoleview.json SOURCES ${kdevkonsoleview_PART_SRCS}) target_link_libraries(kdevkonsoleview KF5::Parts KDev::Interfaces) diff --git a/plugins/konsole/debug.h b/plugins/konsole/debug.h deleted file mode 100644 --- a/plugins/konsole/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_KONSOLE_DEBUG_H -#define KDEVPLATFORM_KONSOLE_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_KONSOLE) - -#endif diff --git a/plugins/konsole/kdevkonsoleviewplugin.cpp b/plugins/konsole/kdevkonsoleviewplugin.cpp --- a/plugins/konsole/kdevkonsoleviewplugin.cpp +++ b/plugins/konsole/kdevkonsoleviewplugin.cpp @@ -20,8 +20,6 @@ #include "kdevkonsoleview.h" #include "debug.h" -Q_LOGGING_CATEGORY(PLUGIN_KONSOLE, "kdevplatform.plugins.konsole") - QObject* createKonsoleView( QWidget*, QObject* op, const QVariantList& args) { KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("konsolepart")); diff --git a/plugins/outlineview/CMakeLists.txt b/plugins/outlineview/CMakeLists.txt --- a/plugins/outlineview/CMakeLists.txt +++ b/plugins/outlineview/CMakeLists.txt @@ -6,6 +6,11 @@ outlinewidget.cpp ) +ecm_qt_declare_logging_category(kdevoutlineview_SRCS + HEADER debug_outline.h + IDENTIFIER PLUGIN_OUTLINE + CATEGORY_NAME "kdevplatform.plugins.outline" +) kdevplatform_add_plugin(kdevoutlineview JSON kdevoutlineview.json SOURCES ${kdevoutlineview_SRCS}) target_link_libraries(kdevoutlineview KDev::Interfaces diff --git a/plugins/outlineview/debug_outline.h b/plugins/outlineview/debug_outline.h deleted file mode 100644 --- a/plugins/outlineview/debug_outline.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * KDevelop outline view - * Copyright 2015 Alex Richardson - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -#pragma once - -#include - -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_OUTLINE) diff --git a/plugins/outlineview/outlineviewplugin.cpp b/plugins/outlineview/outlineviewplugin.cpp --- a/plugins/outlineview/outlineviewplugin.cpp +++ b/plugins/outlineview/outlineviewplugin.cpp @@ -29,8 +29,6 @@ K_PLUGIN_FACTORY_WITH_JSON(KDevOutlineViewFactory, "kdevoutlineview.json", registerPlugin();) -Q_LOGGING_CATEGORY(PLUGIN_OUTLINE, "kdevplatform.plugins.outline") - using namespace KDevelop; class OutlineViewFactory: public KDevelop::IToolViewFactory { diff --git a/plugins/patchreview/CMakeLists.txt b/plugins/patchreview/CMakeLists.txt --- a/plugins/patchreview/CMakeLists.txt +++ b/plugins/patchreview/CMakeLists.txt @@ -23,6 +23,11 @@ localpatchsource.cpp ) +ecm_qt_declare_logging_category(patchreview_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_PATCHREVIEW + CATEGORY_NAME "kdevplatform.plugins.patchreview" +) ki18n_wrap_ui(patchreview_PART_SRCS patchreview.ui localpatchwidget.ui) qt5_add_resources(patchreview_PART_SRCS kdevpatchreview.qrc) diff --git a/plugins/patchreview/debug.h b/plugins/patchreview/debug.h deleted file mode 100644 --- a/plugins/patchreview/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_PATCHREVIEW_DEBUG_H -#define KDEVPLATFORM_PATCHREVIEW_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_PATCHREVIEW) - -#endif diff --git a/plugins/patchreview/patchreview.cpp b/plugins/patchreview/patchreview.cpp --- a/plugins/patchreview/patchreview.cpp +++ b/plugins/patchreview/patchreview.cpp @@ -63,8 +63,6 @@ #include "debug.h" -Q_LOGGING_CATEGORY(PLUGIN_PATCHREVIEW, "kdevplatform.plugins.patchreview") - using namespace KDevelop; namespace diff --git a/plugins/perforce/CMakeLists.txt b/plugins/perforce/CMakeLists.txt --- a/plugins/perforce/CMakeLists.txt +++ b/plugins/perforce/CMakeLists.txt @@ -1,14 +1,21 @@ add_subdirectory(p4clientstub) -add_subdirectory(test) +ecm_qt_declare_logging_category(kdevperforce_LOG_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_PERFORCE + CATEGORY_NAME "kdevplatform.plugins.perforce" +) set(kdevperforce_PART_SRCS perforceplugin.cpp perforcepluginmetadata.cpp + ${kdevperforce_LOG_PART_SRCS} ) kdevplatform_add_plugin(kdevperforce JSON kdevperforce.json SOURCES ${kdevperforce_PART_SRCS}) target_link_libraries(kdevperforce KDev::Interfaces KDev::Vcs ) + +add_subdirectory(test) diff --git a/plugins/perforce/debug.h b/plugins/perforce/debug.h deleted file mode 100644 --- a/plugins/perforce/debug.h +++ /dev/null @@ -1,23 +0,0 @@ -/*************************************************************************** - * Copyright 2010 Morten Danielsen Volden * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ -#ifndef PERFORCE_PLUGIN_DEBUG_H -#define PERFORCE_PLUGIN_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_PERFORCE) - -#endif diff --git a/plugins/perforce/perforceplugin.cpp b/plugins/perforce/perforceplugin.cpp --- a/plugins/perforce/perforceplugin.cpp +++ b/plugins/perforce/perforceplugin.cpp @@ -108,8 +108,6 @@ } -Q_LOGGING_CATEGORY(PLUGIN_PERFORCE, "kdevplatform.plugins.perforce") - PerforcePlugin::PerforcePlugin(QObject* parent, const QVariantList&): KDevelop::IPlugin(QStringLiteral("kdevperforce"), parent) , m_common(new KDevelop::VcsPluginHelper(this, this)) diff --git a/plugins/perforce/test/CMakeLists.txt b/plugins/perforce/test/CMakeLists.txt --- a/plugins/perforce/test/CMakeLists.txt +++ b/plugins/perforce/test/CMakeLists.txt @@ -1,8 +1,12 @@ +include_directories( + .. + ${CMAKE_CURRENT_BINARY_DIR}/.. +) set(perforceplugintest_SRCS test_perforce.cpp ../perforceplugin.cpp + ${kdevperforce_LOG_PART_SRCS} ) -include_directories(../) add_definitions( "-DP4_CLIENT_STUB_EXE=\"${CMAKE_CURRENT_BINARY_DIR}/../p4clientstub/p4clientstub\"" ) diff --git a/plugins/problemreporter/CMakeLists.txt b/plugins/problemreporter/CMakeLists.txt --- a/plugins/problemreporter/CMakeLists.txt +++ b/plugins/problemreporter/CMakeLists.txt @@ -11,6 +11,11 @@ problemreportermodel.cpp ) +ecm_qt_declare_logging_category(kdevproblemreporter_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_PROBLEMREPORTER + CATEGORY_NAME "kdevplatform.plugins.problemreporter" +) qt5_add_resources(kdevproblemreporter_PART_SRCS kdevproblemreporter.qrc) kdevplatform_add_plugin(kdevproblemreporter JSON kdevproblemreporter.json SOURCES ${kdevproblemreporter_PART_SRCS}) target_link_libraries(kdevproblemreporter KF5::TextEditor KF5::Parts KDev::Language KDev::Interfaces KDev::Util KDev::Project KDev::Shell) diff --git a/plugins/problemreporter/problemreporterplugin.h b/plugins/problemreporter/problemreporterplugin.h --- a/plugins/problemreporter/problemreporterplugin.h +++ b/plugins/problemreporter/problemreporterplugin.h @@ -30,9 +30,6 @@ #include #include -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_PROBLEMREPORTER) - namespace KTextEditor { class Document; diff --git a/plugins/problemreporter/problemreporterplugin.cpp b/plugins/problemreporter/problemreporterplugin.cpp --- a/plugins/problemreporter/problemreporterplugin.cpp +++ b/plugins/problemreporter/problemreporterplugin.cpp @@ -51,10 +51,10 @@ #include "shell/problemmodelset.h" #include "problemsview.h" +#include #include -Q_LOGGING_CATEGORY(PLUGIN_PROBLEMREPORTER, "kdevplatform.plugins.problemreporter") K_PLUGIN_FACTORY_WITH_JSON(KDevProblemReporterFactory, "kdevproblemreporter.json", registerPlugin();) diff --git a/plugins/projectfilter/CMakeLists.txt b/plugins/projectfilter/CMakeLists.txt --- a/plugins/projectfilter/CMakeLists.txt +++ b/plugins/projectfilter/CMakeLists.txt @@ -9,12 +9,16 @@ projectfilterdebug.cpp filter.cpp projectfilterconfigpage.cpp - projectfilterdebug.cpp filter.cpp filtermodel.cpp comboboxdelegate.cpp ) +ecm_qt_declare_logging_category(projectfilter_SRCS + HEADER projectfilterdebug.h + IDENTIFIER PLUGIN_PROJECTFILTER + CATEGORY_NAME "kdevplatform.plugins.projectfilter" +) ki18n_wrap_ui(projectfilter_SRCS projectfiltersettings.ui) kconfig_add_kcfg_files(projectfilter_SRCS projectfiltersettings.kcfgc) diff --git a/plugins/projectfilter/projectfilterdebug.h b/plugins/projectfilter/projectfilterdebug.h deleted file mode 100644 --- a/plugins/projectfilter/projectfilterdebug.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of KDevelop - * - * Copyright 2013 Milian Wolff - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef PROJECTFILTERDEBUG_H -#define PROJECTFILTERDEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_PROJECTFILTER) - -namespace KDevelop { - -#define projectFilterDebug() qCDebug(PLUGIN_PROJECTFILTER) - -} - -#endif // PROJECTFILTERDEBUG_H diff --git a/plugins/projectfilter/projectfilterdebug.cpp b/plugins/projectfilter/projectfilterdebug.cpp deleted file mode 100644 --- a/plugins/projectfilter/projectfilterdebug.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of KDevelop - * - * Copyright 2013 Milian Wolff - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "projectfilterdebug.h" - -Q_LOGGING_CATEGORY(PLUGIN_PROJECTFILTER, "kdevplatform.plugins.projectfilter") - -namespace KDevelop { - -} diff --git a/plugins/projectfilter/projectfilterprovider.cpp b/plugins/projectfilter/projectfilterprovider.cpp --- a/plugins/projectfilter/projectfilterprovider.cpp +++ b/plugins/projectfilter/projectfilterprovider.cpp @@ -135,7 +135,7 @@ Filters newFilters = deserialize(readFilters(project->projectConfiguration())); Filters& filters = m_filters[project]; if (filters != newFilters) { - projectFilterDebug() << "project filter changed:" << project->name(); + qCDebug(PLUGIN_PROJECTFILTER) << "project filter changed:" << project->name(); filters = newFilters; emit filterChanged(this, project); } diff --git a/plugins/projectmanagerview/CMakeLists.txt b/plugins/projectmanagerview/CMakeLists.txt --- a/plugins/projectmanagerview/CMakeLists.txt +++ b/plugins/projectmanagerview/CMakeLists.txt @@ -11,6 +11,11 @@ projectmodelitemdelegate.cpp ) +ecm_qt_declare_logging_category(kdevprojectmanagerview_PLUGIN_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_PROJECTMANAGERVIEW + CATEGORY_NAME "kdevplatform.plugins.projectmanagerview" +) ki18n_wrap_ui( kdevprojectmanagerview_PLUGIN_SRCS projectbuildsetwidget.ui projectmanagerview.ui ) qt5_add_resources(kdevprojectmanagerview_PLUGIN_SRCS kdevprojectmanagerview.qrc) diff --git a/plugins/projectmanagerview/debug.h b/plugins/projectmanagerview/debug.h deleted file mode 100644 --- a/plugins/projectmanagerview/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_PROJECTMANAGERVIEW_DEBUG_H -#define KDEVPLATFORM_PROJECTMANAGERVIEW_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_PROJECTMANAGERVIEW) - -#endif diff --git a/plugins/projectmanagerview/projectmanagerviewplugin.cpp b/plugins/projectmanagerview/projectmanagerviewplugin.cpp --- a/plugins/projectmanagerview/projectmanagerviewplugin.cpp +++ b/plugins/projectmanagerview/projectmanagerviewplugin.cpp @@ -54,7 +54,6 @@ using namespace KDevelop; -Q_LOGGING_CATEGORY(PLUGIN_PROJECTMANAGERVIEW, "kdevplatform.plugins.projectmanagerview") K_PLUGIN_FACTORY_WITH_JSON(ProjectManagerFactory, "kdevprojectmanagerview.json", registerPlugin();) class KDevProjectManagerViewFactory: public KDevelop::IToolViewFactory diff --git a/plugins/quickopen/CMakeLists.txt b/plugins/quickopen/CMakeLists.txt --- a/plugins/quickopen/CMakeLists.txt +++ b/plugins/quickopen/CMakeLists.txt @@ -15,6 +15,11 @@ expandingtree/expandingtree.cpp expandingtree/expandingwidgetmodel.cpp ) +ecm_qt_declare_logging_category(kdevquickopen_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_QUICKOPEN + CATEGORY_NAME "kdevplatform.plugins.quickopen" +) ki18n_wrap_ui(kdevquickopen_PART_SRCS quickopenwidget.ui ) diff --git a/plugins/quickopen/debug.h b/plugins/quickopen/debug.h deleted file mode 100644 --- a/plugins/quickopen/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_QUICKOPEN_DEBUG_H -#define KDEVPLATFORM_QUICKOPEN_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_QUICKOPEN) - -#endif diff --git a/plugins/quickopen/expandingtree/expandingdelegate.cpp b/plugins/quickopen/expandingtree/expandingdelegate.cpp --- a/plugins/quickopen/expandingtree/expandingdelegate.cpp +++ b/plugins/quickopen/expandingtree/expandingdelegate.cpp @@ -28,7 +28,7 @@ #include #include "expandingwidgetmodel.h" -#include "../debug.h" +#include ExpandingDelegate::ExpandingDelegate(ExpandingWidgetModel* model, QObject* parent) : QItemDelegate(parent) diff --git a/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp b/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp --- a/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp +++ b/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp @@ -24,14 +24,14 @@ #include #include #include +#include #include #include #include #include "expandingdelegate.h" -#include -#include "../debug.h" +#include QIcon ExpandingWidgetModel::m_expandedIcon; QIcon ExpandingWidgetModel::m_collapsedIcon; diff --git a/plugins/quickopen/quickopenplugin.cpp b/plugins/quickopen/quickopenplugin.cpp --- a/plugins/quickopen/quickopenplugin.cpp +++ b/plugins/quickopen/quickopenplugin.cpp @@ -65,8 +65,6 @@ #include #include -Q_LOGGING_CATEGORY(PLUGIN_QUICKOPEN, "kdevplatform.plugins.quickopen") - using namespace KDevelop; const bool noHtmlDestriptionInOutline = true; diff --git a/plugins/standardoutputview/CMakeLists.txt b/plugins/standardoutputview/CMakeLists.txt --- a/plugins/standardoutputview/CMakeLists.txt +++ b/plugins/standardoutputview/CMakeLists.txt @@ -1,13 +1,19 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevstandardoutputview\") -add_subdirectory(tests) ########### next target ############### +ecm_qt_declare_logging_category(standardoutputview_LOG_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_STANDARDOUTPUTVIEW + CATEGORY_NAME "kdevplatform.plugins.standardoutputview" +) + set(standardoutputview_LIB_SRCS standardoutputview.cpp outputwidget.cpp toolviewdata.cpp standardoutputviewmetadata.cpp + ${standardoutputview_LOG_PART_SRCS} ) qt5_add_resources(standardoutputview_LIB_SRCS kdevstandardoutputview.qrc) @@ -20,3 +26,4 @@ KDev::OutputView ) +add_subdirectory(tests) diff --git a/plugins/standardoutputview/debug.h b/plugins/standardoutputview/debug.h deleted file mode 100644 --- a/plugins/standardoutputview/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_STANDARDOUTPUTVIEW_DEBUG_H -#define KDEVPLATFORM_STANDARDOUTPUTVIEW_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_STANDARDOUTPUTVIEW) - -#endif diff --git a/plugins/standardoutputview/outputwidget.cpp b/plugins/standardoutputview/outputwidget.cpp --- a/plugins/standardoutputview/outputwidget.cpp +++ b/plugins/standardoutputview/outputwidget.cpp @@ -47,9 +47,8 @@ #include "outputmodel.h" #include "toolviewdata.h" -#include "debug.h" +#include -Q_LOGGING_CATEGORY(PLUGIN_STANDARDOUTPUTVIEW, "kdevplatform.plugins.standardoutputview") Q_DECLARE_METATYPE(QTreeView*) OutputWidget::OutputWidget(QWidget* parent, const ToolViewData* tvdata) diff --git a/plugins/standardoutputview/tests/CMakeLists.txt b/plugins/standardoutputview/tests/CMakeLists.txt --- a/plugins/standardoutputview/tests/CMakeLists.txt +++ b/plugins/standardoutputview/tests/CMakeLists.txt @@ -1,8 +1,13 @@ +include_directories( + .. + ${CMAKE_CURRENT_BINARY_DIR}/.. +) set(test_standardOutputView_SRCS test_standardoutputview.cpp ../outputwidget.cpp ../toolviewdata.cpp ../standardoutputview.cpp + ${standardoutputview_LOG_PART_SRCS} ) ecm_add_test(${test_standardOutputView_SRCS} diff --git a/plugins/subversion/CMakeLists.txt b/plugins/subversion/CMakeLists.txt --- a/plugins/subversion/CMakeLists.txt +++ b/plugins/subversion/CMakeLists.txt @@ -75,6 +75,12 @@ svnlocationwidget.cpp ) +ecm_qt_declare_logging_category(kdevsubversion_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_SVN + CATEGORY_NAME "kdevplatform.plugins.svn" +) + set(kdevsubversion_PART_UI ui/ssltrustdialog.ui ui/importmetadatawidget.ui diff --git a/plugins/subversion/debug.h b/plugins/subversion/debug.h deleted file mode 100644 --- a/plugins/subversion/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_SUBVERSION_DEBUG_H -#define KDEVPLATFORM_SUBVERSION_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_SVN) - -#endif diff --git a/plugins/subversion/kdevsvnplugin.cpp b/plugins/subversion/kdevsvnplugin.cpp --- a/plugins/subversion/kdevsvnplugin.cpp +++ b/plugins/subversion/kdevsvnplugin.cpp @@ -65,7 +65,6 @@ #include "svnlocationwidget.h" #include "debug.h" -Q_LOGGING_CATEGORY(PLUGIN_SVN, "kdevplatform.plugins.svn") K_PLUGIN_FACTORY_WITH_JSON(KDevSvnFactory, "kdevsubversion.json", registerPlugin();) KDevSvnPlugin::KDevSvnPlugin(QObject *parent, const QVariantList &) diff --git a/plugins/switchtobuddy/CMakeLists.txt b/plugins/switchtobuddy/CMakeLists.txt --- a/plugins/switchtobuddy/CMakeLists.txt +++ b/plugins/switchtobuddy/CMakeLists.txt @@ -7,6 +7,11 @@ switchtobuddyplugin.cpp ) +ecm_qt_declare_logging_category(kdevswitchtobuddy_PART_SRCS + HEADER debug.h + IDENTIFIER PLUGIN_SWITCHTOBUDDY + CATEGORY_NAME "kdevplatform.plugins.switchtobuddy" +) qt5_add_resources(kdevswitchtobuddy_PART_SRCS kdevswitchtobuddy.qrc) kdevplatform_add_plugin(kdevswitchtobuddy JSON kdevswitchtobuddy.json SOURCES ${kdevswitchtobuddy_PART_SRCS}) diff --git a/plugins/switchtobuddy/switchtobuddyplugin.h b/plugins/switchtobuddy/switchtobuddyplugin.h --- a/plugins/switchtobuddy/switchtobuddyplugin.h +++ b/plugins/switchtobuddy/switchtobuddyplugin.h @@ -25,8 +25,6 @@ #include #include -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_SWITCHTOBUDDY) /** * @short Implements a context menu extension in an editor context which provides diff --git a/plugins/switchtobuddy/switchtobuddyplugin.cpp b/plugins/switchtobuddy/switchtobuddyplugin.cpp --- a/plugins/switchtobuddy/switchtobuddyplugin.cpp +++ b/plugins/switchtobuddy/switchtobuddyplugin.cpp @@ -41,8 +41,7 @@ #include #include - -Q_LOGGING_CATEGORY(PLUGIN_SWITCHTOBUDDY, "kdevplatform.plugins.switchtobuddy") +#include using namespace KDevelop; diff --git a/plugins/testview/CMakeLists.txt b/plugins/testview/CMakeLists.txt --- a/plugins/testview/CMakeLists.txt +++ b/plugins/testview/CMakeLists.txt @@ -4,9 +4,13 @@ set(kdevtestview_PLUGIN_SRCS testview.cpp testviewplugin.cpp - testviewdebug.cpp ) +ecm_qt_declare_logging_category(kdevtestview_PLUGIN_SRCS + HEADER testviewdebug.h + IDENTIFIER PLUGIN_TESTVIEW + CATEGORY_NAME "kdevplatform.plugins.testview" +) qt5_add_resources(kdevtestview_PLUGIN_SRCS kdevtestview.qrc) kdevplatform_add_plugin(kdevtestview JSON kdevtestview.json SOURCES ${kdevtestview_PLUGIN_SRCS}) target_link_libraries(kdevtestview KF5::ItemModels KDev::Interfaces KDev::Util KDev::Language) diff --git a/plugins/testview/testviewdebug.h b/plugins/testview/testviewdebug.h deleted file mode 100644 --- a/plugins/testview/testviewdebug.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - This plugin is part of KDevelop. - - Copyright (C) 2011 Milian Wolff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -#ifndef KDEVPLATFORM_PLUGIN_TESTVIEWDEBUG_H -#define KDEVPLATFORM_PLUGIN_TESTVIEWDEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(PLUGIN_TESTVIEW) - -#endif // KDEVPLATFORM_PLUGIN_TESTVIEWDEBUG_H diff --git a/plugins/testview/testviewdebug.cpp b/plugins/testview/testviewdebug.cpp deleted file mode 100644 --- a/plugins/testview/testviewdebug.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/* - This plugin is part of KDevelop. - - Copyright (C) 2011 Milian Wolff - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -#include "testviewdebug.h" - -Q_LOGGING_CATEGORY(PLUGIN_TESTVIEW, "kdevplatform.plugins.testview") diff --git a/project/debug.cpp b/project/debug.cpp --- a/project/debug.cpp +++ b/project/debug.cpp @@ -19,5 +19,12 @@ #include "debug.h" -Q_LOGGING_CATEGORY(PROJECT, "kdevplatform.project") -Q_LOGGING_CATEGORY(FILEMANAGER, "kdevplatform.filemanager") +// TODO: ecm_qt_declare_logging_category only supports one category +// so generate two separate files with a wrapper debug.h, or have code include explicit matching header? +#if QT_VERSION >= 0x050500 +const QtMsgType defaultMsgType = QtInfoMsg; +#else +const QtMsgType defaultMsgType = QtWarningMsg; +#endif +Q_LOGGING_CATEGORY(PROJECT, "kdevplatform.project", defaultMsgType) +Q_LOGGING_CATEGORY(FILEMANAGER, "kdevplatform.filemanager", defaultMsgType) diff --git a/serialization/CMakeLists.txt b/serialization/CMakeLists.txt --- a/serialization/CMakeLists.txt +++ b/serialization/CMakeLists.txt @@ -5,7 +5,12 @@ indexedstring.cpp itemrepositoryregistry.cpp referencecounting.cpp - debug.cpp +) + +ecm_qt_declare_logging_category(KDevPlatformSerialization_LIB_SRCS + HEADER debug.h + IDENTIFIER SERIALIZATION + CATEGORY_NAME "kdevplatform.serialization" ) kdevplatform_add_library(KDevPlatformSerialization SOURCES ${KDevPlatformSerialization_LIB_SRCS}) diff --git a/serialization/debug.h b/serialization/debug.h deleted file mode 100644 --- a/serialization/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_SERIALIZATION_DEBUG_H -#define KDEVPLATFORM_SERIALIZATION_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(SERIALIZATION) - -#endif diff --git a/serialization/debug.cpp b/serialization/debug.cpp deleted file mode 100644 --- a/serialization/debug.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "debug.h" - -Q_LOGGING_CATEGORY(SERIALIZATION, "kdevplatform.serialization") diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -48,7 +48,6 @@ loadedpluginsdialog.cpp testcontroller.cpp projectsourcepage.cpp - debug.cpp configdialog.cpp editorconfigpage.cpp environmentconfigurebutton.cpp @@ -91,6 +90,12 @@ ) endif() +ecm_qt_declare_logging_category(KDevPlatformShell_LIB_SRCS + HEADER debug.h + IDENTIFIER SHELL + CATEGORY_NAME "kdevplatform.shell" +) + kconfig_add_kcfg_files(KDevPlatformShell_LIB_SRCS settings/uiconfig.kcfgc settings/projectconfig.kcfgc diff --git a/shell/debug.h b/shell/debug.h deleted file mode 100644 --- a/shell/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_SHELL_DEBUG_H -#define KDEVPLATFORM_SHELL_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(SHELL) - -#endif diff --git a/shell/debug.cpp b/shell/debug.cpp deleted file mode 100644 --- a/shell/debug.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "debug.h" - -Q_LOGGING_CATEGORY(SHELL, "kdevplatform.shell") diff --git a/shell/progresswidget/progressmanager.cpp b/shell/progresswidget/progressmanager.cpp --- a/shell/progresswidget/progressmanager.cpp +++ b/shell/progresswidget/progressmanager.cpp @@ -22,7 +22,7 @@ */ #include "progressmanager.h" -#include "../debug.h" +#include "debug.h" #include diff --git a/shell/settings/environmentwidget.cpp b/shell/settings/environmentwidget.cpp --- a/shell/settings/environmentwidget.cpp +++ b/shell/settings/environmentwidget.cpp @@ -38,7 +38,7 @@ #include "environmentprofilelistmodel.h" #include "environmentprofilemodel.h" #include "placeholderitemproxymodel.h" -#include "../debug.h" +#include "debug.h" using namespace KDevelop; diff --git a/shell/settings/pluginpreferences.cpp b/shell/settings/pluginpreferences.cpp --- a/shell/settings/pluginpreferences.cpp +++ b/shell/settings/pluginpreferences.cpp @@ -30,7 +30,7 @@ #include "../core.h" #include "../plugincontroller.h" -#include "../debug.h" +#include "debug.h" namespace KDevelop diff --git a/shell/settings/sourceformattersettings.cpp b/shell/settings/sourceformattersettings.cpp --- a/shell/settings/sourceformattersettings.cpp +++ b/shell/settings/sourceformattersettings.cpp @@ -40,7 +40,7 @@ #include #include "editstyledialog.h" -#include "../debug.h" +#include "debug.h" #define STYLE_ROLE (Qt::UserRole+1) diff --git a/shell/workingsets/closedworkingsetswidget.cpp b/shell/workingsets/closedworkingsetswidget.cpp --- a/shell/workingsets/closedworkingsetswidget.cpp +++ b/shell/workingsets/closedworkingsetswidget.cpp @@ -30,7 +30,7 @@ #include "workingset.h" #include "workingsettoolbutton.h" -#include "../debug.h" +#include "debug.h" using namespace KDevelop; diff --git a/shell/workingsets/workingset.cpp b/shell/workingsets/workingset.cpp --- a/shell/workingsets/workingset.cpp +++ b/shell/workingsets/workingset.cpp @@ -17,7 +17,7 @@ */ #include "workingset.h" -#include "../debug.h" +#include "debug.h" #include #include diff --git a/shell/workingsets/workingsetwidget.cpp b/shell/workingsets/workingsetwidget.cpp --- a/shell/workingsets/workingsetwidget.cpp +++ b/shell/workingsets/workingsetwidget.cpp @@ -18,7 +18,7 @@ */ #include "workingsetwidget.h" -#include "../debug.h" +#include "debug.h" #include diff --git a/sublime/CMakeLists.txt b/sublime/CMakeLists.txt --- a/sublime/CMakeLists.txt +++ b/sublime/CMakeLists.txt @@ -25,6 +25,11 @@ idealdockwidget.cpp idealbuttonbarwidget.cpp ) +ecm_qt_declare_logging_category(sublime_LIB_SRCS + HEADER sublimedebug.h + IDENTIFIER SUBLIME + CATEGORY_NAME "kdevplatform.sublime" +) kdevplatform_add_library(KDevPlatformSublime SOURCES ${sublime_LIB_SRCS}) target_link_libraries(KDevPlatformSublime LINK_PRIVATE KF5::KIOWidgets diff --git a/sublime/mainwindow.cpp b/sublime/mainwindow.cpp --- a/sublime/mainwindow.cpp +++ b/sublime/mainwindow.cpp @@ -38,8 +38,6 @@ #include "holdupdates.h" #include "sublimedebug.h" -Q_LOGGING_CATEGORY(SUBLIME, "kdevplatform.sublime") - namespace Sublime { MainWindow::MainWindow(Controller *controller, Qt::WindowFlags flags) diff --git a/sublime/sublimedebug.h b/sublime/sublimedebug.h deleted file mode 100644 --- a/sublime/sublimedebug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_SUBLIMEDEBUG_H -#define KDEVPLATFORM_SUBLIMEDEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(SUBLIME) - -#endif diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt --- a/util/CMakeLists.txt +++ b/util/CMakeLists.txt @@ -24,7 +24,6 @@ projecttestjob.cpp widgetcolorizer.cpp path.cpp - debug.cpp texteditorhelpers.cpp stack.cpp ) @@ -41,6 +40,12 @@ add_subdirectory(tests) +ecm_qt_declare_logging_category(KDevPlatformUtil_LIB_SRCS + HEADER debug.h + IDENTIFIER UTIL + CATEGORY_NAME "kdevplatform.util" +) + ki18n_wrap_ui(KDevPlatformUtil_LIB_SRCS ${KDevPlatformUtil_LIB_US}) kdevplatform_add_library(KDevPlatformUtil SOURCES ${KDevPlatformUtil_LIB_SRCS}) target_link_libraries(KDevPlatformUtil diff --git a/util/debug.h b/util/debug.h deleted file mode 100644 --- a/util/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_UTIL_DEBUG_H -#define KDEVPLATFORM_UTIL_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(UTIL) - -#endif diff --git a/util/debug.cpp b/util/debug.cpp deleted file mode 100644 --- a/util/debug.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "debug.h" - -Q_LOGGING_CATEGORY(UTIL, "kdevplatform.util") diff --git a/vcs/CMakeLists.txt b/vcs/CMakeLists.txt --- a/vcs/CMakeLists.txt +++ b/vcs/CMakeLists.txt @@ -20,7 +20,6 @@ vcsdiff.cpp vcsevent.cpp vcsstatusinfo.cpp - debug.cpp widgets/vcsimportmetadatawidget.cpp widgets/vcseventwidget.cpp widgets/vcsdiffwidget.cpp @@ -42,6 +41,13 @@ interfaces/ipatchdocument.cpp interfaces/ipatchsource.cpp ) + +ecm_qt_declare_logging_category(KDevPlatformVcs_LIB_SRCS + HEADER debug.h + IDENTIFIER VCS + CATEGORY_NAME "kdevplatform.vcs" +) + ki18n_wrap_ui(KDevPlatformVcs_LIB_SRCS ${KDevPlatformVcs_UIS}) kdevplatform_add_library(KDevPlatformVcs SOURCES ${KDevPlatformVcs_LIB_SRCS}) target_link_libraries(KDevPlatformVcs diff --git a/vcs/debug.h b/vcs/debug.h deleted file mode 100644 --- a/vcs/debug.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KDEVPLATFORM_VCS_DEBUG_H -#define KDEVPLATFORM_VCS_DEBUG_H - -#include -Q_DECLARE_LOGGING_CATEGORY(VCS) - -#endif diff --git a/vcs/debug.cpp b/vcs/debug.cpp deleted file mode 100644 --- a/vcs/debug.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "debug.h" - -Q_LOGGING_CATEGORY(VCS, "kdevplatform.vcs") diff --git a/vcs/dvcs/dvcsjob.cpp b/vcs/dvcs/dvcsjob.cpp --- a/vcs/dvcs/dvcsjob.cpp +++ b/vcs/dvcs/dvcsjob.cpp @@ -25,7 +25,7 @@ ***************************************************************************/ #include "dvcsjob.h" -#include "../debug.h" +#include "debug.h" #include #include diff --git a/vcs/dvcs/ui/branchmanager.cpp b/vcs/dvcs/ui/branchmanager.cpp --- a/vcs/dvcs/ui/branchmanager.cpp +++ b/vcs/dvcs/ui/branchmanager.cpp @@ -29,7 +29,7 @@ #include #include #include "ui_branchmanager.h" -#include "../../debug.h" +#include "debug.h" #include "widgets/vcsdiffpatchsources.h" #include diff --git a/vcs/models/brancheslistmodel.cpp b/vcs/models/brancheslistmodel.cpp --- a/vcs/models/brancheslistmodel.cpp +++ b/vcs/models/brancheslistmodel.cpp @@ -20,7 +20,7 @@ ***************************************************************************/ #include "brancheslistmodel.h" -#include "../debug.h" +#include "debug.h" #include #include #include diff --git a/vcs/widgets/vcsdiffpatchsources.cpp b/vcs/widgets/vcsdiffpatchsources.cpp --- a/vcs/widgets/vcsdiffpatchsources.cpp +++ b/vcs/widgets/vcsdiffpatchsources.cpp @@ -39,7 +39,7 @@ #include #include "vcsdiff.h" #include "vcsjob.h" -#include "../debug.h" +#include "debug.h" using namespace KDevelop; diff --git a/vcs/widgets/vcsdiffwidget.cpp b/vcs/widgets/vcsdiffwidget.cpp --- a/vcs/widgets/vcsdiffwidget.cpp +++ b/vcs/widgets/vcsdiffwidget.cpp @@ -28,7 +28,7 @@ #include "../vcsjob.h" #include "../vcsrevision.h" #include "../vcsdiff.h" -#include "../debug.h" +#include "debug.h" #include "ui_vcsdiffwidget.h" #include "vcsdiffpatchsources.h" diff --git a/vcs/widgets/vcseventwidget.cpp b/vcs/widgets/vcseventwidget.cpp --- a/vcs/widgets/vcseventwidget.cpp +++ b/vcs/widgets/vcseventwidget.cpp @@ -40,10 +40,10 @@ #include "../interfaces/ibasicversioncontrol.h" #include "../models/vcseventmodel.h" #include "../models/vcsitemeventmodel.h" -#include "../debug.h" #include "../vcsevent.h" #include "../vcsjob.h" #include "../vcsrevision.h" +#include "debug.h" namespace KDevelop