diff --git a/cmake/modules/FindLibKasten.cmake b/cmake/modules/FindLibKasten.cmake deleted file mode 100644 --- a/cmake/modules/FindLibKasten.cmake +++ /dev/null @@ -1,163 +0,0 @@ -# - Find Kasten libraries, v0, v1 or v2 -# -# This module defines -# LIBKASTEN_FOUND - whether the libkasten libraries were found -# LIBKASTEN_VERSION - version of the libkasten libraries found -# LIBKASTEN_LIBRARIES - the libkasten libraries -# LIBKASTEN_INCLUDE_DIRS - the include paths of the libkasten libraries - - -if( LIBKASTEN_INCLUDE_DIR AND LIBKASTEN_LIBRARIES AND LIBKASTEN_VERSION ) - # Already in cache, be silent - set( Kasten_FIND_QUIETLY TRUE ) -endif() - -if( LIBKASTEN_FIND_VERSION EQUAL 1 OR LIBKASTEN_FIND_VERSION EQUAL 2) - set( KV ${LIBKASTEN_FIND_VERSION} ) - find_library( KASTEN1OR2_CORE_LIB - NAMES - kasten${KV}core - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_library( KASTEN1OR2_GUI_LIB - NAMES - kasten${KV}gui - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_library( KASTEN1OR2_CONTROLLERS_LIB - NAMES - kasten${KV}controllers - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_path( KASTEN1OR2_NORMAL_INCLUDE_DIR - NAMES - abstractmodel.h - PATH_SUFFIXES - kasten${KV} - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) - - find_path( KASTEN1OR2_CAMELCASE_INCLUDE_DIR - NAMES - Kasten${KV}/AbstractModel - PATH_SUFFIXES - KDE - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) - - - if( KASTEN1OR2_NORMAL_INCLUDE_DIR AND KASTEN1OR2_CAMELCASE_INCLUDE_DIR AND - KASTEN1OR2_CORE_LIB AND KASTEN1OR2_GUI_LIB AND KASTEN1OR2_CONTROLLERS_LIB ) - set( LIBKASTEN_FOUND TRUE ) - endif( KASTEN1OR2_NORMAL_INCLUDE_DIR AND KASTEN1OR2_CAMELCASE_INCLUDE_DIR AND - KASTEN1OR2_CORE_LIB AND KASTEN1OR2_GUI_LIB AND KASTEN1OR2_CONTROLLERS_LIB ) - - if( LIBKASTEN_FOUND ) - set( LIBKASTEN_VERSION ${KV} ) - set( LIBKASTEN_INCLUDE_DIRS - ${KASTEN1OR2_NORMAL_INCLUDE_DIR} - ${KASTEN1OR2_CAMELCASE_INCLUDE_DIR} - ) - set( LIBKASTEN_LIBRARIES - ${KASTEN1OR2_CORE_LIB} - ${KASTEN1OR2_GUI_LIB} - ${KASTEN1OR2_CONTROLLERS_LIB} - ) - endif() -endif() - -if( LIBKASTEN_FIND_VERSION EQUAL 0 ) - find_library( LIBKASTENCORE0_LIBRARY - NAMES - kastencore - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_library( LIBKASTENGUI0_LIBRARY - NAMES - kastengui - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_library( LIBKASTENCONTROLLERS0_LIBRARY - NAMES - kastencontrollers - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - - find_path( LIBKASTEN0_NORMAL_INCLUDE_DIR - NAMES - abstractmodel.h - PATH_SUFFIXES - kasten - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) - - find_path( LIBKASTEN0_CAMELCASE_INCLUDE_DIR - NAMES - Kasten/AbstractModel - PATH_SUFFIXES - KDE - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) - - if( LIBKASTEN0_NORMAL_INCLUDE_DIR AND LIBKASTEN0_CAMELCASE_INCLUDE_DIR AND - LIBKASTENCORE0_LIBRARY AND LIBKASTENGUI0_LIBRARY AND LIBKASTENCONTROLLERS0_LIBRARY ) - set( LIBKASTEN_FOUND TRUE ) - endif( LIBKASTEN0_NORMAL_INCLUDE_DIR AND LIBKASTEN0_CAMELCASE_INCLUDE_DIR AND - LIBKASTENCORE0_LIBRARY AND LIBKASTENGUI0_LIBRARY AND LIBKASTENCONTROLLERS0_LIBRARY ) - - if( LIBKASTEN_FOUND ) - set( LIBKASTEN_VERSION 0 ) - set( LIBKASTEN_INCLUDE_DIRS - ${LIBKASTEN0_NORMAL_INCLUDE_DIR} - ${LIBKASTEN0_CAMELCASE_INCLUDE_DIR} - ) - set( LIBKASTEN_LIBRARIES - ${LIBKASTENCORE0_LIBRARY} - ${LIBKASTENGUI0_LIBRARY} - ${LIBKASTENCONTROLLERS0_LIBRARY} - ) - endif() -endif() - - -if( LIBKASTEN_FOUND ) - if( NOT Kasten_FIND_QUIETLY ) - message( STATUS "Found Kasten libraries v${LIBKASTEN_VERSION}: ${LIBKASTEN_LIBRARIES}" ) - endif() -else() - if( LibKasten_FIND_REQUIRED ) - message( FATAL_ERROR "Could not find Kasten libraries." ) - endif() -endif() - -mark_as_advanced( - LIBKASTEN_INCLUDE_DIRS - LIBKASTEN_LIBRARIES - LIBKASTEN_VERSION -) diff --git a/cmake/modules/FindLibOkteta.cmake b/cmake/modules/FindLibOkteta.cmake deleted file mode 100644 --- a/cmake/modules/FindLibOkteta.cmake +++ /dev/null @@ -1,146 +0,0 @@ -# - Find Okteta libraries, v0 or v1 -# -# This module defines -# LIBOKTETA_FOUND - whether the libokteta libraries were found -# LIBOKTETA_VERSION - version of the libokteta libraries found -# LIBOKTETA_LIBRARIES - the libokteta libraries -# LIBOKTETA_INCLUDE_DIRS - the include paths of the libokteta libraries - - -if( LIBOKTETA_INCLUDE_DIRS AND LIBOKTETA_LIBRARIES AND LIBOKTETA_VERSION ) - # Already in cache, be silent - set( Okteta_FIND_QUIETLY TRUE ) -endif() - -if( LIBOKTETA_FIND_VERSION EQUAL 1 ) - find_library( LIBOKTETACORE1_LIBRARY - NAMES - okteta1core - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_library( LIBOKTETAGUI1_LIBRARY - NAMES - okteta1gui - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - - find_path( LIBOKTETA1_NORMAL_INCLUDE_DIR - NAMES - abstractbytearraymodel.h - PATH_SUFFIXES - okteta1 - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) - - find_path( LIBOKTETA1_CAMELCASE_INCLUDE_DIR - NAMES - Okteta1/AbstractByteArrayModel - PATH_SUFFIXES - KDE - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) - - - if( LIBOKTETA1_NORMAL_INCLUDE_DIR AND LIBOKTETA1_CAMELCASE_INCLUDE_DIR AND - LIBOKTETACORE1_LIBRARY AND LIBOKTETAGUI1_LIBRARY ) - set( LIBOKTETA_FOUND TRUE ) - endif( LIBOKTETA1_NORMAL_INCLUDE_DIR AND LIBOKTETA1_CAMELCASE_INCLUDE_DIR AND - LIBOKTETACORE1_LIBRARY AND LIBOKTETAGUI1_LIBRARY ) - - if( LIBOKTETA_FOUND ) - set( LIBOKTETA_VERSION 1 ) - set( LIBOKTETA_INCLUDE_DIRS - ${LIBOKTETA1_NORMAL_INCLUDE_DIR} - ${LIBOKTETA1_CAMELCASE_INCLUDE_DIR} - ) - set( LIBOKTETA_LIBRARIES - ${LIBOKTETACORE1_LIBRARY} - ${LIBOKTETAGUI1_LIBRARY} - ) - endif() - -endif() - -if( LIBOKTETA_FIND_VERSION EQUAL 0 ) - find_library( LIBOKTETACORE0_LIBRARY - NAMES - oktetacore - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_library( LIBOKTETAGUI0_LIBRARY - NAMES - oktetagui - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_path( LIBOKTETA0_NORMAL_INCLUDE_DIR - NAMES - abstractbytearraymodel.h - PATH_SUFFIXES - okteta - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) - - find_path( LIBOKTETA0_CAMELCASE_INCLUDE_DIR - NAMES - Okteta/AbstractByteArrayModel - PATH_SUFFIXES - KDE - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) - - - if( LIBOKTETA0_NORMAL_INCLUDE_DIR AND LIBOKTETA0_CAMELCASE_INCLUDE_DIR AND - LIBOKTETACORE0_LIBRARY AND LIBOKTETAGUI0_LIBRARY ) - set( LIBOKTETA_FOUND TRUE ) - endif( LIBOKTETA0_NORMAL_INCLUDE_DIR AND LIBOKTETA0_CAMELCASE_INCLUDE_DIR AND - LIBOKTETACORE0_LIBRARY AND LIBOKTETAGUI0_LIBRARY ) - - if( LIBOKTETA_FOUND ) - set( LIBOKTETA_VERSION 0 ) - set( LIBOKTETA_INCLUDE_DIRS - ${LIBOKTETA0_NORMAL_INCLUDE_DIR} - ${LIBOKTETA0_CAMELCASE_INCLUDE_DIR} - ) - set( LIBOKTETA_LIBRARIES - ${LIBOKTETACORE0_LIBRARY} - ${LIBOKTETAGUI0_LIBRARY} - ) - endif() -endif() - - -if( LIBOKTETA_FOUND ) - if( NOT Okteta_FIND_QUIETLY ) - message( STATUS "Found Okteta libraries v${LIBOKTETA_VERSION}: ${LIBOKTETA_LIBRARIES}" ) - endif() -else() - if( LibOkteta_FIND_REQUIRED ) - message( FATAL_ERROR "Could not find Okteta libraries" ) - endif() -endif() - -mark_as_advanced( - LIBOKTETA_INCLUDE_DIRS - LIBOKTETA_LIBRARIES - LIBOKTETA_VERSION -) diff --git a/cmake/modules/FindLibOktetaKasten.cmake b/cmake/modules/FindLibOktetaKasten.cmake deleted file mode 100644 --- a/cmake/modules/FindLibOktetaKasten.cmake +++ /dev/null @@ -1,207 +0,0 @@ -# - Find Okteta Kasten libraries, v0, v1 or v2 -# -# This module defines -# LIBOKTETAKASTEN_FOUND - whether the Okteta Kasten libraries were found -# LIBOKTETAKASTEN_VERSION - version of the Okteta Kasten libraries found -# LIBOKTETAKASTEN_LIBRARIES - the Okteta Kasten libraries -# LIBOKTETAKASTEN_INCLUDE_DIRS - the include paths of the Okteta Kasten libraries - - -if( LIBOKTETAKASTEN_INCLUDE_DIRS AND LIBOKTETAKASTEN_LIBRARIES AND LIBOKTETAKASTEN_VERSION AND - LIBOKTETAKASTEN_NEEDS_KASTEN_VERSION AND LIBOKTETAKASTEN_NEEDS_OKTETA_VERSION ) - # Already in cache, be silent - set( OktetaKasten_FIND_QUIETLY TRUE ) -endif( LIBOKTETAKASTEN_INCLUDE_DIRS AND LIBOKTETAKASTEN_LIBRARIES AND LIBOKTETAKASTEN_VERSION AND - LIBOKTETAKASTEN_NEEDS_KASTEN_VERSION AND LIBOKTETAKASTEN_NEEDS_OKTETA_VERSION ) - - -# First search version 2 -find_library( LIBOKTETA1KASTEN2CORE_LIBRARY - NAMES - kasten2okteta1core - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} -) - -find_library( LIBOKTETA1KASTEN2GUI_LIBRARY - NAMES - kasten2okteta1gui - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} -) - -find_library( LIBOKTETA1KASTEN2CONTROLLERS_LIBRARY - NAMES - kasten2okteta1controllers - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} -) - - -find_path( LIBOKTETA1KASTEN2_INCLUDE_DIR - NAMES - bytearraydocument.h - PATH_SUFFIXES - kasten2/okteta1 - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} -) - -if( LIBOKTETA1KASTEN2_INCLUDE_DIR AND - LIBOKTETA1KASTEN2CORE_LIBRARY AND LIBOKTETA1KASTEN2GUI_LIBRARY AND LIBOKTETA1KASTEN2CONTROLLERS_LIBRARY ) - set( LIBOKTETAKASTEN_FOUND TRUE ) -endif( LIBOKTETA1KASTEN2_INCLUDE_DIR AND - LIBOKTETA1KASTEN2CORE_LIBRARY AND LIBOKTETA1KASTEN2GUI_LIBRARY AND LIBOKTETA1KASTEN2CONTROLLERS_LIBRARY ) - -if( LIBOKTETAKASTEN_FOUND ) - set( LIBOKTETAKASTEN_VERSION 2 ) - set( LIBOKTETAKASTEN_NEEDS_KASTEN_VERSION 2 ) - set( LIBOKTETAKASTEN_NEEDS_OKTETA_VERSION 1 ) - set( LIBOKTETAKASTEN_LIBRARIES - ${LIBOKTETA1KASTEN2CORE_LIBRARY} - ${LIBOKTETA1KASTEN2GUI_LIBRARY} - ${LIBOKTETA1KASTEN2CONTROLLERS_LIBRARY} - ) - set( LIBOKTETAKASTEN_INCLUDE_DIRS - ${LIBOKTETA1KASTEN2_INCLUDE_DIR} - ) -endif() - -# Then search version 1 -if( NOT LIBOKTETAKASTEN_FOUND ) - find_library( LIBOKTETA1KASTEN1CORE_LIBRARY - NAMES - kasten1okteta1core - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_library( LIBOKTETA1KASTEN1GUI_LIBRARY - NAMES - kasten1okteta1gui - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_library( LIBOKTETA1KASTEN1CONTROLLERS_LIBRARY - NAMES - kasten1okteta1controllers - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - - find_path( LIBOKTETA1KASTEN1_INCLUDE_DIR - NAMES - bytearraydocument.h - PATH_SUFFIXES - kasten1/okteta1 - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) - - if( LIBOKTETA1KASTEN1_INCLUDE_DIR AND - LIBOKTETA1KASTEN1CORE_LIBRARY AND LIBOKTETA1KASTEN1GUI_LIBRARY AND LIBOKTETA1KASTEN1CONTROLLERS_LIBRARY ) - set( LIBOKTETAKASTEN_FOUND TRUE ) - endif( LIBOKTETA1KASTEN1_INCLUDE_DIR AND - LIBOKTETA1KASTEN1CORE_LIBRARY AND LIBOKTETA1KASTEN1GUI_LIBRARY AND LIBOKTETA1KASTEN1CONTROLLERS_LIBRARY ) - - if( LIBOKTETAKASTEN_FOUND ) - set( LIBOKTETAKASTEN_VERSION 1 ) - set( LIBOKTETAKASTEN_NEEDS_KASTEN_VERSION 1 ) - set( LIBOKTETAKASTEN_NEEDS_OKTETA_VERSION 1 ) - set( LIBOKTETAKASTEN_LIBRARIES - ${LIBOKTETA1KASTEN1CORE_LIBRARY} - ${LIBOKTETA1KASTEN1GUI_LIBRARY} - ${LIBOKTETA1KASTEN1CONTROLLERS_LIBRARY} - ) - set( LIBOKTETAKASTEN_INCLUDE_DIRS - ${LIBOKTETA1KASTEN1_INCLUDE_DIR} - ) - endif() -endif() - -# Then search version 0 -if( NOT LIBOKTETAKASTEN_FOUND ) - find_library( LIBOKTETAKASTENCORE0_LIBRARY - NAMES - oktetakastencore - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_library( LIBOKTETAKASTENGUI0_LIBRARY - NAMES - oktetakastengui - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - find_library( LIBOKTETAKASTENCONTROLLERS0_LIBRARY - NAMES - oktetakastencontrollers - HINTS - ${LIB_INSTALL_DIR} - ${KDE4_LIB_DIR} - ) - - - find_path( LIBOKTETAKASTEN0_INCLUDE_DIR - NAMES - bytearraydocument.h - PATH_SUFFIXES - kasten - HINTS - ${INCLUDE_INSTALL_DIR} - ${KDE4_INCLUDE_DIR} - ) - - if( LIBOKTETAKASTEN0_INCLUDE_DIR AND - LIBOKTETAKASTENCORE0_LIBRARY AND LIBOKTETAKASTENGUI0_LIBRARY AND LIBOKTETAKASTENCONTROLLERS0_LIBRARY ) - set( LIBOKTETAKASTEN_FOUND TRUE ) - endif( LIBOKTETAKASTEN0_INCLUDE_DIR AND - LIBOKTETAKASTENCORE0_LIBRARY AND LIBOKTETAKASTENGUI0_LIBRARY AND LIBOKTETAKASTENCONTROLLERS0_LIBRARY ) - - if( LIBOKTETAKASTEN_FOUND ) - set( LIBOKTETAKASTEN_VERSION 0 ) - set( LIBOKTETAKASTEN_NEEDS_KASTEN_VERSION 0 ) - set( LIBOKTETAKASTEN_NEEDS_OKTETA_VERSION 0 ) - set( LIBOKTETAKASTEN_INCLUDE_DIRS - ${LIBOKTETAKASTEN0_INCLUDE_DIR} - ) - set( LIBOKTETAKASTEN_LIBRARIES - ${LIBOKTETAKASTENCORE0_LIBRARY} - ${LIBOKTETAKASTENGUI0_LIBRARY} - ${LIBOKTETAKASTENCONTROLLERS0_LIBRARY} - ) - endif() -endif() - - -if( LIBOKTETAKASTEN_FOUND ) - if( NOT OktetaKasten_FIND_QUIETLY ) - message( STATUS "Found Okteta Kasten libraries v${LIBOKTETAKASTEN_VERSION}: ${LIBOKTETAKASTEN_LIBRARIES}" ) - endif() -else() - if( LibKasten_FIND_REQUIRED ) - message( FATAL_ERROR "Could not find Okteta Kasten libraries" ) - endif() -endif() - -mark_as_advanced( - LIBOKTETAKASTEN_INCLUDE_DIRS - LIBOKTETAKASTEN_LIBRARIES - LIBOKTETAKASTEN_VERSION - LIBOKTETAKASTEN_NEEDS_KASTEN_VERSION - LIBOKTETAKASTEN_NEEDS_OKTETA_VERSION -) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,28 +1,19 @@ -# TODO KF5: Port me, currently the find script picks up the wrong okteta lib -#find_package( LibOktetaKasten ) +find_package( OktetaKastenControllers ) -set_package_properties(LibOktetaKasten PROPERTIES +set_package_properties( OktetaKastenControllers PROPERTIES PURPOSE "Required for building Okteta KDevelop plugin." URL "http://kde.org/" TYPE OPTIONAL) -if( LIBOKTETAKASTEN_FOUND ) - set( LIBOKTETA_FIND_VERSION ${LIBOKTETAKASTEN_NEEDS_OKTETA_VERSION} ) - set( LIBKASTEN_FIND_VERSION ${LIBOKTETAKASTEN_NEEDS_KASTEN_VERSION} ) - find_package( LibOkteta ) - find_package( LibKasten ) +if( OktetaKastenControllers_FOUND ) + find_package( KastenControllers ) - set_package_properties(LibOkteta PROPERTIES - PURPOSE "Required for building Okteta KDevelop plugin." - URL "http://kde.org/" - TYPE OPTIONAL) - set_package_properties(LibKasten PROPERTIES + set_package_properties(KastenControllers PROPERTIES PURPOSE "Required for building Okteta KDevelop plugin." URL "http://kde.org/" TYPE OPTIONAL) endif() - -if( LIBOKTETAKASTEN_FOUND AND LIBKASTEN_FOUND AND LIBOKTETA_FOUND ) +if( OktetaKastenControllers_FOUND AND KastenControllers_FOUND) add_subdirectory(okteta) endif() diff --git a/utils/okteta/CMakeLists.txt b/utils/okteta/CMakeLists.txt --- a/utils/okteta/CMakeLists.txt +++ b/utils/okteta/CMakeLists.txt @@ -3,15 +3,6 @@ include_directories( ${okteta_SOURCE_DIR} ${okteta_BINARY_DIR} ) -add_definitions( - -DKASTEN_VERSION=${LIBKASTEN_VERSION} -) - -include_directories( - ${LIBKASTEN_INCLUDE_DIRS} - ${LIBOKTETA_INCLUDE_DIRS} - ${LIBOKTETAKASTEN_INCLUDE_DIRS} -) SET( kdevokteta_PART_SRCS kastentoolviewwidget.cpp oktetatoolviewfactory.cpp @@ -22,21 +13,17 @@ ) qt5_add_resources(kdevokteta_PART_SRCS kdevokteta.qrc) -add_library(kdevokteta MODULE ${kdevokteta_PART_SRCS} ) +kdevplatform_add_plugin(kdevokteta JSON kdevokteta.json SOURCES + ${kdevokteta_PART_SRCS}) TARGET_LINK_LIBRARIES( kdevokteta - ${LIBOKTETAKASTEN_LIBRARIES} - ${LIBOKTETA_LIBRARIES} - ${LIBKASTEN_LIBRARIES} KDev::Interfaces KDev::Project KDev::Sublime KDev::Shell KF5::WidgetsAddons + OktetaKastenControllers + KastenControllers ) install(TARGETS kdevokteta DESTINATION ${PLUGIN_INSTALL_DIR}/kdevplatform/${KDEV_PLUGIN_VERSION}) - - -configure_file(kdevokteta.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevokteta.desktop) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevokteta.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/utils/okteta/kastentoolviewwidget.h b/utils/okteta/kastentoolviewwidget.h --- a/utils/okteta/kastentoolviewwidget.h +++ b/utils/okteta/kastentoolviewwidget.h @@ -23,12 +23,10 @@ #ifndef KASTENTOOLVIEWWIDGET_H #define KASTENTOOLVIEWWIDGET_H -// Plugin -#include "oktetaglobal.h" // Qt #include -namespace KASTEN_NAMESPACE { +namespace Kasten { class AbstractToolView; } namespace Sublime { diff --git a/utils/okteta/kastentoolviewwidget.cpp b/utils/okteta/kastentoolviewwidget.cpp --- a/utils/okteta/kastentoolviewwidget.cpp +++ b/utils/okteta/kastentoolviewwidget.cpp @@ -25,18 +25,10 @@ // plugin #include "oktetaview.h" // Okteta Kasten -#include +#include "kasten/okteta/bytearrayview.h" // Kasten -#if KASTEN_VERSION == 2 -#include -#include -#elif KASTEN_VERSION == 1 -#include -#include -#else #include #include -#endif // KDev #include #include @@ -54,8 +46,8 @@ mToolView( toolView ) { Sublime::Controller* controller = ICore::self()->uiController()->controller(); - connect( controller, SIGNAL(mainWindowAdded(Sublime::MainWindow*)), - SLOT(onMainWindowAdded(Sublime::MainWindow*)) ); + connect( controller, &Sublime::Controller::mainWindowAdded, + this, &KastenToolViewWidget::onMainWindowAdded ); const QList& mainWindows = controller->mainWindows(); foreach( Sublime::MainWindow* mainWindow, mainWindows ) onMainWindowAdded( mainWindow ); @@ -67,8 +59,8 @@ void KastenToolViewWidget::onMainWindowAdded( Sublime::MainWindow* mainWindow ) { - connect( mainWindow, SIGNAL(activeViewChanged(Sublime::View*)), - SLOT(onActiveViewChanged(Sublime::View*)) ); + connect( mainWindow, &Sublime::MainWindow::activeViewChanged, + this, &KastenToolViewWidget::onActiveViewChanged ); onActiveViewChanged( mainWindow->activeView() ); } diff --git a/utils/okteta/kdevokteta.desktop.cmake b/utils/okteta/kdevokteta.desktop.cmake deleted file mode 100644 --- a/utils/okteta/kdevokteta.desktop.cmake +++ /dev/null @@ -1,117 +0,0 @@ -[Desktop Entry] -Type=Service - -Name=Okteta Integration -Name[ar]=تكامل أُكتيتا -Name[bs]=Okteta integracija -Name[ca]=Integració de l'Okteta -Name[ca@valencia]=Integració de l'Okteta -Name[cs]=Integrace Oktety -Name[da]=Okteta-integration -Name[de]=Integration von Okteta -Name[el]=Ενσωμάτωση Okteta -Name[en_GB]=Okteta Integration -Name[es]=Integración de Okteta -Name[et]=Okteta lõimimine -Name[fi]=Okteta-integraatio -Name[fr]=Intégration de Okteta -Name[ga]=Comhtháthú Okteta -Name[gl]=Integración do Okteta -Name[hu]=Okteta integráció -Name[it]=Integrazione Okteta -Name[kk]=Okteta-мен біріктіру -Name[km]=ការ​រួមបញ្ចូល Okteta -Name[nb]=Okteta-integrasjon -Name[nds]=Okteta-Inbinnen -Name[nl]=Okteta-integratie -Name[pl]=Integracja Okteta -Name[pt]=Integração com o Okteta -Name[pt_BR]=Integração com o Okteta -Name[ru]=Интеграция Okteta -Name[sk]=Integrácia Okteta -Name[sl]=Vgradnja Oktete -Name[sv]=Integrering med Okteta -Name[tr]=Okteta Bütünleştirmesi -Name[ug]=Okteta يۈرۈشلەشتۈرۈلۈشى -Name[uk]=Інтеграція з Okteta -Name[x-test]=xxOkteta Integrationxx -Name[zh_CN]=Okteta 集成 -Name[zh_TW]=Okteta 整合 -GenericName=Hex Editor Integration -GenericName[bs]=Integracija heksadekadnog uređivača -GenericName[ca]=Integració d'un editor hexadecimal -GenericName[ca@valencia]=Integració d'un editor hexadecimal -GenericName[cs]=Integrace hexa editoru -GenericName[da]=Integration af HeX-editor -GenericName[de]=Hex-Editor-Integration -GenericName[el]=Ενσωμάτωση κειμενογράφου δεκαεξαδικού συστήματος -GenericName[en_GB]=Hex Editor Integration -GenericName[es]=Integración del editor hexadecimal -GenericName[et]=Binaarfailide redaktori lõimimine -GenericName[fi]=Heksaeditori-integraatio -GenericName[fr]=Intégration d'un éditeur hexadécimal -GenericName[gl]=Integración do editor hexadecimal -GenericName[hu]=Hexa szerkesztő integráció -GenericName[it]=Integrazione editor esadecimale -GenericName[kk]=Оналтылық түрде өңдеу редакторымен біріктіру -GenericName[nb]=Integrasjon av en hex-redigerer -GenericName[nds]=Hex-Editor--Inbinnen -GenericName[nl]=Hexbewerker-integratie -GenericName[pl]=Integracja edytora szesnastkowego -GenericName[pt]=Integração com o Editor Hexadecimal -GenericName[pt_BR]=Integração com o editor hexadecimal -GenericName[ru]=Интеграция шестнадцатеричного редактора -GenericName[sk]=Integrácia hex editora -GenericName[sl]=Vgradnja šestnajstiškega urejevalnika -GenericName[sv]=Integrering av hexadecimaleditor -GenericName[tr]=Altılık Dosya Düzenleyici Tümleştirmesi -GenericName[ug]=ئون ئالتىلىك سان تەھرىرلىگۈچى بىلەن يۈرۈشلەشتۈرۈلۈش -GenericName[uk]=Інтеграція з шістнадцятковим редактором -GenericName[x-test]=xxHex Editor Integrationxx -GenericName[zh_CN]=十六进制编辑器集成 -GenericName[zh_TW]=十六進位資料編輯器整合 -Comment=KDevelop Hex Editor based on Okteta -Comment[bs]=KDevelop heksadekadni uređivač baziran na Okteta -Comment[ca]=Editor hexadecimal del KDevelop basat en l'Okteta -Comment[ca@valencia]=Editor hexadecimal del KDevelop basat en l'Okteta -Comment[da]=KDevelop Hex-editor baseret på Okteta -Comment[de]=Auf Okteta basierender Hex-Editor für KDevelop -Comment[el]=Κειμενογράφος δεκαεξαδικού συστήματος του KDevelop με βάση το Okteta -Comment[en_GB]=KDevelop Hex Editor based on Okteta -Comment[es]=Editor hexadecimal de KDevelop basado en Okteta -Comment[et]=KDevelopi binaarfailide redaktor Okteta põhjal -Comment[fi]=KDevelopin Oktetaan perustuva heksaeditori -Comment[fr]=Éditeur hexadécimal pour KDevelop fondé sur Okteta -Comment[gl]=Editor hexadecimal do KDevelop baseado no Okteta -Comment[hu]=Az Oktetán alapuló KDevelop hexa szerkesztő -Comment[it]=Editor esadecimale di KDevelop basato su Okteta -Comment[kk]=Okteta негізіндегі KDevelop оналтылық редакторы -Comment[nb]=KDevelop Hex-redigerer basert på Okteta -Comment[nds]=Hex-Editor för KDevelop, op Okteta opbuut -Comment[nl]=KDevelop hex-bewerker gebaseerd op Okteta -Comment[pl]=Edytor szesnastkowy oparty na Okteta dla KDevelop -Comment[pt]=Editor Hexadecimal para o KDevelop, baseado no Okteta -Comment[pt_BR]=Editor hexadecimal do KDevelop, baseado no Okteta -Comment[ru]=Шестнадцатеричный редактор в KDevelop на базе Okteta -Comment[sk]=Hex editor KDevelop založený na Okteta -Comment[sl]=Šestnajstiški urejevalnik, ki temelji na Okteti -Comment[sv]=KDevelop hexadecimaleditor baserad på Okteta -Comment[tr]=Okteta temelli KDevelop Altılık Dosya Düzenleyici -Comment[ug]=Okteta ئاساسىدىكى KDevelop ئون ئالتىلىك سان تەھرىرلىگۈچى -Comment[uk]=Шістнадцятковий редактор KDevelop, заснований на Okteta -Comment[x-test]=xxKDevelop Hex Editor based on Oktetaxx -Comment[zh_CN]=基于 Okteta 的 KDevelop 十六进制编辑器 -Comment[zh_TW]=以 Okteta 為基礎的 KDevelop 十六進位資料編輯器 -Icon=okteta -ServiceTypes=KDevelop/Plugin - -X-KDE-Library=kdevplatform/@KDEV_PLUGIN_VERSION@/kdevokteta -X-KDE-PluginInfo-Name=kdevokteta -X-KDE-PluginInfo-Author=Friedrich W. H. Kossebau -X-KDE-PluginInfo-Email=kossebau@kde.org -X-KDE-PluginInfo-Version=0.1.0 -X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-Category=Utilities -X-KDevelop-Version=@KDEV_PLUGIN_VERSION@ -X-KDevelop-Category=Global -X-KDevelop-Mode=GUI diff --git a/utils/okteta/kdevokteta.json b/utils/okteta/kdevokteta.json new file mode 100644 --- /dev/null +++ b/utils/okteta/kdevokteta.json @@ -0,0 +1,122 @@ +{ + "GenericName": "Hex Editor Integration", + "GenericName[bs]": "Integracija heksadekadnog uređivača", + "GenericName[ca@valencia]": "Integració d'un editor hexadecimal", + "GenericName[ca]": "Integració d'un editor hexadecimal", + "GenericName[cs]": "Integrace hexa editoru", + "GenericName[da]": "Integration af HeX-editor", + "GenericName[de]": "Hex-Editor-Integration", + "GenericName[el]": "Ενσωμάτωση κειμενογράφου δεκαεξαδικού συστήματος", + "GenericName[en_GB]": "Hex Editor Integration", + "GenericName[es]": "Integración del editor hexadecimal", + "GenericName[et]": "Binaarfailide redaktori lõimimine", + "GenericName[fi]": "Heksaeditori-integraatio", + "GenericName[fr]": "Intégration d'un éditeur hexadécimal", + "GenericName[gl]": "Integración do editor hexadecimal", + "GenericName[hu]": "Hexa szerkesztő integráció", + "GenericName[it]": "Integrazione editor esadecimale", + "GenericName[kk]": "Оналтылық түрде өңдеу редакторымен біріктіру", + "GenericName[nb]": "Integrasjon av en hex-redigerer", + "GenericName[nds]": "Hex-Editor--Inbinnen", + "GenericName[nl]": "Hexbewerker-integratie", + "GenericName[pl]": "Integracja edytora szesnastkowego", + "GenericName[pt]": "Integração com o Editor Hexadecimal", + "GenericName[pt_BR]": "Integração com o editor hexadecimal", + "GenericName[ru]": "Интеграция шестнадцатеричного редактора", + "GenericName[sk]": "Integrácia hex editora", + "GenericName[sl]": "Vgradnja šestnajstiškega urejevalnika", + "GenericName[sv]": "Integrering av hexadecimaleditor", + "GenericName[tr]": "Altılık Dosya Düzenleyici Tümleştirmesi", + "GenericName[ug]": "ئون ئالتىلىك سان تەھرىرلىگۈچى بىلەن يۈرۈشلەشتۈرۈلۈش", + "GenericName[uk]": "Інтеграція з шістнадцятковим редактором", + "GenericName[x-test]": "xxHex Editor Integrationxx", + "GenericName[zh_CN]": "十六进制编辑器集成", + "GenericName[zh_TW]": "十六進位資料編輯器整合", + "KPlugin": { + "Authors": [ + { + "Email": "kossebau@kde.org", + "Name": "Friedrich W. H. Kossebau" + } + ], + "Category": "Utilities", + "Description": "KDevelop Hex Editor based on Okteta", + "Description[bs]": "KDevelop heksadekadni uređivač baziran na Okteta", + "Description[ca@valencia]": "Editor hexadecimal del KDevelop basat en l'Okteta", + "Description[ca]": "Editor hexadecimal del KDevelop basat en l'Okteta", + "Description[da]": "KDevelop Hex-editor baseret på Okteta", + "Description[de]": "Auf Okteta basierender Hex-Editor für KDevelop", + "Description[el]": "Κειμενογράφος δεκαεξαδικού συστήματος του KDevelop με βάση το Okteta", + "Description[en_GB]": "KDevelop Hex Editor based on Okteta", + "Description[es]": "Editor hexadecimal de KDevelop basado en Okteta", + "Description[et]": "KDevelopi binaarfailide redaktor Okteta põhjal", + "Description[fi]": "KDevelopin Oktetaan perustuva heksaeditori", + "Description[fr]": "Éditeur hexadécimal pour KDevelop fondé sur Okteta", + "Description[gl]": "Editor hexadecimal do KDevelop baseado no Okteta", + "Description[hu]": "Az Oktetán alapuló KDevelop hexa szerkesztő", + "Description[it]": "Editor esadecimale di KDevelop basato su Okteta", + "Description[kk]": "Okteta негізіндегі KDevelop оналтылық редакторы", + "Description[nb]": "KDevelop Hex-redigerer basert på Okteta", + "Description[nds]": "Hex-Editor för KDevelop, op Okteta opbuut", + "Description[nl]": "KDevelop hex-bewerker gebaseerd op Okteta", + "Description[pl]": "Edytor szesnastkowy oparty na Okteta dla KDevelop", + "Description[pt]": "Editor Hexadecimal para o KDevelop, baseado no Okteta", + "Description[pt_BR]": "Editor hexadecimal do KDevelop, baseado no Okteta", + "Description[ru]": "Шестнадцатеричный редактор в KDevelop на базе Okteta", + "Description[sk]": "Hex editor KDevelop založený na Okteta", + "Description[sl]": "Šestnajstiški urejevalnik, ki temelji na Okteti", + "Description[sv]": "KDevelop hexadecimaleditor baserad på Okteta", + "Description[tr]": "Okteta temelli KDevelop Altılık Dosya Düzenleyici", + "Description[ug]": "Okteta ئاساسىدىكى KDevelop ئون ئالتىلىك سان تەھرىرلىگۈچى", + "Description[uk]": "Шістнадцятковий редактор KDevelop, заснований на Okteta", + "Description[x-test]": "xxKDevelop Hex Editor based on Oktetaxx", + "Description[zh_CN]": "基于 Okteta 的 KDevelop 十六进制编辑器", + "Description[zh_TW]": "以 Okteta 為基礎的 KDevelop 十六進位資料編輯器", + "Icon": "okteta", + "Id": "kdevokteta", + "License": "GPL", + "Name": "Okteta Integration", + "Name[ar]": "تكامل أُكتيتا", + "Name[bs]": "Okteta integracija", + "Name[ca@valencia]": "Integració de l'Okteta", + "Name[ca]": "Integració de l'Okteta", + "Name[cs]": "Integrace Oktety", + "Name[da]": "Okteta-integration", + "Name[de]": "Integration von Okteta", + "Name[el]": "Ενσωμάτωση Okteta", + "Name[en_GB]": "Okteta Integration", + "Name[es]": "Integración de Okteta", + "Name[et]": "Okteta lõimimine", + "Name[fi]": "Okteta-integraatio", + "Name[fr]": "Intégration de Okteta", + "Name[ga]": "Comhtháthú Okteta", + "Name[gl]": "Integración do Okteta", + "Name[hu]": "Okteta integráció", + "Name[it]": "Integrazione Okteta", + "Name[kk]": "Okteta-мен біріктіру", + "Name[km]": "ការ​រួមបញ្ចូល Okteta", + "Name[nb]": "Okteta-integrasjon", + "Name[nds]": "Okteta-Inbinnen", + "Name[nl]": "Okteta-integratie", + "Name[pl]": "Integracja Okteta", + "Name[pt]": "Integração com o Okteta", + "Name[pt_BR]": "Integração com o Okteta", + "Name[ru]": "Интеграция Okteta", + "Name[sk]": "Integrácia Okteta", + "Name[sl]": "Vgradnja Oktete", + "Name[sv]": "Integrering med Okteta", + "Name[tr]": "Okteta Bütünleştirmesi", + "Name[ug]": "Okteta يۈرۈشلەشتۈرۈلۈشى", + "Name[uk]": "Інтеграція з Okteta", + "Name[x-test]": "xxOkteta Integrationxx", + "Name[zh_CN]": "Okteta 集成", + "Name[zh_TW]": "Okteta 整合", + "ServiceTypes": [ + "KDevelop/Plugin" + ], + "Version": "0.1.0" + }, + "X-KDevelop-Category": "Global", + "X-KDevelop-Mode": "GUI", + "X-KDevelop-Version": "@KDEV_PLUGIN_VERSION@" +} diff --git a/utils/okteta/oktetadocument.h b/utils/okteta/oktetadocument.h --- a/utils/okteta/oktetadocument.h +++ b/utils/okteta/oktetadocument.h @@ -23,17 +23,15 @@ #ifndef OKTETADOCUMENT_H #define OKTETADOCUMENT_H -// Plugin -#include "oktetaglobal.h" // Kasten core -#include +#include // KDevPlatform #include #include //Qt #include -namespace KASTEN_NAMESPACE { +namespace Kasten { class ByteArrayDocument; class AbstractDocument; } @@ -85,13 +83,7 @@ protected Q_SLOTS: void onByteArrayDocumentChanged(); // Moc is too primitive to know about namespace aliase -#if KASTEN_VERSION == 2 - void onByteArrayDocumentLoaded( Kasten2::AbstractDocument* document ); -#elif KASTEN_VERSION == 1 - void onByteArrayDocumentLoaded( Kasten1::AbstractDocument* document ); -#else void onByteArrayDocumentLoaded( Kasten::AbstractDocument* document ); -#endif private: OktetaPlugin* mPlugin; diff --git a/utils/okteta/oktetadocument.cpp b/utils/okteta/oktetadocument.cpp --- a/utils/okteta/oktetadocument.cpp +++ b/utils/okteta/oktetadocument.cpp @@ -26,38 +26,16 @@ #include "oktetaplugin.h" #include "oktetaview.h" // Okteta -#if KASTEN_VERSION == 2 -#include -#include -#include -#include -#elif KASTEN_VERSION == 1 -#include -#include -#else -#include -#include -#endif +#include +#include +#include +#include // Kasten -#if KASTEN_VERSION == 2 -#include -#include -#include -#include -#include -#elif KASTEN_VERSION == 1 -#include -#include -#include -#include -#include -#else #include #include #include #include #include -#endif // KDevelop #include #include @@ -99,11 +77,7 @@ IDocument::DocumentState OktetaDocument::state() const { return mByteArrayDocument ? -#if KASTEN_VERSION == 2 ( mByteArrayDocument->synchronizer()->localSyncState() == Kasten::LocalHasChanges ? -#else - ( mByteArrayDocument->localSyncState() == Kasten::LocalHasChanges ? -#endif IDocument::Modified : IDocument::Clean ) : IDocument::Clean; @@ -121,12 +95,7 @@ Kasten::AbstractModelSynchronizer* synchronizer = mByteArrayDocument->synchronizer(); Kasten::AbstractSyncToRemoteJob* syncJob = synchronizer->startSyncToRemote(); - const bool syncSucceeded = -#if KASTEN_VERSION == 1 || KASTEN_VERSION == 2 - Kasten::JobManager::executeJob( syncJob ); -#else - Kasten::JobManager::executeJob( syncJob, qApp->activeWindow() ); -#endif + const bool syncSucceeded = Kasten::JobManager::executeJob( syncJob ); if( syncSucceeded ) { @@ -143,12 +112,7 @@ Kasten::AbstractModelSynchronizer* synchronizer = mByteArrayDocument->synchronizer(); Kasten::AbstractSyncFromRemoteJob* syncJob = synchronizer->startSyncFromRemote(); - const bool syncSucceeded = -#if KASTEN_VERSION == 1 || KASTEN_VERSION == 2 - Kasten::JobManager::executeJob( syncJob ); -#else - Kasten::JobManager::executeJob( syncJob, qApp->activeWindow() ); -#endif + const bool syncSucceeded = Kasten::JobManager::executeJob( syncJob ); if( syncSucceeded ) notifyStateChanged(); @@ -244,35 +208,18 @@ Kasten::AbstractModelSynchronizer* synchronizer = synchronizerFactory->createSynchronizer(); Kasten::AbstractLoadJob* loadJob = synchronizer->startLoad( url() ); -#if KASTEN_VERSION == 2 - connect( loadJob, SIGNAL(documentLoaded(Kasten2::AbstractDocument*)), - SLOT(onByteArrayDocumentLoaded(Kasten2::AbstractDocument*)) ); -#elif KASTEN_VERSION == 1 - connect( loadJob, SIGNAL(documentLoaded(Kasten1::AbstractDocument*)), - SLOT(onByteArrayDocumentLoaded(Kasten1::AbstractDocument*)) ); -#else - connect( loadJob, SIGNAL(documentLoaded(Kasten::AbstractDocument*)), - SLOT(onByteArrayDocumentLoaded(Kasten::AbstractDocument*)) ); -#endif - const bool syncSucceeded = -#if KASTEN_VERSION == 1 || KASTEN_VERSION == 2 - Kasten::JobManager::executeJob( loadJob ); -#else - Kasten::JobManager::executeJob( loadJob, qApp->activeWindow() ); -#endif + connect( loadJob, &Kasten::AbstractLoadJob::documentLoaded, + this, &OktetaDocument::onByteArrayDocumentLoaded ); + const bool syncSucceeded = Kasten::JobManager::executeJob( loadJob ); delete synchronizerFactory; } -#if KASTEN_VERSION == 2 Kasten::ByteArrayViewProfileManager* const viewProfileManager = mPlugin->viewProfileManager(); Kasten::ByteArrayViewProfileSynchronizer* viewProfileSynchronizer = new Kasten::ByteArrayViewProfileSynchronizer( viewProfileManager ); viewProfileSynchronizer->setViewProfileId( viewProfileManager->defaultViewProfileId() ); return new OktetaView( this, viewProfileSynchronizer ); -#else - return new OktetaView( this ); -#endif } bool OktetaDocument::closeDocument(bool silent) @@ -285,14 +232,8 @@ if( document ) { mByteArrayDocument = static_cast( document ); -#if KASTEN_VERSION == 2 - connect( mByteArrayDocument->synchronizer(), SIGNAL(localSyncStateChanged(Kasten2::LocalSyncState)), -#elif KASTEN_VERSION == 1 - connect( mByteArrayDocument, SIGNAL(localSyncStateChanged(Kasten1::LocalSyncState)), -#else - connect( mByteArrayDocument, SIGNAL(localSyncStateChanged(Kasten::LocalSyncState)), -#endif - SLOT(onByteArrayDocumentChanged()) ); + connect( mByteArrayDocument->synchronizer(), &Kasten::AbstractModelSynchronizer::localSyncStateChanged, + this, &OktetaDocument::onByteArrayDocumentChanged ); } } diff --git a/utils/okteta/oktetaglobal.h b/utils/okteta/oktetaglobal.h deleted file mode 100644 --- a/utils/okteta/oktetaglobal.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - This file is part of the KDevelop Okteta module, part of the KDE project. - - Copyright 2011 Friedrich W. H. Kossebau - - 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) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), which shall - act as a proxy defined in Section 6 of version 3 of the license. - - 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, see . -*/ - -#ifndef OKTETAGLOBAL_H -#define OKTETAGLOBAL_H - -// Adaptions for the different version of Kasten and Okteta -#if KASTEN_VERSION == 2 -namespace Kasten2 {} -namespace Kasten = Kasten2; -#define KASTEN_NAMESPACE Kasten2 -#elif KASTEN_VERSION == 1 -namespace Kasten1 {} -namespace Kasten = Kasten1; -#define KASTEN_NAMESPACE Kasten1 -#else -#define KASTEN_NAMESPACE Kasten -#endif - -#endif diff --git a/utils/okteta/oktetaplugin.h b/utils/okteta/oktetaplugin.h --- a/utils/okteta/oktetaplugin.h +++ b/utils/okteta/oktetaplugin.h @@ -23,16 +23,14 @@ #ifndef OKTETAPLUGIN_H #define OKTETAPLUGIN_H -// Plugin -#include "oktetaglobal.h" // KDev #include // Qt #include class QUrl; -namespace KASTEN_NAMESPACE +namespace Kasten { class ByteArrayViewProfileManager; } @@ -54,21 +52,16 @@ public: // KDevelop::IPlugin API virtual ContextMenuExtension contextMenuExtension( Context* context ); -#if KASTEN_VERSION == 2 public: Kasten::ByteArrayViewProfileManager* viewProfileManager() const { return mViewProfileManager; } -#endif private Q_SLOTS: void onOpenTriggered(); protected: OktetaDocumentFactory* mDocumentFactory; -#if KASTEN_VERSION == 2 Kasten::ByteArrayViewProfileManager* const mViewProfileManager; -#endif }; } - #endif diff --git a/utils/okteta/oktetaplugin.cpp b/utils/okteta/oktetaplugin.cpp --- a/utils/okteta/oktetaplugin.cpp +++ b/utils/okteta/oktetaplugin.cpp @@ -27,30 +27,28 @@ #include "oktetatoolviewfactory.h" #include "oktetadocument.h" // Okteta Kasten tools -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include // #include // #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifndef BIG_ENDIAN -#include -#include +#include +#include #endif // Okteta Kasten -#if KASTEN_VERSION == 2 -#include -#endif +#include // KDev #include #include @@ -61,10 +59,11 @@ // KDE #include #include +#include #include -K_PLUGIN_FACTORY(OktetaPluginFactory, registerPlugin(); ) +K_PLUGIN_FACTORY_WITH_JSON(OktetaPluginFactory, "kdevokteta.json", registerPlugin(); ) namespace KDevelop { @@ -84,19 +83,10 @@ OktetaPlugin::OktetaPlugin( QObject* parent, const QVariantList& args ) : IPlugin( "kdevokteta", parent ) , mDocumentFactory( new OktetaDocumentFactory(this) ) -#if KASTEN_VERSION == 2 , mViewProfileManager( new Kasten::ByteArrayViewProfileManager() ) -#endif { Q_UNUSED(args) -#if KASTEN_VERSION == 0 || KASTEN_VERSION == 1 - KLocale* globalLocale = KGlobal::locale(); - globalLocale->insertCatalog( QString::fromLatin1("liboktetacore") ); - globalLocale->insertCatalog( QString::fromLatin1("libkasten") ); - globalLocale->insertCatalog( QString::fromLatin1("liboktetakasten") ); -#endif - IUiController* uiController = core()->uiController(); addTool( uiController, new Kasten::ChecksumToolViewFactory(), new Kasten::ChecksumToolFactory() ); addTool( uiController, new Kasten::FilterToolViewFactory(), new Kasten::FilterToolFactory() ); @@ -118,12 +108,12 @@ { OpenWithContext* openWithContext = dynamic_cast( context ); - if( openWithContext && !openWithContext->mimeType()->is("inode/directory")) + if( openWithContext && !openWithContext->mimeType().inherits("inode/directory")) { QAction* openAction = new QAction( i18n("Hex Editor"), this ); openAction->setIcon( QIcon::fromTheme("document-open") ); - openAction->setData( openWithContext->urls() ); - connect( openAction, SIGNAL(triggered()), SLOT(onOpenTriggered()) ); + openAction->setData( QVariant::fromValue(openWithContext->urls()) ); + connect( openAction, &QAction::triggered, this, &OktetaPlugin::onOpenTriggered ); KDevelop::ContextMenuExtension contextMenuExtension; contextMenuExtension.addAction( KDevelop::ContextMenuExtension::OpenEmbeddedGroup, openAction ); @@ -160,3 +150,5 @@ } } + +#include "oktetaplugin.moc" diff --git a/utils/okteta/oktetatoolviewfactory.h b/utils/okteta/oktetatoolviewfactory.h --- a/utils/okteta/oktetatoolviewfactory.h +++ b/utils/okteta/oktetatoolviewfactory.h @@ -23,12 +23,10 @@ #ifndef OKTETATOOLVIEWFACTORY_H #define OKTETATOOLVIEWFACTORY_H -// Plugin -#include "oktetaglobal.h" // KDev #include -namespace KASTEN_NAMESPACE { +namespace Kasten { class AbstractToolViewFactory; class AbstractToolFactory; } diff --git a/utils/okteta/oktetatoolviewfactory.cpp b/utils/okteta/oktetatoolviewfactory.cpp --- a/utils/okteta/oktetatoolviewfactory.cpp +++ b/utils/okteta/oktetatoolviewfactory.cpp @@ -25,19 +25,9 @@ // plugin #include "kastentoolviewwidget.h" // Kasten -#if KASTEN_VERSION == 2 -#include -#include -#include -#elif KASTEN_VERSION == 1 -#include -#include -#include -#else #include #include #include -#endif #include diff --git a/utils/okteta/oktetaview.h b/utils/okteta/oktetaview.h --- a/utils/okteta/oktetaview.h +++ b/utils/okteta/oktetaview.h @@ -23,12 +23,10 @@ #ifndef OKTETAVIEW_H #define OKTETAVIEW_H -// Plugin -#include "oktetaglobal.h" // KDevPlatform #include -namespace KASTEN_NAMESPACE { +namespace Kasten { class ByteArrayViewProfileSynchronizer; class ByteArrayView; } @@ -44,11 +42,7 @@ Q_OBJECT public: -#if KASTEN_VERSION == 2 OktetaView( OktetaDocument* document, Kasten::ByteArrayViewProfileSynchronizer* viewProfileSynchronizer ); -#else - explicit OktetaView( OktetaDocument* document ); -#endif virtual ~OktetaView(); public: diff --git a/utils/okteta/oktetaview.cpp b/utils/okteta/oktetaview.cpp --- a/utils/okteta/oktetaview.cpp +++ b/utils/okteta/oktetaview.cpp @@ -27,21 +27,15 @@ #include "oktetadocument.h" #include "oktetawidget.h" // Okteta Kasten -#include +#include namespace KDevelop { -#if KASTEN_VERSION == 2 OktetaView::OktetaView( OktetaDocument* document, Kasten::ByteArrayViewProfileSynchronizer* viewProfileSynchronizer ) : Sublime::View( document, View::TakeOwnership ), mByteArrayView( new Kasten::ByteArrayView( document->byteArrayDocument(), viewProfileSynchronizer ) ) -#else -OktetaView::OktetaView( OktetaDocument* document ) - : Sublime::View( document, View::TakeOwnership ), - mByteArrayView( new Kasten::ByteArrayView( document->byteArrayDocument() ) ) -#endif { } diff --git a/utils/okteta/oktetawidget.h b/utils/okteta/oktetawidget.h --- a/utils/okteta/oktetawidget.h +++ b/utils/okteta/oktetawidget.h @@ -23,14 +23,12 @@ #ifndef OKTETAWIDGET_H #define OKTETAWIDGET_H -// Plugin -#include "oktetaglobal.h" // KDE #include // Qt #include -namespace KASTEN_NAMESPACE { +namespace Kasten { class ByteArrayView; class AbstractXmlGuiController; } diff --git a/utils/okteta/oktetawidget.cpp b/utils/okteta/oktetawidget.cpp --- a/utils/okteta/oktetawidget.cpp +++ b/utils/okteta/oktetawidget.cpp @@ -26,35 +26,33 @@ #include "oktetadocument.h" #include "oktetaplugin.h" // Okteta Kasten -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if KASTEN_VERSION == 2 -#include -#include -#endif +#include +//#include +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // Kasten -#include +#include // #include // #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include // KDevelop #include // KDE @@ -74,7 +72,7 @@ KXMLGUIClient(), mByteArrayView( byteArrayView ) { - setComponentData( plugin->componentData() ); + setComponentName( "kdevokteta" , "KDevelop Okteta"); setXMLFile( "kdevokteta.rc" ); setupActions(plugin); @@ -107,15 +105,13 @@ mControllers.append( new Kasten::PrintController( this ) ); mControllers.append( new Kasten::ViewConfigController(this) ); mControllers.append( new Kasten::ViewModeController(this) ); -#if KASTEN_VERSION == 2 Kasten::ByteArrayViewProfileManager* viewProfileManager = plugin->viewProfileManager(); mControllers.append( new Kasten::ViewProfileController(viewProfileManager, mByteArrayView->widget(), this) ); mControllers.append( new Kasten::ViewProfilesManageController(this, viewProfileManager, mByteArrayView->widget()) ); // update the text of the viewprofiles_manage action, to make clear this is just for byte arrays QAction* viewprofilesManageAction = actionCollection()->action(QLatin1String("settings_viewprofiles_manage")); viewprofilesManageAction->setText( i18nc("@action:inmenu", "Manage Byte Array View Profiles...") ); -#endif // Kasten::StatusBar* bottomBar = static_cast( statusBar() ); // mControllers.append( new ViewStatusController(bottomBar) );